From 8e54efdc35a947c8c93c5e19dde5d873db6e74d1 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 26 Jun 2023 07:26:37 +1000 Subject: Metadata cleanup. --- hash/megacdj.xml | 8 +++----- hash/megadriv.xml | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/hash/megacdj.xml b/hash/megacdj.xml index c80ed11c3c5..a1c9ef932cb 100644 --- a/hash/megacdj.xml +++ b/hash/megacdj.xml @@ -2118,7 +2118,7 @@ Requires [disc swap] --> - Sonic The Hedgehog CD (Japan) + Sonic the Hedgehog CD (Japan) 1993 Sega @@ -5504,14 +5504,12 @@ Black screen, requires sub CPU to be overclocked by 1.5x --> - Sonic The Hedgehog CD Hibaihin (Japan) + Sonic the Hedgehog CD Hibaihin (Japan) 1993 Sega - + diff --git a/hash/megadriv.xml b/hash/megadriv.xml index 79ae0442996..714c867df1c 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -7593,7 +7593,7 @@ Unsupported [Menacer] peripheral - Sonic the Hedgehog (Europe, USA) + Sonic The Hedgehog (Europe, USA) 1991 Sega @@ -7609,7 +7609,7 @@ Unsupported [Menacer] peripheral - Sonic the Hedgehog (Japan, Korea) + Sonic The Hedgehog (Japan, Korea) 1991 Sega @@ -7627,7 +7627,7 @@ Unsupported [Menacer] peripheral - Sonic the Hedgehog 2 (World, rev. A) + Sonic The Hedgehog 2 (World, rev. A) 1992 Sega @@ -7644,7 +7644,7 @@ Unsupported [Menacer] peripheral - Sonic the Hedgehog 3 (Europe) + Sonic The Hedgehog 3 (Europe) 1994 Sega @@ -9934,7 +9934,7 @@ Doesn't accept any input - Sonic the Hedgehog 3 (Japan, Korea) + Sonic The Hedgehog 3 (Japan, Korea) 1994 Sega @@ -26513,7 +26513,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog (pirate, ripped from Golden 10 in 1) + Sonic The Hedgehog (pirate, ripped from Golden 10 in 1) 1991? <unlicensed> @@ -26524,7 +26524,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog (prototype) + Sonic The Hedgehog (prototype) 1991 Sega @@ -26535,7 +26535,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World) + Sonic The Hedgehog 2 (World) 1992 Sega @@ -26549,7 +26549,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 4, 19920918, 16.26) + Sonic The Hedgehog 2 (Beta 4, 19920918, 16.26) 1992 Sega @@ -26560,7 +26560,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 5, 19920921, 12.06) + Sonic The Hedgehog 2 (Beta 5, 19920921, 12.06) 1992 Sega @@ -26571,7 +26571,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 6, 19920922, 18.47) + Sonic The Hedgehog 2 (Beta 6, 19920922, 18.47) 1992 Sega @@ -26582,7 +26582,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 6, 19920922, 19.42) + Sonic The Hedgehog 2 (Beta 6, 19920922, 19.42) 1992 Sega @@ -26593,7 +26593,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 7, 19920924, 09.26) + Sonic The Hedgehog 2 (Beta 7, 19920924, 09.26) 1992 Sega @@ -26604,7 +26604,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (Beta 8, 19920924, 19.27) + Sonic The Hedgehog 2 (Beta 8, 19920924, 19.27) 1992 Sega @@ -26615,7 +26615,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (prototype) + Sonic The Hedgehog 2 (prototype) 1992 Sega @@ -26626,7 +26626,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, rev. 01a) + Sonic The Hedgehog 2 (World, rev. 01a) 1992 Sega @@ -26640,7 +26640,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, rev. SC02) + Sonic The Hedgehog 2 (World, rev. SC02) 1992 Sega @@ -26654,7 +26654,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, prototype) + Sonic The Hedgehog 2 (World, prototype) 1992 Sega @@ -26665,7 +26665,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, prototype 19920821) + Sonic The Hedgehog 2 (World, prototype 19920821) 1992 Sega @@ -26683,7 +26683,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, prototype 19920914) + Sonic The Hedgehog 2 (World, prototype 19920914) 1992 Sega @@ -26697,7 +26697,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 2 (World, final prototype 19921102) + Sonic The Hedgehog 2 (World, final prototype 19921102) 1992 Sega @@ -26711,7 +26711,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 3 (pirate) + Sonic The Hedgehog 3 (pirate) 1994? <unlicensed> @@ -26725,7 +26725,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 3 (USA) + Sonic The Hedgehog 3 (USA) 1994 Sega @@ -26748,7 +26748,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 3 (USA, prototype 19931120) + Sonic The Hedgehog 3 (USA, prototype 19931120) 1994 Sega @@ -26763,7 +26763,7 @@ Black screen, writes in ROM area then jumps to PC=1a2000 (encryption?) - Sonic the Hedgehog 3 (World, prototype 19931103) + Sonic The Hedgehog 3 (World, prototype 19931103) 1993 Sega -- cgit v1.2.3 From 1add0a6116ac174e19d032e787d794a089e908d9 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 25 Jun 2023 22:41:01 +0200 Subject: cdimono: fix cdrom regions --- src/mame/philips/cdi.cpp | 9 +++++---- src/mame/philips/cdi.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mame/philips/cdi.cpp b/src/mame/philips/cdi.cpp index 6b06ce6a8dc..fa410220e17 100644 --- a/src/mame/philips/cdi.cpp +++ b/src/mame/philips/cdi.cpp @@ -458,9 +458,8 @@ void cdi_state::cdimono1_base(machine_config &config) CDI_SLAVE_HLE(config, m_slave_hle, 0); m_slave_hle->int_callback().set(m_maincpu, FUNC(scc68070_device::in2_w)); - cdrom_image_device &cdrom(CDROM(config, "cdrom")); - cdrom.set_interface("cdi_cdrom"); - cdrom.add_region("cdrom"); + CDROM(config, m_cdrom); + m_cdrom->set_interface("cdi_cdrom"); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -504,7 +503,7 @@ void cdi_state::cdimono2(machine_config &config) M68HC05C8(config, m_servo, 4_MHz_XTAL); M68HC05C8(config, m_slave, 4_MHz_XTAL); - CDROM(config, "cdrom").set_interface("cdi_cdrom"); + CDROM(config, m_cdrom).set_interface("cdi_cdrom"); SOFTWARE_LIST(config, "cd_list").set_original("cdi").set_filter("!DVC"); /* sound hardware */ @@ -579,6 +578,8 @@ void cdi_state::cdimono1(machine_config &config) void quizard_state::quizard(machine_config &config) { cdimono1_base(config); + m_cdrom->add_region("cdrom"); + m_maincpu->set_addrmap(AS_PROGRAM, &quizard_state::cdimono1_mem); m_maincpu->uart_rtsn_callback().set(FUNC(quizard_state::mcu_rtsn_from_cpu)); m_maincpu->uart_tx_callback().set(FUNC(quizard_state::mcu_rx_from_cpu)); diff --git a/src/mame/philips/cdi.h b/src/mame/philips/cdi.h index 2c56e066465..fbece9d34bf 100644 --- a/src/mame/philips/cdi.h +++ b/src/mame/philips/cdi.h @@ -29,6 +29,7 @@ public: , m_servo(*this, "servo") , m_slave(*this, "slave") , m_cdic(*this, "cdic") + , m_cdrom(*this, "cdrom") , m_mcd212(*this, "mcd212") , m_dmadac(*this, "dac%u", 1U) { } @@ -48,7 +49,6 @@ protected: optional_device m_lcd; optional_device m_slave_hle; -private: enum servo_portc_bit_t { INV_JUC_OUT = (1 << 2), @@ -77,6 +77,7 @@ private: optional_device m_servo; optional_device m_slave; optional_device m_cdic; + required_device m_cdrom; required_device m_mcd212; required_device_array m_dmadac; -- cgit v1.2.3 From 26903e1bb3c648eafffa015498cd859ba1423b44 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 25 Jun 2023 22:53:22 +0200 Subject: cdimono: reorder things a little --- src/mame/philips/cdi.h | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/mame/philips/cdi.h b/src/mame/philips/cdi.h index fbece9d34bf..e83c18cd687 100644 --- a/src/mame/philips/cdi.h +++ b/src/mame/philips/cdi.h @@ -40,15 +40,6 @@ public: void cdi910(machine_config &config); protected: - virtual void machine_reset() override; - - void cdimono1_mem(address_map &map); - - required_device m_maincpu; - required_region_ptr m_main_rom; - optional_device m_lcd; - optional_device m_slave_hle; - enum servo_portc_bit_t { INV_JUC_OUT = (1 << 2), @@ -56,7 +47,23 @@ protected: INV_CADDYSWITCH_IN = (1 << 7) }; + required_device m_maincpu; + required_region_ptr m_main_rom; + optional_device m_lcd; + optional_device m_slave_hle; + required_shared_ptr_array m_plane_ram; + optional_device m_servo; + optional_device m_slave; + optional_device m_cdic; + required_device m_cdrom; + required_device m_mcd212; + + required_device_array m_dmadac; + uint32_t screen_update_cdimono1_lcd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual void machine_reset() override; + + void cdimono1_mem(address_map &map); void cdi910_mem(address_map &map); void cdimono2_mem(address_map &map); @@ -72,15 +79,6 @@ protected: uint16_t bus_error_r(offs_t offset); void bus_error_w(offs_t offset, uint16_t data); - - required_shared_ptr_array m_plane_ram; - optional_device m_servo; - optional_device m_slave; - optional_device m_cdic; - required_device m_cdrom; - required_device m_mcd212; - - required_device_array m_dmadac; }; class quizard_state : public cdi_state, public device_serial_interface -- cgit v1.2.3