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

mame/machine: simplified some handlers (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2020-04-22 18:13:38 +02:00
parent 8994f0f4b8
commit e4680e94c3
73 changed files with 431 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/at.cpp
View File

@ -316,7 +316,7 @@ WRITE16_MEMBER( at_state::ps1_unk_w )
READ8_MEMBER( at_state::ps1_portb_r )
{
uint8_t data = m_mb->portb_r(space, offset);
uint8_t data = m_mb->portb_r();
/* 0x10 is the dram refresh line bit, 15.085us. */
data = (data & ~0x10) | ((machine().time().as_ticks(66291) & 1) ? 0x10 : 0);

2
src/mame/drivers/gaelco3d.cpp
View File

@ -262,7 +262,7 @@ READ16_MEMBER(gaelco3d_state::eeprom_data_r)
/* bit 0 is clock */
/* bit 1 active */
result &= ~uint32_t(gaelco_serial_device::EXT_STATUS_MASK);
result |= m_serial->status_r(space, 0);
result |= m_serial->status_r();
}
if (m_eeprom->do_read())

8
src/mame/drivers/segas16b.cpp
View File

@ -1351,7 +1351,7 @@ void segas16b_state::altbeast_common_i8751_sim(offs_t soundoffs, offs_t inputoff
uint16_t temp = m_workram[soundoffs];
if ((temp & 0xff00) != 0x0000)
{
m_mapper->write(space, 0x03, temp >> 8);
m_mapper->write(0x03, temp >> 8);
m_workram[soundoffs] = temp & 0x00ff;
}
@ -1381,8 +1381,7 @@ void segas16b_state::tturf_i8751_sim()
temp = m_workram[0x01d0/2];
if ((temp & 0xff00) != 0x0000)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp);
m_mapper->write(0x03, temp);
m_workram[0x01d0/2] = temp & 0x00ff;
}
@ -1407,8 +1406,7 @@ void segas16b_state::wb3_i8751_sim()
uint16_t temp = m_workram[0x0008/2];
if ((temp & 0x00ff) != 0x0000)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp >> 8);
m_mapper->write(0x03, temp >> 8);
m_workram[0x0008/2] = temp & 0xff00;
}
}

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

@ -211,7 +211,7 @@ READ16_MEMBER( segas18_state::misc_io_r )
// I/O chip
case 0x0000/2:
case 0x1000/2:
return m_io->read(space, offset) | (m_mapper->open_bus_r() & 0xff00);
return m_io->read(offset) | (m_mapper->open_bus_r() & 0xff00);
// video control latch
case 0x2000/2:
@ -237,7 +237,7 @@ WRITE16_MEMBER( segas18_state::misc_io_w )
case 0x1000/2:
if (ACCESSING_BITS_0_7)
{
m_io->write(space, offset, data);
m_io->write(offset, data);
return;
}
break;

12
src/mame/machine/315_5195.cpp
View File

@ -90,7 +90,7 @@ u16 sega_315_5195_mapper_device::open_bus_r()
// write - handle a write to the memory mapper
//-------------------------------------------------
WRITE8_MEMBER( sega_315_5195_mapper_device::write )
void sega_315_5195_mapper_device::write(offs_t offset, u8 data)
{
// wraps every 32 bytes
offset &= 0x1f;
@ -176,7 +176,7 @@ WRITE8_MEMBER( sega_315_5195_mapper_device::write )
// read - handle a read from the memory mapper
//-------------------------------------------------
READ8_MEMBER( sega_315_5195_mapper_device::read )
u8 sega_315_5195_mapper_device::read(offs_t offset)
{
// wraps every 32 bytes
offset &= 0x1f;
@ -210,7 +210,7 @@ READ8_MEMBER( sega_315_5195_mapper_device::read )
logerror("Unknown memory_mapper_r from address %02X\n", offset);
break;
}
return (space.data_width() == 8) ? 0xff : open_bus_r();
return (m_space->data_width() == 8) ? 0xff : open_bus_r();
}
@ -372,7 +372,7 @@ TIMER_CALLBACK_MEMBER(sega_315_5195_mapper_device::write_from_sound)
// pread - sound CPU read handler
//-------------------------------------------------
READ8_MEMBER(sega_315_5195_mapper_device::pread)
u8 sega_315_5195_mapper_device::pread()
{
if (!m_pbf_callback.isnull() && !machine().side_effects_disabled())
m_pbf_callback(CLEAR_LINE);
@ -384,7 +384,7 @@ READ8_MEMBER(sega_315_5195_mapper_device::pread)
// pwrite - sound CPU write handler
//-------------------------------------------------
WRITE8_MEMBER(sega_315_5195_mapper_device::pwrite)
void sega_315_5195_mapper_device::pwrite(u8 data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(sega_315_5195_mapper_device::write_from_sound), this), data);
}
@ -483,7 +483,7 @@ void sega_315_5195_mapper_device::update_mapping()
// first reset everything back to the beginning
m_space->unmap_readwrite(0x000000, 0xffffff);
m_space->install_readwrite_handler(0x000000, 0xffffff, read8_delegate(*this, FUNC(sega_315_5195_mapper_device::read)), write8_delegate(*this, FUNC(sega_315_5195_mapper_device::write)), 0x00ff);
m_space->install_readwrite_handler(0x000000, 0xffffff, read8sm_delegate(*this, FUNC(sega_315_5195_mapper_device::read)), write8sm_delegate(*this, FUNC(sega_315_5195_mapper_device::write)), 0x00ff);
// loop over the regions
for (int index = 7; index >= 0; index--)

8
src/mame/machine/315_5195.h
View File

@ -46,10 +46,10 @@ public:
auto mcu_int() { return m_mcu_int_callback.bind(); }
// public interface
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( pread );
DECLARE_WRITE8_MEMBER( pwrite );
u8 read(offs_t offset);
void write(offs_t offset, u8 data);
u8 pread();
void pwrite(u8 data);
// mapping helpers
void map_as_rom(u32 offset, u32 length, offs_t mirror, const char *bank_name, const char *decrypted_bank_name, offs_t rgnoffset, write16_delegate whandler);

4
src/mame/machine/315_5296.cpp
View File

@ -81,7 +81,7 @@ void sega_315_5296_device::device_reset()
//-------------------------------------------------
READ8_MEMBER( sega_315_5296_device::read )
uint8_t sega_315_5296_device::read(offs_t offset)
{
offset &= 0x3f;
@ -122,7 +122,7 @@ READ8_MEMBER( sega_315_5296_device::read )
}
WRITE8_MEMBER( sega_315_5296_device::write )
void sega_315_5296_device::write(offs_t offset, uint8_t data)
{
offset &= 0x3f;

4
src/mame/machine/315_5296.h
View File

@ -49,8 +49,8 @@ public:
void set_ddr_override(uint8_t mask) { m_dir_override = mask; }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);
uint8_t debug_peek_output(offs_t offset) const { return m_output_latch[offset & 7]; }

4
src/mame/machine/315_5338a.cpp
View File

@ -64,7 +64,7 @@ void sega_315_5338a_device::device_start()
// INTERFACE
//**************************************************************************
READ8_MEMBER( sega_315_5338a_device::read )
uint8_t sega_315_5338a_device::read(offs_t offset)
{
uint8_t data = 0xff;
@ -107,7 +107,7 @@ READ8_MEMBER( sega_315_5338a_device::read )
return data;
}
WRITE8_MEMBER( sega_315_5338a_device::write )
void sega_315_5338a_device::write(offs_t offset, uint8_t data)
{
LOG("WR %02x = %02x\n", offset, data);

4
src/mame/machine/315_5338a.h
View File

@ -55,8 +55,8 @@ public:
auto out_pf_callback() { return m_out_port_cb[5].bind(); }
auto out_pg_callback() { return m_out_port_cb[6].bind(); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);
protected:
// device-level overrides

4
src/mame/machine/315_5649.cpp
View File

@ -85,7 +85,7 @@ void sega_315_5649_device::device_reset()
// INTERFACE
//**************************************************************************
READ8_MEMBER( sega_315_5649_device::read )
uint8_t sega_315_5649_device::read(offs_t offset)
{
uint8_t data = 0xff;
@ -142,7 +142,7 @@ READ8_MEMBER( sega_315_5649_device::read )
return data;
}
WRITE8_MEMBER( sega_315_5649_device::write )
void sega_315_5649_device::write(offs_t offset, uint8_t data)
{
LOG("WR %02x = %02x\n", offset, data);

4
src/mame/machine/315_5649.h
View File

@ -51,8 +51,8 @@ public:
template <unsigned N> auto in_counter_callback() { return m_cnt_cb[N].bind(); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);
protected:
// device-level overrides

10
src/mame/machine/3dom2.h
View File

@ -142,16 +142,6 @@ public:
DECLARE_READ32_MEMBER( cpu_id_r );
DECLARE_WRITE32_MEMBER( cpu_id_w );
READ8_MEMBER( read_bus )
{
return read_bus8(offset);
}
WRITE8_MEMBER( write_bus )
{
write_bus8(offset, data);
}
uint8_t read_bus8(offs_t offset);
uint16_t read_bus16(offs_t offset);
uint32_t read_bus32(offs_t offset);

8
src/mame/machine/acs8600_ics.cpp
View File

@ -30,23 +30,23 @@ const tiny_rom_entry *acs8600_ics_device::device_rom_region() const
return ROM_NAME(acs8600_ics);
}
WRITE8_MEMBER(acs8600_ics_device::hiaddr_w)
void acs8600_ics_device::hiaddr_w(u8 data)
{
m_hiaddr = data;
}
WRITE8_MEMBER(acs8600_ics_device::ctrl_w)
void acs8600_ics_device::ctrl_w(u8 data)
{
m_ctrl = data;
m_out_irq1_func(BIT(data, 1) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER(acs8600_ics_device::hostram_r)
u8 acs8600_ics_device::hostram_r(offs_t offset)
{
return m_host_space->read_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff));
}
WRITE8_MEMBER(acs8600_ics_device::hostram_w)
void acs8600_ics_device::hostram_w(offs_t offset, u8 data)
{
m_host_space->write_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff), data);
}

8
src/mame/machine/acs8600_ics.h
View File

@ -25,10 +25,10 @@ protected:
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
DECLARE_WRITE8_MEMBER(hiaddr_w);
DECLARE_WRITE8_MEMBER(ctrl_w);
DECLARE_READ8_MEMBER(hostram_r);
DECLARE_WRITE8_MEMBER(hostram_w);
void hiaddr_w(u8 data);
void ctrl_w(u8 data);
u8 hostram_r(offs_t offset);
void hostram_w(offs_t offset, u8 data);
void ics_io(address_map &map);
void ics_mem(address_map &map);

10
src/mame/machine/alpha8201.cpp
View File

@ -361,7 +361,7 @@ void alpha_8201_device::mcu_update_address()
}
READ8_MEMBER(alpha_8201_device::mcu_data_r)
u8 alpha_8201_device::mcu_data_r(offs_t offset)
{
u8 ret = 0;
@ -375,7 +375,7 @@ READ8_MEMBER(alpha_8201_device::mcu_data_r)
return ret & 0xf;
}
WRITE8_MEMBER(alpha_8201_device::mcu_data_w)
void alpha_8201_device::mcu_data_w(offs_t offset, u8 data)
{
// R0,R1: RAM data
// R2,R3: RAM A0-A7
@ -383,7 +383,7 @@ WRITE8_MEMBER(alpha_8201_device::mcu_data_w)
mcu_update_address();
}
WRITE16_MEMBER(alpha_8201_device::mcu_d_w)
void alpha_8201_device::mcu_d_w(u16 data)
{
// D0,D1: RAM A8,A9
// D2: _RD
@ -415,13 +415,13 @@ WRITE_LINE_MEMBER(alpha_8201_device::mcu_start_w)
m_mcu->set_input_line(0, (state) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER(alpha_8201_device::ext_ram_r)
u8 alpha_8201_device::ext_ram_r(offs_t offset)
{
// going by exctsccr, m_bus has no effect here
return m_shared_ram[offset & 0x3ff];
}
WRITE8_MEMBER(alpha_8201_device::ext_ram_w)
void alpha_8201_device::ext_ram_w(offs_t offset, u8 data)
{
// going by exctsccr, m_bus has no effect here
m_shared_ram[offset & 0x3ff] = data;

10
src/mame/machine/alpha8201.h
View File

@ -20,8 +20,8 @@ public:
// external I/O
DECLARE_WRITE_LINE_MEMBER(bus_dir_w);
DECLARE_WRITE_LINE_MEMBER(mcu_start_w);
DECLARE_READ8_MEMBER(ext_ram_r);
DECLARE_WRITE8_MEMBER(ext_ram_w);
u8 ext_ram_r(offs_t offset);
void ext_ram_w(offs_t offset, u8 data);
protected:
// device-level overrides
@ -42,9 +42,9 @@ private:
void mcu_update_address();
void mcu_writeram();
DECLARE_READ8_MEMBER(mcu_data_r);
DECLARE_WRITE8_MEMBER(mcu_data_w);
DECLARE_WRITE16_MEMBER(mcu_d_w);
u8 mcu_data_r(offs_t offset);
void mcu_data_w(offs_t offset, u8 data);
void mcu_d_w(u16 data);
};

2
src/mame/machine/apexc.cpp
View File

@ -94,7 +94,7 @@ apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_con
Read a tape image
*/
READ8_MEMBER(apexc_tape_reader_image_device::read)
uint8_t apexc_tape_reader_image_device::read()
{
uint8_t reply;
if (exists() && (fread(&reply, 1) == 1))

3
src/mame/machine/apexc.h
View File

@ -138,7 +138,8 @@ public:
virtual bool is_reset_on_load() const noexcept override { return false; }
virtual const char *file_extensions() const noexcept override { return "tap"; }
DECLARE_READ8_MEMBER(read);
uint8_t read();
private:
virtual void device_start() override { }
};

16
src/mame/machine/apricotkb.cpp
View File

@ -287,7 +287,7 @@ uint8_t apricot_keyboard_device::read_keyboard()
// kb_lo_r -
//-------------------------------------------------
READ8_MEMBER( apricot_keyboard_device::kb_lo_r )
uint8_t apricot_keyboard_device::kb_lo_r()
{
return read_keyboard() & 0x0f;
}
@ -297,7 +297,7 @@ READ8_MEMBER( apricot_keyboard_device::kb_lo_r )
// kb_hi_r -
//-------------------------------------------------
READ8_MEMBER( apricot_keyboard_device::kb_hi_r )
uint8_t apricot_keyboard_device::kb_hi_r()
{
return read_keyboard() >> 4;
}
@ -307,7 +307,7 @@ READ8_MEMBER( apricot_keyboard_device::kb_hi_r )
// kb_p6_r -
//-------------------------------------------------
READ8_MEMBER( apricot_keyboard_device::kb_p6_r )
uint8_t apricot_keyboard_device::kb_p6_r()
{
/*
@ -329,7 +329,7 @@ READ8_MEMBER( apricot_keyboard_device::kb_p6_r )
// kb_p3_w -
//-------------------------------------------------
WRITE8_MEMBER( apricot_keyboard_device::kb_p3_w )
void apricot_keyboard_device::kb_p3_w(uint8_t data)
{
// bit 1 controls the IR LEDs
}
@ -339,7 +339,7 @@ WRITE8_MEMBER( apricot_keyboard_device::kb_p3_w )
// kb_y0_w -
//-------------------------------------------------
WRITE8_MEMBER( apricot_keyboard_device::kb_y0_w )
void apricot_keyboard_device::kb_y0_w(uint8_t data)
{
m_kb_y = (m_kb_y & 0xfff0) | (data & 0x0f);
}
@ -349,7 +349,7 @@ WRITE8_MEMBER( apricot_keyboard_device::kb_y0_w )
// kb_y4_w -
//-------------------------------------------------
WRITE8_MEMBER( apricot_keyboard_device::kb_y4_w )
void apricot_keyboard_device::kb_y4_w(uint8_t data)
{
m_kb_y = (m_kb_y & 0xff0f) | ((data & 0x0f) << 4);
}
@ -359,7 +359,7 @@ WRITE8_MEMBER( apricot_keyboard_device::kb_y4_w )
// kb_y8_w -
//-------------------------------------------------
WRITE8_MEMBER( apricot_keyboard_device::kb_y8_w )
void apricot_keyboard_device::kb_y8_w(uint8_t data)
{
m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 8);
}
@ -369,7 +369,7 @@ WRITE8_MEMBER( apricot_keyboard_device::kb_y8_w )
// kb_yc_w -
//-------------------------------------------------
WRITE8_MEMBER( apricot_keyboard_device::kb_yc_w )
void apricot_keyboard_device::kb_yc_w(uint8_t data)
{
m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 12);
}

16
src/mame/machine/apricotkb.h
View File

@ -37,14 +37,14 @@ public:
uint8_t read_keyboard();
DECLARE_READ8_MEMBER( kb_lo_r );
DECLARE_READ8_MEMBER( kb_hi_r );
DECLARE_READ8_MEMBER( kb_p6_r );
DECLARE_WRITE8_MEMBER( kb_p3_w );
DECLARE_WRITE8_MEMBER( kb_y0_w );
DECLARE_WRITE8_MEMBER( kb_y4_w );
DECLARE_WRITE8_MEMBER( kb_y8_w );
DECLARE_WRITE8_MEMBER( kb_yc_w );
uint8_t kb_lo_r();
uint8_t kb_hi_r();
uint8_t kb_p6_r();
void kb_p3_w(uint8_t data);
void kb_y0_w(uint8_t data);
void kb_y4_w(uint8_t data);
void kb_y8_w(uint8_t data);
void kb_yc_w(uint8_t data);
void apricot_keyboard_io(address_map &map);
protected:

52
src/mame/machine/at.cpp
View File

@ -170,7 +170,7 @@ void at_mb_device::map(address_map &map)
* pic8259 configuration
*
*************************************************************/
READ8_MEMBER( at_mb_device::get_slave_ack )
uint8_t at_mb_device::get_slave_ack(offs_t offset)
{
if (offset==2) // IRQ = 2
return m_pic8259_slave->acknowledge();
@ -211,7 +211,7 @@ WRITE_LINE_MEMBER( at_mb_device::pit8254_out2_changed )
*
*************************************************************************/
READ8_MEMBER( at_mb_device::page8_r )
uint8_t at_mb_device::page8_r(offs_t offset)
{
uint8_t data = m_at_pages[offset % 0x10];
@ -234,7 +234,7 @@ READ8_MEMBER( at_mb_device::page8_r )
}
WRITE8_MEMBER( at_mb_device::page8_w )
void at_mb_device::page8_w(offs_t offset, uint8_t data)
{
m_at_pages[offset % 0x10] = data;
@ -270,7 +270,7 @@ WRITE_LINE_MEMBER( at_mb_device::dma_hrq_changed )
m_dma8237_2->hack_w(state);
}
READ8_MEMBER(at_mb_device::dma_read_byte)
uint8_t at_mb_device::dma_read_byte(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
@ -283,7 +283,7 @@ READ8_MEMBER(at_mb_device::dma_read_byte)
}
WRITE8_MEMBER(at_mb_device::dma_write_byte)
void at_mb_device::dma_write_byte(offs_t offset, uint8_t data)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
@ -294,7 +294,7 @@ WRITE8_MEMBER(at_mb_device::dma_write_byte)
}
READ8_MEMBER(at_mb_device::dma_read_word)
uint8_t at_mb_device::dma_read_word(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
@ -303,13 +303,13 @@ READ8_MEMBER(at_mb_device::dma_read_word)
offs_t page_offset = ((offs_t) m_dma_offset[1][m_dma_channel & 3]) << 16;
result = prog_space.read_word((page_offset & 0xfe0000) | (offset << 1));
m_dma_high_byte = result & 0xFF00;
m_dma_high_byte = result & 0xff00;
return result & 0xFF;
return result & 0xff;
}
WRITE8_MEMBER(at_mb_device::dma_write_word)
void at_mb_device::dma_write_word(offs_t offset, uint8_t data)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
@ -319,22 +319,22 @@ WRITE8_MEMBER(at_mb_device::dma_write_word)
prog_space.write_word((page_offset & 0xfe0000) | (offset << 1), m_dma_high_byte | data);
}
READ8_MEMBER( at_mb_device::dma8237_0_dack_r ) { return m_isabus->dack_r(0); }
READ8_MEMBER( at_mb_device::dma8237_1_dack_r ) { return m_isabus->dack_r(1); }
READ8_MEMBER( at_mb_device::dma8237_2_dack_r ) { return m_isabus->dack_r(2); }
READ8_MEMBER( at_mb_device::dma8237_3_dack_r ) { return m_isabus->dack_r(3); }
READ8_MEMBER( at_mb_device::dma8237_5_dack_r ) { uint16_t ret = m_isabus->dack16_r(5); m_dma_high_byte = ret & 0xff00; return ret; }
READ8_MEMBER( at_mb_device::dma8237_6_dack_r ) { uint16_t ret = m_isabus->dack16_r(6); m_dma_high_byte = ret & 0xff00; return ret; }
READ8_MEMBER( at_mb_device::dma8237_7_dack_r ) { uint16_t ret = m_isabus->dack16_r(7); m_dma_high_byte = ret & 0xff00; return ret; }
uint8_t at_mb_device::dma8237_0_dack_r() { return m_isabus->dack_r(0); }
uint8_t at_mb_device::dma8237_1_dack_r() { return m_isabus->dack_r(1); }
uint8_t at_mb_device::dma8237_2_dack_r() { return m_isabus->dack_r(2); }
uint8_t at_mb_device::dma8237_3_dack_r() { return m_isabus->dack_r(3); }
uint8_t at_mb_device::dma8237_5_dack_r() { uint16_t ret = m_isabus->dack16_r(5); m_dma_high_byte = ret & 0xff00; return ret; }
uint8_t at_mb_device::dma8237_6_dack_r() { uint16_t ret = m_isabus->dack16_r(6); m_dma_high_byte = ret & 0xff00; return ret; }
uint8_t at_mb_device::dma8237_7_dack_r() { uint16_t ret = m_isabus->dack16_r(7); m_dma_high_byte = ret & 0xff00; return ret; }
WRITE8_MEMBER( at_mb_device::dma8237_0_dack_w ){ m_isabus->dack_w(0, data); }
WRITE8_MEMBER( at_mb_device::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); }
WRITE8_MEMBER( at_mb_device::dma8237_2_dack_w ){ m_isabus->dack_w(2, data); }
WRITE8_MEMBER( at_mb_device::dma8237_3_dack_w ){ m_isabus->dack_w(3, data); }
WRITE8_MEMBER( at_mb_device::dma8237_5_dack_w ){ m_isabus->dack16_w(5, m_dma_high_byte | data); }
WRITE8_MEMBER( at_mb_device::dma8237_6_dack_w ){ m_isabus->dack16_w(6, m_dma_high_byte | data); }
WRITE8_MEMBER( at_mb_device::dma8237_7_dack_w ){ m_isabus->dack16_w(7, m_dma_high_byte | data); }
void at_mb_device::dma8237_0_dack_w(uint8_t data) { m_isabus->dack_w(0, data); }
void at_mb_device::dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); }
void at_mb_device::dma8237_2_dack_w(uint8_t data) { m_isabus->dack_w(2, data); }
void at_mb_device::dma8237_3_dack_w(uint8_t data) { m_isabus->dack_w(3, data); }
void at_mb_device::dma8237_5_dack_w(uint8_t data) { m_isabus->dack16_w(5, m_dma_high_byte | data); }
void at_mb_device::dma8237_6_dack_w(uint8_t data) { m_isabus->dack16_w(6, m_dma_high_byte | data); }
void at_mb_device::dma8237_7_dack_w(uint8_t data) { m_isabus->dack16_w(7, m_dma_high_byte | data); }
WRITE_LINE_MEMBER( at_mb_device::dma8237_out_eop )
{
@ -364,7 +364,7 @@ void at_mb_device::set_dma_channel(int channel, int state)
}
}
WRITE8_MEMBER( at_mb_device::write_rtc )
void at_mb_device::write_rtc(offs_t offset, uint8_t data)
{
if (offset==0) {
m_nmi_enabled = BIT(data,7);
@ -396,7 +396,7 @@ WRITE_LINE_MEMBER( at_mb_device::dack5_w ) { set_dma_channel(5, state); }
WRITE_LINE_MEMBER( at_mb_device::dack6_w ) { set_dma_channel(6, state); }
WRITE_LINE_MEMBER( at_mb_device::dack7_w ) { set_dma_channel(7, state); }
READ8_MEMBER( at_mb_device::portb_r )
uint8_t at_mb_device::portb_r()
{
uint8_t data = m_at_speaker;
data &= ~0xd0; /* AT BIOS don't likes this being set */
@ -412,7 +412,7 @@ READ8_MEMBER( at_mb_device::portb_r )
return data;
}
WRITE8_MEMBER( at_mb_device::portb_w )
void at_mb_device::portb_w(uint8_t data)
{
m_at_speaker = data;
m_pit8254->write_gate2(BIT(data, 0));

48
src/mame/machine/at.h
View File

@ -19,11 +19,11 @@ public:
void map(address_map &map);
DECLARE_READ8_MEMBER(page8_r);
DECLARE_WRITE8_MEMBER(page8_w);
DECLARE_READ8_MEMBER(portb_r);
DECLARE_WRITE8_MEMBER(portb_w);
DECLARE_WRITE8_MEMBER(write_rtc);
uint8_t page8_r(offs_t offset);
void page8_w(offs_t offset, uint8_t data);
uint8_t portb_r();
void portb_w(uint8_t data);
void write_rtc(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(iochck_w);
DECLARE_WRITE_LINE_MEMBER(shutdown);
@ -63,20 +63,20 @@ private:
DECLARE_WRITE_LINE_MEMBER(dma8237_out_eop);
DECLARE_WRITE_LINE_MEMBER(dma8237_2_out_eop);
DECLARE_READ8_MEMBER(dma8237_0_dack_r);
DECLARE_READ8_MEMBER(dma8237_1_dack_r);
DECLARE_READ8_MEMBER(dma8237_2_dack_r);
DECLARE_READ8_MEMBER(dma8237_3_dack_r);
DECLARE_READ8_MEMBER(dma8237_5_dack_r);
DECLARE_READ8_MEMBER(dma8237_6_dack_r);
DECLARE_READ8_MEMBER(dma8237_7_dack_r);
DECLARE_WRITE8_MEMBER(dma8237_0_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_1_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_2_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_3_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_5_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_6_dack_w);
DECLARE_WRITE8_MEMBER(dma8237_7_dack_w);
uint8_t dma8237_0_dack_r();
uint8_t dma8237_1_dack_r();
uint8_t dma8237_2_dack_r();
uint8_t dma8237_3_dack_r();
uint8_t dma8237_5_dack_r();
uint8_t dma8237_6_dack_r();
uint8_t dma8237_7_dack_r();
void dma8237_0_dack_w(uint8_t data);
void dma8237_1_dack_w(uint8_t data);
void dma8237_2_dack_w(uint8_t data);
void dma8237_3_dack_w(uint8_t data);
void dma8237_5_dack_w(uint8_t data);
void dma8237_6_dack_w(uint8_t data);
void dma8237_7_dack_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(dack0_w);
DECLARE_WRITE_LINE_MEMBER(dack1_w);
DECLARE_WRITE_LINE_MEMBER(dack2_w);
@ -85,13 +85,13 @@ private:
DECLARE_WRITE_LINE_MEMBER(dack5_w);
DECLARE_WRITE_LINE_MEMBER(dack6_w);
DECLARE_WRITE_LINE_MEMBER(dack7_w);
DECLARE_READ8_MEMBER(get_slave_ack);
uint8_t get_slave_ack(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed);
DECLARE_READ8_MEMBER(dma_read_byte);
DECLARE_WRITE8_MEMBER(dma_write_byte);
DECLARE_READ8_MEMBER(dma_read_word);
DECLARE_WRITE8_MEMBER(dma_write_word);
uint8_t dma_read_byte(offs_t offset);
void dma_write_byte(offs_t offset, uint8_t data);
uint8_t dma_read_word(offs_t offset);
void dma_write_word(offs_t offset, uint8_t data);
};
DECLARE_DEVICE_TYPE(AT_MB, at_mb_device)

4
src/mame/machine/atarifdc.cpp
View File

@ -661,7 +661,7 @@ void atari_fdc_device::a800_serial_write()
}
}
READ8_MEMBER( atari_fdc_device::serin_r )
uint8_t atari_fdc_device::serin_r()
{
int data = 0x00;
int ser_delay = 0;
@ -689,7 +689,7 @@ READ8_MEMBER( atari_fdc_device::serin_r )
return data;
}
WRITE8_MEMBER( atari_fdc_device::serout_w )
void atari_fdc_device::serout_w(uint8_t data)
{
/* ignore serial commands if no floppy image is specified */
if( !m_drv[0].image )

4
src/mame/machine/atarifdc.h
View File

@ -17,8 +17,8 @@ class atari_fdc_device : public device_t
public:
atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( serin_r );
DECLARE_WRITE8_MEMBER( serout_w );
uint8_t serin_r();
void serout_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( pia_cb2_w );
void atari_load_proc(device_image_interface &image, bool is_created);

22
src/mame/machine/beta.cpp
View File

@ -69,7 +69,7 @@ void beta_disk_device::disable()
m_betadisk_active = 0;
}
READ8_MEMBER(beta_disk_device::status_r)
uint8_t beta_disk_device::status_r()
{
if (m_betadisk_active==1) {
return m_wd179x->status_r();
@ -78,7 +78,7 @@ READ8_MEMBER(beta_disk_device::status_r)
}
}
READ8_MEMBER(beta_disk_device::track_r)
uint8_t beta_disk_device::track_r()
{
if (m_betadisk_active==1) {
return m_wd179x->track_r();
@ -87,7 +87,7 @@ READ8_MEMBER(beta_disk_device::track_r)
}
}
READ8_MEMBER(beta_disk_device::sector_r)
uint8_t beta_disk_device::sector_r()
{
if (m_betadisk_active==1) {
return m_wd179x->sector_r();
@ -96,7 +96,7 @@ READ8_MEMBER(beta_disk_device::sector_r)
}
}
READ8_MEMBER(beta_disk_device::data_r)
uint8_t beta_disk_device::data_r()
{
if (m_betadisk_active==1) {
return m_wd179x->data_r();
@ -105,10 +105,10 @@ READ8_MEMBER(beta_disk_device::data_r)
}
}
READ8_MEMBER(beta_disk_device::state_r)
uint8_t beta_disk_device::state_r()
{
if (m_betadisk_active==1) {
uint8_t result = 0x3F; // actually open bus
uint8_t result = 0x3f; // actually open bus
result |= m_wd179x->drq_r() ? 0x40 : 0;
result |= m_wd179x->intrq_r() ? 0x80 : 0;
return result;
@ -117,7 +117,7 @@ READ8_MEMBER(beta_disk_device::state_r)
}
}
WRITE8_MEMBER(beta_disk_device::param_w)
void beta_disk_device::param_w(uint8_t data)
{
if (m_betadisk_active == 1)
{
@ -143,28 +143,28 @@ WRITE8_MEMBER(beta_disk_device::param_w)
}
}
WRITE8_MEMBER(beta_disk_device::command_w)
void beta_disk_device::command_w(uint8_t data)
{
if (m_betadisk_active==1) {
m_wd179x->cmd_w(data);
}
}
WRITE8_MEMBER(beta_disk_device::track_w)
void beta_disk_device::track_w(uint8_t data)
{
if (m_betadisk_active==1) {
m_wd179x->track_w(data);
}
}
WRITE8_MEMBER(beta_disk_device::sector_w)
void beta_disk_device::sector_w(uint8_t data)
{
if (m_betadisk_active==1) {
m_wd179x->sector_w(data);
}
}
WRITE8_MEMBER(beta_disk_device::data_w)
void beta_disk_device::data_w(uint8_t data)
{
if (m_betadisk_active==1) {
m_wd179x->data_w(data);

20
src/mame/machine/beta.h
View File

@ -25,17 +25,17 @@ class beta_disk_device : public device_t
public:
beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(track_r);
DECLARE_READ8_MEMBER(sector_r);
DECLARE_READ8_MEMBER(data_r);
DECLARE_READ8_MEMBER(state_r);
uint8_t status_r();
uint8_t track_r();
uint8_t sector_r();
uint8_t data_r();
uint8_t state_r();
DECLARE_WRITE8_MEMBER(param_w);
DECLARE_WRITE8_MEMBER(command_w);
DECLARE_WRITE8_MEMBER(track_w);
DECLARE_WRITE8_MEMBER(sector_w);
DECLARE_WRITE8_MEMBER(data_w);
void param_w(uint8_t data);
void command_w(uint8_t data);
void track_w(uint8_t data);
void sector_w(uint8_t data);
void data_w(uint8_t data);
int is_active();
void enable();

10
src/mame/machine/c117.cpp
View File

@ -104,17 +104,17 @@ void namco_c117_device::device_add_mconfig(machine_config &config)
}
READ8_MEMBER(namco_c117_device::main_r)
uint8_t namco_c117_device::main_r(offs_t offset)
{
return m_program->read_byte(remap(0, offset));
}
READ8_MEMBER(namco_c117_device::sub_r)
uint8_t namco_c117_device::sub_r(offs_t offset)
{
return m_program->read_byte(remap(1, offset));
}
WRITE8_MEMBER(namco_c117_device::main_w)
void namco_c117_device::main_w(offs_t offset, uint8_t data)
{
if (offset < 0xe000)
m_program->write_byte(remap(0, offset), data);
@ -122,7 +122,7 @@ WRITE8_MEMBER(namco_c117_device::main_w)
register_w(0, offset, data);
}
WRITE8_MEMBER(namco_c117_device::sub_w)
void namco_c117_device::sub_w(offs_t offset, uint8_t data)
{
if (offset < 0xe000)
m_program->write_byte(remap(1, offset), data);
@ -133,7 +133,7 @@ WRITE8_MEMBER(namco_c117_device::sub_w)
// FIXME: the sound CPU watchdog is probably in CUS121, and definitely isn't in CUS117
// however, until the watchdog is a device and it's possible to have two independent
// watchdogs in a machine, it's easiest to handle it here
WRITE8_MEMBER(namco_c117_device::sound_watchdog_w)
void namco_c117_device::sound_watchdog_w(uint8_t data)
{
kick_watchdog(2);
}

10
src/mame/machine/c117.h
View File

@ -29,13 +29,13 @@ public:
}
auto subres_cb() { return m_subres_cb.bind(); }
DECLARE_READ8_MEMBER(main_r);
DECLARE_READ8_MEMBER(sub_r);
DECLARE_WRITE8_MEMBER(main_w);
DECLARE_WRITE8_MEMBER(sub_w);
uint8_t main_r(offs_t offset);
uint8_t sub_r(offs_t offset);
void main_w(offs_t offset, uint8_t data);
void sub_w(offs_t offset, uint8_t data);
// FIXME: this doesn't belong here
DECLARE_WRITE8_MEMBER(sound_watchdog_w);
void sound_watchdog_w(uint8_t data);
offs_t remap(int whichcpu, offs_t offset) { return m_offsets[whichcpu][offset>>13] | (offset & 0x1fff); }

4
src/mame/machine/cedar_magnet_flop.cpp
View File

@ -201,7 +201,7 @@ void cedar_magnet_flop_device::port63_w(u8 data)
}
WRITE8_MEMBER(cedar_magnet_flop_device::write)
void cedar_magnet_flop_device::write(offs_t offset, u8 data)
{
switch (offset & 3)
{
@ -213,7 +213,7 @@ WRITE8_MEMBER(cedar_magnet_flop_device::write)
}
}
READ8_MEMBER(cedar_magnet_flop_device::read)
u8 cedar_magnet_flop_device::read(offs_t offset)
{
switch (offset & 3)
{

4
src/mame/machine/cedar_magnet_flop.h
View File

@ -24,8 +24,8 @@ public:
void port62_w(u8 data);
void port63_w(u8 data);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
u8 read(offs_t offset);
void write(offs_t offset, u8 data);
protected:
virtual void device_add_mconfig(machine_config &config) override;

6
src/mame/machine/cedar_magnet_plane.h
View File

@ -48,12 +48,12 @@ private:
u8 pio0_pa_r();
void pio0_pa_w(u8 data);
// DECLARE_READ8_MEMBER(pio0_pb_r);
// u8 pio0_pb_r();
void pio0_pb_w(u8 data);
// DECLARE_READ8_MEMBER(pio1_pa_r);
// u8 pio1_pa_r();
void pio1_pa_w(u8 data);
// DECLARE_READ8_MEMBER(pio1_pb_r);
// u8pio1_pb_r();
void pio1_pb_w(u8 data);
};

10
src/mame/machine/cedar_magnet_sprite.h
View File

@ -61,17 +61,17 @@ private:
u8 pio0_pa_r();
void pio0_pa_w(u8 data);
// DECLARE_READ8_MEMBER(pio0_pb_r);
// u8 pio0_pb_r();
void pio0_pb_w(u8 data);
// DECLARE_READ8_MEMBER(pio1_pa_r);
// u8 pio1_pa_r();
void pio1_pa_w(u8 data);
// DECLARE_READ8_MEMBER(pio1_pb_r);
// u8 pio1_pb_r();
void pio1_pb_w(u8 data);
// DECLARE_READ8_MEMBER(pio2_pa_r);
// u8 pio2_pa_r();
void pio2_pa_w(u8 data);
// DECLARE_READ8_MEMBER(pio2_pb_r);
// u8 pio2_pb_r();
void pio2_pb_w(u8 data);
required_device_array<z80pio_device, 3> m_pio;

2
src/mame/machine/cmi_ankbd.cpp
View File

@ -39,7 +39,7 @@ void cmi_alphanumeric_keyboard_device::device_start()
{
}
READ8_MEMBER( cmi_alphanumeric_keyboard_device::col_r )
u8 cmi_alphanumeric_keyboard_device::col_r()
{
int row = m_pia->b_output() ^ 0xff;

2
src/mame/machine/cmi_ankbd.h
View File

@ -32,7 +32,7 @@ protected:
virtual void device_start() override;
private:
DECLARE_READ8_MEMBER( col_r );
u8 col_r();
DECLARE_WRITE_LINE_MEMBER( txd_w );
DECLARE_WRITE_LINE_MEMBER( rts_w );

6
src/mame/machine/cmi_mkbd.cpp
View File

@ -106,7 +106,7 @@ void cmi_music_keyboard_device::device_timer(emu_timer &timer, device_timer_id i
CB2 = /DWS
*/
WRITE8_MEMBER( cmi_music_keyboard_device::cmi10_u20_a_w )
void cmi_music_keyboard_device::cmi10_u20_a_w(u8 data)
{
// low 7 bits connected to alphanumeric display data lines
m_dp1->data_w(data & 0x7f);
@ -126,7 +126,7 @@ WRITE8_MEMBER( cmi_music_keyboard_device::cmi10_u20_a_w )
*/
}
WRITE8_MEMBER( cmi_music_keyboard_device::cmi10_u20_b_w )
void cmi_music_keyboard_device::cmi10_u20_b_w(u8 data)
{
// connected to alphanumeric display control lines
u8 const addr = bitswap<2>(data, 0, 1);
@ -178,7 +178,7 @@ WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u21_cb2_w )
}
READ8_MEMBER( cmi_music_keyboard_device::cmi10_u21_a_r )
u8 cmi_music_keyboard_device::cmi10_u21_a_r()
{
#if 0
// int thld = m_cmi10_pia_u21->ca2_output();

6
src/mame/machine/cmi_mkbd.h
View File

@ -41,12 +41,12 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
DECLARE_WRITE8_MEMBER( cmi10_u20_a_w );
DECLARE_WRITE8_MEMBER( cmi10_u20_b_w );
void cmi10_u20_a_w(u8 data);
void cmi10_u20_b_w(u8 data);
DECLARE_READ_LINE_MEMBER( cmi10_u20_cb1_r );
DECLARE_WRITE_LINE_MEMBER( cmi10_u20_cb2_w );
DECLARE_WRITE_LINE_MEMBER( cmi10_u21_cb2_w );
DECLARE_READ8_MEMBER( cmi10_u21_a_r );
u8 cmi10_u21_a_r();
DECLARE_WRITE_LINE_MEMBER( kbd_acia_int );
DECLARE_WRITE_LINE_MEMBER( cmi_acia_int );

2
src/mame/machine/coco_vhd.h
View File

@ -46,8 +46,6 @@ public:
virtual const char *file_extensions() const noexcept override { return "vhd"; }
// specific implementation
DECLARE_READ8_MEMBER(read) { return read(offset); }
DECLARE_WRITE8_MEMBER(write) { write(offset, data); }
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);

10
src/mame/machine/compiskb.cpp
View File

@ -261,9 +261,9 @@ WRITE_LINE_MEMBER( compis_keyboard_device::si_w )
// bus_r -
//-------------------------------------------------
READ8_MEMBER( compis_keyboard_device::bus_r )
uint8_t compis_keyboard_device::bus_r()
{
// HACK this should be handled in mcs48.c
// HACK this should be handled in mcs48.cpp
return m_bus;
}
@ -272,7 +272,7 @@ READ8_MEMBER( compis_keyboard_device::bus_r )
// bus_w -
//-------------------------------------------------
WRITE8_MEMBER( compis_keyboard_device::bus_w )
void compis_keyboard_device::bus_w(uint8_t data)
{
/*
@ -309,7 +309,7 @@ WRITE8_MEMBER( compis_keyboard_device::bus_w )
// bus_w -
//-------------------------------------------------
READ8_MEMBER( compis_keyboard_device::p1_r )
uint8_t compis_keyboard_device::p1_r()
{
uint8_t data = 0xff;
@ -334,7 +334,7 @@ READ8_MEMBER( compis_keyboard_device::p1_r )
// p2_r -
//-------------------------------------------------
READ8_MEMBER( compis_keyboard_device::p2_r )
uint8_t compis_keyboard_device::p2_r()
{
uint8_t data = 0xff;

8
src/mame/machine/compiskb.h
View File

@ -51,10 +51,10 @@ private:
uint8_t m_bus;
uint8_t m_keylatch;
DECLARE_READ8_MEMBER( bus_r );
DECLARE_WRITE8_MEMBER( bus_w );
DECLARE_READ8_MEMBER( p1_r );
DECLARE_READ8_MEMBER( p2_r );
uint8_t bus_r();
void bus_w(uint8_t data);
uint8_t p1_r();
uint8_t p2_r();
};

34
src/mame/machine/cuda.cpp
View File

@ -100,7 +100,7 @@ const tiny_rom_entry *cuda_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
void cuda_device::send_port(address_space &space, uint8_t offset, uint8_t data)
void cuda_device::send_port(uint8_t offset, uint8_t data)
{
// printf("PORT %c write %02x (DDR = %02x) (PC=%x)\n", 'A' + offset, data, ddrs[offset], m_maincpu->pc());
@ -187,21 +187,21 @@ void cuda_device::send_port(address_space &space, uint8_t offset, uint8_t data)
}
}
READ8_MEMBER( cuda_device::ddr_r )
uint8_t cuda_device::ddr_r(offs_t offset)
{
return ddrs[offset];
}
WRITE8_MEMBER( cuda_device::ddr_w )
void cuda_device::ddr_w(offs_t offset, uint8_t data)
{
// printf("%02x to PORT %c DDR (PC=%x)\n", data, 'A' + offset, m_maincpu->pc());
send_port(space, offset, ports[offset] & data);
send_port(offset, ports[offset] & data);
ddrs[offset] = data;
}
READ8_MEMBER( cuda_device::ports_r )
uint8_t cuda_device::ports_r(offs_t offset)
{
uint8_t incoming = 0;
@ -260,19 +260,19 @@ READ8_MEMBER( cuda_device::ports_r )
return incoming;
}
WRITE8_MEMBER( cuda_device::ports_w )
void cuda_device::ports_w(offs_t offset, uint8_t data)
{
send_port(space, offset, data);
send_port(offset, data);
ports[offset] = data;
}
READ8_MEMBER( cuda_device::pll_r )
uint8_t cuda_device::pll_r()
{
return pll_ctrl;
}
WRITE8_MEMBER( cuda_device::pll_w )
void cuda_device::pll_w(uint8_t data)
{
#ifdef CUDA_SUPER_VERBOSE
if (pll_ctrl != data)
@ -289,12 +289,12 @@ WRITE8_MEMBER( cuda_device::pll_w )
pll_ctrl = data;
}
READ8_MEMBER( cuda_device::timer_ctrl_r )
uint8_t cuda_device::timer_ctrl_r()
{
return timer_ctrl;
}
WRITE8_MEMBER( cuda_device::timer_ctrl_w )
void cuda_device::timer_ctrl_w(uint8_t data)
{
static const attotime rates[4][5] =
{
@ -331,24 +331,24 @@ WRITE8_MEMBER( cuda_device::timer_ctrl_w )
timer_ctrl |= (data & ~0xc0);
}
READ8_MEMBER( cuda_device::timer_counter_r )
uint8_t cuda_device::timer_counter_r()
{
return timer_counter;
}
WRITE8_MEMBER( cuda_device::timer_counter_w )
void cuda_device::timer_counter_w(uint8_t data)
{
// printf("%02x to timer counter (PC=%x)\n", data, m_maincpu->pc());
timer_counter = data;
ripple_counter = timer_counter;
}
READ8_MEMBER( cuda_device::onesec_r )
uint8_t cuda_device::onesec_r()
{
return onesec;
}
WRITE8_MEMBER( cuda_device::onesec_w )
void cuda_device::onesec_w(uint8_t data)
{
m_timer->adjust(attotime::from_seconds(1), 0, attotime::from_seconds(1));
@ -360,12 +360,12 @@ WRITE8_MEMBER( cuda_device::onesec_w )
onesec = data;
}
READ8_MEMBER( cuda_device::pram_r )
uint8_t cuda_device::pram_r(offs_t offset)
{
return pram[offset];
}
WRITE8_MEMBER( cuda_device::pram_w )
void cuda_device::pram_w(offs_t offset, uint8_t data)
{
pram[offset] = data;
}

30
src/mame/machine/cuda.h
View File

@ -43,20 +43,20 @@ public:
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
DECLARE_READ8_MEMBER( ddr_r );
DECLARE_WRITE8_MEMBER( ddr_w );
DECLARE_READ8_MEMBER( ports_r );
DECLARE_WRITE8_MEMBER( ports_w );
DECLARE_READ8_MEMBER( pll_r );
DECLARE_WRITE8_MEMBER( pll_w );
DECLARE_READ8_MEMBER( timer_ctrl_r );
DECLARE_WRITE8_MEMBER( timer_ctrl_w );
DECLARE_READ8_MEMBER( timer_counter_r );
DECLARE_WRITE8_MEMBER( timer_counter_w );
DECLARE_READ8_MEMBER( onesec_r );
DECLARE_WRITE8_MEMBER( onesec_w );
DECLARE_READ8_MEMBER( pram_r );
DECLARE_WRITE8_MEMBER( pram_w );
uint8_t ddr_r(offs_t offset);
void ddr_w(offs_t offset, uint8_t data);
uint8_t ports_r(offs_t offset);
void ports_w(offs_t offset, uint8_t data);
uint8_t pll_r();
void pll_w(uint8_t data);
uint8_t timer_ctrl_r();
void timer_ctrl_w(uint8_t data);
uint8_t timer_counter_r();
void timer_counter_w(uint8_t data);
uint8_t onesec_r();
void onesec_w(uint8_t data);
uint8_t pram_r(offs_t offset);
void pram_w(offs_t offset, uint8_t data);
// VIA interface routines
uint8_t get_treq() { return treq; }
@ -106,7 +106,7 @@ private:
uint8_t pram[0x100], disk_pram[0x100];
bool pram_loaded;
void send_port(address_space &space, uint8_t offset, uint8_t data);
void send_port(uint8_t offset, uint8_t data);
};
// device type definition

26
src/mame/machine/dec_lk201.cpp
View File

@ -630,7 +630,7 @@ void lk201_device::update_interrupts()
}
}
READ8_MEMBER( lk201_device::timer_r )
uint8_t lk201_device::timer_r(offs_t offset)
{
static uint16_t count;
@ -655,7 +655,7 @@ READ8_MEMBER( lk201_device::timer_r )
return ret;
}
WRITE8_MEMBER( lk201_device::timer_w )
void lk201_device::timer_w(offs_t offset, uint8_t data)
{
static uint16_t count;
static int save_tsr;
@ -679,21 +679,21 @@ WRITE8_MEMBER( lk201_device::timer_w )
}
}
READ8_MEMBER( lk201_device::ddr_r )
uint8_t lk201_device::ddr_r(offs_t offset)
{
return ddrs[offset];
}
WRITE8_MEMBER( lk201_device::ddr_w )
void lk201_device::ddr_w(offs_t offset, uint8_t data)
{
// printf("%02x to PORT %c DDR (PC=%x)\n", data, 'A' + offset, m_maincpu->pc());
uint8_t olddata = ddrs[offset];
ddrs[offset] = data;
send_port(space, offset, ports[offset] & olddata);
send_port(offset, ports[offset] & olddata);
}
READ8_MEMBER( lk201_device::ports_r )
uint8_t lk201_device::ports_r(offs_t offset)
{
uint8_t incoming = 0;
@ -707,15 +707,15 @@ READ8_MEMBER( lk201_device::ports_r )
return incoming;
}
WRITE8_MEMBER( lk201_device::ports_w )
void lk201_device::ports_w(offs_t offset, uint8_t data)
{
uint8_t olddata = ports[offset];
ports[offset] = data; // "port writes are independent of DDRC"
send_port(space, offset, olddata & ddrs[offset]);
send_port(offset, olddata & ddrs[offset]);
// printf("\nPORT %c write %02x (OLD = %02x) (DDR = %02x) (PC=%x)\n", 'A' + offset, data, olddata, ddrs[offset], m_maincpu->pc());
}
void lk201_device::send_port(address_space &space, uint8_t offset, uint8_t olddata)
void lk201_device::send_port(uint8_t offset, uint8_t olddata)
{
uint8_t porta = ports[0] & ddrs[0];
uint8_t portb = ports[1] & ddrs[1];
@ -808,7 +808,7 @@ void lk201_device::send_port(address_space &space, uint8_t offset, uint8_t oldda
} // outer switch
}
READ8_MEMBER( lk201_device::sci_r )
uint8_t lk201_device::sci_r(offs_t offset)
{
uint8_t incoming = 0;
@ -841,7 +841,7 @@ READ8_MEMBER( lk201_device::sci_r )
return incoming;
}
WRITE8_MEMBER( lk201_device::sci_w )
void lk201_device::sci_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@ -871,7 +871,7 @@ WRITE8_MEMBER( lk201_device::sci_w )
// printf("SCI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc());
}
READ8_MEMBER( lk201_device::spi_r )
uint8_t lk201_device::spi_r(offs_t offset)
{
uint8_t incoming = 0;
@ -895,7 +895,7 @@ READ8_MEMBER( lk201_device::spi_r )
return incoming;
}
WRITE8_MEMBER( lk201_device::spi_w )
void lk201_device::spi_w(offs_t offset, uint8_t data)
{
switch (offset)
{

22
src/mame/machine/dec_lk201.h
View File

@ -46,16 +46,16 @@ public:
// construction/destruction
lk201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(ddr_r);
DECLARE_WRITE8_MEMBER(ddr_w);
DECLARE_READ8_MEMBER(ports_r);
DECLARE_WRITE8_MEMBER(ports_w);
DECLARE_READ8_MEMBER(sci_r);
DECLARE_WRITE8_MEMBER(sci_w);
DECLARE_READ8_MEMBER(spi_r);
DECLARE_WRITE8_MEMBER(spi_w);
DECLARE_READ8_MEMBER(timer_r);
DECLARE_WRITE8_MEMBER(timer_w);
uint8_t ddr_r(offs_t offset);
void ddr_w(offs_t offset, uint8_t data);
uint8_t ports_r(offs_t offset);
void ports_w(offs_t offset, uint8_t data);
uint8_t sci_r(offs_t offset);
void sci_w(offs_t offset, uint8_t data);
uint8_t spi_r(offs_t offset);
void spi_w(offs_t offset, uint8_t data);
uint8_t timer_r(offs_t offset);
void timer_w(offs_t offset, uint8_t data);
auto tx_handler() { return m_tx_handler.bind(); }
@ -128,7 +128,7 @@ private:
required_ioport m_kbd16;
required_ioport m_kbd17;
void send_port(address_space &space, uint8_t offset, uint8_t data);
void send_port(uint8_t offset, uint8_t data);
void update_interrupts();
int m_kbd_state;

30
src/mame/machine/decopincpu.cpp
View File

@ -118,18 +118,18 @@ WRITE_LINE_MEMBER( decocpu_type1_device::pia21_ca2_w )
m_ca2 = state;
}
WRITE8_MEMBER( decocpu_type1_device::lamp0_w )
void decocpu_type1_device::lamp0_w(uint8_t data)
{
m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_write_lamp(0,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::lamp1_w )
void decocpu_type1_device::lamp1_w(uint8_t data)
{
m_write_lamp(1,data,0xff);
}
READ8_MEMBER( decocpu_type1_device::display_strobe_r )
uint8_t decocpu_type1_device::display_strobe_r()
{
uint8_t ret = 0x80;
@ -139,62 +139,62 @@ READ8_MEMBER( decocpu_type1_device::display_strobe_r )
return ret | (m_read_display(0) & 0x7f);
}
WRITE8_MEMBER( decocpu_type1_device::display_strobe_w )
void decocpu_type1_device::display_strobe_w(uint8_t data)
{
m_write_display(0,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::display_out1_w )
void decocpu_type1_device::display_out1_w(uint8_t data)
{
m_write_display(1,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::display_out2_w )
void decocpu_type1_device::display_out2_w(uint8_t data)
{
m_write_display(2,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::display_out3_w )
void decocpu_type1_device::display_out3_w(uint8_t data)
{
m_write_display(3,data,0xff);
}
READ8_MEMBER( decocpu_type1_device::display_in3_r )
uint8_t decocpu_type1_device::display_in3_r()
{
return m_read_display(3);
}
WRITE8_MEMBER( decocpu_type1_device::switch_w )
void decocpu_type1_device::switch_w(uint8_t data)
{
m_write_switch(0,data,0xff);
}
READ8_MEMBER( decocpu_type1_device::switch_r )
uint8_t decocpu_type1_device::switch_r()
{
return m_read_switch(0);
}
READ8_MEMBER( decocpu_type1_device::dmdstatus_r )
uint8_t decocpu_type1_device::dmdstatus_r()
{
return m_read_dmdstatus(0);
}
WRITE8_MEMBER( decocpu_type1_device::display_out4_w )
void decocpu_type1_device::display_out4_w(uint8_t data)
{
m_write_display(4,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::sound_w )
void decocpu_type1_device::sound_w(uint8_t data)
{
m_write_soundlatch(0,data,0xff);
}
WRITE8_MEMBER( decocpu_type1_device::solenoid1_w )
void decocpu_type1_device::solenoid1_w(uint8_t data)
{
// todo
}
WRITE8_MEMBER( decocpu_type1_device::solenoid2_w )
void decocpu_type1_device::solenoid2_w(uint8_t data)
{
// todo
}

30
src/mame/machine/decopincpu.h
View File

@ -47,7 +47,7 @@ public:
auto lamp_write_callback() { return m_write_lamp.bind(); }
auto solenoid_write_callback() { return m_write_solenoid.bind(); }
DECLARE_WRITE8_MEMBER(solenoid2_w);
void solenoid2_w(uint8_t data);
INPUT_CHANGED_MEMBER(main_nmi);
INPUT_CHANGED_MEMBER(audio_nmi);
@ -92,20 +92,20 @@ private:
DECLARE_WRITE_LINE_MEMBER(cpu_pia_irq);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w);
DECLARE_READ8_MEMBER(display_strobe_r);
DECLARE_WRITE8_MEMBER(display_strobe_w);
DECLARE_WRITE8_MEMBER(display_out1_w);
DECLARE_WRITE8_MEMBER(display_out2_w);
DECLARE_WRITE8_MEMBER(display_out3_w);
DECLARE_WRITE8_MEMBER(display_out4_w);
DECLARE_READ8_MEMBER(display_in3_r);
DECLARE_WRITE8_MEMBER(switch_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_READ8_MEMBER(dmdstatus_r);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(solenoid1_w);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
uint8_t display_strobe_r();
void display_strobe_w(uint8_t data);
void display_out1_w(uint8_t data);
void display_out2_w(uint8_t data);
void display_out3_w(uint8_t data);
void display_out4_w(uint8_t data);
uint8_t display_in3_r();
void switch_w(uint8_t data);
uint8_t switch_r();
uint8_t dmdstatus_r();
void sound_w(uint8_t data);
void solenoid1_w(uint8_t data);
};
class decocpu_type2_device : public decocpu_type1_device

6
src/mame/machine/dmv_keyb.cpp
View File

@ -254,7 +254,7 @@ const tiny_rom_entry *dmv_keyboard_device::device_rom_region() const
// port1_r -
//-------------------------------------------------
READ8_MEMBER( dmv_keyboard_device::port1_r )
uint8_t dmv_keyboard_device::port1_r()
{
return m_keyboard[m_col]->read();
}
@ -263,7 +263,7 @@ READ8_MEMBER( dmv_keyboard_device::port1_r )
// port2_r
//-------------------------------------------------
READ8_MEMBER( dmv_keyboard_device::port2_r )
uint8_t dmv_keyboard_device::port2_r()
{
return ((m_sd_data_state | m_sd_poll_state) << 7) | m_col;
}
@ -272,7 +272,7 @@ READ8_MEMBER( dmv_keyboard_device::port2_r )
// port2_w
//-------------------------------------------------
WRITE8_MEMBER( dmv_keyboard_device::port2_w )
void dmv_keyboard_device::port2_w(uint8_t data)
{
/*
P2.0 col 0

6
src/mame/machine/dmv_keyb.h
View File

@ -48,9 +48,9 @@ private:
int m_sd_data_state;
int m_sd_poll_state;
DECLARE_READ8_MEMBER( port1_r );
DECLARE_READ8_MEMBER( port2_r );
DECLARE_WRITE8_MEMBER( port2_w );
uint8_t port1_r();
uint8_t port2_r();
void port2_w(uint8_t data);
};

34
src/mame/machine/egret.cpp
View File

@ -99,7 +99,7 @@ const tiny_rom_entry *egret_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
void egret_device::send_port(address_space &space, uint8_t offset, uint8_t data)
void egret_device::send_port(uint8_t offset, uint8_t data)
{
switch (offset)
{
@ -184,21 +184,21 @@ void egret_device::send_port(address_space &space, uint8_t offset, uint8_t data)
}
}
READ8_MEMBER( egret_device::ddr_r )
uint8_t egret_device::ddr_r(offs_t offset)
{
return ddrs[offset];
}
WRITE8_MEMBER( egret_device::ddr_w )
void egret_device::ddr_w(offs_t offset, uint8_t data)
{
/* printf("%02x to DDR %c\n", data, 'A' + offset);*/
send_port(space, offset, ports[offset] & data);
send_port(offset, ports[offset] & data);
ddrs[offset] = data;
}
READ8_MEMBER( egret_device::ports_r )
uint8_t egret_device::ports_r(offs_t offset)
{
uint8_t incoming = 0;
@ -241,19 +241,19 @@ READ8_MEMBER( egret_device::ports_r )
return incoming;
}
WRITE8_MEMBER( egret_device::ports_w )
void egret_device::ports_w(offs_t offset, uint8_t data)
{
send_port(space, offset, data);
send_port(offset, data);
ports[offset] = data;
}
READ8_MEMBER( egret_device::pll_r )
uint8_t egret_device::pll_r()
{
return pll_ctrl;
}
WRITE8_MEMBER( egret_device::pll_w )
void egret_device::pll_w(uint8_t data)
{
#ifdef EGRET_SUPER_VERBOSE
if (pll_ctrl != data)
@ -270,34 +270,34 @@ WRITE8_MEMBER( egret_device::pll_w )
pll_ctrl = data;
}
READ8_MEMBER( egret_device::timer_ctrl_r )
uint8_t egret_device::timer_ctrl_r()
{
return timer_ctrl;
}
WRITE8_MEMBER( egret_device::timer_ctrl_w )
void egret_device::timer_ctrl_w(uint8_t data)
{
// printf("%02x to timer control\n", data);
timer_ctrl = data;
}
READ8_MEMBER( egret_device::timer_counter_r )
uint8_t egret_device::timer_counter_r()
{
return timer_counter;
}
WRITE8_MEMBER( egret_device::timer_counter_w )
void egret_device::timer_counter_w(uint8_t data)
{
// printf("%02x to timer/counter\n", data);
timer_counter = data;
}
READ8_MEMBER( egret_device::onesec_r )
uint8_t egret_device::onesec_r()
{
return onesec;
}
WRITE8_MEMBER( egret_device::onesec_w )
void egret_device::onesec_w(uint8_t data)
{
// printf("%02x to one-second control\n", data);
@ -311,12 +311,12 @@ WRITE8_MEMBER( egret_device::onesec_w )
onesec = data;
}
READ8_MEMBER( egret_device::pram_r )
uint8_t egret_device::pram_r(offs_t offset)
{
return pram[offset];
}
WRITE8_MEMBER( egret_device::pram_w )
void egret_device::pram_w(offs_t offset, uint8_t data)
{
pram[offset] = data;
}

30
src/mame/machine/egret.h
View File

@ -44,20 +44,20 @@ public:
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
DECLARE_READ8_MEMBER( ddr_r );
DECLARE_WRITE8_MEMBER( ddr_w );
DECLARE_READ8_MEMBER( ports_r );
DECLARE_WRITE8_MEMBER( ports_w );
DECLARE_READ8_MEMBER( pll_r );
DECLARE_WRITE8_MEMBER( pll_w );
DECLARE_READ8_MEMBER( timer_ctrl_r );
DECLARE_WRITE8_MEMBER( timer_ctrl_w );
DECLARE_READ8_MEMBER( timer_counter_r );
DECLARE_WRITE8_MEMBER( timer_counter_w );
DECLARE_READ8_MEMBER( onesec_r );
DECLARE_WRITE8_MEMBER( onesec_w );
DECLARE_READ8_MEMBER( pram_r );
DECLARE_WRITE8_MEMBER( pram_w );
uint8_t ddr_r(offs_t offset);
void ddr_w(offs_t offset, uint8_t data);
uint8_t ports_r(offs_t offset);
void ports_w(offs_t offset, uint8_t data);
uint8_t pll_r();
void pll_w(uint8_t data);
uint8_t timer_ctrl_r();
void timer_ctrl_w(uint8_t data);
uint8_t timer_counter_r();
void timer_counter_w(uint8_t data);
uint8_t onesec_r();
void onesec_w(uint8_t data);
uint8_t pram_r(offs_t offset);
void pram_w(offs_t offset, uint8_t data);
// interface routines
uint8_t get_xcvr_session() { return xcvr_session; }
@ -107,7 +107,7 @@ private:
uint8_t pram[0x100], disk_pram[0x100];
bool pram_loaded;
void send_port(address_space &space, uint8_t offset, uint8_t data);
void send_port(uint8_t offset, uint8_t data);
};
// device type definition

2
src/mame/machine/esqvfd.h
View File

@ -9,7 +9,7 @@
class esqvfd_device : public device_t {
public:
DECLARE_WRITE8_MEMBER( write ) { write_char(data); }
void write(uint8_t data) { write_char(data); }
virtual void write_char(int data) = 0;
virtual void update_display();

4
src/mame/machine/etna.cpp
View File

@ -86,7 +86,7 @@ void etna_device::device_reset()
m_prom[0x7f] = chk ^ 66;
}
WRITE8_MEMBER(etna_device::regs_w)
void etna_device::regs_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@ -147,7 +147,7 @@ WRITE8_MEMBER(etna_device::regs_w)
}
}
READ8_MEMBER(etna_device::regs_r)
uint8_t etna_device::regs_r(offs_t offset)
{
uint8_t data = 0;
switch (offset)

4
src/mame/machine/etna.h
View File

@ -20,8 +20,8 @@ class etna_device : public device_t
public:
etna_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U);
DECLARE_WRITE8_MEMBER(regs_w);
DECLARE_READ8_MEMBER(regs_r);
void regs_w(offs_t offset, uint8_t data);
uint8_t regs_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(eeprom_cs_in);
DECLARE_WRITE_LINE_MEMBER(eeprom_clk_in);

4
src/mame/machine/fm_scsi.cpp
View File

@ -415,7 +415,7 @@ void fmscsi_device::fmscsi_control_w(uint8_t data)
logerror("FMSCSI: control write %02x\n",data);
}
READ8_MEMBER( fmscsi_device::fmscsi_r )
uint8_t fmscsi_device::fmscsi_r(offs_t offset)
{
switch(offset & 0x03)
{
@ -431,7 +431,7 @@ READ8_MEMBER( fmscsi_device::fmscsi_r )
return 0;
}
WRITE8_MEMBER( fmscsi_device::fmscsi_w )
void fmscsi_device::fmscsi_w(offs_t offset, uint8_t data)
{
switch(offset & 0x03)
{

4
src/mame/machine/fm_scsi.h
View File

@ -28,8 +28,8 @@ public:
void fmscsi_data_w(uint8_t data);
uint8_t fmscsi_status_r(void);
void fmscsi_control_w(uint8_t data);
DECLARE_READ8_MEMBER( fmscsi_r );
DECLARE_WRITE8_MEMBER( fmscsi_w );
uint8_t fmscsi_r(offs_t offset);
void fmscsi_w(offs_t offset, uint8_t data);
void set_phase(int phase);
int get_phase(void);

14
src/mame/machine/fmt_icmem.cpp
View File

@ -97,22 +97,22 @@ image_init_result fmt_icmem_device::call_create(int format_type, util::option_re
}
READ8_MEMBER(fmt_icmem_device::static_mem_read)
uint8_t fmt_icmem_device::static_mem_read(offs_t offset)
{
return m_memcard_ram[offset];
}
WRITE8_MEMBER(fmt_icmem_device::static_mem_write)
void fmt_icmem_device::static_mem_write(offs_t offset, uint8_t data)
{
m_memcard_ram[offset] = data;
}
READ8_MEMBER(fmt_icmem_device::mem_read)
uint8_t fmt_icmem_device::mem_read(offs_t offset)
{
return m_memcard_ram[(m_bank*0x100000) + offset];
}
WRITE8_MEMBER(fmt_icmem_device::mem_write)
void fmt_icmem_device::mem_write(offs_t offset, uint8_t data)
{
m_memcard_ram[(m_bank*0x100000) + offset] = data;
}
@ -123,7 +123,7 @@ WRITE8_MEMBER(fmt_icmem_device::mem_write)
// bit 3,4,5 - not memory card related (EEPROM and backup battery level)
// bit 6 - unknown
// bit 7 - 1 = card changed, flips back to 0 when read
READ8_MEMBER(fmt_icmem_device::status_r)
uint8_t fmt_icmem_device::status_r()
{
uint8_t ret = 0x00;
@ -144,7 +144,7 @@ READ8_MEMBER(fmt_icmem_device::status_r)
// Attribute/Common memory select (0x491)
// bit 0: 0 = common memory, 1 = attribute memory (TODO)
// bit 7: 0 indicates that card is JEIDA v4 compliant
READ8_MEMBER(fmt_icmem_device::bank_r)
uint8_t fmt_icmem_device::bank_r(offs_t offset)
{
switch(offset)
{
@ -156,7 +156,7 @@ READ8_MEMBER(fmt_icmem_device::bank_r)
return 0xff;
}
WRITE8_MEMBER(fmt_icmem_device::bank_w)
void fmt_icmem_device::bank_w(offs_t offset, uint8_t data)
{
switch(offset)
{

14
src/mame/machine/fmt_icmem.h
View File

@ -37,13 +37,13 @@ public:
virtual void call_unload() override;
virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override;
DECLARE_READ8_MEMBER(static_mem_read);
DECLARE_WRITE8_MEMBER(static_mem_write);
DECLARE_READ8_MEMBER(mem_read);
DECLARE_WRITE8_MEMBER(mem_write);
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(bank_r);
DECLARE_WRITE8_MEMBER(bank_w);
uint8_t static_mem_read(offs_t offset);
void static_mem_write(offs_t offset, uint8_t data);
uint8_t mem_read(offs_t offset);
void mem_write(offs_t offset, uint8_t data);
uint8_t status_r();
uint8_t bank_r(offs_t offset);
void bank_w(offs_t offset, uint8_t data);
protected:
// device_t implementation

6
src/mame/machine/gaelco3d.cpp
View File

@ -348,7 +348,7 @@ WRITE_LINE_MEMBER(gaelco_serial_device::irq_enable)
LOGMSG(("???? irq enable %d\n", state));
}
READ8_MEMBER(gaelco_serial_device::status_r)
uint8_t gaelco_serial_device::status_r()
{
uint8_t ret = 0;
@ -363,7 +363,7 @@ READ8_MEMBER(gaelco_serial_device::status_r)
return ret;
}
WRITE8_MEMBER(gaelco_serial_device::data_w)
void gaelco_serial_device::data_w(uint8_t data)
{
std::lock_guard<std::mutex> guard(m_mutex);
@ -376,7 +376,7 @@ WRITE8_MEMBER(gaelco_serial_device::data_w)
LOGMSG(("command send %02x at %d\n", data, m_out_ptr->cnt));
}
READ8_MEMBER( gaelco_serial_device::data_r)
uint8_t gaelco_serial_device::data_r()
{
uint8_t ret;

6
src/mame/machine/gaelco3d.h
View File

@ -26,9 +26,9 @@ public:
auto irq_handler() { return m_irq_handler.bind(); }
DECLARE_READ8_MEMBER(status_r);
DECLARE_WRITE8_MEMBER(data_w);
DECLARE_READ8_MEMBER(data_r);
uint8_t status_r();
void data_w(uint8_t data);
uint8_t data_r();
DECLARE_WRITE_LINE_MEMBER(rts_w);
/* Set to 1 during transmit, 0 for receive */
DECLARE_WRITE_LINE_MEMBER(tr_w);

4
src/mame/machine/gaelco_ds5002fp.cpp
View File

@ -28,12 +28,12 @@ gaelco_ds5002fp_device::gaelco_ds5002fp_device(machine_config const &mconfig, ch
{
}
READ8_MEMBER(gaelco_ds5002fp_device::hostmem_r)
uint8_t gaelco_ds5002fp_device::hostmem_r(offs_t offset)
{
return m_hostmem->read_byte(offset);
}
WRITE8_MEMBER(gaelco_ds5002fp_device::hostmem_w)
void gaelco_ds5002fp_device::hostmem_w(offs_t offset, uint8_t data)
{
m_hostmem->write_byte(offset, data);
}

4
src/mame/machine/gaelco_ds5002fp.h
View File

@ -30,8 +30,8 @@ private:
address_space_config const m_hostmem_config;
address_space *m_hostmem;
DECLARE_READ8_MEMBER(hostmem_r);
DECLARE_WRITE8_MEMBER(hostmem_w);
uint8_t hostmem_r(offs_t offset);
void hostmem_w(offs_t offset, uint8_t data);
};
#endif // MAME_MACHINE_GAELCO_DS5002FP_H

2
src/mame/machine/hp98x5_io_sys.cpp
View File

@ -79,7 +79,7 @@ IRQ_CALLBACK_MEMBER(hp98x5_io_sys_device::irq_callback)
}
}
WRITE8_MEMBER(hp98x5_io_sys_device::pa_w)
void hp98x5_io_sys_device::pa_w(uint8_t data)
{
m_pa = data;
update_flg_sts();

2
src/mame/machine/hp98x5_io_sys.h
View File

@ -30,7 +30,7 @@ public:
auto dmar() { return m_dmar_handler.bind(); }
IRQ_CALLBACK_MEMBER(irq_callback);
DECLARE_WRITE8_MEMBER(pa_w);
void pa_w(uint8_t data);
void set_irq(uint8_t sc , int state);
void set_sts(uint8_t sc , int state);

10
src/mame/machine/ibm6580_fdc.cpp
View File

@ -74,21 +74,21 @@ void dw_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param
m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
WRITE8_MEMBER( dw_fdc_device::p1_w )
void dw_fdc_device::p1_w(uint8_t data)
{
m_p1 = data;
LOGDBG("p1 <- %02x\n", data, m_p1);
}
WRITE8_MEMBER( dw_fdc_device::p2_w )
void dw_fdc_device::p2_w(uint8_t data)
{
m_p2 = data;
LOGDBG("p2 <- %02x\n", data);
}
READ8_MEMBER( dw_fdc_device::p2_r )
uint8_t dw_fdc_device::p2_r()
{
uint8_t data = m_p2;
@ -111,12 +111,12 @@ READ_LINE_MEMBER( dw_fdc_device::t1_r )
return m_t1;
}
WRITE8_MEMBER( dw_fdc_device::bus_w )
void dw_fdc_device::bus_w(uint8_t data)
{
m_bus = data;
}
READ8_MEMBER( dw_fdc_device::bus_r )
uint8_t dw_fdc_device::bus_r()
{
return m_bus;
}

10
src/mame/machine/ibm6580_fdc.h
View File

@ -39,11 +39,11 @@ private:
devcb_write_line m_out_strobe;
required_device<i8048_device> m_mcu;
DECLARE_WRITE8_MEMBER(bus_w);
DECLARE_READ8_MEMBER(bus_r);
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_WRITE8_MEMBER(p2_w);
DECLARE_READ8_MEMBER(p2_r);
void bus_w(uint8_t data);
uint8_t bus_r();
void p1_w(uint8_t data);
void p2_w(uint8_t data);
uint8_t p2_r();
DECLARE_READ_LINE_MEMBER(t0_r);
DECLARE_READ_LINE_MEMBER(t1_r);
};

10
src/mame/machine/ibm6580_kbd.cpp
View File

@ -206,14 +206,14 @@ void dw_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int
m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
WRITE8_MEMBER( dw_keyboard_device::p1_w )
void dw_keyboard_device::p1_w(uint8_t data)
{
m_drive = data;
LOGDBG("p1 <- %02x = drive %04x\n", data, m_drive);
}
WRITE8_MEMBER( dw_keyboard_device::p2_w )
void dw_keyboard_device::p2_w(uint8_t data)
{
if (BIT(m_p2 ^ data, 3) && BIT(data, 3)) {
m_sense = data & 7;
@ -225,7 +225,7 @@ WRITE8_MEMBER( dw_keyboard_device::p2_w )
LOGDBG("p2 <- %02x = drive %04x sense row %d\n", data, m_drive, data & 7);
}
READ8_MEMBER( dw_keyboard_device::p2_r )
uint8_t dw_keyboard_device::p2_r()
{
uint8_t data = m_p2;
@ -248,7 +248,7 @@ READ_LINE_MEMBER( dw_keyboard_device::t1_r )
return m_keylatch;
}
WRITE8_MEMBER( dw_keyboard_device::bus_w )
void dw_keyboard_device::bus_w(uint8_t data)
{
int i, sense = 0;
@ -299,7 +299,7 @@ WRITE8_MEMBER( dw_keyboard_device::bus_w )
}
}
READ8_MEMBER( dw_keyboard_device::bus_r )
uint8_t dw_keyboard_device::bus_r()
{
return m_bus;
}

10
src/mame/machine/ibm6580_kbd.h
View File

@ -40,11 +40,11 @@ private:
devcb_write_line m_out_strobe;
required_device<i8049_device> m_mcu;
DECLARE_WRITE8_MEMBER(bus_w);
DECLARE_READ8_MEMBER(bus_r);
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_WRITE8_MEMBER(p2_w);
DECLARE_READ8_MEMBER(p2_r);
void bus_w(uint8_t data);
uint8_t bus_r();
void p1_w(uint8_t data);
void p2_w(uint8_t data);
uint8_t p2_r();
DECLARE_READ_LINE_MEMBER(t0_r);
DECLARE_READ_LINE_MEMBER(t1_r);
};

44
src/mame/machine/imds2ioc.cpp
View File

@ -83,7 +83,7 @@ imds2ioc_device::imds2ioc_device(const machine_config &mconfig, const char *tag,
}
WRITE8_MEMBER(imds2ioc_device::miscout_w)
void imds2ioc_device::miscout_w(uint8_t data)
{
m_miscout = data;
update_beeper();
@ -91,7 +91,7 @@ WRITE8_MEMBER(imds2ioc_device::miscout_w)
m_master_intr_cb(BIT(m_miscout, 1));
}
READ8_MEMBER(imds2ioc_device::miscin_r)
uint8_t imds2ioc_device::miscin_r()
{
uint8_t res = m_ioc_options->read();
return res | ((m_beeper_timer == 0) << 2);
@ -103,19 +103,19 @@ WRITE_LINE_MEMBER(imds2ioc_device::beep_timer_w)
update_beeper();
}
WRITE8_MEMBER(imds2ioc_device::start_timer_w)
void imds2ioc_device::start_timer_w(uint8_t data)
{
// Trigger timer 2 of ioctimer
m_ioctimer->write_gate2(0);
m_ioctimer->write_gate2(1);
}
READ8_MEMBER(imds2ioc_device::kb_read)
uint8_t imds2ioc_device::kb_read(offs_t offset)
{
return m_kbcpu->upi41_master_r((offset & 2) >> 1);
}
READ8_MEMBER(imds2ioc_device::kb_port_p2_r)
uint8_t imds2ioc_device::kb_port_p2_r()
{
if ((m_kb_p1 & 3) == 0) {
// Row selected
@ -175,7 +175,7 @@ READ8_MEMBER(imds2ioc_device::kb_port_p2_r)
}
}
WRITE8_MEMBER(imds2ioc_device::kb_port_p1_w)
void imds2ioc_device::kb_port_p1_w(uint8_t data)
{
m_kb_p1 = data;
}
@ -194,37 +194,37 @@ READ_LINE_MEMBER(imds2ioc_device::kb_port_t1_r)
return 0;
}
WRITE8_MEMBER(imds2ioc_device::ioc_dbbout_w)
void imds2ioc_device::ioc_dbbout_w(offs_t offset, uint8_t data)
{
m_ioc_obf = ~data;
// Set/reset OBF flag (b0)
m_ipc_ioc_status = ((offset & 1) == 0) | (m_ipc_ioc_status & ~0x01);
}
WRITE8_MEMBER(imds2ioc_device::ioc_f0_w)
void imds2ioc_device::ioc_f0_w(offs_t offset, uint8_t data)
{
// Set/reset F0 flag (b2)
m_ipc_ioc_status = ((offset & 1) << 2) | (m_ipc_ioc_status & ~0x04);
}
WRITE8_MEMBER(imds2ioc_device::ioc_set_f1_w)
void imds2ioc_device::ioc_set_f1_w(uint8_t data)
{
// Set F1 flag (b3)
m_ipc_ioc_status |= 0x08;
}
WRITE8_MEMBER(imds2ioc_device::ioc_reset_f1_w)
void imds2ioc_device::ioc_reset_f1_w(uint8_t data)
{
// Reset F1 flag (b3)
m_ipc_ioc_status &= ~0x08;
}
READ8_MEMBER(imds2ioc_device::ioc_status_r)
uint8_t imds2ioc_device::ioc_status_r()
{
return ~m_ipc_ioc_status;
}
READ8_MEMBER(imds2ioc_device::ioc_dbbin_r)
uint8_t imds2ioc_device::ioc_dbbin_r()
{
// Reset IBF flag (b1)
if (!machine().side_effects_disabled())
@ -232,7 +232,7 @@ READ8_MEMBER(imds2ioc_device::ioc_dbbin_r)
return ~m_ioc_ibf;
}
READ8_MEMBER(imds2ioc_device::dbb_master_r)
uint8_t imds2ioc_device::dbb_master_r(offs_t offset)
{
// Read status register
if (BIT(offset, 0))
@ -248,7 +248,7 @@ READ8_MEMBER(imds2ioc_device::dbb_master_r)
}
}
WRITE8_MEMBER(imds2ioc_device::dbb_master_w)
void imds2ioc_device::dbb_master_w(offs_t offset, uint8_t data)
{
// Set IBF flag (b1)
m_ipc_ioc_status |= 0x02;
@ -275,19 +275,19 @@ WRITE_LINE_MEMBER(imds2ioc_device::hrq_w)
m_iocdma->hlda_w(state);
}
READ8_MEMBER(imds2ioc_device::ioc_mem_r)
uint8_t imds2ioc_device::ioc_mem_r(offs_t offset)
{
address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
return prog_space.read_byte(offset);
}
WRITE8_MEMBER(imds2ioc_device::ioc_mem_w)
void imds2ioc_device::ioc_mem_w(offs_t offset, uint8_t data)
{
address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
return prog_space.write_byte(offset, data);
}
READ8_MEMBER(imds2ioc_device::pio_port_p1_r)
uint8_t imds2ioc_device::pio_port_p1_r()
{
// If STATUS ENABLE/ == 0 return inverted device status byte, else return 0xff
// STATUS ENABLE/ == 0 when P23-P20 == 12 & P24 == 0 & P25 = 1 & P26 = 1
@ -298,18 +298,18 @@ READ8_MEMBER(imds2ioc_device::pio_port_p1_r)
}
}
WRITE8_MEMBER(imds2ioc_device::pio_port_p1_w)
void imds2ioc_device::pio_port_p1_w(uint8_t data)
{
m_pio_port1 = data;
update_printer();
}
READ8_MEMBER(imds2ioc_device::pio_port_p2_r)
uint8_t imds2ioc_device::pio_port_p2_r()
{
return m_pio_port2;
}
WRITE8_MEMBER(imds2ioc_device::pio_port_p2_w)
void imds2ioc_device::pio_port_p2_w(uint8_t data)
{
m_pio_port2 = data;
update_printer();
@ -397,12 +397,12 @@ I8275_DRAW_CHARACTER_MEMBER(imds2ioc_device::crtc_display_pixels)
}
}
READ8_MEMBER(imds2ioc_device::pio_master_r)
uint8_t imds2ioc_device::pio_master_r(offs_t offset)
{
return m_iocpio->upi41_master_r(offset);
}
WRITE8_MEMBER(imds2ioc_device::pio_master_w)
void imds2ioc_device::pio_master_w(offs_t offset, uint8_t data)
{
m_iocpio->upi41_master_w(offset, data);
}

44
src/mame/machine/imds2ioc.h
View File

@ -23,11 +23,11 @@ public:
auto master_intr_cb() { return m_master_intr_cb.bind(); }
auto parallel_int_cb() { return m_parallel_int_cb.bind(); }
DECLARE_READ8_MEMBER(dbb_master_r);
DECLARE_WRITE8_MEMBER(dbb_master_w);
uint8_t dbb_master_r(offs_t offset);
void dbb_master_w(offs_t offset, uint8_t data);
DECLARE_READ8_MEMBER(pio_master_r);
DECLARE_WRITE8_MEMBER(pio_master_w);
uint8_t pio_master_r(offs_t offset);
void pio_master_w(offs_t offset, uint8_t data);
protected:
virtual ioport_constructor device_input_ports() const override;
@ -39,32 +39,32 @@ protected:
virtual void device_reset() override;
private:
DECLARE_WRITE8_MEMBER(miscout_w);
DECLARE_READ8_MEMBER(miscin_r);
void miscout_w(uint8_t data);
uint8_t miscin_r();
DECLARE_WRITE_LINE_MEMBER(beep_timer_w);
DECLARE_WRITE8_MEMBER(start_timer_w);
void start_timer_w(uint8_t data);
DECLARE_READ8_MEMBER(kb_read);
DECLARE_READ8_MEMBER(kb_port_p2_r);
DECLARE_WRITE8_MEMBER(kb_port_p1_w);
uint8_t kb_read(offs_t offset);
uint8_t kb_port_p2_r();
void kb_port_p1_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(kb_port_t0_r);
DECLARE_READ_LINE_MEMBER(kb_port_t1_r);
DECLARE_WRITE8_MEMBER(ioc_dbbout_w);
DECLARE_WRITE8_MEMBER(ioc_f0_w);
DECLARE_WRITE8_MEMBER(ioc_set_f1_w);
DECLARE_WRITE8_MEMBER(ioc_reset_f1_w);
DECLARE_READ8_MEMBER(ioc_status_r);
DECLARE_READ8_MEMBER(ioc_dbbin_r);
void ioc_dbbout_w(offs_t offset, uint8_t data);
void ioc_f0_w(offs_t offset, uint8_t data);
void ioc_set_f1_w(uint8_t data);
void ioc_reset_f1_w(uint8_t data);
uint8_t ioc_status_r();
uint8_t ioc_dbbin_r();
DECLARE_WRITE_LINE_MEMBER(hrq_w);
DECLARE_READ8_MEMBER(ioc_mem_r);
DECLARE_WRITE8_MEMBER(ioc_mem_w);
uint8_t ioc_mem_r(offs_t offset);
void ioc_mem_w(offs_t offset, uint8_t data);
DECLARE_READ8_MEMBER(pio_port_p1_r);
DECLARE_WRITE8_MEMBER(pio_port_p1_w);
DECLARE_READ8_MEMBER(pio_port_p2_r);
DECLARE_WRITE8_MEMBER(pio_port_p2_w);
uint8_t pio_port_p1_r();
void pio_port_p1_w(uint8_t data);
uint8_t pio_port_p2_r();
void pio_port_p2_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pio_lpt_ack_w);
DECLARE_WRITE_LINE_MEMBER(pio_lpt_busy_w);
DECLARE_WRITE_LINE_MEMBER(pio_lpt_select_w);

20
src/mame/machine/inder_sb.cpp
View File

@ -26,7 +26,7 @@ inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag,
// hacks for test purposes, these are installed over the program rom so we know when irqs are actually taken
READ8_MEMBER(inder_sb_device::vec_bankswitch_r)
uint8_t inder_sb_device::vec_bankswitch_r(offs_t offset)
{
if (!machine().side_effects_disabled())
m_sounddata_bank->set_entry(m_soundbank[(offset & 6) >> 1] & 7);
@ -35,7 +35,7 @@ READ8_MEMBER(inder_sb_device::vec_bankswitch_r)
READ16_MEMBER(inder_sb_device::megaphx_0x050002_r)
uint16_t inder_sb_device::megaphx_0x050002_r(offs_t offset, uint16_t mem_mask)
{
//logerror("%s megaphx_0x050002_r (from z80?) %04x\n", machine().describe_context(), mem_mask);
machine().scheduler().synchronize();
@ -44,7 +44,7 @@ READ16_MEMBER(inder_sb_device::megaphx_0x050002_r)
return ret;
}
WRITE16_MEMBER(inder_sb_device::megaphx_0x050000_w)
void inder_sb_device::megaphx_0x050000_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
//logerror("%s megaphx_0x050000_w (to z80?) %04x %04x\n", machine().describe_context(), data, mem_mask);
machine().scheduler().synchronize();
@ -72,13 +72,13 @@ void inder_sb_device::sound_map(address_map &map)
map(0x8000, 0xffff).bankr("snddata");
}
READ8_MEMBER(inder_sb_device::megaphx_sound_cmd_r)
uint8_t inder_sb_device::megaphx_sound_cmd_r()
{
machine().scheduler().synchronize();
return m_sounddata;
}
READ8_MEMBER(inder_sb_device::megaphx_sound_sent_r)
uint8_t inder_sb_device::megaphx_sound_sent_r()
{
machine().scheduler().synchronize();
int ret = m_soundsent;
@ -86,7 +86,7 @@ READ8_MEMBER(inder_sb_device::megaphx_sound_sent_r)
return ret;
}
WRITE8_MEMBER(inder_sb_device::megaphx_sound_to_68k_w)
void inder_sb_device::megaphx_sound_to_68k_w(uint8_t data)
{
//logerror("%s megaphx_sound_to_68k_w (to 68k?) %02x\n", machine().describe_context(), data);
machine().scheduler().synchronize();
@ -94,27 +94,27 @@ WRITE8_MEMBER(inder_sb_device::megaphx_sound_to_68k_w)
m_soundback = data;
}
WRITE8_MEMBER(inder_sb_device::dac0_rombank_write)
void inder_sb_device::dac0_rombank_write(uint8_t data)
{
m_soundbank[0] = data;
// printf("dac0_rombank_write %02x", data);
}
WRITE8_MEMBER(inder_sb_device::dac1_rombank_write)
void inder_sb_device::dac1_rombank_write(uint8_t data)
{
m_soundbank[1] = data;
// printf("dac1_rombank_write %02x", data);
}
WRITE8_MEMBER(inder_sb_device::dac2_rombank_write)
void inder_sb_device::dac2_rombank_write(uint8_t data)
{
m_soundbank[2] = data;
// printf("dac2_rombank_write %02x", data);
}
WRITE8_MEMBER(inder_sb_device::dac3_rombank_write)
void inder_sb_device::dac3_rombank_write(uint8_t data)
{
m_soundbank[3] = data;
// printf("dac3_rombank_write %02x", data);

20
src/mame/machine/inder_sb.h
View File

@ -24,20 +24,20 @@ public:
// construction/destruction
inder_sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(megaphx_sound_sent_r);
DECLARE_READ8_MEMBER(megaphx_sound_cmd_r);
DECLARE_WRITE8_MEMBER(megaphx_sound_to_68k_w);
uint8_t megaphx_sound_sent_r();
uint8_t megaphx_sound_cmd_r();
void megaphx_sound_to_68k_w(uint8_t data);
DECLARE_WRITE8_MEMBER(dac0_rombank_write);
DECLARE_WRITE8_MEMBER(dac1_rombank_write);
DECLARE_WRITE8_MEMBER(dac2_rombank_write);
DECLARE_WRITE8_MEMBER(dac3_rombank_write);
void dac0_rombank_write(uint8_t data);
void dac1_rombank_write(uint8_t data);
void dac2_rombank_write(uint8_t data);
void dac3_rombank_write(uint8_t data);
DECLARE_READ8_MEMBER(vec_bankswitch_r);
uint8_t vec_bankswitch_r(offs_t offset);
DECLARE_READ16_MEMBER(megaphx_0x050002_r);
DECLARE_WRITE16_MEMBER(megaphx_0x050000_w);
uint16_t megaphx_0x050002_r(offs_t offset, uint16_t mem_mask = ~0);
void megaphx_0x050000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void sound_io(address_map &map);
void sound_map(address_map &map);

8
src/mame/machine/isbc_208.cpp
View File

@ -73,25 +73,25 @@ WRITE_LINE_MEMBER(isbc_208_device::hreq_w)
m_dmac->hack_w(state);
}
READ8_MEMBER(isbc_208_device::dma_read_byte)
uint8_t isbc_208_device::dma_read_byte(offs_t offset)
{
return m_maincpu_mem->read_byte(((offset + (m_seg << 4)) & 0xfffff) | ((m_aux & 0xf0) << 16));
}
WRITE8_MEMBER(isbc_208_device::dma_write_byte)
void isbc_208_device::dma_write_byte(offs_t offset, uint8_t data)
{
return m_maincpu_mem->write_byte(((offset + (m_seg << 4)) & 0xfffff) | ((m_aux & 0xf0) << 16), data);
}
READ8_MEMBER(isbc_208_device::stat_r)
uint8_t isbc_208_device::stat_r(offs_t offset)
{
if(!offset)
return m_fdc->get_irq() ? 1 : 0;
return 0;
}
WRITE8_MEMBER( isbc_208_device::aux_w )
void isbc_208_device::aux_w(offs_t offset, uint8_t data)
{
switch(offset)
{

8
src/mame/machine/isbc_208.h
View File

@ -22,8 +22,8 @@ public:
isbc_208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void map(address_map &map);
DECLARE_READ8_MEMBER(stat_r);
DECLARE_WRITE8_MEMBER(aux_w);
uint8_t stat_r(offs_t offset);
void aux_w(offs_t offset, uint8_t data);
auto irq_callback() { return m_out_irq_func.bind(); }
@ -44,8 +44,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(out_eop_w);
DECLARE_WRITE_LINE_MEMBER(hreq_w);
DECLARE_READ8_MEMBER(dma_read_byte);
DECLARE_WRITE8_MEMBER(dma_write_byte);
uint8_t dma_read_byte(offs_t offset);
void dma_write_byte(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(irq_w);
DECLARE_FLOPPY_FORMATS(floppy_formats);
};