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

a little more macro removal (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2020-05-18 19:29:39 +02:00
parent d1db16413c
commit 07a0b64f7a
66 changed files with 571 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/drivers/dreamwld.cpp
View File

@ -175,9 +175,9 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
DECLARE_WRITE8_MEMBER(prot_p1_w);
DECLARE_WRITE8_MEMBER(prot_p2_w);
DECLARE_READ8_MEMBER(prot_p2_r);
void prot_p1_w(uint8_t data);
void prot_p2_w(uint8_t data);
uint8_t prot_p2_r();
DECLARE_WRITE32_MEMBER(to_prot_w);
@ -741,13 +741,13 @@ void dreamwld_state::machine_reset()
m_protlatch = 0;
}
WRITE8_MEMBER(dreamwld_state::prot_p1_w)
void dreamwld_state::prot_p1_w(uint8_t data)
{
logerror("%s:prot_p1_w %02x\n", machine().describe_context(), data);
m_port1_data = data;
}
WRITE8_MEMBER(dreamwld_state::prot_p2_w)
void dreamwld_state::prot_p2_w(uint8_t data)
{
logerror("%s:prot_p2_w %02x\n", machine().describe_context(), data);
@ -776,7 +776,7 @@ WRITE8_MEMBER(dreamwld_state::prot_p2_w)
m_port2_data = data;
}
READ8_MEMBER(dreamwld_state::prot_p2_r)
uint8_t dreamwld_state::prot_p2_r()
{
// bit 2 is waited on before reading from port 0
// bit 3 is waited on after writing a byte

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

@ -31,8 +31,8 @@ public:
void security_decrypt();
private:
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_WRITE8_MEMBER(p3_w);
void p1_w(uint8_t data);
void p3_w(uint8_t data);
DECLARE_READ8_MEMBER(ext_r);
DECLARE_WRITE8_MEMBER(ext_w);
@ -40,13 +40,13 @@ private:
void i8031_ext_mem(address_map &map);
};
WRITE8_MEMBER(dynamoah_state::p1_w)
void dynamoah_state::p1_w(uint8_t data)
{
if (data != 0x1f)
LOG("%s: P1 = %02X\n", machine().describe_context(), data);
}
WRITE8_MEMBER(dynamoah_state::p3_w)
void dynamoah_state::p3_w(uint8_t data)
{
LOG("%s: P3 = %02X\n", machine().describe_context(), data);
}

16
src/mame/drivers/efdt.cpp
View File

@ -452,22 +452,22 @@ WRITE8_MEMBER(efdt_state::main_soundlatch_w)
}
}
READ8_MEMBER(efdt_state::soundlatch_0_r)
uint8_t efdt_state::soundlatch_0_r()
{
return m_soundCommand;
}
READ8_MEMBER(efdt_state::soundlatch_1_r)
uint8_t efdt_state::soundlatch_1_r()
{
return m_soundControl;
}
WRITE8_MEMBER(efdt_state::soundlatch_0_w)
void efdt_state::soundlatch_0_w(uint8_t data)
{
//m_soundCommand;
}
WRITE8_MEMBER(efdt_state::soundlatch_1_w)
void efdt_state::soundlatch_1_w(uint8_t data)
{
if (!(data == 0xfd || data == 0xf5))
{
@ -481,22 +481,22 @@ WRITE8_MEMBER(efdt_state::soundlatch_1_w)
// m_soundControl &= ~1;
}
READ8_MEMBER(efdt_state::soundlatch_2_r)
uint8_t efdt_state::soundlatch_2_r()
{
return m_soundControl;
}
READ8_MEMBER(efdt_state::soundlatch_3_r)
uint8_t efdt_state::soundlatch_3_r()
{
return m_soundControl;
}
WRITE8_MEMBER(efdt_state::soundlatch_2_w)
void efdt_state::soundlatch_2_w(uint8_t data)
{
//m_soundCommand;
}
WRITE8_MEMBER(efdt_state::soundlatch_3_w)
void efdt_state::soundlatch_3_w(uint8_t data)
{
m_soundControl = data;
}

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

@ -113,7 +113,7 @@ void epos_state::dealer_io_map(address_map &map)
map(0x40, 0x40).w("watchdog", FUNC(watchdog_timer_device::reset_w));
}
READ8_MEMBER(epos_state::i8255_porta_r)
uint8_t epos_state::i8255_porta_r()
{
uint8_t data = 0xff;
@ -131,18 +131,18 @@ READ8_MEMBER(epos_state::i8255_porta_r)
There's a separate ROM check for banked U04 at 30F3.
It looks like dealer/revenger uses ppi8255 to control bankswitching.
*/
WRITE8_MEMBER(epos_state::i8255_portc_w)
void epos_state::i8255_portc_w(uint8_t data)
{
membank("bank2")->set_entry(data & 0x01);
m_input_multiplex = (data >> 5) & 3;
}
READ8_MEMBER(epos_state::ay_porta_mpx_r)
uint8_t epos_state::ay_porta_mpx_r()
{
return (m_ay_porta_multiplex ? 0xFF : ioport("DSW")->read());
}
WRITE8_MEMBER(epos_state::flip_screen_w)
void epos_state::flip_screen_w(uint8_t data)
{
flip_screen_set(BIT(data, 7));
// bit 6: ay8910 port A/B multiplexer read

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

@ -191,7 +191,7 @@ WRITE8_MEMBER(esripsys_state::fdt_w)
*
*************************************/
READ16_MEMBER( esripsys_state::fdt_rip_r )
uint16_t esripsys_state::fdt_rip_r(offs_t offset)
{
offset = (offset & 0x7ff) << 1;
@ -201,7 +201,7 @@ READ16_MEMBER( esripsys_state::fdt_rip_r )
return (m_fdt_b[offset] << 8) | m_fdt_b[offset + 1];
}
WRITE16_MEMBER( esripsys_state::fdt_rip_w )
void esripsys_state::fdt_rip_w(offs_t offset, uint16_t data)
{
offset = (offset & 0x7ff) << 1;
@ -228,7 +228,7 @@ WRITE16_MEMBER( esripsys_state::fdt_rip_w )
D7 = /FDONE
*/
READ8_MEMBER(esripsys_state::rip_status_in)
uint8_t esripsys_state::rip_status_in()
{
int vpos = m_screen->vpos();
uint8_t _vblank = !(vpos >= ESRIPSYS_VBLANK_START);

16
src/mame/drivers/fastinvaders.cpp
View File

@ -75,10 +75,10 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(count_ar);
DECLARE_WRITE_LINE_MEMBER(vsync);
DECLARE_WRITE_LINE_MEMBER(hsync);
DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte);
DECLARE_WRITE8_MEMBER(dark_1_clr);
DECLARE_WRITE8_MEMBER(dark_2_clr);
uint8_t memory_read_byte(offs_t offset);
void memory_write_byte(offs_t offset, uint8_t data);
void dark_1_clr(uint8_t data);
void dark_2_clr(uint8_t data);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void fastinvaders_map(address_map &map);
@ -177,7 +177,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(fastinvaders_state::count_ar)
}
}
WRITE8_MEMBER(fastinvaders_state::dark_1_clr)
void fastinvaders_state::dark_1_clr(uint8_t data)
{
//address_space& prog_space = m_maincpu->space(AS_PROGRAM);
if (data)
@ -196,7 +196,7 @@ WRITE8_MEMBER(fastinvaders_state::dark_1_clr)
//return 0x00;
}
WRITE8_MEMBER(fastinvaders_state::dark_2_clr)
void fastinvaders_state::dark_2_clr(uint8_t data)
{
//address_space& prog_space = m_maincpu->space(AS_PROGRAM);
if (data)
@ -470,7 +470,7 @@ DECLARE_WRITE_LINE_MEMBER( fastinvaders_state::hsync)
}
}
READ8_MEMBER(fastinvaders_state::memory_read_byte)
uint8_t fastinvaders_state::memory_read_byte(offs_t offset)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM);
logerror("dma read\n");
@ -480,7 +480,7 @@ READ8_MEMBER(fastinvaders_state::memory_read_byte)
//return 0x00;
}
WRITE8_MEMBER(fastinvaders_state::memory_write_byte)
void fastinvaders_state::memory_write_byte(offs_t offset, uint8_t data)
{
//address_space& prog_space = m_maincpu->space(AS_PROGRAM);
logerror("dma write\n");

30
src/mame/drivers/fireball.cpp
View File

@ -66,10 +66,10 @@ private:
DECLARE_READ8_MEMBER(io_04_r);
DECLARE_WRITE8_MEMBER(io_06_w);
DECLARE_READ8_MEMBER(io_06_r);
DECLARE_READ8_MEMBER(p1_r);
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_READ8_MEMBER(p3_r);
DECLARE_WRITE8_MEMBER(p3_w);
uint8_t p1_r();
void p1_w(uint8_t data);
uint8_t p3_r();
void p3_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(int_0);
void fireball_io_map(address_map &map);
@ -203,17 +203,17 @@ WRITE8_MEMBER(fireball_state::io_06_w)
}
READ8_MEMBER(fireball_state::p1_r)
{
uint8_t fireball_state::p1_r()
{
uint8_t tmp=0;
tmp=(m_p1_data&0xfe)|(m_eeprom->do_read());
if (LOG_P1)
logerror("readP1 port data %02X\n",tmp&0x01);
return tmp;
}
}
WRITE8_MEMBER(fireball_state::p1_w)
{
void fireball_state::p1_w(uint8_t data)
{
//eeprom x24c44/ay8912/system stuff...
//bit0 goes to eeprom pin 3 and 4 (0x01) Data_in and Data_out
//bit1 goes to eeprom pin 1 (0x02) CE Hi active
@ -228,7 +228,7 @@ WRITE8_MEMBER(fireball_state::io_06_w)
if(( data&0x30) != (m_p1_data&0x30)){
logerror("write ay8910 control bc1= %02X bdir= %02X\n",data&0x10, data&0x20);
}
}
}
m_eeprom->di_write(data & 0x01);
m_eeprom->clk_write((data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
@ -271,16 +271,16 @@ WRITE8_MEMBER(fireball_state::io_06_w)
}
READ8_MEMBER(fireball_state::p3_r)
{
uint8_t fireball_state::p3_r()
{
uint8_t ret = 0xfb | ((int_data&1)<<2);
if (LOG_P3)
logerror("read P3 port data = %02X\n",ret);
return ret;
}
}
WRITE8_MEMBER(fireball_state::p3_w)
{
void fireball_state::p3_w(uint8_t data)
{
if (LOG_P3)
logerror("write to P3 port data=%02X\n",data);

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

@ -137,7 +137,7 @@ private:
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_WRITE8_MEMBER(layer_w);
DECLARE_READ8_MEMBER(soundlatch_r);
DECLARE_WRITE8_MEMBER(portc_w);
void portc_w(uint8_t data);
void flipjack_palette(palette_device &palette) const;
MC6845_UPDATE_ROW(update_row);
@ -273,7 +273,7 @@ WRITE8_MEMBER(flipjack_state::sound_nmi_ack_w)
m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
WRITE8_MEMBER(flipjack_state::portc_w)
void flipjack_state::portc_w(uint8_t data)
{
// vestigial hopper output?
}

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

@ -710,17 +710,17 @@ INPUT_PORTS_END
*
*************************************/
WRITE8_MEMBER(freekick_state::snd_rom_addr_l_w)
void freekick_state::snd_rom_addr_l_w(uint8_t data)
{
m_romaddr = (m_romaddr & 0xff00) | data;
}
WRITE8_MEMBER(freekick_state::snd_rom_addr_h_w)
void freekick_state::snd_rom_addr_h_w(uint8_t data)
{
m_romaddr = (m_romaddr & 0x00ff) | (data << 8);
}
READ8_MEMBER(freekick_state::snd_rom_r)
uint8_t freekick_state::snd_rom_r()
{
return memregion("user1")->base()[m_romaddr & 0x7fff];
}

24
src/mame/drivers/gei.cpp
View File

@ -125,12 +125,12 @@ private:
template <unsigned N> DECLARE_READ8_MEMBER(banksel_r);
DECLARE_READ8_MEMBER(signature_r);
DECLARE_WRITE8_MEMBER(signature_w);
DECLARE_WRITE8_MEMBER(lamps_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(sound2_w);
DECLARE_WRITE8_MEMBER(lamps2_w);
DECLARE_WRITE8_MEMBER(nmi_w);
DECLARE_READ8_MEMBER(portC_r);
void lamps_w(uint8_t data);
void sound_w(uint8_t data);
void sound2_w(uint8_t data);
void lamps2_w(uint8_t data);
void nmi_w(uint8_t data);
uint8_t portC_r();
INTERRUPT_GEN_MEMBER(vblank_irq);
@ -216,7 +216,7 @@ uint32_t gei_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
return 0;
}
WRITE8_MEMBER(gei_state::lamps_w)
void gei_state::lamps_w(uint8_t data)
{
/* 5 button lamps */
m_lamps[0] = BIT(data, 0);
@ -232,7 +232,7 @@ WRITE8_MEMBER(gei_state::lamps_w)
m_lamps[6] = BIT(data, 7);
}
WRITE8_MEMBER(gei_state::sound_w)
void gei_state::sound_w(uint8_t data)
{
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
machine().bookkeeping().coin_lockout_global_w(BIT(~data, 3));
@ -249,7 +249,7 @@ WRITE8_MEMBER(gei_state::sound_w)
m_dac->write(BIT(data, 7));
}
WRITE8_MEMBER(gei_state::sound2_w)
void gei_state::sound2_w(uint8_t data)
{
/* bit 3,6 - coin lockout, lamp 10 + 11 in selection test mode */
machine().bookkeeping().coin_lockout_w(0, BIT(~data, 3));
@ -266,13 +266,13 @@ WRITE8_MEMBER(gei_state::sound2_w)
m_dac->write(BIT(data, 7));
}
WRITE8_MEMBER(gei_state::lamps2_w)
void gei_state::lamps2_w(uint8_t data)
{
/* bit 4 - play/raise button lamp, lamp 9 in poker test mode */
m_lamps[8] = BIT(data, 4);
}
WRITE8_MEMBER(gei_state::nmi_w)
void gei_state::nmi_w(uint8_t data)
{
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
m_lamps[8] = BIT(data, 4);
@ -291,7 +291,7 @@ READ8_MEMBER(gei_state::catchall)
return 0xff;
}
READ8_MEMBER(gei_state::portC_r)
uint8_t gei_state::portC_r()
{
return 4;
}

64
src/mame/drivers/goldnpkr.cpp
View File

@ -1353,10 +1353,10 @@ public:
void init_bchancep();
void init_bonuspkr();
DECLARE_READ8_MEMBER(pottnpkr_mux_port_r);
DECLARE_WRITE8_MEMBER(lamps_a_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(mux_w);
uint8_t pottnpkr_mux_port_r();
void lamps_a_w(uint8_t data);
void sound_w(uint8_t data);
void mux_w(uint8_t data);
uint32_t screen_update_goldnpkr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@ -1380,19 +1380,19 @@ protected:
optional_device<discrete_device> m_discrete;
private:
DECLARE_READ8_MEMBER(goldnpkr_mux_port_r);
DECLARE_WRITE8_MEMBER(mux_port_w);
uint8_t goldnpkr_mux_port_r();
void mux_port_w(uint8_t data);
uint8_t ay8910_data_r();
void ay8910_data_w(uint8_t data);
void ay8910_control_w(uint8_t data);
DECLARE_WRITE8_MEMBER(pia0_a_w);
DECLARE_WRITE8_MEMBER(pia0_b_w);
DECLARE_WRITE8_MEMBER(pia1_a_w);
DECLARE_WRITE8_MEMBER(pia1_b_w);
DECLARE_READ8_MEMBER(pia0_a_r);
DECLARE_READ8_MEMBER(pia0_b_r);
DECLARE_READ8_MEMBER(pia1_a_r);
DECLARE_READ8_MEMBER(pia1_b_r);
void pia0_a_w(uint8_t data);
void pia0_b_w(uint8_t data);
void pia1_a_w(uint8_t data);
void pia1_b_w(uint8_t data);
uint8_t pia0_a_r();
uint8_t pia0_b_r();
uint8_t pia1_a_r();
uint8_t pia1_b_r();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(wcrdxtnd_get_bg_tile_info);
@ -1448,8 +1448,8 @@ public:
private:
DECLARE_READ8_MEMBER(cpubank_decrypt_r);
DECLARE_WRITE8_MEMBER(mcu_command_w);
DECLARE_WRITE8_MEMBER(mcu_portb_w);
DECLARE_WRITE8_MEMBER(mcu_portc_w);
void mcu_portb_w(uint8_t data);
void mcu_portc_w(uint8_t data);
void megadpkr_banked_map(address_map &map);
void megadpkr_map(address_map &map);
@ -1740,7 +1740,7 @@ void goldnpkr_state::super21p_palette(palette_device &palette) const
There are 4 sets of 5 bits each and are connected to PIA0, portA.
The selector bits are located in PIA1, portB (bits 4-7).
*/
READ8_MEMBER(goldnpkr_state::goldnpkr_mux_port_r)
uint8_t goldnpkr_state::goldnpkr_mux_port_r()
{
switch( m_mux_data & 0xf0 ) /* bits 4-7 */
{
@ -1760,7 +1760,7 @@ READ8_MEMBER(goldnpkr_state::goldnpkr_mux_port_r)
return 0xff;
}
READ8_MEMBER(goldnpkr_state::pottnpkr_mux_port_r)
uint8_t goldnpkr_state::pottnpkr_mux_port_r()
{
uint8_t pa_0_4 = 0xff, pa_7; /* Temporary place holder for bits 0 to 4 & 7 */
@ -1777,13 +1777,13 @@ READ8_MEMBER(goldnpkr_state::pottnpkr_mux_port_r)
return ( (pa_0_4 & 0x3f) | (pa_7 << 6) | (pa_7 << 7) ) ;
}
WRITE8_MEMBER(goldnpkr_state::mux_w)
void goldnpkr_state::mux_w(uint8_t data)
{
//logerror("mux_w: %2x\n",data);
m_mux_data = data ^ 0xff; /* inverted */
}
WRITE8_MEMBER(goldnpkr_state::mux_port_w)
void goldnpkr_state::mux_port_w(uint8_t data)
{
m_pia0_PA_data = data;
}
@ -1859,7 +1859,7 @@ void goldnpkr_state::ay8910_control_w(uint8_t data)
---- x--- Take Lamp.
*/
WRITE8_MEMBER(goldnpkr_state::lamps_a_w)
void goldnpkr_state::lamps_a_w(uint8_t data)
{
/***** General Lamps and Counters wiring *****
@ -1887,7 +1887,7 @@ WRITE8_MEMBER(goldnpkr_state::lamps_a_w)
machine().bookkeeping().coin_counter_w(2, data & 0x20); /* counter3 */
}
WRITE8_MEMBER(goldnpkr_state::sound_w)
void goldnpkr_state::sound_w(uint8_t data)
{
/* 555 voltage controlled */
logerror("Sound Data: %2x\n",data & 0x0f);
@ -1897,43 +1897,43 @@ WRITE8_MEMBER(goldnpkr_state::sound_w)
m_discrete->write(NODE_10, data & 0x07);
}
WRITE8_MEMBER(goldnpkr_state::pia0_a_w)
void goldnpkr_state::pia0_a_w(uint8_t data)
{
logerror("pia0_a_w: %2x\n", data);
}
WRITE8_MEMBER(goldnpkr_state::pia0_b_w)
void goldnpkr_state::pia0_b_w(uint8_t data)
{
logerror("pia0_b_w: %2x\n", data);
}
WRITE8_MEMBER(goldnpkr_state::pia1_a_w)
void goldnpkr_state::pia1_a_w(uint8_t data)
{
logerror("pia1_a_w: %2x\n", data);
}
WRITE8_MEMBER(goldnpkr_state::pia1_b_w)
void goldnpkr_state::pia1_b_w(uint8_t data)
{
logerror("pia1_b_w: %2x\n", data);
}
READ8_MEMBER(goldnpkr_state::pia0_a_r)
uint8_t goldnpkr_state::pia0_a_r()
{
return 0xff;
}
READ8_MEMBER(goldnpkr_state::pia0_b_r)
uint8_t goldnpkr_state::pia0_b_r()
{
return 0xff;
}
READ8_MEMBER(goldnpkr_state::pia1_a_r)
uint8_t goldnpkr_state::pia1_a_r()
{
return 0xff;
}
READ8_MEMBER(goldnpkr_state::pia1_b_r)
uint8_t goldnpkr_state::pia1_b_r()
{
return 0xff;
}
@ -4909,12 +4909,12 @@ WRITE8_MEMBER(blitz_state::mcu_command_w)
}
}
WRITE8_MEMBER(blitz_state::mcu_portb_w)
void blitz_state::mcu_portb_w(uint8_t data)
{
m_cpubank_xor = data;
}
WRITE8_MEMBER(blitz_state::mcu_portc_w)
void blitz_state::mcu_portc_w(uint8_t data)
{
if (!BIT(data, 0))
{

36
src/mame/drivers/hapyfish.cpp
View File

@ -127,15 +127,15 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
DECLARE_READ32_MEMBER(s3c2440_gpio_port_r);
DECLARE_WRITE32_MEMBER(s3c2440_gpio_port_w);
DECLARE_READ32_MEMBER(s3c2440_core_pin_r);
DECLARE_WRITE8_MEMBER(s3c2440_nand_command_w );
DECLARE_WRITE8_MEMBER(s3c2440_nand_address_w );
DECLARE_READ8_MEMBER(s3c2440_nand_data_r );
DECLARE_WRITE8_MEMBER(s3c2440_nand_data_w );
DECLARE_WRITE16_MEMBER(s3c2440_i2s_data_w );
DECLARE_READ32_MEMBER(s3c2440_adc_data_r );
uint32_t s3c2440_gpio_port_r(offs_t offset);
void s3c2440_gpio_port_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
uint32_t s3c2440_core_pin_r(offs_t offset);
void s3c2440_nand_command_w(uint8_t data);
void s3c2440_nand_address_w(uint8_t data);
uint8_t s3c2440_nand_data_r();
void s3c2440_nand_data_w(uint8_t data);
void s3c2440_i2s_data_w(offs_t offset, uint16_t data);
uint32_t s3c2440_adc_data_r();
void hapyfish_map(address_map &map);
};
@ -266,7 +266,7 @@ void hapyfish_state::i2c_scl_write(bool scl)
// GPIO
READ32_MEMBER(hapyfish_state::s3c2440_gpio_port_r)
uint32_t hapyfish_state::s3c2440_gpio_port_r(offs_t offset)
{
uint32_t data = m_port[offset];
switch (offset)
@ -321,7 +321,7 @@ READ32_MEMBER(hapyfish_state::s3c2440_gpio_port_r)
return data;
}
WRITE32_MEMBER(hapyfish_state::s3c2440_gpio_port_w)
void hapyfish_state::s3c2440_gpio_port_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// tout2/gb2 -> uda1341ts l3mode
// tout3/gb3 -> uda1341ts l3data
@ -401,7 +401,7 @@ NCON: NAND flash memory selection (Normal / Advance)
*/
READ32_MEMBER(hapyfish_state::s3c2440_core_pin_r)
uint32_t hapyfish_state::s3c2440_core_pin_r(offs_t offset)
{
int data = 0;
switch (offset)
@ -415,7 +415,7 @@ READ32_MEMBER(hapyfish_state::s3c2440_core_pin_r)
// NAND
WRITE8_MEMBER(hapyfish_state::s3c2440_nand_command_w )
void hapyfish_state::s3c2440_nand_command_w(uint8_t data)
{
if (m_nand_select)
m_nand->command_w(data);
@ -423,7 +423,7 @@ WRITE8_MEMBER(hapyfish_state::s3c2440_nand_command_w )
m_nand2->command_w(data);
}
WRITE8_MEMBER(hapyfish_state::s3c2440_nand_address_w )
void hapyfish_state::s3c2440_nand_address_w(uint8_t data)
{
if (m_nand_select)
m_nand->address_w(data);
@ -431,7 +431,7 @@ WRITE8_MEMBER(hapyfish_state::s3c2440_nand_address_w )
m_nand2->address_w(data);
}
READ8_MEMBER(hapyfish_state::s3c2440_nand_data_r )
uint8_t hapyfish_state::s3c2440_nand_data_r()
{
if (m_nand_select)
return m_nand->data_r();
@ -439,7 +439,7 @@ READ8_MEMBER(hapyfish_state::s3c2440_nand_data_r )
return m_nand2->data_r();
}
WRITE8_MEMBER(hapyfish_state::s3c2440_nand_data_w )
void hapyfish_state::s3c2440_nand_data_w(uint8_t data)
{
if (m_nand_select)
m_nand->data_w(data);
@ -449,7 +449,7 @@ WRITE8_MEMBER(hapyfish_state::s3c2440_nand_data_w )
// I2S
WRITE16_MEMBER(hapyfish_state::s3c2440_i2s_data_w )
void hapyfish_state::s3c2440_i2s_data_w(offs_t offset, uint16_t data)
{
if (offset)
m_ldac->write(data);
@ -459,7 +459,7 @@ WRITE16_MEMBER(hapyfish_state::s3c2440_i2s_data_w )
// ADC
READ32_MEMBER(hapyfish_state::s3c2440_adc_data_r )
uint32_t hapyfish_state::s3c2440_adc_data_r()
{
uint32_t data = 0;
LOGMASKED(LOG_ADC, "%s: ADC data read: %08x\n", machine().describe_context(), data);

24
src/mame/drivers/hh_melps4.cpp
View File

@ -125,10 +125,10 @@ public:
{ }
void update_display();
DECLARE_WRITE8_MEMBER(plate_w);
DECLARE_WRITE16_MEMBER(grid_w);
void plate_w(offs_t offset, u8 data);
void grid_w(u16 data);
DECLARE_WRITE_LINE_MEMBER(speaker_w);
DECLARE_READ16_MEMBER(input_r);
u16 input_r();
void cfrogger(machine_config &config);
};
@ -141,7 +141,7 @@ void cfrogger_state::update_display()
m_display->matrix(grid, plate);
}
WRITE8_MEMBER(cfrogger_state::plate_w)
void cfrogger_state::plate_w(offs_t offset, u8 data)
{
// F0,F1: input mux
if (offset == MELPS4_PORTF)
@ -154,7 +154,7 @@ WRITE8_MEMBER(cfrogger_state::plate_w)
update_display();
}
WRITE16_MEMBER(cfrogger_state::grid_w)
void cfrogger_state::grid_w(u16 data)
{
// D0-D11: vfd grid
m_grid = data;
@ -167,7 +167,7 @@ WRITE_LINE_MEMBER(cfrogger_state::speaker_w)
m_speaker->level_w(state);
}
READ16_MEMBER(cfrogger_state::input_r)
u16 cfrogger_state::input_r()
{
// K0,K1: multiplexed inputs
// K2: N/C
@ -250,10 +250,10 @@ public:
{ }
void update_display();
DECLARE_WRITE8_MEMBER(plate_w);
DECLARE_WRITE16_MEMBER(grid_w);
void plate_w(offs_t offset, u8 data);
void grid_w(u16 data);
DECLARE_WRITE_LINE_MEMBER(speaker_w);
DECLARE_READ16_MEMBER(input_r);
u16 input_r();
void gjungler(machine_config &config);
};
@ -266,7 +266,7 @@ void gjungler_state::update_display()
m_display->matrix(grid, plate);
}
WRITE8_MEMBER(gjungler_state::plate_w)
void gjungler_state::plate_w(offs_t offset, u8 data)
{
// G0,G1: input mux
if (offset == MELPS4_PORTG)
@ -279,7 +279,7 @@ WRITE8_MEMBER(gjungler_state::plate_w)
update_display();
}
WRITE16_MEMBER(gjungler_state::grid_w)
void gjungler_state::grid_w(u16 data)
{
// D0-D11: vfd grid
m_grid = data;
@ -292,7 +292,7 @@ WRITE_LINE_MEMBER(gjungler_state::speaker_w)
m_speaker->level_w(state);
}
READ16_MEMBER(gjungler_state::input_r)
u16 gjungler_state::input_r()
{
// K0,K1: multiplexed inputs
// K2,K3: fixed inputs

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

@ -84,8 +84,8 @@ private:
DECLARE_WRITE8_MEMBER(hitpoker_cram_w);
DECLARE_READ8_MEMBER(hitpoker_paletteram_r);
DECLARE_WRITE8_MEMBER(hitpoker_paletteram_w);
DECLARE_READ8_MEMBER(hitpoker_pic_r);
DECLARE_WRITE8_MEMBER(hitpoker_pic_w);
uint8_t hitpoker_pic_r(offs_t offset);
void hitpoker_pic_w(offs_t offset, uint8_t data);
virtual void video_start() override;
uint32_t screen_update_hitpoker(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<mc68hc11_cpu_device> m_maincpu;
@ -190,7 +190,7 @@ WRITE8_MEMBER(hitpoker_state::hitpoker_paletteram_w)
}
READ8_MEMBER(hitpoker_state::hitpoker_pic_r)
uint8_t hitpoker_state::hitpoker_pic_r(offs_t offset)
{
// logerror("R\n");
@ -208,7 +208,7 @@ READ8_MEMBER(hitpoker_state::hitpoker_pic_r)
return m_sys_regs;
}
WRITE8_MEMBER(hitpoker_state::hitpoker_pic_w)
void hitpoker_state::hitpoker_pic_w(offs_t offset, uint8_t data)
{
if(offset == 0)
m_pic_data = (data & 0xff);// | (data & 0x40) ? 0x80 : 0x00;

22
src/mame/drivers/homedata.cpp
View File

@ -322,17 +322,17 @@ WRITE8_MEMBER(homedata_state::mrokumei_sound_cmd_w)
********************************************************************************/
READ8_MEMBER(homedata_state::reikaids_upd7807_porta_r)
uint8_t homedata_state::reikaids_upd7807_porta_r()
{
return m_upd7807_porta;
}
WRITE8_MEMBER(homedata_state::reikaids_upd7807_porta_w)
void homedata_state::reikaids_upd7807_porta_w(uint8_t data)
{
m_upd7807_porta = data;
}
WRITE8_MEMBER(homedata_state::reikaids_upd7807_portc_w)
void homedata_state::reikaids_upd7807_portc_w(uint8_t data)
{
/* port C layout:
7 coin counter
@ -402,7 +402,7 @@ READ8_MEMBER(homedata_state::pteacher_io_r)
return res;
}
READ8_MEMBER(homedata_state::pteacher_keyboard_r)
uint8_t homedata_state::pteacher_keyboard_r()
{
int dips = ioport("DSW")->read();
@ -424,7 +424,7 @@ READ8_MEMBER(homedata_state::pteacher_keyboard_r)
return 0xff;
}
READ8_MEMBER(homedata_state::pteacher_upd7807_porta_r)
uint8_t homedata_state::pteacher_upd7807_porta_r()
{
if (!BIT(m_upd7807_portc, 6))
m_upd7807_porta = m_soundlatch->read();
@ -434,12 +434,12 @@ READ8_MEMBER(homedata_state::pteacher_upd7807_porta_r)
return m_upd7807_porta;
}
WRITE8_MEMBER(homedata_state::pteacher_upd7807_porta_w)
void homedata_state::pteacher_upd7807_porta_w(uint8_t data)
{
m_upd7807_porta = data;
}
WRITE8_MEMBER(homedata_state::pteacher_upd7807_portc_w)
void homedata_state::pteacher_upd7807_portc_w(uint8_t data)
{
/* port C layout:
7 coin counter
@ -1235,10 +1235,8 @@ MACHINE_RESET_MEMBER(homedata_state,mrokumei)
MACHINE_RESET_MEMBER(homedata_state,pteacher)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
pteacher_upd7807_portc_w(space, 0, 0xff);
pteacher_upd7807_portc_w(0xff);
MACHINE_RESET_CALL_MEMBER(homedata);
@ -1249,10 +1247,8 @@ MACHINE_RESET_MEMBER(homedata_state,pteacher)
MACHINE_RESET_MEMBER(homedata_state,reikaids)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
reikaids_upd7807_portc_w(space, 0, 0xff);
reikaids_upd7807_portc_w(0xff);
MACHINE_RESET_CALL_MEMBER(homedata);

36
src/mame/drivers/inder.cpp
View File

@ -69,19 +69,19 @@ public:
void init_inder1();
private:
DECLARE_READ8_MEMBER(ppic_r);
DECLARE_WRITE8_MEMBER(ppia_w);
DECLARE_WRITE8_MEMBER(ppib_w);
DECLARE_WRITE8_MEMBER(ppic_w);
DECLARE_WRITE8_MEMBER(ppi60a_w);
DECLARE_WRITE8_MEMBER(ppi60b_w);
DECLARE_WRITE8_MEMBER(ppi64c_w);
DECLARE_READ8_MEMBER(sw_r);
uint8_t ppic_r();
void ppia_w(uint8_t data);
void ppib_w(uint8_t data);
void ppic_w(uint8_t data);
void ppi60a_w(uint8_t data);
void ppi60b_w(uint8_t data);
void ppi64c_w(uint8_t data);
uint8_t sw_r();
DECLARE_WRITE8_MEMBER(sw_w);
DECLARE_WRITE8_MEMBER(sol_brvteam_w);
DECLARE_WRITE8_MEMBER(sol_canasta_w);
DECLARE_WRITE8_MEMBER(sn_w);
DECLARE_READ8_MEMBER(sndcmd_r);
uint8_t sndcmd_r();
DECLARE_WRITE8_MEMBER(sndbank_w);
DECLARE_WRITE8_MEMBER(sndcmd_w);
DECLARE_WRITE8_MEMBER(sndcmd_lapbylap_w);
@ -1131,7 +1131,7 @@ static INPUT_PORTS_START( metalman )
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
READ8_MEMBER( inder_state::sw_r )
uint8_t inder_state::sw_r()
{
return m_switches[m_row]->read();
}
@ -1157,7 +1157,7 @@ WRITE8_MEMBER( inder_state::sndcmd_w )
m_sndcmd = data;
}
READ8_MEMBER( inder_state::sndcmd_r )
uint8_t inder_state::sndcmd_r()
{
return m_sndcmd;
}
@ -1221,7 +1221,7 @@ WRITE8_MEMBER( inder_state::disp_w )
}
}
WRITE8_MEMBER( inder_state::ppi60a_w )
void inder_state::ppi60a_w(uint8_t data)
{
if (data)
for (uint8_t i = 0; i < 8; i++)
@ -1230,7 +1230,7 @@ WRITE8_MEMBER( inder_state::ppi60a_w )
}
// always 0 but we'll support it anyway
WRITE8_MEMBER( inder_state::ppi60b_w )
void inder_state::ppi60b_w(uint8_t data)
{
if (data & 7)
for (uint8_t i = 0; i < 3; i++)
@ -1238,7 +1238,7 @@ WRITE8_MEMBER( inder_state::ppi60b_w )
m_row = i+8;
}
WRITE8_MEMBER( inder_state::ppi64c_w )
void inder_state::ppi64c_w(uint8_t data)
{
uint8_t i;
data &= 15;
@ -1292,24 +1292,24 @@ WRITE_LINE_MEMBER( inder_state::qc9b_w )
m_13->select_w(state);
}
READ8_MEMBER( inder_state::ppic_r )
uint8_t inder_state::ppic_r()
{
return (m_pc0 ? 1 : 0) | m_portc;
}
WRITE8_MEMBER( inder_state::ppia_w )
void inder_state::ppia_w(uint8_t data)
{
m_sound_addr = (m_sound_addr & 0x3ff00) | data;
update_mus();
}
WRITE8_MEMBER( inder_state::ppib_w )
void inder_state::ppib_w(uint8_t data)
{
m_sound_addr = (m_sound_addr & 0x300ff) | (data << 8);
update_mus();
}
WRITE8_MEMBER( inder_state::ppic_w )
void inder_state::ppic_w(uint8_t data)
{
// pc4 - READY line back to cpu board, but not used
if (BIT(data, 5) != BIT(m_portc, 5))

24
src/mame/drivers/irisha.cpp
View File

@ -42,12 +42,12 @@ public:
void irisha(machine_config &config);
private:
DECLARE_READ8_MEMBER(irisha_keyboard_r);
DECLARE_READ8_MEMBER(irisha_8255_portb_r);
DECLARE_READ8_MEMBER(irisha_8255_portc_r);
DECLARE_WRITE8_MEMBER(irisha_8255_porta_w);
DECLARE_WRITE8_MEMBER(irisha_8255_portb_w);
DECLARE_WRITE8_MEMBER(irisha_8255_portc_w);
uint8_t irisha_keyboard_r();
uint8_t irisha_8255_portb_r();
uint8_t irisha_8255_portc_r();
void irisha_8255_porta_w(uint8_t data);
void irisha_8255_portb_w(uint8_t data);
void irisha_8255_portc_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(speaker_w);
TIMER_CALLBACK_MEMBER(irisha_key);
uint32_t screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -252,7 +252,7 @@ GFXDECODE_END
*************************************************/
READ8_MEMBER(irisha_state::irisha_8255_portb_r)
uint8_t irisha_state::irisha_8255_portb_r()
{
if (m_keypressed==1)
{
@ -263,13 +263,13 @@ READ8_MEMBER(irisha_state::irisha_8255_portb_r)
return 0x00;
}
READ8_MEMBER(irisha_state::irisha_8255_portc_r)
uint8_t irisha_state::irisha_8255_portc_r()
{
logerror("irisha_8255_portc_r\n");
return 0;
}
WRITE8_MEMBER(irisha_state::irisha_8255_porta_w)
void irisha_state::irisha_8255_porta_w(uint8_t data)
{
logerror("irisha_8255_porta_w %02x\n",data);
@ -278,12 +278,12 @@ WRITE8_MEMBER(irisha_state::irisha_8255_porta_w)
update_speaker();
}
WRITE8_MEMBER(irisha_state::irisha_8255_portb_w)
void irisha_state::irisha_8255_portb_w(uint8_t data)
{
logerror("irisha_8255_portb_w %02x\n",data);
}
WRITE8_MEMBER(irisha_state::irisha_8255_portc_w)
void irisha_state::irisha_8255_portc_w(uint8_t data)
{
//logerror("irisha_8255_portc_w %02x\n",data);
@ -329,7 +329,7 @@ TIMER_CALLBACK_MEMBER(irisha_state::irisha_key)
m_keyboard_cnt = 0;
}
READ8_MEMBER(irisha_state::irisha_keyboard_r)
uint8_t irisha_state::irisha_keyboard_r()
{
uint8_t keycode = 0xff;

12
src/mame/drivers/jankenmn.cpp
View File

@ -174,9 +174,9 @@ public:
void jankenmn(machine_config &config);
private:
DECLARE_WRITE8_MEMBER(lamps1_w);
DECLARE_WRITE8_MEMBER(lamps2_w);
DECLARE_WRITE8_MEMBER(lamps3_w);
void lamps1_w(uint8_t data);
void lamps2_w(uint8_t data);
void lamps3_w(uint8_t data);
virtual void machine_start() override;
@ -196,7 +196,7 @@ private:
static constexpr uint8_t led_map[16] = // 7748 IC?
{ 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 };
WRITE8_MEMBER(jankenmn_state::lamps1_w)
void jankenmn_state::lamps1_w(uint8_t data)
{
// hand state: d0: rock, d1: scissors, d2: paper
m_lamps[8] = (data & 7) != 0;
@ -212,7 +212,7 @@ WRITE8_MEMBER(jankenmn_state::lamps1_w)
// d3: ? (only set if game is over)
}
WRITE8_MEMBER(jankenmn_state::lamps2_w)
void jankenmn_state::lamps2_w(uint8_t data)
{
// button LEDs: d1: paper, d2: scissors, d3: rock
m_lamps[2] = BIT(data, 3);
@ -231,7 +231,7 @@ WRITE8_MEMBER(jankenmn_state::lamps2_w)
m_digits[0] = led_map[data & 1];
}
WRITE8_MEMBER(jankenmn_state::lamps3_w)
void jankenmn_state::lamps3_w(uint8_t data)
{
// d1: blue rotating lamp on top of cab
m_lamps[15] = BIT(data, 1);

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

@ -59,7 +59,7 @@ private:
DECLARE_READ8_MEMBER(soundlatch_r);
DECLARE_READ8_MEMBER(soundlatch_nmi_r);
DECLARE_WRITE8_MEMBER(resint_w);
DECLARE_WRITE8_MEMBER(slalom03_oki_bank_w);
void slalom03_oki_bank_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(vck_w);
virtual void machine_start() override;
@ -251,7 +251,7 @@ WRITE8_MEMBER(joctronic_state::resint_w)
m_soundcpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
}
WRITE8_MEMBER(joctronic_state::slalom03_oki_bank_w)
void joctronic_state::slalom03_oki_bank_w(uint8_t data)
{
m_soundbank->set_entry((data & 0xc0) >> 6);
m_oki->s1_w(BIT(data, 1));

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

@ -111,8 +111,8 @@ private:
DECLARE_WRITE8_MEMBER(jokrwild_videoram_w);
DECLARE_WRITE8_MEMBER(jokrwild_colorram_w);
DECLARE_READ8_MEMBER(rng_r);
DECLARE_WRITE8_MEMBER(testa_w);
DECLARE_WRITE8_MEMBER(testb_w);
void testa_w(uint8_t data);
void testb_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
void jokrwild_palette(palette_device &palette) const;
uint32_t screen_update_jokrwild(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@ -399,12 +399,12 @@ GFXDECODE_END
* PIA Interfaces *
***********************/
WRITE8_MEMBER(jokrwild_state::testa_w)
void jokrwild_state::testa_w(uint8_t data)
{
// printf("%02x A\n",data);
}
WRITE8_MEMBER(jokrwild_state::testb_w)
void jokrwild_state::testb_w(uint8_t data)
{
// printf("%02x B\n",data);
}

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

@ -189,8 +189,8 @@ private:
bool bg15_tiles_dirty;
// eeprom
DECLARE_READ16_MEMBER(eeprom_r);
DECLARE_WRITE16_MEMBER(eeprom_w);
uint16_t eeprom_r();
void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// cart
DECLARE_READ16_MEMBER(cart_r);
@ -374,13 +374,13 @@ WRITE16_MEMBER(joystand_state::oki_bank_w)
m_oki->set_rom_bank((data >> 6) & 3);
}
READ16_MEMBER(joystand_state::eeprom_r)
uint16_t joystand_state::eeprom_r()
{
// mask 0x0020 ? (active low)
// mask 0x0040 ? ""
return (m_eeprom->do_read() & 1) << 3;
}
WRITE16_MEMBER(joystand_state::eeprom_w)
void joystand_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{

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

@ -48,8 +48,8 @@ public:
void jps(machine_config &config);
private:
DECLARE_READ8_MEMBER(porta_r);
DECLARE_READ8_MEMBER(portb_r);
uint8_t porta_r();
uint8_t portb_r();
DECLARE_WRITE8_MEMBER(out1_w);
DECLARE_WRITE8_MEMBER(out2_w);
DECLARE_WRITE_LINE_MEMBER(disp_data_w);
@ -283,7 +283,7 @@ void jp_state::update_display()
}
}
READ8_MEMBER(jp_state::porta_r)
uint8_t jp_state::porta_r()
{
uint8_t result = 0xff;
if (m_latch[3]->q1_r() == 0)
@ -295,7 +295,7 @@ READ8_MEMBER(jp_state::porta_r)
return result;
}
READ8_MEMBER(jp_state::portb_r)
uint8_t jp_state::portb_r()
{
uint8_t result = 0xff;
if (m_latch[3]->q1_r() == 0)

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

@ -138,7 +138,7 @@ static INPUT_PORTS_START( kim1 )
INPUT_PORTS_END
// Read from keyboard
READ8_MEMBER( kim1_state::kim1_u2_read_a )
uint8_t kim1_state::kim1_u2_read_a()
{
uint8_t data = 0xff;
@ -150,7 +150,7 @@ READ8_MEMBER( kim1_state::kim1_u2_read_a )
}
// Write to 7-Segment LEDs
WRITE8_MEMBER( kim1_state::kim1_u2_write_a )
void kim1_state::kim1_u2_write_a(uint8_t data)
{
uint8_t idx = ( m_u2_port_b >> 1 ) & 0x0f;
@ -165,7 +165,7 @@ WRITE8_MEMBER( kim1_state::kim1_u2_write_a )
}
// Load from cassette
READ8_MEMBER( kim1_state::kim1_u2_read_b )
uint8_t kim1_state::kim1_u2_read_b()
{
if ( m_riot2->portb_out_get() & 0x20 )
return 0xFF;
@ -174,7 +174,7 @@ READ8_MEMBER( kim1_state::kim1_u2_read_b )
}
// Save to cassette
WRITE8_MEMBER( kim1_state::kim1_u2_write_b )
void kim1_state::kim1_u2_write_b(uint8_t data)
{
m_u2_port_b = data;

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

@ -427,8 +427,8 @@ private:
DECLARE_WRITE8_MEMBER(kurukuru_adpcm_reset_w);
DECLARE_READ8_MEMBER(kurukuru_adpcm_timer_irqack_r);
DECLARE_WRITE8_MEMBER(kurukuru_adpcm_data_w);
DECLARE_WRITE8_MEMBER(ym2149_aout_w);
DECLARE_WRITE8_MEMBER(ym2149_bout_w);
void ym2149_aout_w(uint8_t data);
void ym2149_bout_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
@ -646,12 +646,12 @@ void kurukuru_state::ppj_audio_io(address_map &map)
*/
/* YM2149 ports */
WRITE8_MEMBER(kurukuru_state::ym2149_aout_w)
void kurukuru_state::ym2149_aout_w(uint8_t data)
{
logerror("YM2149: Port A out: %02X\n", data);
}
WRITE8_MEMBER(kurukuru_state::ym2149_bout_w)
void kurukuru_state::ym2149_bout_w(uint8_t data)
{
logerror("YM2149: Port B out: %02X\n", data);
}

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

@ -108,7 +108,7 @@ WRITE8_MEMBER(ladyfrog_state::nmi_enable_w)
}
}
WRITE8_MEMBER(ladyfrog_state::unk_w)
void ladyfrog_state::unk_w(uint8_t data)
{
}

16
src/mame/drivers/ltcasino.cpp
View File

@ -137,11 +137,11 @@ private:
void machine_start_ltcasino();
void machine_start_ltcasin2();
DECLARE_READ8_MEMBER(input_q_r);
DECLARE_READ8_MEMBER(input_s_r);
uint8_t input_q_r();
uint8_t input_s_r();
DECLARE_WRITE8_MEMBER(output_r_w);
DECLARE_WRITE8_MEMBER(output_t_w);
void output_r_w(uint8_t data);
void output_t_w(uint8_t data);
};
@ -440,7 +440,7 @@ void ltcasino_state::machine_start_ltcasin2()
m_lamps.resolve();
}
READ8_MEMBER(ltcasino_state::input_s_r)
uint8_t ltcasino_state::input_s_r()
{
uint8_t data = m_input_s->read() & 0xf1;
@ -452,7 +452,7 @@ READ8_MEMBER(ltcasino_state::input_s_r)
return data;
}
READ8_MEMBER(ltcasino_state::input_q_r)
uint8_t ltcasino_state::input_q_r()
{
uint8_t data = m_input_q->read() & 0x1f;
@ -464,7 +464,7 @@ READ8_MEMBER(ltcasino_state::input_q_r)
return data;
}
WRITE8_MEMBER(ltcasino_state::output_r_w)
void ltcasino_state::output_r_w(uint8_t data)
{
// 7------- unknown (toggles rapidly)
// -6------ unknown (toggles rapidly)
@ -480,7 +480,7 @@ WRITE8_MEMBER(ltcasino_state::output_r_w)
machine().bookkeeping().coin_counter_w(0, BIT(data, 5));
}
WRITE8_MEMBER(ltcasino_state::output_t_w)
void ltcasino_state::output_t_w(uint8_t data)
{
// 76543210 unknown

16
src/mame/drivers/ltd.cpp
View File

@ -74,10 +74,10 @@ public:
private:
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
DECLARE_READ8_MEMBER(port1_r);
DECLARE_WRITE8_MEMBER(port1_w);
DECLARE_READ8_MEMBER(port2_r);
DECLARE_WRITE8_MEMBER(port2_w);
uint8_t port1_r();
void port1_w(uint8_t data);
uint8_t port2_r();
void port2_w(uint8_t data);
DECLARE_WRITE8_MEMBER(count_reset_w);
TIMER_DEVICE_CALLBACK_MEMBER(timer_r);
void ltd3_map(address_map &map);
@ -274,7 +274,7 @@ WRITE8_MEMBER( ltd_state::io_w )
offset >>= 10; // reduces offsets to 1 per bank
}
READ8_MEMBER( ltd_state:: port1_r )
uint8_t ltd_state:: port1_r()
{
if (~m_port2 & 0x10)
{
@ -307,7 +307,7 @@ READ8_MEMBER( ltd_state:: port1_r )
return 0xff;
}
WRITE8_MEMBER( ltd_state::port1_w )
void ltd_state::port1_w(uint8_t data)
{
if (m_port2 & 0x10)
{
@ -348,12 +348,12 @@ WRITE8_MEMBER( ltd_state::port1_w )
}
}
READ8_MEMBER( ltd_state:: port2_r )
uint8_t ltd_state:: port2_r()
{
return m_port2;
}
WRITE8_MEMBER( ltd_state::port2_w )
void ltd_state::port2_w(uint8_t data)
{
if (~m_port2 & data & 0x10)
m_counter++;

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

@ -148,7 +148,7 @@ public:
void prg(machine_config &config);
protected:
DECLARE_WRITE8_MEMBER(pb_w)
void pb_w(u8 data)
{
// PB4: address counter reset (active high)
// PB3: address counter clock (falling edge)

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

@ -104,7 +104,7 @@ private:
DECLARE_READ8_MEMBER(magtouch_io_r);
DECLARE_WRITE8_MEMBER(magtouch_io_w);
DECLARE_WRITE8_MEMBER(dma8237_1_dack_w);
void dma8237_1_dack_w(uint8_t data);
virtual void machine_start() override;
static void magtouch_sb_conf(device_t *device);
void magtouch_io(address_map &map);
@ -169,7 +169,7 @@ static INPUT_PORTS_START( magtouch )
INPUT_PORTS_END
//TODO: use atmb device
WRITE8_MEMBER( magtouch_state::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); }
void magtouch_state::dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); }
void magtouch_state::machine_start()
{

28
src/mame/drivers/marywu.cpp
View File

@ -36,13 +36,13 @@ public:
void marywu(machine_config &config);
private:
DECLARE_WRITE8_MEMBER(display_7seg_data_w);
DECLARE_WRITE8_MEMBER(multiplex_7seg_w);
DECLARE_WRITE8_MEMBER(ay1_port_a_w);
DECLARE_WRITE8_MEMBER(ay1_port_b_w);
DECLARE_WRITE8_MEMBER(ay2_port_a_w);
DECLARE_WRITE8_MEMBER(ay2_port_b_w);
DECLARE_READ8_MEMBER(keyboard_r);
void display_7seg_data_w(uint8_t data);
void multiplex_7seg_w(uint8_t data);
void ay1_port_a_w(uint8_t data);
void ay1_port_b_w(uint8_t data);
void ay2_port_a_w(uint8_t data);
void ay2_port_b_w(uint8_t data);
uint8_t keyboard_r();
void io_map(address_map &map);
void program_map(address_map &map);
@ -110,28 +110,28 @@ static INPUT_PORTS_START( marywu )
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)
INPUT_PORTS_END
WRITE8_MEMBER( marywu_state::ay1_port_a_w )
void marywu_state::ay1_port_a_w(uint8_t data)
{
for (uint8_t i=0; i<8; i++){
m_leds[i] = BIT(data, i);
}
}
WRITE8_MEMBER( marywu_state::ay1_port_b_w )
void marywu_state::ay1_port_b_w(uint8_t data)
{
for (uint8_t i=0; i<8; i++){
m_leds[i+8] = BIT(data, i);
}
}
WRITE8_MEMBER( marywu_state::ay2_port_a_w )
void marywu_state::ay2_port_a_w(uint8_t data)
{
for (uint8_t i=0; i<8; i++){
m_leds[i+16] = BIT(data, i);
}
}
WRITE8_MEMBER( marywu_state::ay2_port_b_w )
void marywu_state::ay2_port_b_w(uint8_t data)
{
for (uint8_t i=0; i<6; i++){
/* we only have 30 LEDs. The last 2 bits in this port are unused. */
@ -139,12 +139,12 @@ WRITE8_MEMBER( marywu_state::ay2_port_b_w )
}
}
WRITE8_MEMBER( marywu_state::multiplex_7seg_w )
void marywu_state::multiplex_7seg_w(uint8_t data)
{
m_selected_7seg_module = data;
}
READ8_MEMBER( marywu_state::keyboard_r )
uint8_t marywu_state::keyboard_r()
{
switch(m_selected_7seg_module % 8){
case 0: return ioport("KEYS1")->read();
@ -156,7 +156,7 @@ READ8_MEMBER( marywu_state::keyboard_r )
}
}
WRITE8_MEMBER( marywu_state::display_7seg_data_w )
void marywu_state::display_7seg_data_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // HEF4511BP (7 seg display driver)

16
src/mame/drivers/mekd1.cpp
View File

@ -133,10 +133,10 @@ private:
required_ioport m_stop_bits;
required_ioport m_acia_baud_rate;
DECLARE_READ8_MEMBER(pia0_pa_r);
DECLARE_READ8_MEMBER(pia0_pb_r);
DECLARE_WRITE8_MEMBER(pia0_pa_w);
DECLARE_WRITE8_MEMBER(pia0_pb_w);
uint8_t pia0_pa_r();
uint8_t pia0_pb_r();
void pia0_pa_w(uint8_t data);
void pia0_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w);
// Clocks
@ -218,12 +218,12 @@ INPUT_PORTS_END
READ8_MEMBER(mekd1_state::pia0_pa_r)
uint8_t mekd1_state::pia0_pa_r()
{
return m_rs232->rxd_r() << 7;
}
READ8_MEMBER(mekd1_state::pia0_pb_r)
uint8_t mekd1_state::pia0_pb_r()
{
bool timer_out;
uint8_t stop_bits = m_stop_bits->read();
@ -236,12 +236,12 @@ READ8_MEMBER(mekd1_state::pia0_pb_r)
return (timer_out << 7) | (stop_bits << 6);
}
WRITE8_MEMBER(mekd1_state::pia0_pa_w)
void mekd1_state::pia0_pa_w(uint8_t data)
{
m_rs232->write_txd(BIT(data, 0));
}
WRITE8_MEMBER(mekd1_state::pia0_pb_w)
void mekd1_state::pia0_pb_w(uint8_t data)
{
m_bit_rate_select = BIT(data, 2);

20
src/mame/drivers/meyc8088.cpp
View File

@ -71,11 +71,11 @@ private:
DECLARE_READ8_MEMBER(video5_flip_r);
DECLARE_WRITE8_MEMBER(screen_flip_w);
DECLARE_READ8_MEMBER(screen_flip_r);
DECLARE_READ8_MEMBER(input_r);
DECLARE_READ8_MEMBER(status_r);
DECLARE_WRITE8_MEMBER(lights1_w);
DECLARE_WRITE8_MEMBER(lights2_w);
DECLARE_WRITE8_MEMBER(common_w);
uint8_t input_r();
uint8_t status_r();
void lights1_w(uint8_t data);
void lights2_w(uint8_t data);
void common_w(uint8_t data);
void meyc8088_palette(palette_device &palette) const;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -240,7 +240,7 @@ void meyc8088_state::meyc8088_map(address_map &map)
}
READ8_MEMBER(meyc8088_state::input_r)
uint8_t meyc8088_state::input_r()
{
uint8_t ret = 0xff;
@ -253,7 +253,7 @@ READ8_MEMBER(meyc8088_state::input_r)
return ret;
}
READ8_MEMBER(meyc8088_state::status_r)
uint8_t meyc8088_state::status_r()
{
// d0: /CR2
// d1: screen on
@ -265,21 +265,21 @@ READ8_MEMBER(meyc8088_state::status_r)
}
WRITE8_MEMBER(meyc8088_state::lights1_w)
void meyc8088_state::lights1_w(uint8_t data)
{
// lite 1-8
for (int i = 0; i < 8; i++)
m_lamps[i] = BIT(~data, i);
}
WRITE8_MEMBER(meyc8088_state::lights2_w)
void meyc8088_state::lights2_w(uint8_t data)
{
// lite 9-16
for (int i = 0; i < 8; i++)
m_lamps[i + 8] = BIT(~data, i);
}
WRITE8_MEMBER(meyc8088_state::common_w)
void meyc8088_state::common_w(uint8_t data)
{
// d0: /CR2
m_status = (m_status & ~1) | (data & 1);

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

@ -139,8 +139,8 @@ private:
DECLARE_WRITE8_MEMBER(csoki_w);
DECLARE_READ8_MEMBER(csoki_r);
DECLARE_READ8_MEMBER(ay8910_a_r);
DECLARE_READ8_MEMBER(ay8910_b_r);
uint8_t ay8910_a_r();
uint8_t ay8910_b_r();
TIMER_DEVICE_CALLBACK_MEMBER(int_0);
@ -390,7 +390,7 @@ WRITE8_MEMBER(mgavegas_state::cso2_w)
}
READ8_MEMBER(mgavegas_state::ay8910_a_r)
uint8_t mgavegas_state::ay8910_a_r()
{
uint8_t ret=0xff;
@ -402,7 +402,7 @@ READ8_MEMBER(mgavegas_state::ay8910_a_r)
return ret;
}
READ8_MEMBER(mgavegas_state::ay8910_b_r)
uint8_t mgavegas_state::ay8910_b_r()
{
uint8_t ret=0xff;

16
src/mame/drivers/micropin.cpp
View File

@ -54,14 +54,14 @@ public:
private:
DECLARE_READ8_MEMBER(pia51_r);
DECLARE_WRITE8_MEMBER(pia51_w);
DECLARE_READ8_MEMBER(p51b_r);
uint8_t p51b_r();
DECLARE_WRITE8_MEMBER(sol_w);
DECLARE_WRITE_LINE_MEMBER(p50ca2_w);
DECLARE_WRITE8_MEMBER(sw_w);
DECLARE_WRITE8_MEMBER(lamp_w);
DECLARE_WRITE8_MEMBER(p50a_w);
DECLARE_WRITE8_MEMBER(p50b_w);
DECLARE_WRITE8_MEMBER(p51a_w);
void p50a_w(uint8_t data);
void p50b_w(uint8_t data);
void p51a_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(timer_a);
void micropin_map(address_map &map);
void pentacup2_io(address_map &map);
@ -203,7 +203,7 @@ WRITE8_MEMBER( micropin_state::sw_w )
{
}
WRITE8_MEMBER( micropin_state::p50a_w )
void micropin_state::p50a_w(uint8_t data)
{
m_counter++;
if (m_counter == 1)
@ -214,7 +214,7 @@ WRITE8_MEMBER( micropin_state::p50a_w )
}
}
WRITE8_MEMBER( micropin_state::p50b_w )
void micropin_state::p50b_w(uint8_t data)
{
m_counter++;
if (m_counter == 2)
@ -242,7 +242,7 @@ WRITE_LINE_MEMBER( micropin_state::p50ca2_w )
// The sound never gets muted, but is turned down with an electronic volume control,
// which must be the most complex circuit in this machine. We use a beeper to
// make the tones, and turn it off if no new commands arrive within .1 second.
WRITE8_MEMBER( micropin_state::p51a_w )
void micropin_state::p51a_w(uint8_t data)
{
static uint16_t frequency[16] = { 387, 435, 488, 517, 581, 652, 691, 775, 870, 977, 1035, 1161, 1304, 1381, 1550, 1740 };
m_beep->set_clock(frequency[data & 15]);
@ -250,7 +250,7 @@ WRITE8_MEMBER( micropin_state::p51a_w )
m_beep->set_state(1);
}
READ8_MEMBER( micropin_state::p51b_r )
uint8_t micropin_state::p51b_r()
{
return ioport("X0")->read();
}

20
src/mame/drivers/mkit09.cpp
View File

@ -63,10 +63,10 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi);
protected:
DECLARE_READ8_MEMBER(pa_r);
DECLARE_READ8_MEMBER(pb_r);
DECLARE_WRITE8_MEMBER(pa_w);
DECLARE_WRITE8_MEMBER(pb_w);
uint8_t pa_r();
uint8_t pb_r();
void pa_w(uint8_t data);
void pb_w(uint8_t data);
void mkit09_mem(address_map &map);
uint8_t m_keydata;
@ -89,7 +89,7 @@ public:
void mkit09a(machine_config &config);
private:
DECLARE_WRITE8_MEMBER(pa_w);
void pa_w(uint8_t data);
void mkit09a_mem(address_map &map);
};
@ -222,7 +222,7 @@ void mkit09_state::machine_reset()
}
// read keyboard
READ8_MEMBER( mkit09_state::pa_r )
uint8_t mkit09_state::pa_r()
{
if (m_keydata < 4)
return m_io_keyboard[m_keydata]->read();
@ -231,13 +231,13 @@ READ8_MEMBER( mkit09_state::pa_r )
}
// read cassette
READ8_MEMBER( mkit09_state::pb_r )
uint8_t mkit09_state::pb_r()
{
return m_keydata | ((m_cass->input() > +0.03) ? 0x80 : 0);
}
// write display segments
WRITE8_MEMBER( mkit09_state::pa_w )
void mkit09_state::pa_w(uint8_t data)
{
data ^= 0xff;
if (m_keydata > 3)
@ -250,7 +250,7 @@ WRITE8_MEMBER( mkit09_state::pa_w )
return;
}
WRITE8_MEMBER( mkit09a_state::pa_w )
void mkit09a_state::pa_w(uint8_t data)
{
if (m_keydata > 3)
{
@ -263,7 +263,7 @@ WRITE8_MEMBER( mkit09a_state::pa_w )
}
// write cassette, select keyboard row, select a digit
WRITE8_MEMBER( mkit09_state::pb_w )
void mkit09_state::pb_w(uint8_t data)
{
m_cass->output(BIT(data, 6) ? -1.0 : +1.0);
m_keydata = data & 15;

12
src/mame/drivers/mrgame.cpp
View File

@ -80,7 +80,7 @@ private:
void mrgame_palette(palette_device &palette) const;
DECLARE_WRITE8_MEMBER(ack1_w);
DECLARE_WRITE8_MEMBER(ack2_w);
DECLARE_WRITE8_MEMBER(portb_w);
void portb_w(uint8_t data);
DECLARE_WRITE8_MEMBER(row_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(triple_w);
@ -93,8 +93,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(flip_w);
DECLARE_READ8_MEMBER(col_r);
DECLARE_READ8_MEMBER(sound_r);
DECLARE_READ8_MEMBER(porta_r);
DECLARE_READ8_MEMBER(portc_r);
uint8_t porta_r();
uint8_t portc_r();
DECLARE_READ8_MEMBER(rsw_r);
DECLARE_WRITE_LINE_MEMBER(vblank_int_w);
DECLARE_WRITE_LINE_MEMBER(vblank_nmi_w);
@ -349,18 +349,18 @@ WRITE8_MEMBER(mrgame_state::ack2_w)
m_ack2 = BIT(data, 0);
}
READ8_MEMBER(mrgame_state::porta_r)
uint8_t mrgame_state::porta_r()
{
return m_video_data;
}
WRITE8_MEMBER(mrgame_state::portb_w)
void mrgame_state::portb_w(uint8_t data)
{
m_video_status = data;
m_ackv = 0;
}
READ8_MEMBER(mrgame_state::portc_r)
uint8_t mrgame_state::portc_r()
{
return m_io_dsw1->read() | ((uint8_t)m_ackv << 4);
}

16
src/mame/drivers/multi8.cpp
View File

@ -60,10 +60,10 @@ private:
DECLARE_WRITE8_MEMBER(pal_w);
DECLARE_READ8_MEMBER(kanji_r);
DECLARE_WRITE8_MEMBER(kanji_w);
DECLARE_READ8_MEMBER(porta_r);
DECLARE_WRITE8_MEMBER(portb_w);
DECLARE_WRITE8_MEMBER(portc_w);
DECLARE_WRITE8_MEMBER(ym2203_porta_w);
uint8_t porta_r();
void portb_w(uint8_t data);
void portc_w(uint8_t data);
void ym2203_porta_w(uint8_t data);
DECLARE_READ8_MEMBER(ay8912_0_r);
DECLARE_READ8_MEMBER(ay8912_1_r);
TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback);
@ -559,7 +559,7 @@ static GFXDECODE_START( gfx_multi8 )
GFXDECODE_END
READ8_MEMBER( multi8_state::porta_r )
uint8_t multi8_state::porta_r()
{
int vsync = (ioport("VBLANK")->read() & 0x1) << 5;
/*
@ -572,7 +572,7 @@ READ8_MEMBER( multi8_state::porta_r )
}
WRITE8_MEMBER( multi8_state::portb_w )
void multi8_state::portb_w(uint8_t data)
{
/*
x--- ---- color mode
@ -584,7 +584,7 @@ WRITE8_MEMBER( multi8_state::portb_w )
m_display_reg = data;
}
WRITE8_MEMBER( multi8_state::portc_w )
void multi8_state::portc_w(uint8_t data)
{
// printf("Port C w = %02x\n",data);
m_vram_bank = data & 0x1f;
@ -595,7 +595,7 @@ WRITE8_MEMBER( multi8_state::portc_w )
}
WRITE8_MEMBER( multi8_state::ym2203_porta_w )
void multi8_state::ym2203_porta_w(uint8_t data)
{
m_beeper->set_state(BIT(data, 3));
}

24
src/mame/drivers/play_2.cpp
View File

@ -77,14 +77,14 @@ private:
DECLARE_READ_LINE_MEMBER(clear_r);
DECLARE_READ_LINE_MEMBER(ef1_r);
DECLARE_READ_LINE_MEMBER(ef4_r);
DECLARE_WRITE16_MEMBER(clockcnt_w);
void clockcnt_w(uint16_t data);
DECLARE_WRITE_LINE_MEMBER(clock2_w);
// Zira
DECLARE_WRITE8_MEMBER(sound_d_w);
DECLARE_WRITE8_MEMBER(sound_g_w);
DECLARE_READ8_MEMBER(psg_r);
DECLARE_WRITE8_MEMBER(psg_w);
DECLARE_READ8_MEMBER(sound_in_r);
void sound_d_w(uint8_t data);
void sound_g_w(uint8_t data);
uint8_t psg_r();
void psg_w(uint8_t data);
uint8_t sound_in_r();
void play_2_io(address_map &map);
void play_2_map(address_map &map);
@ -300,7 +300,7 @@ READ_LINE_MEMBER( play_2_state::ef4_r )
return BIT(m_keyboard[7]->read(), 0); // inverted test button - doesn't seem to do anything
}
WRITE16_MEMBER( play_2_state::clockcnt_w )
void play_2_state::clockcnt_w(uint16_t data)
{
if ((data & 0x3ff) == 0)
m_4013b->preset_w(BIT(data, 10)); // Q10 output
@ -313,13 +313,13 @@ WRITE_LINE_MEMBER( play_2_state::clock2_w )
}
// *********** Zira Sound handlers ***************** (same as cidelsa.cpp)
WRITE8_MEMBER( play_2_state::sound_d_w )
void play_2_state::sound_d_w(uint8_t data)
{
// D3 2716 A10
membank("bank1")->set_entry(BIT(data, 3));
}
WRITE8_MEMBER( play_2_state::sound_g_w )
void play_2_state::sound_g_w(uint8_t data)
{
switch (data)
{
@ -337,17 +337,17 @@ WRITE8_MEMBER( play_2_state::sound_g_w )
}
}
READ8_MEMBER( play_2_state::sound_in_r )
uint8_t play_2_state::sound_in_r()
{
return m_soundlatch;
}
READ8_MEMBER( play_2_state::psg_r )
uint8_t play_2_state::psg_r()
{
return m_psg_latch;
}
WRITE8_MEMBER( play_2_state::psg_w )
void play_2_state::psg_w(uint8_t data)
{
m_psg_latch = data;
}

26
src/mame/drivers/s11.cpp
View File

@ -208,7 +208,7 @@ WRITE8_MEMBER( s11_state::sol3_w )
{
}
WRITE8_MEMBER( s11_state::sound_w )
void s11_state::sound_w(uint8_t data)
{
m_sound_data = data;
}
@ -222,12 +222,12 @@ WRITE_LINE_MEMBER( s11_state::pia21_ca2_w )
m_pia40->cb2_w(state);
}
WRITE8_MEMBER( s11_state::lamp0_w )
void s11_state::lamp0_w(uint8_t data)
{
m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
}
WRITE8_MEMBER( s11_state::dig0_w )
void s11_state::dig0_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
data &= 0x7f;
@ -238,7 +238,7 @@ WRITE8_MEMBER( s11_state::dig0_w )
m_segment2 = 0;
}
WRITE8_MEMBER( s11_state::dig1_w )
void s11_state::dig1_w(uint8_t data)
{
m_segment2 |= data;
m_segment2 |= 0x20000;
@ -249,7 +249,7 @@ WRITE8_MEMBER( s11_state::dig1_w )
}
}
READ8_MEMBER( s11_state::pia28_w7_r )
uint8_t s11_state::pia28_w7_r()
{
uint8_t ret = 0x80;
@ -262,7 +262,7 @@ READ8_MEMBER( s11_state::pia28_w7_r )
return ret;
}
WRITE8_MEMBER( s11_state::pia2c_pa_w )
void s11_state::pia2c_pa_w(uint8_t data)
{
m_segment1 |= (data<<8);
m_segment1 |= 0x10000;
@ -273,7 +273,7 @@ WRITE8_MEMBER( s11_state::pia2c_pa_w )
}
}
WRITE8_MEMBER( s11_state::pia2c_pb_w )
void s11_state::pia2c_pb_w(uint8_t data)
{
m_segment1 |= data;
m_segment1 |= 0x20000;
@ -284,19 +284,19 @@ WRITE8_MEMBER( s11_state::pia2c_pb_w )
}
}
READ8_MEMBER( s11_state::switch_r )
uint8_t s11_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ~ioport(kbdrow)->read();
}
WRITE8_MEMBER( s11_state::switch_w )
void s11_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
WRITE8_MEMBER( s11_state::pia34_pa_w )
void s11_state::pia34_pa_w(uint8_t data)
{
m_segment2 |= (data<<8);
m_segment2 |= 0x10000;
@ -307,7 +307,7 @@ WRITE8_MEMBER( s11_state::pia34_pa_w )
}
}
WRITE8_MEMBER( s11_state::pia34_pb_w )
void s11_state::pia34_pb_w(uint8_t data)
{
if(m_pia40)
m_pia40->portb_w(data);
@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( s11_state::pias_cb2_w )
m_hc55516->digit_w(state);
}
READ8_MEMBER( s11_state::sound_r )
uint8_t s11_state::sound_r()
{
return m_sound_data;
}
@ -364,7 +364,7 @@ WRITE_LINE_MEMBER( s11_state::pia40_cb2_w )
m_pia34->cb1_w(state); // To Widget MCB1 through CPU Data interface
}
WRITE8_MEMBER( s11_state::pia40_pb_w )
void s11_state::pia40_pb_w(uint8_t data)
{
m_pia34->portb_w(data);
}

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

@ -148,7 +148,7 @@ MACHINE_RESET_MEMBER( s11a_state, s11a )
membank("bgbank")->set_entry(0);
}
WRITE8_MEMBER( s11a_state::dig0_w )
void s11a_state::dig0_w(uint8_t data)
{
data &= 0x7f;
set_strobe(data & 15);

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

@ -173,7 +173,7 @@ WRITE8_MEMBER( s11b_state::bg_speech_digit_w )
m_bg_hc55516->digit_w(data);
}
WRITE8_MEMBER( s11b_state::dig1_w )
void s11b_state::dig1_w(uint8_t data)
{
uint32_t seg = get_segment2();
seg |= data;
@ -189,7 +189,7 @@ WRITE8_MEMBER( s11b_state::dig1_w )
set_segment2(seg);
}
WRITE8_MEMBER( s11b_state::pia2c_pa_w )
void s11b_state::pia2c_pa_w(uint8_t data)
{
uint32_t seg = get_segment1();
seg |= (data<<8);
@ -205,7 +205,7 @@ WRITE8_MEMBER( s11b_state::pia2c_pa_w )
set_segment1(seg);
}
WRITE8_MEMBER( s11b_state::pia2c_pb_w )
void s11b_state::pia2c_pb_w(uint8_t data)
{
uint32_t seg = get_segment1();
seg |= data;
@ -221,7 +221,7 @@ WRITE8_MEMBER( s11b_state::pia2c_pb_w )
set_segment1(seg);
}
WRITE8_MEMBER( s11b_state::pia34_pa_w )
void s11b_state::pia34_pa_w(uint8_t data)
{
uint32_t seg = get_segment2();
seg |= (data<<8);

40
src/mame/drivers/s3.cpp
View File

@ -72,16 +72,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w);
DECLARE_WRITE8_MEMBER(sol0_w);
DECLARE_WRITE8_MEMBER(sol1_w);
DECLARE_READ8_MEMBER(dips_r);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
void sol0_w(uint8_t data);
void sol1_w(uint8_t data);
uint8_t dips_r();
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
@ -301,13 +301,13 @@ INPUT_CHANGED_MEMBER( s3_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s3_state::sol0_w )
void s3_state::sol0_w(uint8_t data)
{
if (BIT(data, 4))
m_samples->start(5, 5); // outhole
}
WRITE8_MEMBER( s3_state::sol1_w )
void s3_state::sol1_w(uint8_t data)
{
if (m_chimes)
{
@ -353,12 +353,12 @@ WRITE8_MEMBER( s3_state::sol1_w )
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s3_state::lamp0_w )
void s3_state::lamp0_w(uint8_t data)
{
m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
}
WRITE8_MEMBER( s3_state::lamp1_w )
void s3_state::lamp1_w(uint8_t data)
{
}
@ -372,7 +372,7 @@ READ_LINE_MEMBER( s3_state::pia28_cb1_r )
return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
}
READ8_MEMBER( s3_state::dips_r )
uint8_t s3_state::dips_r()
{
if (BIT(ioport("DIAGS")->read(), 4) )
{
@ -391,7 +391,7 @@ READ8_MEMBER( s3_state::dips_r )
return 0xff;
}
WRITE8_MEMBER( s3_state::dig0_w )
void s3_state::dig0_w(uint8_t data)
{
m_strobe = data & 15;
m_data_ok = true;
@ -399,7 +399,7 @@ WRITE8_MEMBER( s3_state::dig0_w )
output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s3_state::dig1_w )
void s3_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -410,19 +410,19 @@ WRITE8_MEMBER( s3_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s3_state::switch_r )
uint8_t s3_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read();
}
WRITE8_MEMBER( s3_state::switch_w )
void s3_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s3_state::sound_r )
uint8_t s3_state::sound_r()
{
return m_sound_data;
}

40
src/mame/drivers/s4.cpp
View File

@ -66,16 +66,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w);
DECLARE_WRITE8_MEMBER(sol0_w);
DECLARE_WRITE8_MEMBER(sol1_w);
DECLARE_READ8_MEMBER(dips_r);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
void sol0_w(uint8_t data);
void sol1_w(uint8_t data);
uint8_t dips_r();
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
@ -296,13 +296,13 @@ INPUT_CHANGED_MEMBER( s4_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s4_state::sol0_w )
void s4_state::sol0_w(uint8_t data)
{
if (BIT(data, 4))
m_samples->start(2, 5); // outhole
}
WRITE8_MEMBER( s4_state::sol1_w )
void s4_state::sol1_w(uint8_t data)
{
if (m_chimes)
{
@ -348,12 +348,12 @@ WRITE8_MEMBER( s4_state::sol1_w )
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s4_state::lamp0_w )
void s4_state::lamp0_w(uint8_t data)
{
m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
}
WRITE8_MEMBER( s4_state::lamp1_w )
void s4_state::lamp1_w(uint8_t data)
{
}
@ -367,7 +367,7 @@ READ_LINE_MEMBER( s4_state::pia28_cb1_r )
return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
}
READ8_MEMBER( s4_state::dips_r )
uint8_t s4_state::dips_r()
{
if (BIT(ioport("DIAGS")->read(), 4) )
{
@ -386,7 +386,7 @@ READ8_MEMBER( s4_state::dips_r )
return 0xff;
}
WRITE8_MEMBER( s4_state::dig0_w )
void s4_state::dig0_w(uint8_t data)
{
m_strobe = data & 15;
m_data_ok = true;
@ -394,7 +394,7 @@ WRITE8_MEMBER( s4_state::dig0_w )
output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s4_state::dig1_w )
void s4_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -405,19 +405,19 @@ WRITE8_MEMBER( s4_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s4_state::switch_r )
uint8_t s4_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s4_state::switch_w )
void s4_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s4_state::sound_r )
uint8_t s4_state::sound_r()
{
return m_sound_data;
}

40
src/mame/drivers/s6.cpp
View File

@ -83,16 +83,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w);
DECLARE_READ8_MEMBER(dips_r);
DECLARE_WRITE8_MEMBER(sol0_w);
DECLARE_WRITE8_MEMBER(sol1_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
uint8_t dips_r();
void sol0_w(uint8_t data);
void sol1_w(uint8_t data);
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
@ -263,13 +263,13 @@ INPUT_CHANGED_MEMBER( s6_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s6_state::sol0_w )
void s6_state::sol0_w(uint8_t data)
{
if (BIT(data, 4))
m_samples->start(2, 5); // outhole
}
WRITE8_MEMBER( s6_state::sol1_w )
void s6_state::sol1_w(uint8_t data)
{
uint8_t sound_data = ioport("SND")->read();
if (BIT(data, 0))
@ -298,15 +298,15 @@ WRITE8_MEMBER( s6_state::sol1_w )
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s6_state::lamp0_w )
void s6_state::lamp0_w(uint8_t data)
{
}
WRITE8_MEMBER( s6_state::lamp1_w )
void s6_state::lamp1_w(uint8_t data)
{
}
READ8_MEMBER( s6_state::dips_r )
uint8_t s6_state::dips_r()
{
if (BIT(ioport("DIAGS")->read(), 4) )
{
@ -325,7 +325,7 @@ READ8_MEMBER( s6_state::dips_r )
return 0xff;
}
WRITE8_MEMBER( s6_state::dig0_w )
void s6_state::dig0_w(uint8_t data)
{
m_strobe = data & 15;
m_data_ok = true;
@ -333,7 +333,7 @@ WRITE8_MEMBER( s6_state::dig0_w )
output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s6_state::dig1_w )
void s6_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -344,19 +344,19 @@ WRITE8_MEMBER( s6_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s6_state::switch_r )
uint8_t s6_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s6_state::switch_w )
void s6_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s6_state::sound_r )
uint8_t s6_state::sound_r()
{
return m_sound_data;
}

40
src/mame/drivers/s6a.cpp
View File

@ -76,16 +76,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w);
DECLARE_WRITE8_MEMBER(sol0_w);
DECLARE_WRITE8_MEMBER(sol1_w);
DECLARE_READ8_MEMBER(dips_r);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
void sol0_w(uint8_t data);
void sol1_w(uint8_t data);
uint8_t dips_r();
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
@ -246,13 +246,13 @@ INPUT_CHANGED_MEMBER( s6a_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s6a_state::sol0_w )
void s6a_state::sol0_w(uint8_t data)
{
if (BIT(data, 4))
m_samples->start(2, 5); // outhole
}
WRITE8_MEMBER( s6a_state::sol1_w )
void s6a_state::sol1_w(uint8_t data)
{
uint8_t sound_data = ioport("SND")->read();
if (BIT(data, 0))
@ -281,15 +281,15 @@ WRITE8_MEMBER( s6a_state::sol1_w )
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s6a_state::lamp0_w )
void s6a_state::lamp0_w(uint8_t data)
{
}
WRITE8_MEMBER( s6a_state::lamp1_w )
void s6a_state::lamp1_w(uint8_t data)
{
}
READ8_MEMBER( s6a_state::dips_r )
uint8_t s6a_state::dips_r()
{
if (BIT(ioport("DIAGS")->read(), 4) )
{
@ -308,7 +308,7 @@ READ8_MEMBER( s6a_state::dips_r )
return 0xff;
}
WRITE8_MEMBER( s6a_state::dig0_w )
void s6a_state::dig0_w(uint8_t data)
{
m_strobe = data & 15;
m_data_ok = true;
@ -316,7 +316,7 @@ WRITE8_MEMBER( s6a_state::dig0_w )
output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s6a_state::dig1_w )
void s6a_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -327,19 +327,19 @@ WRITE8_MEMBER( s6a_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s6a_state::switch_r )
uint8_t s6a_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s6a_state::switch_w )
void s6a_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s6a_state::sound_r )
uint8_t s6a_state::sound_r()
{
return m_sound_data;
}

46
src/mame/drivers/s7.cpp
View File

@ -95,19 +95,19 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(diag_coin);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w) { };
DECLARE_WRITE8_MEMBER(sol0_w) { };
DECLARE_WRITE8_MEMBER(sol1_w) { };
DECLARE_WRITE8_MEMBER(sol2_w);
DECLARE_WRITE8_MEMBER(sol3_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_READ8_MEMBER(dips_r);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data) { };
void sol0_w(uint8_t data) { };
void sol1_w(uint8_t data) { };
void sol2_w(uint8_t data);
void sol3_w(uint8_t data);
void sound_w(uint8_t data);
uint8_t dips_r();
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ8_MEMBER(nvram_r);
DECLARE_WRITE8_MEMBER(nvram_w);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w) { };
@ -282,18 +282,18 @@ INPUT_CHANGED_MEMBER( s7_state::diag_coin )
m_memprotect = newval;
}
WRITE8_MEMBER( s7_state::sol2_w )
void s7_state::sol2_w(uint8_t data)
{
m_pia21->ca1_w(BIT(data, 5));
}
WRITE8_MEMBER( s7_state::sol3_w )
void s7_state::sol3_w(uint8_t data)
{
if (BIT(data, 1))
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s7_state::sound_w )
void s7_state::sound_w(uint8_t data)
{
uint8_t sound_data = (ioport("SND")->read() & 0xe0) | (data & 0x1f);
@ -305,11 +305,11 @@ WRITE8_MEMBER( s7_state::sound_w )
m_pias->cb1_w(cb1);
}
WRITE8_MEMBER( s7_state::lamp0_w )
void s7_state::lamp0_w(uint8_t data)
{
}
WRITE8_MEMBER( s7_state::dig0_w )
void s7_state::dig0_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
m_strobe = data & 15;
@ -318,7 +318,7 @@ WRITE8_MEMBER( s7_state::dig0_w )
m_digits[60] = patterns[data>>4]; // diag digit
}
WRITE8_MEMBER( s7_state::dig1_w )
void s7_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -329,7 +329,7 @@ WRITE8_MEMBER( s7_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s7_state::dips_r )
uint8_t s7_state::dips_r()
{
if (BIT(ioport("DIAGS")->read(), 4) )
{
@ -348,14 +348,14 @@ READ8_MEMBER( s7_state::dips_r )
return 0xff;
}
READ8_MEMBER( s7_state::switch_r )
uint8_t s7_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff; // comes in through inverter buffers
}
WRITE8_MEMBER( s7_state::switch_w )
void s7_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
@ -373,7 +373,7 @@ WRITE8_MEMBER( s7_state::nvram_w )
m_nvram[offset] = data;
}
READ8_MEMBER( s7_state::sound_r )
uint8_t s7_state::sound_r()
{
return m_sound_data;
}

36
src/mame/drivers/s8.cpp
View File

@ -79,16 +79,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w) { };
DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15
DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data) { };
void sol2_w(uint8_t data) { }; // solenoids 8-15
void sol3_w(uint8_t data); // solenoids 0-7
void sound_w(uint8_t data);
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
@ -205,13 +205,13 @@ INPUT_CHANGED_MEMBER( s8_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s8_state::sol3_w )
void s8_state::sol3_w(uint8_t data)
{
if (BIT(data, 1))
m_samples->start(0, 6); // knocker
}
WRITE8_MEMBER( s8_state::sound_w )
void s8_state::sound_w(uint8_t data)
{
m_sound_data = data;
}
@ -228,11 +228,11 @@ WRITE_LINE_MEMBER( s8_state::pia21_ca2_w )
m_pias->ca1_w(state);
}
WRITE8_MEMBER( s8_state::lamp0_w )
void s8_state::lamp0_w(uint8_t data)
{
}
WRITE8_MEMBER( s8_state::dig0_w )
void s8_state::dig0_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
data &= 0x7f;
@ -241,7 +241,7 @@ WRITE8_MEMBER( s8_state::dig0_w )
m_digits[60] = patterns[data>>4]; // diag digit
}
WRITE8_MEMBER( s8_state::dig1_w )
void s8_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543
if (m_data_ok)
@ -252,19 +252,19 @@ WRITE8_MEMBER( s8_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s8_state::switch_r )
uint8_t s8_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s8_state::switch_w )
void s8_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s8_state::sound_r )
uint8_t s8_state::sound_r()
{
return m_sound_data;
}

36
src/mame/drivers/s8a.cpp
View File

@ -55,16 +55,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w) { };
DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15
DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data) { };
void sol2_w(uint8_t data) { }; // solenoids 8-15
void sol3_w(uint8_t data); // solenoids 0-7
void sound_w(uint8_t data);
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
@ -177,13 +177,13 @@ INPUT_CHANGED_MEMBER( s8a_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s8a_state::sol3_w )
void s8a_state::sol3_w(uint8_t data)
{
if (data==0x0a)
m_samples->start(0, 7); // mechanical drum when you have 2 or more batches
}
WRITE8_MEMBER( s8a_state::sound_w )
void s8a_state::sound_w(uint8_t data)
{
m_sound_data = data;
}
@ -200,11 +200,11 @@ WRITE_LINE_MEMBER( s8a_state::pia21_ca2_w )
m_pias->ca1_w(state);
}
WRITE8_MEMBER( s8a_state::lamp0_w )
void s8a_state::lamp0_w(uint8_t data)
{
}
WRITE8_MEMBER( s8a_state::dig0_w )
void s8a_state::dig0_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
data &= 0x7f;
@ -213,7 +213,7 @@ WRITE8_MEMBER( s8a_state::dig0_w )
m_digits[60] = patterns[data>>4]; // diag digit
}
WRITE8_MEMBER( s8a_state::dig1_w )
void s8a_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543
if (m_data_ok)
@ -224,19 +224,19 @@ WRITE8_MEMBER( s8a_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s8a_state::switch_r )
uint8_t s8a_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s8a_state::switch_w )
void s8a_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s8a_state::sound_r )
uint8_t s8a_state::sound_r()
{
return m_sound_data;
}

32
src/mame/drivers/s9.cpp
View File

@ -66,16 +66,16 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w) { };
DECLARE_WRITE8_MEMBER(lamp1_w) { };
DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15
DECLARE_WRITE8_MEMBER(sol3_w) { }; // solenoids 0-7
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data) { };
void lamp1_w(uint8_t data) { };
void sol2_w(uint8_t data) { }; // solenoids 8-15
void sol3_w(uint8_t data) { }; // solenoids 0-7
void sound_w(uint8_t data);
uint8_t switch_r();
void switch_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
@ -221,7 +221,7 @@ INPUT_CHANGED_MEMBER( s9_state::audio_nmi )
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
WRITE8_MEMBER( s9_state::sound_w )
void s9_state::sound_w(uint8_t data)
{
m_sound_data = data;
}
@ -238,7 +238,7 @@ WRITE_LINE_MEMBER( s9_state::pia21_ca2_w )
m_pias->ca1_w(state);
}
WRITE8_MEMBER( s9_state::dig0_w )
void s9_state::dig0_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
data &= 0x7f;
@ -247,7 +247,7 @@ WRITE8_MEMBER( s9_state::dig0_w )
m_digits[60] = patterns[data>>4]; // diag digit
}
WRITE8_MEMBER( s9_state::dig1_w )
void s9_state::dig1_w(uint8_t data)
{
static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
@ -258,19 +258,19 @@ WRITE8_MEMBER( s9_state::dig1_w )
m_data_ok = false;
}
READ8_MEMBER( s9_state::switch_r )
uint8_t s9_state::switch_r()
{
char kbdrow[8];
sprintf(kbdrow,"X%X",m_kbdrow);
return ioport(kbdrow)->read() ^ 0xff;
}
WRITE8_MEMBER( s9_state::switch_w )
void s9_state::switch_w(uint8_t data)
{
m_kbdrow = data;
}
READ8_MEMBER( s9_state::sound_r )
uint8_t s9_state::sound_r()
{
return m_sound_data;
}

16
src/mame/drivers/spectra.cpp
View File

@ -60,10 +60,10 @@ public:
void spectra(machine_config &config);
private:
DECLARE_READ8_MEMBER(porta_r);
DECLARE_READ8_MEMBER(portb_r);
DECLARE_WRITE8_MEMBER(porta_w);
DECLARE_WRITE8_MEMBER(portb_w);
uint8_t porta_r();
uint8_t portb_r();
void porta_w(uint8_t data);
void portb_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(nmitimer);
TIMER_DEVICE_CALLBACK_MEMBER(outtimer);
void spectra_map(address_map &map);
@ -138,7 +138,7 @@ void spectra_state::machine_reset()
m_t_c = 0;
}
READ8_MEMBER( spectra_state::porta_r )
uint8_t spectra_state::porta_r()
{
uint8_t row = (m_porta & 0x18) >> 3;
uint8_t key = m_switch[row]->read();
@ -150,7 +150,7 @@ READ8_MEMBER( spectra_state::porta_r )
return ret;
}
READ8_MEMBER( spectra_state::portb_r )
uint8_t spectra_state::portb_r()
{
if (m_p_ram[0xf0] != 1)
return 0x5a; // factory reset if first time
@ -158,13 +158,13 @@ READ8_MEMBER( spectra_state::portb_r )
return m_portb;
}
WRITE8_MEMBER( spectra_state::porta_w )
void spectra_state::porta_w(uint8_t data)
{
m_porta = data;
}
// sound port
WRITE8_MEMBER( spectra_state::portb_w )
void spectra_state::portb_w(uint8_t data)
{
m_portb = data;
float vco = 5.0;

16
src/mame/drivers/spirit76.cpp
View File

@ -37,10 +37,10 @@ public:
private:
TIMER_DEVICE_CALLBACK_MEMBER(irq);
DECLARE_WRITE8_MEMBER(porta_w);
DECLARE_WRITE8_MEMBER(portb_w);
DECLARE_READ8_MEMBER(porta_r);
DECLARE_READ8_MEMBER(portb_r);
void porta_w(u8 data);
void portb_w(u8 data);
u8 porta_r();
u8 portb_r();
DECLARE_WRITE8_MEMBER(unk_w);
DECLARE_READ8_MEMBER(unk_r);
void maincpu_map(address_map &map);
@ -79,26 +79,26 @@ TIMER_DEVICE_CALLBACK_MEMBER( spirit76_state::irq )
}
// continual write in irq routine
WRITE8_MEMBER( spirit76_state::porta_w )
void spirit76_state::porta_w(u8 data)
{
printf("PORT A=%X\n",data);
}
// continual write in irq routine
WRITE8_MEMBER( spirit76_state::portb_w )
void spirit76_state::portb_w(u8 data)
{
printf("PORT B=%X\n",data);
}
// continual read in irq routine
READ8_MEMBER( spirit76_state::porta_r )
u8 spirit76_state::porta_r()
{
printf("Read PORT A\n");
return 0xff;
}
// might not be used?
READ8_MEMBER( spirit76_state::portb_r )
u8 spirit76_state::portb_r()
{
printf("Read PORT B\n");
return 0xff;

28
src/mame/drivers/st_mp100.cpp
View File

@ -50,13 +50,13 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(self_test);
private:
DECLARE_READ8_MEMBER(u10_a_r);
DECLARE_WRITE8_MEMBER(u10_a_w);
DECLARE_READ8_MEMBER(u10_b_r);
DECLARE_WRITE8_MEMBER(u10_b_w);
DECLARE_READ8_MEMBER(u11_a_r);
DECLARE_WRITE8_MEMBER(u11_a_w);
DECLARE_WRITE8_MEMBER(u11_b_w);
uint8_t u10_a_r();
void u10_a_w(uint8_t data);
uint8_t u10_b_r();
void u10_b_w(uint8_t data);
uint8_t u11_a_r();
void u11_a_w(uint8_t data);
void u11_b_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(u10_ca2_w);
DECLARE_WRITE_LINE_MEMBER(u10_cb2_w);
DECLARE_WRITE_LINE_MEMBER(u11_ca2_w);
@ -526,12 +526,12 @@ WRITE_LINE_MEMBER( st_mp100_state::u11_cb2_w )
m_u11_cb2 = state;
}
READ8_MEMBER( st_mp100_state::u10_a_r )
uint8_t st_mp100_state::u10_a_r()
{
return m_u10a;
}
WRITE8_MEMBER( st_mp100_state::u10_a_w )
void st_mp100_state::u10_a_w(uint8_t data)
{
m_u10a = data;
@ -556,7 +556,7 @@ WRITE8_MEMBER( st_mp100_state::u10_a_w )
}
}
READ8_MEMBER( st_mp100_state::u10_b_r )
uint8_t st_mp100_state::u10_b_r()
{
uint8_t data = 0;
@ -590,17 +590,17 @@ READ8_MEMBER( st_mp100_state::u10_b_r )
return data;
}
WRITE8_MEMBER( st_mp100_state::u10_b_w )
void st_mp100_state::u10_b_w(uint8_t data)
{
m_u10b = data;
}
READ8_MEMBER( st_mp100_state::u11_a_r )
uint8_t st_mp100_state::u11_a_r()
{
return m_u11a;
}
WRITE8_MEMBER( st_mp100_state::u11_a_w )
void st_mp100_state::u11_a_w(uint8_t data)
{
m_u11a = data;
@ -631,7 +631,7 @@ WRITE8_MEMBER( st_mp100_state::u11_a_w )
}
}
WRITE8_MEMBER( st_mp100_state::u11_b_w )
void st_mp100_state::u11_b_w(uint8_t data)
{
m_u11b = data;
if (!m_u11_cb2)

28
src/mame/drivers/st_mp200.cpp
View File

@ -62,13 +62,13 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(self_test);
private:
DECLARE_READ8_MEMBER(u10_a_r);
DECLARE_WRITE8_MEMBER(u10_a_w);
DECLARE_READ8_MEMBER(u10_b_r);
DECLARE_WRITE8_MEMBER(u10_b_w);
DECLARE_READ8_MEMBER(u11_a_r);
DECLARE_WRITE8_MEMBER(u11_a_w);
DECLARE_WRITE8_MEMBER(u11_b_w);
uint8_t u10_a_r();
void u10_a_w(uint8_t data);
uint8_t u10_b_r();
void u10_b_w(uint8_t data);
uint8_t u11_a_r();
void u11_a_w(uint8_t data);
void u11_b_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(u10_ca2_w);
DECLARE_WRITE_LINE_MEMBER(u10_cb2_w);
DECLARE_WRITE_LINE_MEMBER(u11_ca2_w);
@ -375,12 +375,12 @@ WRITE_LINE_MEMBER( st_mp200_state::u11_cb2_w )
m_u11_cb2 = state;
}
READ8_MEMBER( st_mp200_state::u10_a_r )
uint8_t st_mp200_state::u10_a_r()
{
return m_u10a;
}
WRITE8_MEMBER( st_mp200_state::u10_a_w )
void st_mp200_state::u10_a_w(uint8_t data)
{
m_u10a = data;
@ -405,7 +405,7 @@ WRITE8_MEMBER( st_mp200_state::u10_a_w )
}
}
READ8_MEMBER( st_mp200_state::u10_b_r )
uint8_t st_mp200_state::u10_b_r()
{
uint8_t data = 0;
@ -439,17 +439,17 @@ READ8_MEMBER( st_mp200_state::u10_b_r )
return data;
}
WRITE8_MEMBER( st_mp200_state::u10_b_w )
void st_mp200_state::u10_b_w(uint8_t data)
{
m_u10b = data;
}
READ8_MEMBER( st_mp200_state::u11_a_r )
uint8_t st_mp200_state::u11_a_r()
{
return m_u11a;
}
WRITE8_MEMBER( st_mp200_state::u11_a_w )
void st_mp200_state::u11_a_w(uint8_t data)
{
m_u11a = data;
@ -482,7 +482,7 @@ WRITE8_MEMBER( st_mp200_state::u11_a_w )
}
}
WRITE8_MEMBER( st_mp200_state::u11_b_w )
void st_mp200_state::u11_b_w(uint8_t data)
{
m_u11b = data;
if (!m_u11_cb2)

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

@ -82,8 +82,8 @@ public:
private:
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
DECLARE_READ8_MEMBER(pia_pb_r);
DECLARE_WRITE8_MEMBER(pia_pb_w);
uint8_t pia_pb_r();
void pia_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
DECLARE_WRITE_LINE_MEMBER(votrax_request);
TIMER_DEVICE_CALLBACK_MEMBER(timer_a);
@ -312,12 +312,12 @@ WRITE_LINE_MEMBER( taito_state::pia_cb2_w )
m_votrax->write(m_votrax_cmd);
}
READ8_MEMBER( taito_state::pia_pb_r )
uint8_t taito_state::pia_pb_r()
{
return ~m_sndcmd;
}
WRITE8_MEMBER( taito_state::pia_pb_w )
void taito_state::pia_pb_w(uint8_t data)
{
m_votrax_cmd = data;
}

16
src/mame/includes/efdt.h
View File

@ -63,15 +63,15 @@ private:
DECLARE_READ8_MEMBER(main_soundlatch_r);
DECLARE_WRITE8_MEMBER(main_soundlatch_w);
DECLARE_READ8_MEMBER(soundlatch_0_r);
DECLARE_READ8_MEMBER(soundlatch_1_r);
DECLARE_READ8_MEMBER(soundlatch_2_r);
DECLARE_READ8_MEMBER(soundlatch_3_r);
uint8_t soundlatch_0_r();
uint8_t soundlatch_1_r();
uint8_t soundlatch_2_r();
uint8_t soundlatch_3_r();
DECLARE_WRITE8_MEMBER(soundlatch_0_w);
DECLARE_WRITE8_MEMBER(soundlatch_1_w);
DECLARE_WRITE8_MEMBER(soundlatch_2_w);
DECLARE_WRITE8_MEMBER(soundlatch_3_w);
void soundlatch_0_w(uint8_t data);
void soundlatch_1_w(uint8_t data);
void soundlatch_2_w(uint8_t data);
void soundlatch_3_w(uint8_t data);
uint32_t screen_update_efdt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);

8
src/mame/includes/epos.h
View File

@ -36,10 +36,10 @@ protected:
private:
DECLARE_WRITE8_MEMBER(dealer_decrypt_rom);
DECLARE_WRITE8_MEMBER(port_1_w);
DECLARE_READ8_MEMBER(i8255_porta_r);
DECLARE_WRITE8_MEMBER(i8255_portc_w);
DECLARE_READ8_MEMBER(ay_porta_mpx_r);
DECLARE_WRITE8_MEMBER(flip_screen_w);
uint8_t i8255_porta_r();
void i8255_portc_w(uint8_t data);
uint8_t ay_porta_mpx_r();
void flip_screen_w(uint8_t data);
DECLARE_WRITE8_MEMBER(dealer_pal_w);
DECLARE_MACHINE_START(epos);
DECLARE_MACHINE_START(dealer);

6
src/mame/includes/esripsys.h
View File

@ -106,9 +106,9 @@ private:
DECLARE_WRITE8_MEMBER(frame_w);
DECLARE_READ8_MEMBER(fdt_r);
DECLARE_WRITE8_MEMBER(fdt_w);
DECLARE_READ16_MEMBER( fdt_rip_r );
DECLARE_WRITE16_MEMBER( fdt_rip_w );
DECLARE_READ8_MEMBER(rip_status_in);
uint16_t fdt_rip_r(offs_t offset);
void fdt_rip_w(offs_t offset, uint16_t data);
uint8_t rip_status_in();
DECLARE_WRITE8_MEMBER(g_iobus_w);
DECLARE_READ8_MEMBER(g_iobus_r);
DECLARE_WRITE8_MEMBER(g_ioadd_w);

6
src/mame/includes/freekick.h
View File

@ -66,9 +66,9 @@ private:
DECLARE_READ8_MEMBER(freekick_ff_r);
DECLARE_WRITE8_MEMBER(freekick_ff_w);
DECLARE_WRITE8_MEMBER(freek_videoram_w);
DECLARE_WRITE8_MEMBER(snd_rom_addr_l_w);
DECLARE_WRITE8_MEMBER(snd_rom_addr_h_w);
DECLARE_READ8_MEMBER(snd_rom_r);
void snd_rom_addr_l_w(uint8_t data);
void snd_rom_addr_h_w(uint8_t data);
uint8_t snd_rom_r();
TILE_GET_INFO_MEMBER(get_freek_tile_info);
virtual void video_start() override;
DECLARE_MACHINE_START(pbillrd);

14
src/mame/includes/homedata.h
View File

@ -94,15 +94,15 @@ private:
DECLARE_WRITE8_MEMBER(mrokumei_keyboard_select_w);
DECLARE_WRITE8_MEMBER(mrokumei_sound_bank_w);
DECLARE_WRITE8_MEMBER(mrokumei_sound_cmd_w);
DECLARE_READ8_MEMBER(reikaids_upd7807_porta_r);
DECLARE_WRITE8_MEMBER(reikaids_upd7807_porta_w);
DECLARE_WRITE8_MEMBER(reikaids_upd7807_portc_w);
uint8_t reikaids_upd7807_porta_r();
void reikaids_upd7807_porta_w(uint8_t data);
void reikaids_upd7807_portc_w(uint8_t data);
DECLARE_READ8_MEMBER(reikaids_io_r);
DECLARE_READ8_MEMBER(pteacher_io_r);
DECLARE_READ8_MEMBER(pteacher_keyboard_r);
DECLARE_READ8_MEMBER(pteacher_upd7807_porta_r);
DECLARE_WRITE8_MEMBER(pteacher_upd7807_porta_w);
DECLARE_WRITE8_MEMBER(pteacher_upd7807_portc_w);
uint8_t pteacher_keyboard_r();
uint8_t pteacher_upd7807_porta_r();
void pteacher_upd7807_porta_w(uint8_t data);
void pteacher_upd7807_portc_w(uint8_t data);
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_READ8_MEMBER(mirderby_prot_r);
DECLARE_WRITE8_MEMBER(mirderby_prot_w);

8
src/mame/includes/kim1.h
View File

@ -40,10 +40,10 @@ public:
void kim1(machine_config &config);
private:
DECLARE_READ8_MEMBER(kim1_u2_read_a);
DECLARE_WRITE8_MEMBER(kim1_u2_write_a);
DECLARE_READ8_MEMBER(kim1_u2_read_b);
DECLARE_WRITE8_MEMBER(kim1_u2_write_b);
uint8_t kim1_u2_read_a();
void kim1_u2_write_a(uint8_t data);
uint8_t kim1_u2_read_b();
void kim1_u2_write_b(uint8_t data);
// device overrides
virtual void machine_start() override;

2
src/mame/includes/ladyfrog.h
View File

@ -83,7 +83,7 @@ private:
DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl2_w);
DECLARE_READ8_MEMBER(ladyfrog_scrlram_r);
DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w);
DECLARE_WRITE8_MEMBER(unk_w);
void unk_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_VIDEO_START(toucheme);
DECLARE_VIDEO_START(ladyfrog_common);

2
src/mame/includes/malzak.h
View File

@ -58,7 +58,7 @@ private:
DECLARE_WRITE8_MEMBER(portc0_w);
DECLARE_READ8_MEMBER(collision_r);
DECLARE_WRITE8_MEMBER(playfield_w);
DECLARE_READ8_MEMBER(videoram_r);
uint8_t videoram_r(offs_t offset);
void palette_init(palette_device &palette) const;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);

30
src/mame/includes/s11.h
View File

@ -56,22 +56,22 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_READ8_MEMBER(sound_r);
uint8_t sound_r();
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(lamp0_w);
DECLARE_WRITE8_MEMBER(lamp1_w) { };
DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data) { };
void sol2_w(uint8_t data) { }; // solenoids 8-15
DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7
DECLARE_WRITE8_MEMBER(sound_w);
void sound_w(uint8_t data);
DECLARE_WRITE8_MEMBER(pia2c_pa_w);
DECLARE_WRITE8_MEMBER(pia2c_pb_w);
DECLARE_WRITE8_MEMBER(pia34_pa_w);
DECLARE_WRITE8_MEMBER(pia34_pb_w);
void pia2c_pa_w(uint8_t data);
void pia2c_pb_w(uint8_t data);
void pia34_pa_w(uint8_t data);
void pia34_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia34_cb2_w);
DECLARE_WRITE8_MEMBER(pia40_pb_w);
void pia40_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(pia40_cb2_w);
DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
@ -85,9 +85,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w);
DECLARE_WRITE_LINE_MEMBER(pia_irq);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
DECLARE_READ8_MEMBER(pia28_w7_r);
uint8_t switch_r();
void switch_w(uint8_t data);
uint8_t pia28_w7_r();
protected:
DECLARE_MACHINE_RESET(s11);

2
src/mame/includes/s11a.h
View File

@ -23,7 +23,7 @@ public:
void init_s11a();
DECLARE_WRITE8_MEMBER(bgbank_w);
DECLARE_WRITE8_MEMBER(dig0_w);
void dig0_w(uint8_t data);
private:
DECLARE_MACHINE_RESET(s11a);

8
src/mame/includes/s11b.h
View File

@ -24,10 +24,10 @@ public:
void init_s11b();
void init_s11b_invert();
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(pia2c_pa_w);
DECLARE_WRITE8_MEMBER(pia2c_pb_w);
DECLARE_WRITE8_MEMBER(pia34_pa_w);
void dig1_w(uint8_t data);
void pia2c_pa_w(uint8_t data);
void pia2c_pb_w(uint8_t data);
void pia34_pa_w(uint8_t data);
DECLARE_WRITE8_MEMBER(bg_speech_clock_w);
DECLARE_WRITE8_MEMBER(bg_speech_digit_w);

2
src/mame/video/malzak.cpp
View File

@ -26,7 +26,7 @@ void malzak_state::palette_init(palette_device &palette) const
}
}
READ8_MEMBER(malzak_state::videoram_r)
uint8_t malzak_state::videoram_r(offs_t offset)
{
return m_videoram[offset];
}