diff options
-rw-r--r-- | src/emu/bus/sms_ctrl/sports.c | 4 | ||||
-rw-r--r-- | src/emu/bus/sms_ctrl/sports.h | 2 | ||||
-rw-r--r-- | src/emu/bus/sms_exp/gender.c | 8 | ||||
-rw-r--r-- | src/emu/bus/sms_exp/gender.h | 2 | ||||
-rw-r--r-- | src/emu/bus/sms_exp/smsexp.c | 17 | ||||
-rw-r--r-- | src/mess/includes/sms.h | 4 | ||||
-rw-r--r-- | src/mess/machine/sms.c | 20 |
7 files changed, 29 insertions, 28 deletions
diff --git a/src/emu/bus/sms_ctrl/sports.c b/src/emu/bus/sms_ctrl/sports.c index 4b0e184a4d0..2eb0ea0f316 100644 --- a/src/emu/bus/sms_ctrl/sports.c +++ b/src/emu/bus/sms_ctrl/sports.c @@ -1,6 +1,6 @@ /********************************************************************** - Sega Master System "Sports Pad" emulation + Sega Master System "Sports Pad" (US model) emulation Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -112,7 +112,7 @@ ioport_constructor sms_sports_pad_device::device_input_ports() const //------------------------------------------------- sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_SPORTS_PAD, "Sports Pad", tag, owner, clock, "sms_sports_pad", __FILE__), + device_t(mconfig, SMS_SPORTS_PAD, "Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__), device_sms_control_port_interface(mconfig, *this), m_sports_in(*this, "SPORTS_IN"), m_sports_out(*this, "SPORTS_OUT"), diff --git a/src/emu/bus/sms_ctrl/sports.h b/src/emu/bus/sms_ctrl/sports.h index 0ce5cc96b09..ab2eaf7377a 100644 --- a/src/emu/bus/sms_ctrl/sports.h +++ b/src/emu/bus/sms_ctrl/sports.h @@ -1,6 +1,6 @@ /********************************************************************** - Sega Master System "Sports Pad" emulation + Sega Master System "Sports Pad" (US model) emulation Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. diff --git a/src/emu/bus/sms_exp/gender.c b/src/emu/bus/sms_exp/gender.c index 0b80deb7c68..1bda24ca090 100644 --- a/src/emu/bus/sms_exp/gender.c +++ b/src/emu/bus/sms_exp/gender.c @@ -58,6 +58,14 @@ READ8_MEMBER(sms_gender_adapter_device::read_ram) return m_subslot->read_ram(space, offset); } +int sms_gender_adapter_device::get_lphaser_xoffs() +{ + if (m_subslot->m_cart) + return m_subslot->m_cart->get_lphaser_xoffs(); + else + return 0; +} + //------------------------------------------------- // write diff --git a/src/emu/bus/sms_exp/gender.h b/src/emu/bus/sms_exp/gender.h index 4458e880688..52f3643b367 100644 --- a/src/emu/bus/sms_exp/gender.h +++ b/src/emu/bus/sms_exp/gender.h @@ -40,6 +40,8 @@ public: virtual DECLARE_READ8_MEMBER(read_ram); virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual int get_lphaser_xoffs(); + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/bus/sms_exp/smsexp.c b/src/emu/bus/sms_exp/smsexp.c index e1ddb4969f0..46d16c1a935 100644 --- a/src/emu/bus/sms_exp/smsexp.c +++ b/src/emu/bus/sms_exp/smsexp.c @@ -97,6 +97,14 @@ READ8_MEMBER(sms_expansion_slot_device::read_ram) return 0xff; } +int sms_expansion_slot_device::get_lphaser_xoffs() +{ + if (m_device) + return m_device->get_lphaser_xoffs(); + else + return 0; +} + //------------------------------------------------- // write @@ -120,15 +128,6 @@ WRITE8_MEMBER(sms_expansion_slot_device::write_ram) m_device->write_ram(space, offset, data); } -int sms_expansion_slot_device::get_lphaser_xoffs() -{ - if (m_device) - return m_device->get_lphaser_xoffs(); - else - return 0; -} - - //------------------------------------------------- // SLOT_INTERFACE( sms_expansion_devices ) diff --git a/src/mess/includes/sms.h b/src/mess/includes/sms.h index 7c9d8e0a637..5dbe7124d67 100644 --- a/src/mess/includes/sms.h +++ b/src/mess/includes/sms.h @@ -198,11 +198,7 @@ public: DECLARE_WRITE8_MEMBER(sms_store_control_w); DECLARE_DRIVER_INIT(smssdisp); - DECLARE_READ8_MEMBER(store_read_0000); - DECLARE_READ8_MEMBER(store_read_4000); - DECLARE_READ8_MEMBER(store_read_8000); DECLARE_READ8_MEMBER(store_cart_peek); - DECLARE_WRITE8_MEMBER(store_write_cart); DECLARE_WRITE_LINE_MEMBER(sms_store_int_callback); }; diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c index 77188b3c19c..3fc56cf39ee 100644 --- a/src/mess/machine/sms.c +++ b/src/mess/machine/sms.c @@ -767,18 +767,14 @@ MACHINE_START_MEMBER(sms_state,sms) { m_mainram = auto_alloc_array_clear(machine(), UINT8, 0x2000); save_pointer(NAME(m_mainram), 0x2000); - } - // alibaba and blockhol are ports of games for the MSX system. The - // MSX bios usually initializes callback "vectors" at the top of RAM. - // The code in alibaba does not do this so the IRQ vector only contains - // the "call $4010" without a following RET statement. That is basically - // a bug in the program code. The only way this cartridge could have run - // successfully on a real unit is if the RAM would be initialized with - // a F0 pattern on power up; F0 = RET P. Do that only for consoles of - // Japan region (including Korea), until confirmed on other consoles. - if (m_is_region_japan) - { + // alibaba and blockhol are ports of games for the MSX system. The + // MSX bios usually initializes callback "vectors" at the top of RAM. + // The code in alibaba does not do this so the IRQ vector only contains + // the "call $4010" without a following RET statement. That is basically + // a bug in the program code. The only way this cartridge could have run + // successfully on a real unit is if the RAM would be initialized with + // a F0 pattern on power up; F0 = RET P. memset(m_mainram, 0xf0, 0x2000); } @@ -900,7 +896,7 @@ WRITE8_MEMBER(smssdisp_state::sms_store_cart_select_w) // each slot of the pair, to enable the first where a ROM was found? slottype = data & 0x08; - logerror("switching in part of %s slot #%d\n", slottype ? "card" : "cartridge", slot ); + logerror("switching in part of %s slot #%d\n", slottype ? "card" : "cartridge", slot); } |