Previous 199869 Revisions Next

r34280 Friday 9th January, 2015 at 05:49:01 UTC by Olivier Galibert
Merge pull request #97 from RealComboman/patch-3

added output so artwork can display current gear settings
[/trunk]makefile
[src/emu/netlist/devices]nld_9316.c
[src/mame]mame.lst
[src/mame/drivers]seta2.c
[src/osd/modules/sync]work_osd.c
[src/osd/osdmini]osdmini.mak
[src/osd/sdl]sdl.mak
[src/osd/windows]windows.mak

trunk/makefile
r242791r242792
490490DEFS += -DMAME_DEBUG_FAST
491491endif
492492
493# add a define identifying the target osd
494
495ifeq ($(OSD),sdl)
496DEFS += -DOSD_SDL
497else
498ifeq ($(OSD),windows)
499DEFS += -DOSD_WINDOWS
500else
501ifeq ($(OSD),winui)
502DEFS += -DOSD_WINDOWS
503else
504ifeq ($(OSD),osdmini)
505DEFS += -DOSD_MINI
506else
507$(warning Please add -DOSD_[SDL|WINDOWS|MINI] in $(OSD).mak)
508endif
509endif
510endif
511endif
512
513493#-------------------------------------------------
514494# compile flags
515495# CCOMFLAGS are common flags
r242791r242792
885865# TODO: -x c++ should not be hard-coded
886866CPPCHECKFLAGS = $(CDEFS) $(INCPATH) -x c++ --enable=style
887867
868#-------------------------------------------------
869# sanity check OSD additions
870#-------------------------------------------------
888871
872ifeq (,$(findstring -DOSD_,$(CDEFS)))
873$(error $(OSD).mak should have defined -DOSD_)
874endif
875
889876#-------------------------------------------------
890877# primary targets
891878#-------------------------------------------------
trunk/src/emu/netlist/devices/nld_9316.c
r242791r242792
116116   sub.m_ent = INPLOGIC(m_ENT);
117117   const netlist_sig_t clrq = INPLOGIC(m_CLRQ);
118118
119   if ((!sub.m_loadq | (sub.m_ent & INPLOGIC(m_ENP))) & clrq)
119   if ((!sub.m_loadq || (sub.m_ent & INPLOGIC(m_ENP))) && clrq)
120120   {
121121      sub.m_CLK.activate_lh();
122122   }
r242791r242792
124124   {
125125      UINT8 cnt = sub.m_cnt;
126126      sub.m_CLK.inactivate();
127      if (!clrq & (cnt>0))
127      if (!clrq && (cnt>0))
128128      {
129129         cnt = 0;
130130         sub.update_outputs(cnt);
trunk/src/mame/drivers/seta2.c
r242791r242792
3030P0-125A ; KE (Namco)    1996    Kosodate Quiz My Angel                  Namco
3131P0-136A ; KL (Namco)    1997    Kosodate Quiz My Angel 2                Namco
3232P-FG-02                 1997    Reel'N Quake                            <unknown>
33P-FG-03              <unknown>  Endless Riches                          E.N.Tiger
3334P0-140B                 2000    Funcube                                 Namco
3435P0-140B                 2000    Namco Stars                             Namco
3536P0-142A                 1999    Puzzle De Bowling                       MOSS / Nihon System
r242791r242792
4142B0-010A                 2002    Trophy Hunting - Bear & Moose           Sammy
4243-------------------------------------------------------------------------------------------
4344
44* Not dumped: Endless Riches by <unknown> 8-liner gambler on modified Reel'N Quake PCB that
45              uses an 8-liner harness instead of a JAMMA connector.
46
4745TODO:
4846
4947- Proper emulation of the TMP68301 CPU, in a core file.
r242791r242792
15631561
15641562static INPUT_PORTS_START( reelquak )
15651563   PORT_START("DSW1")  // $400300.w
1566   PORT_DIPNAME( 0x0001, 0x0001, "Game Style" )
1564   PORT_DIPNAME( 0x0001, 0x0001, "Game Style" ) PORT_DIPLOCATION("SW1:1")
15671565   PORT_DIPSETTING(      0x0001, DEF_STR( Standard ) )
15681566   PORT_DIPSETTING(      0x0000, "Redemption" )
1569   PORT_DIPNAME( 0x000e, 0x000e, "Key-In Credits" )
1567   PORT_DIPNAME( 0x000e, 0x000e, "Key-In Credits" ) PORT_DIPLOCATION("SW1:2,3,4")
15701568   PORT_DIPSETTING(      0x000c, "1 Turn / 2 Credits" )
15711569   PORT_DIPSETTING(      0x000a, "1 Turn / 3 Credits" )
15721570   PORT_DIPSETTING(      0x0008, "1 Turn / 5 Credits" )
r242791r242792
15751573   PORT_DIPSETTING(      0x0004, "1 Turn / 25 Credits" )
15761574   PORT_DIPSETTING(      0x0002, "1 Turn / 50 Credits" )
15771575   PORT_DIPSETTING(      0x0000, "1 Turn / 100 Credits" )
1578   PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) )
1576   PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6")
15791577   PORT_DIPSETTING(      0x0030, DEF_STR( 1C_1C ) )
15801578   PORT_DIPSETTING(      0x0020, DEF_STR( 1C_2C ) )
15811579   PORT_DIPSETTING(      0x0010, DEF_STR( 1C_5C ) )
15821580   PORT_DIPSETTING(      0x0000, "1 Coin/10 Credits" )
1583   PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) )   // bit 7 tested according to game style
1581   PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8")   // bit 7 tested according to game style
15841582   PORT_DIPSETTING(      0x00c0, DEF_STR( 1C_1C ) )
15851583   PORT_DIPSETTING(      0x0080, DEF_STR( 1C_2C ) )
15861584   PORT_DIPSETTING(      0x0040, DEF_STR( 1C_5C ) )
15871585   PORT_DIPSETTING(      0x0000, "1 Coin/10 Credits" )
15881586
1589   PORT_START("DSW2")  // $400302.w
1590   PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )  // used
1587   PORT_START("DSW2")  // $400302.w   PORT_START("DSW2")  // $400302.w
1588   PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")  // used
15911589   PORT_DIPSETTING(      0x0001, DEF_STR( Off ) )
15921590   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1593   PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
1591   PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:2")
15941592   PORT_DIPSETTING(      0x0002, DEF_STR( Off ) )
15951593   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1596   PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
1594   PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:3")
15971595   PORT_DIPSETTING(      0x0004, DEF_STR( Off ) )
15981596   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1599   PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
1597   PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4")
16001598   PORT_DIPSETTING(      0x0008, DEF_STR( Off ) )
16011599   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1602   PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
1600   PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5")
16031601   PORT_DIPSETTING(      0x0010, DEF_STR( Off ) )
16041602   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1605   PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
1603   PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6")
16061604   PORT_DIPSETTING(      0x0020, DEF_STR( Off ) )
16071605   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1608   PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
1606   PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
16091607   PORT_DIPSETTING(      0x0040, DEF_STR( Off ) )
16101608   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
1611   PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
1609   PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8")
16121610   PORT_DIPSETTING(      0x0080, DEF_STR( Off ) )
16131611   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
16141612
16151613   PORT_START("P1")    // $400001.b
1616   PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_POKER_CANCEL  )    // bet cancel
1617   PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE   )    // collect
1618   PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP   )    // double up
1619   PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH   )    // big
1620   PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_POKER_BET     )    // bet
1621   PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_GAMBLE_LOW    )    // small
1622   PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL   )    // start
1614   PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_POKER_CANCEL  )                    // bet cancel
1615   PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE   )                    // collect
1616   PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP   )                    // double up
1617   PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH   ) PORT_NAME("Big")   // big
1618   PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_POKER_BET     )                    // bet
1619   PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_GAMBLE_LOW    ) PORT_NAME("Small") // small
1620   PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL   )                    // start
16231621   PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN       )
16241622
16251623   PORT_START("TICKET")    // $400003.b
16261624   PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL       ) PORT_READ_LINE_DEVICE_MEMBER("ticket", ticket_dispenser_device, line_r)    // ticket sensor
16271625   PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN       )
16281626   PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN       )
1629   PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT )                            // knock down
1627   PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_NAME("Knock Down")    // knock down
16301628   PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE2      ) PORT_NAME("Ticket Clear")  // ticket clear
16311629   PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE3      ) PORT_NAME("Ticket Resume") // ticket resume
16321630   PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN  )                            // key in
r242791r242792
16451643
16461644
16471645/***************************************************************************
1646                              Endless Riches
1647***************************************************************************/
1648
1649static INPUT_PORTS_START( endrichs )
1650   PORT_INCLUDE(reelquak)
1651   
1652   PORT_MODIFY("DSW1")  // $400300.w
1653   PORT_DIPNAME( 0x0001, 0x0001, "Payout Style" ) PORT_DIPLOCATION("SW1:1")
1654   PORT_DIPSETTING(      0x0001, "Normal Payout" )
1655   PORT_DIPSETTING(      0x0000, "Ticket Payout" ) // Ticket Printer?
1656
1657   PORT_MODIFY("DSW2")  // $400302.w
1658   PORT_DIPUNUSED_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW2:1" ) // DSW2 unpopulated
1659   PORT_DIPUNUSED_DIPLOC( 0x0002, IP_ACTIVE_LOW, "SW2:2" )
1660   PORT_DIPUNUSED_DIPLOC( 0x0004, IP_ACTIVE_LOW, "SW2:3" )
1661   PORT_DIPUNUSED_DIPLOC( 0x0008, IP_ACTIVE_LOW, "SW2:4" )
1662   PORT_DIPUNUSED_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW2:5" )
1663   PORT_DIPUNUSED_DIPLOC( 0x0020, IP_ACTIVE_LOW, "SW2:6" )
1664   PORT_DIPUNUSED_DIPLOC( 0x0040, IP_ACTIVE_LOW, "SW2:7" )
1665   PORT_DIPUNUSED_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" )
1666INPUT_PORTS_END
1667
1668
1669/***************************************************************************
16481670                            Sammy Outdoor Shooting
16491671***************************************************************************/
16501672
r242791r242792
31213143
31223144/***************************************************************************
31233145
3146Endless Riches
3147(c) 199? E.N.Tiger
3148
3149   CPU: Toshiba TMP68301AF-16 (100 Pin PQFP)
3150 Video: NEC DX-101 (240 Pin PQFP, @ U10)
3151        NEC DX-102 (52 Pin PQFP x3, @ U28 U30 & U45)
3152 Sound: X1-010 (Mitsubishi M60016 Gate Array, 80 Pin PQFP @ U26)
3153   OSC: 50MHz & 28MHz
3154 Other: 8 Position Dipswitch x 2
3155        Push Button SW1
3156        3.6V Battery at BT1
3157        GAL 16V8 - labeled "KF-001" at U38
3158
3159Memory:
3160M1 are TC551001BFL-70L at U42 & U43
3161M2 is  W2465K-70LL at U27
3162M3 are LH5168D-10L at U8 & U9
3163M4 are UT62256SC-70L at U6, U7, U13 & U14
3164
3165PCB Number: P-FG-03
3166+-----+_+----------------------------------------------------+
3167|             +------+      U  U                             |
3168| VOL         |Seta  |   M  5  5            +---------------+|
3169|             |X1-010|   2  8  7    +-+  M  |KFC-U16-C00 U16||
3170|             +------+      *  *    | |  1  +---------------+|
3171+-+                                 |U|                      |
3172  |  +-+    +-+           BT1       |3|            U20*      |
3173+-+  | |    | |         M           |2|  M                   |
3174|    |U| U  |U| U  M M  4           | |  1  +---------------+|
3175|    |3| 5  |2| 4  3 3              +-+     |KFC-U15-C00 U15||
3176|8   | | *  | | *       M                   +---------------+|
3177|    +-+    +-+         4                                    |
3178|L                                                 U19*      |
3179|I                                                           |
3180|N                                          +---------------+|
3181|E                                          |KFC-U18-C00 U18||
3182|R                           +----------+   +---------------+|
3183|           +-------+        |          |                    |
3184|C C        |Toshiba|        |   NEC    |          U22*      |
3185|o N        |  TMP  |        |  DX-101  |                    |
3186|n 1        | 68301 |        |          |   +---------------+|
3187|n        U +-------+        |          |   |KFC-U17-C00 U17||
3188|e C      5                  +----------+   +---------------+|
3189|c N      6                                                  |
3190|t 2      *                                        U21*      |
3191|e  +---+    +---+       U  50MHz 28MHz                      |
3192|r    |DX | S  |DX |       3                                 |
3193|     |102| W  |102|       8                   +---+    OSC2*|
3194|     +---+ 1  +---+                    M  M   |DX |         |
3195+-+            D D                      4  4   |102|         |
3196  |            S S                             +---+         |
3197+-+            W W                                           |
3198|              2 1                                           |
3199+------------------------------------------------------------+
3200
3201CN1   - 7 Pin connector
3202CN2   - 8 Pin connector
3203
3204* Denotes not populated.
3205  U56 is unpopulated 93C45 EEPROM
3206  DSW2 is unpopulated
3207
3208    U3-U5 silkscreened 27C4001
3209  U57-U58 silkscreened 23C8001E
3210  U15-U22 silkscreened 23C32000
3211      U32 silkscreened 23C32000
3212
3213Note:
3214  8-Liner version of P-FG-02 (see Reel'N Quake! above)
3215  Hitting Service Mode "F2" will show Ver 1.7, but going through the diagnostic "0"
3216   Main Menu --> Test Mode --> Memory Test will show Version 1.20
3217
3218***************************************************************************/
3219
3220ROM_START( endrichs )
3221   ROM_REGION( 0x100000, "maincpu", 0 )    // TMP68301 Code
3222   ROM_LOAD16_BYTE( "kfp_u02_c12.u2", 0x00000, 0x80000, CRC(462341d2) SHA1(a88215d74469513f4239853f62d4dbbffe2aa83a) )
3223   ROM_LOAD16_BYTE( "kfp_u03_c12.u3", 0x00001, 0x80000, CRC(2baee8d1) SHA1(f86920382c54a259adb1dee253859561746d215a) )
3224
3225   ROM_REGION( 0x800000, "sprites", 0 )    // Sprites
3226   ROM_LOAD( "kfc-u16-c00.u16", 0x000000, 0x200000, CRC(cbfe5e0f) SHA1(6c7c8088c43231997ac47ce05cf43c78c1fdad47) )
3227   ROM_LOAD( "kfc-u15-c00.u15", 0x200000, 0x200000, CRC(98e4c36c) SHA1(651be122b78f225d38878ae90776f66989440590) )
3228   ROM_LOAD( "kfc-u18-c00.u18", 0x400000, 0x200000, CRC(561ac136) SHA1(96da493157405a5d3d72b8cc3004abd3fa3eadfa) )
3229   ROM_LOAD( "kfc-u17-c00.u17", 0x600000, 0x200000, CRC(34660029) SHA1(cf09b97422497d739f71e6ff8b9974fca0329928) )
3230
3231   ROM_REGION( 0x300000, "x1snd", 0 )  // Samples
3232   // Leave 1MB empty (addressable by the chip)
3233   ROM_LOAD( "kfs-u32-c00.u32", 0x100000, 0x200000, CRC(e9ffbecf) SHA1(3cc9ab3f4be1a305235603a68ca1e15797fb27cb) ) // Yes, it's actually "KFS" here
3234
3235   ROM_REGION( 0x117, "plds", 0 )
3236   ROM_LOAD( "gal16v8_kf-001.u38", 0x000, 0x117, NO_DUMP )
3237ROM_END
3238
3239/***************************************************************************
3240
31243241Sammy USA Outdoor Shooting Series PCB
31253242
31263243PCB B0-003A (or B0-003B):
r242791r242792
34363553GAME( 1996, mj4simai, 0,        mj4simai, mj4simai, driver_device, 0,        ROT0, "Maboroshi Ware",        "Wakakusamonogatari Mahjong Yonshimai (Japan)", GAME_NO_COCKTAIL )
34373554GAME( 1996, myangel,  0,        myangel,  myangel,  driver_device, 0,        ROT0, "MOSS / Namco",          "Kosodate Quiz My Angel (Japan)",               GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS )
34383555GAME( 1997, myangel2, 0,        myangel2, myangel2, driver_device, 0,        ROT0, "MOSS / Namco",          "Kosodate Quiz My Angel 2 (Japan)",             GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS )
3439GAME( 1997, reelquak, 0,        reelquak, reelquak, driver_device, 0,        ROT0, "<unknown>",             "Reel'N Quake! (Ver. 1.05)",                    GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS )
3556GAME( 1997, reelquak, 0,        reelquak, reelquak, driver_device, 0,        ROT0, "<unknown>",             "Reel'N Quake! (Version 1.05)",                 GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS )
3557GAME( 199?, endrichs, 0,        reelquak, endrichs, driver_device, 0,        ROT0, "E.N.Tiger",             "Endless Riches (Ver 1.20)",                    GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS )
34403558GAME( 1999, pzlbowl,  0,        pzlbowl,  pzlbowl,  driver_device, 0,        ROT0, "MOSS / Nihon System",   "Puzzle De Bowling (Japan)",                    GAME_NO_COCKTAIL )
34413559GAME( 2000, penbros,  0,        penbros,  penbros,  driver_device, 0,        ROT0, "Subsino",               "Penguin Brothers (Japan)",                     GAME_NO_COCKTAIL )
34423560GAME( 2000, namcostr, 0,        namcostr, funcube,  driver_device, 0,        ROT0, "Namco",                 "Namco Stars",                                  GAME_NO_COCKTAIL | GAME_NOT_WORKING )
trunk/src/mame/mame.lst
r242791r242792
90669066myangel         // (c) 1996 Namco
90679067myangel2        // (c) 1997 Namco
90689068reelquak        // (c) 1997 <unknown>
9069endrichs        // (c) 199? E.N.Tiger
90699070pzlbowl         // (c) 1999 Nihon System / Moss
90709071namcostr        // (c) 2000 Namco
90719072penbros         // (c) 2000 Subsino
trunk/src/osd/modules/sync/work_osd.c
r242791r242792
7676        int spin = 10000;
7777        while (--spin)
7878        {
79            if ((*ptr == val) ^ invert)
79            if ((*ptr != val) ^ invert)
8080                return;
8181        }
8282    } while (((*ptr == val) ^ invert) && osd_ticks() < stopspin);
trunk/src/osd/osdmini/osdmini.mak
r242791r242792
3737#
3838###########################################################################
3939
40# add a define identifying the target osd
41DEFS += -DOSD_MINI
4042
4143#-------------------------------------------------
4244# object and source roots
trunk/src/osd/sdl/sdl.mak
r242791r242792
8686OSDSRC = $(SRC)/osd
8787OSDOBJ = $(OBJ)/osd
8888
89# add a define identifying the target osd
90DEFS += -DOSD_SDL
91
8992# default to SDL2 for non-OS/2, non-Emscripten builds now
9093ifndef SDL_LIBVER
9194ifneq ($(TARGETOS),os2)
trunk/src/osd/windows/windows.mak
r242791r242792
7373##################   END USER-CONFIGURABLE OPTIONS   ######################
7474###########################################################################
7575
76# add a define identifying the target osd
77DEFS += -DOSD_WINDOWS
7678
79
7780#-------------------------------------------------
7881# object and source roots
7982#-------------------------------------------------

https://github.com/mamedev/mame/commit/b60ada63a53e0a720f33193c2985df234b24adfd

Previous 199869 Revisions Next

© 1997-2024 The MAME Team