diff options
author | Couriersud <couriersud@users.noreply.github.com> | 2014-03-04 09:21:56 +0000 |
---|---|---|
committer | Couriersud <couriersud@users.noreply.github.com> | 2014-03-04 09:21:56 +0000 |
commit | 0d16fc4fc2af2a35472f4981b9b53616c440a30f (patch) | |
tree | 5603e4712b1c0ae5a19d642f0a8902c99d38b481 /src | |
parent | d3edfb5fc607823fe66b66b125f622c7745f12a7 (diff) |
Fixed pong (rom based). Minor changes no netlist code.[Couriersud]
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/netlist/devices/net_lib.c | 2 | ||||
-rw-r--r-- | src/emu/netlist/nl_base.c | 4 | ||||
-rw-r--r-- | src/emu/netlist/nl_base.h | 1 | ||||
-rw-r--r-- | src/mame/drivers/pong.c | 19 |
4 files changed, 5 insertions, 21 deletions
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c index b038d27db8d..0eed88a8240 100644 --- a/src/emu/netlist/devices/net_lib.c +++ b/src/emu/netlist/devices/net_lib.c @@ -99,7 +99,7 @@ void netlist_factory_t::initialize() ENTRY(mainclock, MAINCLOCK, "FREQ") ENTRY(solver, SOLVER, "FREQ") ENTRY(gnd, GND, "-") - ENTRY(switch2, SWITCH2, "+i1,i2") + ENTRY(switch2, SWITCH2, "-") ENTRY(nicRSFF, NETDEV_RSFF, "+S,R") ENTRY(7400, TTL_7400_NAND, "+A,B") ENTRY(7402, TTL_7402_NOR, "+A,B") diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index be36df8a547..2ee9a716b46 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -591,7 +591,7 @@ ATTR_COLD void netlist_net_t::register_con(netlist_core_terminal_t &terminal) m_active++; } -ATTR_HOT ATTR_ALIGN static void update_dev(const netlist_core_terminal_t *inp, const UINT32 mask) +ATTR_HOT ATTR_ALIGN static inline void update_dev(const netlist_core_terminal_t *inp, const UINT32 mask) { if ((inp->state() & mask) != 0) { @@ -603,7 +603,7 @@ ATTR_HOT ATTR_ALIGN static void update_dev(const netlist_core_terminal_t *inp, c } } -ATTR_HOT /*ATTR_ALIGN*/ inline void netlist_net_t::update_devs() +ATTR_HOT ATTR_ALIGN inline void netlist_net_t::update_devs() { assert(m_num_cons != 0); assert(this->isRailNet()); diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index b8803210da5..40c81f4bc05 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -565,7 +565,6 @@ public: ATTR_COLD void merge_net(netlist_net_t *othernet); ATTR_COLD void register_railterminal(netlist_output_t &mr); - /* inline not always works out */ ATTR_HOT inline void update_devs(); ATTR_HOT inline const netlist_time time() const { return m_time; } diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c index f6aff35239d..780d8359518 100644 --- a/src/mame/drivers/pong.c +++ b/src/mame/drivers/pong.c @@ -144,8 +144,6 @@ static NETLIST_START(pong_schematics) TTL_7404_INVERT(e4d, STOPG) -#if 1 - TTL_7404_INVERT(c9f, c9c.Q) TTL_7404_INVERT(c9c, c9f.Q) @@ -153,19 +151,6 @@ static NETLIST_START(pong_schematics) NET_C(c9c.Q, coinsw.1) NET_C(c9f.Q, coinsw.2) -#else - RES(RYf, 50) // output impedance - not in schematics, hack (till better proxies exist) - RES(RYc, 50) // output impedance - not in schematics, hack (till better proxies exist) - - TTL_7404_INVERT(c9f, RYc.2) - TTL_7404_INVERT(c9c, RYf.2) - NET_C(c9f.Q, RYf.1) - NET_C(c9c.Q, RYc.1) - - SWITCH2(coinsw) - NET_C(RYc.2, coinsw.1) - NET_C(RYf.2, coinsw.2) -#endif NET_C(coinsw.Q, GND) /* Antenna circuit */ @@ -980,7 +965,7 @@ MACHINE_CONFIG_END ROM_START( pong ) /* dummy to satisfy game entry*/ ROM_REGION( 0x10000, "maincpu", 0 ) /* enough for netlist */ - ROM_LOAD( "pong.netlist", 0x000000, 17790 /*0x0043d9*/, CRC(64edd5a0) SHA1(9e661f2fba44f46015fdccffa7766dd4e61cdc7d) ) + ROM_LOAD( "pong.netlist", 0x000000, 0x00457f, CRC(72d5e4fe) SHA1(7bb15828223c34915c5e2869dd7917532a4bb7b4) ) ROM_END ROM_START( pongf ) /* dummy to satisfy game entry*/ @@ -993,7 +978,7 @@ ROM_START( pongd ) /* dummy to satisfy game entry*/ ROM_END #endif -GAME( 1972, pong, 0, pong, pong, driver_device, 0, ROT0, "Atari", "Pong (Rev E) external", GAME_SUPPORTS_SAVE | GAME_NOT_WORKING) +GAME( 1972, pong, 0, pong, pong, driver_device, 0, ROT0, "Atari", "Pong (Rev E) external", GAME_SUPPORTS_SAVE) GAME( 1972, pongf, 0, pongf, pong, driver_device, 0, ROT0, "Atari", "Pong (Rev E)", GAME_SUPPORTS_SAVE ) #if PONGD GAME( 1974, pongd, 0, pongd, pongd, driver_device, 0, ROT0, "Atari", "Pong Doubles", GAME_SUPPORTS_SAVE ) |