Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bus/spectrum: Simplify read/write handlers (nw)

Browse Source
This commit is contained in:
AJR 2019-03-09 09:10:58 -05:00
parent aaadc281cf
commit 7ae0276843
26 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/bus/spectrum/exp.cpp
View File

@ -107,10 +107,10 @@ void spectrum_expansion_slot_device::device_reset()
// port_fe_r
//-------------------------------------------------
READ8_MEMBER(spectrum_expansion_slot_device::port_fe_r)
uint8_t spectrum_expansion_slot_device::port_fe_r(offs_t offset)
{
if (m_card)
return m_card->port_fe_r(space, offset);
return m_card->port_fe_r(offset);
else
return 0xff;
}
@ -131,10 +131,10 @@ READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs)
// mreq_r
//-------------------------------------------------
READ8_MEMBER(spectrum_expansion_slot_device::mreq_r)
uint8_t spectrum_expansion_slot_device::mreq_r(offs_t offset)
{
if (m_card)
return m_card->mreq_r(space, offset);
return m_card->mreq_r(offset);
else
return 0xff;
}
@ -143,10 +143,10 @@ READ8_MEMBER(spectrum_expansion_slot_device::mreq_r)
// mreq_w
//-------------------------------------------------
WRITE8_MEMBER(spectrum_expansion_slot_device::mreq_w)
void spectrum_expansion_slot_device::mreq_w(offs_t offset, uint8_t data)
{
if (m_card)
m_card->mreq_w(space, offset, data);
m_card->mreq_w(offset, data);
}

12
src/devices/bus/spectrum/exp.h
View File

@ -75,9 +75,9 @@ public:
auto irq_handler() { return m_irq_handler.bind(); }
auto nmi_handler() { return m_nmi_handler.bind(); }
DECLARE_READ8_MEMBER( mreq_r );
DECLARE_WRITE8_MEMBER( mreq_w );
DECLARE_READ8_MEMBER( port_fe_r );
uint8_t mreq_r(offs_t offset);
void mreq_w(offs_t offset, uint8_t data);
uint8_t port_fe_r(offs_t offset);
DECLARE_READ_LINE_MEMBER( romcs );
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); }
@ -109,9 +109,9 @@ public:
device_spectrum_expansion_interface(const machine_config &mconfig, device_t &device);
// reading and writing
virtual DECLARE_READ8_MEMBER(mreq_r) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(mreq_w) { }
virtual DECLARE_READ8_MEMBER(port_fe_r) { return 0xff; }
virtual uint8_t mreq_r(offs_t offset) { return 0xff; }
virtual void mreq_w(offs_t offset, uint8_t data) { }
virtual uint8_t port_fe_r(offs_t offset) { return 0xff; }
virtual DECLARE_READ_LINE_MEMBER(romcs) { return 0; }
protected:

16
src/devices/bus/spectrum/fuller.cpp
View File

@ -92,7 +92,7 @@ void spectrum_fuller_device::device_reset()
{
io_space().install_write_handler(0x3f, 0x3f, 0, 0xff00, 0, write8smo_delegate(FUNC(ay8910_device::address_w), m_psg.target()));
io_space().install_readwrite_handler(0x5f, 0x5f, 0, 0xff00, 0, read8smo_delegate(FUNC(ay8910_device::data_r), m_psg.target()), write8smo_delegate(FUNC(ay8910_device::data_w), m_psg.target()));
io_space().install_read_handler(0x7f, 0x7f, 0, 0xff00, 0, read8_delegate(FUNC(spectrum_fuller_device::joystick_r), this));
io_space().install_read_handler(0x7f, 0x7f, 0, 0xff00, 0, read8smo_delegate(FUNC(spectrum_fuller_device::joystick_r), this));
}
@ -100,7 +100,7 @@ void spectrum_fuller_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
READ8_MEMBER(spectrum_fuller_device::joystick_r)
uint8_t spectrum_fuller_device::joystick_r()
{
return m_joy->read() | (0xff ^ 0x8f);
}
@ -110,23 +110,23 @@ READ_LINE_MEMBER(spectrum_fuller_device::romcs)
return m_exp->romcs();
}
READ8_MEMBER(spectrum_fuller_device::mreq_r)
uint8_t spectrum_fuller_device::mreq_r(offs_t offset)
{
return m_exp->mreq_r(space, offset);
return m_exp->mreq_r(offset);
}
WRITE8_MEMBER(spectrum_fuller_device::mreq_w)
void spectrum_fuller_device::mreq_w(offs_t offset, uint8_t data)
{
if (m_exp->romcs())
m_exp->mreq_w(space, offset, data);
m_exp->mreq_w(offset, data);
}
READ8_MEMBER(spectrum_fuller_device::port_fe_r)
uint8_t spectrum_fuller_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;
if (m_exp->romcs())
data &= m_exp->port_fe_r(space, offset);
data &= m_exp->port_fe_r(offset);
return data;
}

8
src/devices/bus/spectrum/fuller.h
View File

@ -38,13 +38,13 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual ioport_constructor device_input_ports() const override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_WRITE8_MEMBER(mreq_w) override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t port_fe_r(offs_t offset) override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
private:
DECLARE_READ8_MEMBER(joystick_r);
uint8_t joystick_r();
required_device<spectrum_expansion_slot_device> m_exp;
required_device<ay8910_device> m_psg;

12
src/devices/bus/spectrum/intf1.cpp
View File

@ -105,7 +105,7 @@ READ_LINE_MEMBER(spectrum_intf1_device::romcs)
return m_romcs | m_exp->romcs();
}
READ8_MEMBER(spectrum_intf1_device::mreq_r)
uint8_t spectrum_intf1_device::mreq_r(offs_t offset)
{
uint8_t temp;
uint8_t data = 0xff;
@ -116,7 +116,7 @@ READ8_MEMBER(spectrum_intf1_device::mreq_r)
m_romcs = 1;
}
temp = m_exp->mreq_r(space, offset);
temp = m_exp->mreq_r(offset);
if (m_exp->romcs())
data &= temp;
@ -132,18 +132,18 @@ READ8_MEMBER(spectrum_intf1_device::mreq_r)
return data;
}
WRITE8_MEMBER(spectrum_intf1_device::mreq_w)
void spectrum_intf1_device::mreq_w(offs_t offset, uint8_t data)
{
if (m_exp->romcs())
m_exp->mreq_w(space, offset, data);
m_exp->mreq_w(offset, data);
}
READ8_MEMBER(spectrum_intf1_device::port_fe_r)
uint8_t spectrum_intf1_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;
if (m_exp->romcs())
data &= m_exp->port_fe_r(space, offset);
data &= m_exp->port_fe_r(offset);
return data;
}

6
src/devices/bus/spectrum/intf1.h
View File

@ -36,9 +36,9 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_WRITE8_MEMBER(mreq_w) override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t port_fe_r(offs_t offset) override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
private:

4
src/devices/bus/spectrum/intf2.cpp
View File

@ -117,7 +117,7 @@ READ_LINE_MEMBER(spectrum_intf2_device::romcs)
return 0;
}
READ8_MEMBER(spectrum_intf2_device::mreq_r)
uint8_t spectrum_intf2_device::mreq_r(offs_t offset)
{
if (m_cart && m_cart->exists())
return m_cart->get_rom_base()[offset & 0x3fff];
@ -125,7 +125,7 @@ READ8_MEMBER(spectrum_intf2_device::mreq_r)
return 0xff;
}
READ8_MEMBER(spectrum_intf2_device::port_fe_r)
uint8_t spectrum_intf2_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;

4
src/devices/bus/spectrum/intf2.h
View File

@ -35,8 +35,8 @@ protected:
virtual ioport_constructor device_input_ports() const override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t port_fe_r(offs_t offset) override;
private:
image_init_result load_cart(device_image_interface &image, generic_slot_device *slot);

4
src/devices/bus/spectrum/kempjoy.cpp
View File

@ -71,7 +71,7 @@ void spectrum_kempjoy_device::device_start()
void spectrum_kempjoy_device::device_reset()
{
io_space().install_read_handler(0x1f, 0x1f, 0, 0xff00, 0, read8_delegate(FUNC(spectrum_kempjoy_device::joystick_r), this));
io_space().install_read_handler(0x1f, 0x1f, 0, 0xff00, 0, read8smo_delegate(FUNC(spectrum_kempjoy_device::joystick_r), this));
}
@ -79,7 +79,7 @@ void spectrum_kempjoy_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
READ8_MEMBER(spectrum_kempjoy_device::joystick_r)
uint8_t spectrum_kempjoy_device::joystick_r()
{
return m_joy->read() & 0x1f;
}

2
src/devices/bus/spectrum/kempjoy.h
View File

@ -37,7 +37,7 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
DECLARE_READ8_MEMBER(joystick_r);
uint8_t joystick_r();
required_ioport m_joy;
};

12
src/devices/bus/spectrum/melodik.cpp
View File

@ -79,23 +79,23 @@ READ_LINE_MEMBER(spectrum_melodik_device::romcs)
return m_exp->romcs();
}
READ8_MEMBER(spectrum_melodik_device::mreq_r)
uint8_t spectrum_melodik_device::mreq_r(offs_t offset)
{
return m_exp->mreq_r(space, offset);
return m_exp->mreq_r(offset);
}
WRITE8_MEMBER(spectrum_melodik_device::mreq_w)
void spectrum_melodik_device::mreq_w(offs_t offset, uint8_t data)
{
if (m_exp->romcs())
m_exp->mreq_w(space, offset, data);
m_exp->mreq_w(offset, data);
}
READ8_MEMBER(spectrum_melodik_device::port_fe_r)
uint8_t spectrum_melodik_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;
if (m_exp->romcs())
data &= m_exp->port_fe_r(space, offset);
data &= m_exp->port_fe_r(offset);
return data;
}

6
src/devices/bus/spectrum/melodik.h
View File

@ -37,9 +37,9 @@ protected:
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_WRITE8_MEMBER(mreq_w) override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t port_fe_r(offs_t offset) override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
private:

6
src/devices/bus/spectrum/mikroplus.cpp
View File

@ -91,7 +91,7 @@ void spectrum_mikroplus_device::device_start()
void spectrum_mikroplus_device::device_reset()
{
io_space().install_read_handler(0xdf, 0xdf, 0, 0xff00, 0, read8_delegate(FUNC(spectrum_mikroplus_device::joystick_r), this));
io_space().install_read_handler(0xdf, 0xdf, 0, 0xff00, 0, read8smo_delegate(FUNC(spectrum_mikroplus_device::joystick_r), this));
}
@ -99,7 +99,7 @@ void spectrum_mikroplus_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
READ8_MEMBER(spectrum_mikroplus_device::joystick_r)
uint8_t spectrum_mikroplus_device::joystick_r()
{
return m_joy->read() | (0xff ^ 0x1f);
}
@ -109,7 +109,7 @@ READ_LINE_MEMBER(spectrum_mikroplus_device::romcs)
return 1;
}
READ8_MEMBER(spectrum_mikroplus_device::mreq_r)
uint8_t spectrum_mikroplus_device::mreq_r(offs_t offset)
{
return m_rom->base()[offset & 0x3fff];
}

4
src/devices/bus/spectrum/mikroplus.h
View File

@ -38,10 +38,10 @@ protected:
virtual ioport_constructor device_input_ports() const override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
private:
DECLARE_READ8_MEMBER(joystick_r);
uint8_t joystick_r();
required_memory_region m_rom;
required_ioport m_joy;

2
src/devices/bus/spectrum/plus2test.cpp
View File

@ -68,7 +68,7 @@ READ_LINE_MEMBER(spectrum_plus2test_device::romcs)
return 1;
}
READ8_MEMBER(spectrum_plus2test_device::mreq_r)
uint8_t spectrum_plus2test_device::mreq_r(offs_t offset)
{
return m_rom->base()[offset & 0x3fff];
}

2
src/devices/bus/spectrum/plus2test.h
View File

@ -36,7 +36,7 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
private:
required_memory_region m_rom;

2
src/devices/bus/spectrum/protek.cpp
View File

@ -72,7 +72,7 @@ void spectrum_protek_device::device_start()
// IMPLEMENTATION
//**************************************************************************
READ8_MEMBER(spectrum_protek_device::port_fe_r)
uint8_t spectrum_protek_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;

2
src/devices/bus/spectrum/protek.h
View File

@ -35,7 +35,7 @@ protected:
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t port_fe_r(offs_t offset) override;
private:
required_ioport m_exp_line3;

18
src/devices/bus/spectrum/uslot.cpp
View File

@ -77,40 +77,40 @@ READ_LINE_MEMBER(spectrum_uslot_device::romcs)
}
READ8_MEMBER(spectrum_uslot_device::mreq_r)
uint8_t spectrum_uslot_device::mreq_r(offs_t offset)
{
uint8_t temp;
uint8_t data = 0xff;
temp = m_exp1->mreq_r(space, offset);
temp = m_exp1->mreq_r(offset);
if (m_exp1->romcs())
data &= temp;
temp = m_exp2->mreq_r(space, offset);
temp = m_exp2->mreq_r(offset);
if (m_exp2->romcs())
data &= temp;
return data;
}
WRITE8_MEMBER(spectrum_uslot_device::mreq_w)
void spectrum_uslot_device::mreq_w(offs_t offset, uint8_t data)
{
if (m_exp1->romcs())
m_exp1->mreq_w(space, offset, data);
m_exp1->mreq_w(offset, data);
if (m_exp2->romcs())
m_exp2->mreq_w(space, offset, data);
m_exp2->mreq_w(offset, data);
}
READ8_MEMBER(spectrum_uslot_device::port_fe_r)
uint8_t spectrum_uslot_device::port_fe_r(offs_t offset)
{
uint8_t data = 0xff;
if (m_exp1->romcs())
data &= m_exp1->port_fe_r(space, offset);
data &= m_exp1->port_fe_r(offset);
if (m_exp2->romcs())
data &= m_exp2->port_fe_r(space, offset);
data &= m_exp2->port_fe_r(offset);
return data;
}

6
src/devices/bus/spectrum/uslot.h
View File

@ -36,9 +36,9 @@ protected:
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_WRITE8_MEMBER(mreq_w) override;
virtual DECLARE_READ8_MEMBER(port_fe_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t port_fe_r(offs_t offset) override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
private:

2
src/devices/bus/spectrum/usource.cpp
View File

@ -83,7 +83,7 @@ READ_LINE_MEMBER(spectrum_usource_device::romcs)
}
READ8_MEMBER(spectrum_usource_device::mreq_r)
uint8_t spectrum_usource_device::mreq_r(offs_t offset)
{
uint8_t data;

2
src/devices/bus/spectrum/usource.h
View File

@ -39,7 +39,7 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual uint8_t mreq_r(offs_t offset) override;
private:
required_memory_region m_rom;

4
src/devices/bus/spectrum/uspeech.cpp
View File

@ -99,7 +99,7 @@ READ_LINE_MEMBER(spectrum_uspeech_device::romcs)
}
READ8_MEMBER(spectrum_uspeech_device::mreq_r)
uint8_t spectrum_uspeech_device::mreq_r(offs_t offset)
{
uint8_t data;
@ -121,7 +121,7 @@ READ8_MEMBER(spectrum_uspeech_device::mreq_r)
return data;
}
WRITE8_MEMBER(spectrum_uspeech_device::mreq_w)
void spectrum_uspeech_device::mreq_w(offs_t offset, uint8_t data)
{
switch (offset)
{

4
src/devices/bus/spectrum/uspeech.h
View File

@ -41,8 +41,8 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
virtual DECLARE_READ8_MEMBER(mreq_r) override;
virtual DECLARE_WRITE8_MEMBER(mreq_w) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
private:
required_device<sp0256_device> m_nsp;

4
src/mame/drivers/spec128.cpp
View File

@ -168,7 +168,7 @@ resulting mess can be seen in the F4 viewer display.
WRITE8_MEMBER( spectrum_state::spectrum_128_bank1_w )
{
if (m_exp->romcs())
m_exp->mreq_w(space, offset, data);
m_exp->mreq_w(offset, data);
}
READ8_MEMBER( spectrum_state::spectrum_128_bank1_r )
@ -177,7 +177,7 @@ READ8_MEMBER( spectrum_state::spectrum_128_bank1_r )
if (m_exp->romcs())
{
data = m_exp->mreq_r(space, offset);
data = m_exp->mreq_r(offset);
}
else
{

6
src/mame/drivers/spectrum.cpp
View File

@ -295,14 +295,14 @@ SamRam
WRITE8_MEMBER(spectrum_state::spectrum_rom_w)
{
if (m_exp->romcs())
m_exp->mreq_w(space, offset, data);
m_exp->mreq_w(offset, data);
}
READ8_MEMBER(spectrum_state::spectrum_rom_r)
{
uint8_t data;
data = m_exp->mreq_r(space, offset);
data = m_exp->mreq_r(offset);
if (!m_exp->romcs())
data = memregion("maincpu")->base()[offset];
@ -412,7 +412,7 @@ READ8_MEMBER(spectrum_state::spectrum_port_fe_r)
/* expansion port */
if (m_exp)
data &= m_exp->port_fe_r(space, offset);
data &= m_exp->port_fe_r(offset);
/* Issue 2 Spectrums default to having bits 5, 6 & 7 set.
Issue 3 Spectrums default to having bits 5 & 7 set and bit 6 reset. */