From ae63f9316fbde99891fa5191e58fde480519c5c2 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 21 Jun 2023 14:32:42 +0200 Subject: turbosub: more consistent romset shortnames --- src/mame/mame.lst | 6 +++--- src/mame/misc/esripsys.cpp | 24 ++++++++++++++++-------- src/mame/misc/esripsys.h | 28 +++++++++++++++------------- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index d2e5e94d211..a2a8420cc3d 100755 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -29414,12 +29414,12 @@ eshb // (c) 1984 Funai / Gakken @source:misc/esripsys.cpp turbosub // (c) 1985 Entertainment Sciences -turbosub6 // (c) 1985 Entertainment Sciences -turbosub7 // (c) 1985 Entertainment Sciences -turbosub8 turbosubb8 // (c) 1985 Entertainment Sciences turbosubc5 // (c) 1985 Entertainment Sciences turbosubc5s // (c) 1985 Entertainment Sciences +turbosubc6 // (c) 1985 Entertainment Sciences +turbosubc7 // (c) 1985 Entertainment Sciences +turbosubc8 // (c) 1985 Entertainment Sciences @source:misc/ettrivia.cpp promutrv // (c) 1985 Enerdyne Technologies Inc diff --git a/src/mame/misc/esripsys.cpp b/src/mame/misc/esripsys.cpp index a827eb5f925..93dad82841b 100644 --- a/src/mame/misc/esripsys.cpp +++ b/src/mame/misc/esripsys.cpp @@ -15,14 +15,16 @@ Notes: * 'turbosub' executes a series of hardware tests on startup. - To skip, hold down keypad '*' on reset. + To skip, hold down keypad '*' on reset. * Hold '*' during the game to access the operator menu. BTANB: * Missing lines occur on real hardware. - To do: + TODO: * Implement collision detection hardware (unused by Turbo Sub). + * turbosubb8/c5/c5s lock up at hardware tests, see note above on + how to skip. ****************************************************************************/ @@ -241,6 +243,7 @@ uint8_t esripsys_state::rip_status_in() | (m_f_status & 0x80); } + /************************************* * * I/O @@ -410,6 +413,7 @@ INPUT_CHANGED_MEMBER(esripsys_state::coin_interrupt) } } + /************************************* * * Port definitions @@ -461,6 +465,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( turbosubb8 ) PORT_INCLUDE( turbosub ) + PORT_MODIFY("IO_1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) @@ -468,6 +473,7 @@ static INPUT_PORTS_START( turbosubb8 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) INPUT_PORTS_END + /************************************* * * Sound @@ -565,6 +571,7 @@ void esripsys_state::esripsys_dac_w(offs_t offset, uint8_t data) } } + /************************************* * * Memory Maps @@ -844,7 +851,7 @@ ROM_START( turbosub ) ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) ) ROM_END -ROM_START( turbosub7 ) +ROM_START( turbosubc7 ) ROM_REGION( 0xc0000, "main_code", 0) /* Non-bankswitched, 6809 #0 code */ ROM_LOAD( "mem6u85.bin", 0x18000, 0x4000, CRC(30016c8b) SHA1(0cd2dd7052de0eaa451ff8b0b2224180764c26de) ) @@ -954,7 +961,7 @@ ROM_START( turbosub7 ) ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) ) ROM_END -ROM_START( turbosub6 ) +ROM_START( turbosubc6 ) ROM_REGION( 0xc0000, "main_code", 0) /* Non-bankswitched, 6809 #0 code */ ROM_LOAD( "u85", 0x18000, 0x4000, CRC(d37ccb06) SHA1(445df1caa4dd4901e474bb0903bf28e536edf493) ) @@ -1070,7 +1077,7 @@ ROM_START( turbosub6 ) ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) ) ROM_END -ROM_START( turbosub8 ) +ROM_START( turbosubc8 ) ROM_REGION( 0xc0000, "main_code", 0) /* Non-bankswitched, 6809 #0 code */ ROM_LOAD( "tsc8.u85", 0x18000, 0x4000, CRC(f27d048e) SHA1(a98dc42fb8eb7ee320c7b77f9be272448ec8ec9b) ) @@ -1528,6 +1535,7 @@ ROM_START( turbosubc5 ) ROM_LOAD( "6331_vid.u155", 0x0240, 0x0020, CRC(63371737) SHA1(f08c03c81322c0de9ee64b4a9f11a1422c5bd463) ) ROM_END + /************************************* * * Game drivers @@ -1537,7 +1545,7 @@ ROM_END GAME( 1985, turbosub, 0, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSCA)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, turbosubc5, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC5)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, turbosubc5s, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC5*)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, turbosub6, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC6)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, turbosub7, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC7)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, turbosub8, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC8)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, turbosubc6, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC6)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, turbosubc7, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC7)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, turbosubc8, turbosub, esripsys, turbosub, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSC8)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, turbosubb8, turbosub, esripsys, turbosubb8, esripsys_state, init_esripsys, ROT0, "Entertainment Sciences", "Turbo Sub (prototype rev. TSB8)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/esripsys.h b/src/mame/misc/esripsys.h index b11abb818a1..e0124d07f95 100644 --- a/src/mame/misc/esripsys.h +++ b/src/mame/misc/esripsys.h @@ -32,16 +32,17 @@ class esripsys_state : public driver_device { public: - esripsys_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_framecpu(*this, "frame_cpu"), - m_videocpu(*this, "video_cpu"), - m_gamecpu(*this, "game_cpu"), - m_soundcpu(*this, "sound_cpu"), - m_tms(*this, "tms5220nl"), - m_pal_ram(*this, "pal_ram"), - m_dac(*this, "dac"), - m_screen(*this, "screen") { } + esripsys_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_framecpu(*this, "frame_cpu"), + m_videocpu(*this, "video_cpu"), + m_gamecpu(*this, "game_cpu"), + m_soundcpu(*this, "sound_cpu"), + m_tms(*this, "tms5220nl"), + m_pal_ram(*this, "pal_ram"), + m_dac(*this, "dac"), + m_screen(*this, "screen") + { } void esripsys(machine_config &config); @@ -59,6 +60,9 @@ private: required_device m_gamecpu; required_device m_soundcpu; required_device m_tms; + required_shared_ptr m_pal_ram; + required_device m_dac; + required_device m_screen; uint8_t m_g_iodata = 0U; uint8_t m_g_ioaddr = 0U; @@ -92,7 +96,6 @@ private: int m_fasel = 0; int m_fbsel = 0; int m_hblank = 0; - required_shared_ptr m_pal_ram; int m_frame_vbl = 0; int m_12sel = 0; int m_video_firq_en = 0; @@ -102,6 +105,7 @@ private: std::unique_ptr m_scale_table; int m_video_firq = 0; uint8_t m_bg_intensity = 0; + void uart_w(offs_t offset, uint8_t data); uint8_t uart_r(); uint8_t g_status_r(); @@ -132,8 +136,6 @@ private: TIMER_CALLBACK_MEMBER(delayed_bank_swap); TIMER_CALLBACK_MEMBER(hblank_start_callback); TIMER_CALLBACK_MEMBER(hblank_end_callback); - required_device m_dac; - required_device m_screen; ESRIP_DRAW(esripsys_draw); void frame_cpu_map(address_map &map); void game_cpu_map(address_map &map); -- cgit v1.2.3