diff options
69 files changed, 335 insertions, 347 deletions
diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp index d64892f4bd2..68ff34874c9 100644 --- a/src/mame/audio/carnival.cpp +++ b/src/mame/audio/carnival.cpp @@ -183,14 +183,14 @@ void carnival_state::carnival_psg_latch() } } -WRITE8_MEMBER( carnival_state::carnivala_music_port_1_w ) +void carnival_state::carnivala_music_port_1_w(uint8_t data) { // P1: AY8912 d0-d7 m_musicData = data; carnival_psg_latch(); } -WRITE8_MEMBER( carnival_state::carnivala_music_port_2_w ) +void carnival_state::carnivala_music_port_2_w(uint8_t data) { // P2 d6: AY8912 BDIR(R/W) // P2 d7: AY8912 BC1 @@ -219,13 +219,13 @@ void carnival_state::carnivala_audio(machine_config &config) // PIT8253 music -WRITE8_MEMBER( carnival_state::carnivalb_music_port_1_w ) +void carnival_state::carnivalb_music_port_1_w(uint8_t data) { // P1: PIT8253 d0-d7 m_musicData = data; } -WRITE8_MEMBER( carnival_state::carnivalb_music_port_2_w ) +void carnival_state::carnivalb_music_port_2_w(uint8_t data) { // P2 d7: PIT8253 write strobe // P2 d5,d6: PIT8253 A0,A1 diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index ce3f3c5bee1..b9d8567fe12 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -438,7 +438,7 @@ void segag80r_state::sega005_sound_board(machine_config &config) * *************************************/ -WRITE8_MEMBER(segag80r_state::sega005_sound_a_w) +void segag80r_state::sega005_sound_a_w(uint8_t data) { uint8_t diff = data ^ m_sound_state[0]; m_sound_state[0] = data; @@ -494,7 +494,7 @@ inline void segag80r_state::sega005_update_sound_data() } -WRITE8_MEMBER(segag80r_state::sega005_sound_b_w) +void segag80r_state::sega005_sound_b_w(uint8_t data) { /* D6: manual timer clock (0->1) diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp index 638202663d2..6de1129f59c 100644 --- a/src/mame/drivers/angelkds.cpp +++ b/src/mame/drivers/angelkds.cpp @@ -143,7 +143,7 @@ Dumped by Chackn */ -WRITE8_MEMBER(angelkds_state::angelkds_cpu_bank_write) +void angelkds_state::angelkds_cpu_bank_write(uint8_t data) { membank("bank1")->set_entry(data & 0x0f); // shall we check (data & 0x0f) < # of available banks (8 or 10 resp.)? } diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index 9f58603f07a..c1bfbfc3497 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -54,9 +54,9 @@ public: m_adpcm_pos(0), m_adpcm_idle(1), m_adpcm_data(0), m_trigger(0) { } - DECLARE_WRITE8_MEMBER(input_select_w); - DECLARE_READ8_MEMBER(input_p2_r); - DECLARE_READ8_MEMBER(input_p1_r); + void input_select_w(uint8_t data); + uint8_t input_p2_r(); + uint8_t input_p1_r(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(tile_info); @@ -328,7 +328,7 @@ INPUT_PORTS_END // INPUT PORT HANDLING //************************************************************************** -WRITE8_MEMBER( chinsan_state::input_select_w ) +void chinsan_state::input_select_w(uint8_t data) { // 765----- unknown // ---43210 input select (shared for player 1 and 2) @@ -336,7 +336,7 @@ WRITE8_MEMBER( chinsan_state::input_select_w ) m_port_select = data; } -READ8_MEMBER( chinsan_state::input_p1_r ) +uint8_t chinsan_state::input_p1_r() { uint8_t data = 0xff; @@ -349,7 +349,7 @@ READ8_MEMBER( chinsan_state::input_p1_r ) return data; } -READ8_MEMBER( chinsan_state::input_p2_r ) +uint8_t chinsan_state::input_p2_r() { uint8_t data = 0xff; diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index 8bfb51c0407..68ec8b6235d 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -390,7 +390,7 @@ public: DECLARE_WRITE32_MEMBER(dma_w); template<int Chip> DECLARE_READ16_MEMBER(soundram_r); template<int Chip> DECLARE_WRITE16_MEMBER(soundram_w); - DECLARE_WRITE8_MEMBER(lamps_w); + void lamps_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(scsp1_to_sh1_irq); DECLARE_WRITE_LINE_MEMBER(scsp2_to_sh1_irq); DECLARE_WRITE8_MEMBER(sound_to_sh1_w); @@ -414,7 +414,7 @@ public: void blit_current_sprite(address_space &space); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_main); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_sub); - DECLARE_WRITE8_MEMBER(scsp_irq); + void scsp_irq(offs_t offset, uint8_t data); void dma_transfer( address_space &space, uint16_t dma_index ); @@ -2828,7 +2828,7 @@ WRITE16_MEMBER( coolridr_state::soundram_w) } -WRITE8_MEMBER( coolridr_state::lamps_w ) +void coolridr_state::lamps_w(uint8_t data) { /* x--- ---- P2 Music select Lamp @@ -3204,7 +3204,7 @@ void coolridr_state::machine_reset() m_usethreads = m_io_config->read()&1; } -WRITE8_MEMBER(coolridr_state::scsp_irq) +void coolridr_state::scsp_irq(offs_t offset, uint8_t data) { m_soundcpu->set_input_line(offset, data); } diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 7be3be463ac..324566007e3 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -225,35 +225,35 @@ void fitfight_state::snd_mem(address_map &map) map(0x8000, 0x87ff).ram(); } -READ8_MEMBER(fitfight_state::snd_porta_r) +uint8_t fitfight_state::snd_porta_r() { //logerror("PA R %s\n",machine().describe_context()); return machine().rand(); } -READ8_MEMBER(fitfight_state::snd_portb_r) +uint8_t fitfight_state::snd_portb_r() { //logerror("PB R %s\n",machine().describe_context()); return machine().rand(); } -READ8_MEMBER(fitfight_state::snd_portc_r) +uint8_t fitfight_state::snd_portc_r() { //logerror("PC R %s\n",machine().describe_context()); return machine().rand(); } -WRITE8_MEMBER(fitfight_state::snd_porta_w) +void fitfight_state::snd_porta_w(uint8_t data) { //logerror("PA W %x %s\n",data,machine().describe_context()); } -WRITE8_MEMBER(fitfight_state::snd_portb_w) +void fitfight_state::snd_portb_w(uint8_t data) { //logerror("PB W %x %s\n",data,machine().describe_context()); } -WRITE8_MEMBER(fitfight_state::snd_portc_w) +void fitfight_state::snd_portc_w(uint8_t data) { //logerror("PC W %x %s\n",data,machine().describe_context()); } diff --git a/src/mame/drivers/flashbeats.cpp b/src/mame/drivers/flashbeats.cpp index 36fce5218f5..2130e076dcc 100644 --- a/src/mame/drivers/flashbeats.cpp +++ b/src/mame/drivers/flashbeats.cpp @@ -53,7 +53,7 @@ public: private: virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER(scsp_irq); + void scsp_irq(offs_t offset, uint8_t data); DECLARE_READ16_MEMBER(p6_r); DECLARE_WRITE16_MEMBER(p6_w); @@ -176,7 +176,7 @@ void flashbeats_state::flashbeats(machine_config &config) m_scsp->add_route(1, "rspeaker", 1.0); } -WRITE8_MEMBER(flashbeats_state::scsp_irq) +void flashbeats_state::scsp_irq(offs_t offset, uint8_t data) { } diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 85d98462c57..c940ee289b8 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -46,7 +46,7 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE8_MEMBER(lamp_w); + void lamp_w(uint8_t data); DECLARE_WRITE8_MEMBER(output_w); DECLARE_WRITE8_MEMBER(oki_bank_w); void sgx_io(address_map &map); @@ -64,7 +64,7 @@ void ggconnie_state::machine_start() m_okibank->configure_entries(0, 8, memregion("oki")->base(), 0x10000); } -WRITE8_MEMBER(ggconnie_state::lamp_w) +void ggconnie_state::lamp_w(uint8_t data) { output().set_value("lamp", !BIT(data,0)); } diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index f846590101a..7369fdebcea 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -98,13 +98,13 @@ void kopunch_state::kopunch_io_map(address_map &map) ********************************************************/ -READ8_MEMBER(kopunch_state::sensors1_r) +uint8_t kopunch_state::sensors1_r() { // punch strength low bits return machine().rand(); } -READ8_MEMBER(kopunch_state::sensors2_r) +uint8_t kopunch_state::sensors2_r() { // d0-d2: punch strength high bits // d3: coin 2 @@ -115,12 +115,12 @@ READ8_MEMBER(kopunch_state::sensors2_r) return (machine().rand() & 0x07) | ioport("SYSTEM")->read(); } -WRITE8_MEMBER(kopunch_state::lamp_w) +void kopunch_state::lamp_w(uint8_t data) { m_lamp = BIT(~data, 7); } -WRITE8_MEMBER(kopunch_state::coin_w) +void kopunch_state::coin_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, ~data & 0x80); machine().bookkeeping().coin_counter_w(1, ~data & 0x40); diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 2e39e219489..43ac513d888 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -43,7 +43,7 @@ READ8_MEMBER(magmax_state::sound_r) return (m_soundlatch->read() << 1) | m_LS74_q; } -WRITE8_MEMBER(magmax_state::ay8910_portB_0_w) +void magmax_state::ay8910_portB_0_w(uint8_t data) { /*bit 0 is input to CLR line of the LS74*/ m_LS74_clr = data & 1; @@ -93,7 +93,7 @@ void magmax_state::machine_reset() -WRITE8_MEMBER(magmax_state::ay8910_portA_0_w) +void magmax_state::ay8910_portA_0_w(uint8_t data) { /*There are three AY8910 chips and four(!) separate amplifiers on the board * Each of AY channels is hardware mapped in following way: diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index 1e43fa7126b..a24e657a73d 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -71,20 +71,20 @@ private: DECLARE_READ16_MEMBER(extra_ram_r); DECLARE_WRITE16_MEMBER(extra_ram_w); - DECLARE_WRITE8_MEMBER(bios_banksel_w); - DECLARE_WRITE8_MEMBER(bios_gamesel_w); + void bios_banksel_w(uint8_t data); + void bios_gamesel_w(uint8_t data); DECLARE_WRITE16_MEMBER(mp_io_write); DECLARE_READ16_MEMBER(mp_io_read); DECLARE_READ8_MEMBER(bank_r); DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_READ8_MEMBER(bios_6402_r); - DECLARE_WRITE8_MEMBER(bios_6402_w); - DECLARE_READ8_MEMBER(bios_6204_r); - DECLARE_WRITE8_MEMBER(bios_width_w); - DECLARE_READ8_MEMBER(bios_6404_r); - DECLARE_WRITE8_MEMBER(bios_6404_w); - DECLARE_READ8_MEMBER(bios_6600_r); - DECLARE_WRITE8_MEMBER(bios_6600_w); + uint8_t bios_6402_r(); + void bios_6402_w(uint8_t data); + uint8_t bios_6204_r(); + void bios_width_w(uint8_t data); + uint8_t bios_6404_r(); + void bios_6404_w(uint8_t data); + uint8_t bios_6600_r(); + void bios_6600_w(uint8_t data); DECLARE_WRITE8_MEMBER(game_w); DECLARE_READ8_MEMBER(vdp1_count_r); @@ -410,7 +410,7 @@ READ_LINE_MEMBER(mplay_state::start2_r) return BIT(m_bios_bank, 5); } -WRITE8_MEMBER(mplay_state::bios_banksel_w) +void mplay_state::bios_banksel_w(uint8_t data) { /* Multi-slot note: Bits 0 and 1 appear to determine the selected game slot. @@ -426,7 +426,7 @@ WRITE8_MEMBER(mplay_state::bios_banksel_w) // logerror("BIOS: ROM bank %i selected [0x%02x]\n", m_bios_bank >> 6, data); } -WRITE8_MEMBER(mplay_state::bios_gamesel_w) +void mplay_state::bios_gamesel_w(uint8_t data) { m_bios_6403 = data; @@ -511,38 +511,38 @@ WRITE8_MEMBER(mplay_state::bank_w) /* Megaplay BIOS handles regs[2] at start in a different way compared to megadrive */ /* other io data/ctrl regs are dealt with exactly like in the console */ -READ8_MEMBER(mplay_state::bios_6402_r) +uint8_t mplay_state::bios_6402_r() { return m_megadrive_io_data_regs[2];// & 0xfe; } -WRITE8_MEMBER(mplay_state::bios_6402_w) +void mplay_state::bios_6402_w(uint8_t data) { m_megadrive_io_data_regs[2] = (m_megadrive_io_data_regs[2] & 0x07) | ((data & 0x70) >> 1); // logerror("BIOS: 0x6402 write: 0x%02x\n", data); } -READ8_MEMBER(mplay_state::bios_6204_r) +uint8_t mplay_state::bios_6204_r() { return m_megadrive_io_data_regs[2]; // return (m_bios_width & 0xf8) + (m_bios_6204 & 0x07); } -WRITE8_MEMBER(mplay_state::bios_width_w) +void mplay_state::bios_width_w(uint8_t data) { m_bios_width = data; m_megadrive_io_data_regs[2] = (m_megadrive_io_data_regs[2] & 0x07) | ((data & 0xf8)); // logerror("BIOS: 0x6204 - Width write: %02x\n", data); } -READ8_MEMBER(mplay_state::bios_6404_r) +uint8_t mplay_state::bios_6404_r() { // logerror("BIOS: 0x6404 read: returned 0x%02x\n",bios_6404 | (bios_6403 & 0x10) >> 4); return ((m_bios_6403 & 0x10) >> 4); // return m_bios_6404 | (m_bios_6403 & 0x10) >> 4; } -WRITE8_MEMBER(mplay_state::bios_6404_w) +void mplay_state::bios_6404_w(uint8_t data) { if(((m_bios_6404 & 0x0c) == 0x00) && ((data & 0x0c) == 0x0c)) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); @@ -551,7 +551,7 @@ WRITE8_MEMBER(mplay_state::bios_6404_w) // logerror("BIOS: 0x6404 write: 0x%02x\n", data); } -READ8_MEMBER(mplay_state::bios_6600_r) +uint8_t mplay_state::bios_6600_r() { /* Multi-slot note: 0x6600 appears to be used to check for extra slots being used. @@ -562,7 +562,7 @@ READ8_MEMBER(mplay_state::bios_6600_r) return m_bios_6600;// & 0xfe; } -WRITE8_MEMBER(mplay_state::bios_6600_w) +void mplay_state::bios_6600_w(uint8_t data) { m_bios_6600 = data; // logerror("BIOS: 0x6600 write: 0x%02x\n",data); diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index 11077e1cacc..fbf597b6b7c 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -119,11 +119,11 @@ private: void megatech(machine_config &config); DECLARE_READ8_MEMBER(cart_select_r); - DECLARE_WRITE8_MEMBER(cart_select_w); - DECLARE_READ8_MEMBER(bios_portc_r); - DECLARE_READ8_MEMBER(bios_porte_r); - DECLARE_WRITE8_MEMBER(bios_portd_w); - DECLARE_WRITE8_MEMBER(bios_porte_w); + void cart_select_w(uint8_t data); + uint8_t bios_portc_r(); + uint8_t bios_porte_r(); + void bios_portd_w(uint8_t data); + void bios_porte_w(uint8_t data); DECLARE_READ8_MEMBER(read_68k_banked_data); DECLARE_WRITE8_MEMBER(write_68k_banked_data); DECLARE_WRITE8_MEMBER(mt_z80_bank_w); @@ -464,7 +464,7 @@ void mtech_state::switch_cart(int gameno) } } -WRITE8_MEMBER(mtech_state::cart_select_w) +void mtech_state::cart_select_w(uint8_t data) { /* seems to write the slot number.. but it stores something in (banked?) ram @@ -475,23 +475,23 @@ WRITE8_MEMBER(mtech_state::cart_select_w) } -READ8_MEMBER(mtech_state::bios_portc_r) +uint8_t mtech_state::bios_portc_r() { return 0; } -READ8_MEMBER(mtech_state::bios_porte_r) +uint8_t mtech_state::bios_porte_r() { return 0; } -WRITE8_MEMBER(mtech_state::bios_portd_w) +void mtech_state::bios_portd_w(uint8_t data) { output().set_value("Alarm_sound", BIT(data, 7)); m_bios_ctrl_inputs = data & 0x04; // Genesis/SMS input ports disable bit } -WRITE8_MEMBER(mtech_state::bios_porte_w) +void mtech_state::bios_porte_w(uint8_t data) { output().set_value("Flash_screen", BIT(data, 1)); } diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index b50cf8b7b72..f213e883de8 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -397,7 +397,7 @@ void mermaid_state::machine_reset() } /* Similar to Jantotsu, apparently the HW has three ports that controls what kind of sample should be played. Every sample size is 0x1000. */ -WRITE8_MEMBER(mermaid_state::adpcm_data_w) +void mermaid_state::adpcm_data_w(uint8_t data) { m_adpcm_data = data; m_adpcm->data_w(m_adpcm_trigger ? (data & 0x0f) : (data & 0xf0) >> 4); diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 013b2899006..9d7821eb376 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -69,12 +69,12 @@ CUSTOM_INPUT_MEMBER(mjkjidai_state::keyboard_r) return res; } -WRITE8_MEMBER(mjkjidai_state::keyboard_select_lo_w) +void mjkjidai_state::keyboard_select_lo_w(uint8_t data) { m_keyb = (m_keyb & 0xff00) | (data); } -WRITE8_MEMBER(mjkjidai_state::keyboard_select_hi_w) +void mjkjidai_state::keyboard_select_hi_w(uint8_t data) { m_keyb = (m_keyb & 0x00ff) | (data << 8); } diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index e8e4fe7f905..c4834a7a31e 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -613,7 +613,7 @@ READ8_MEMBER( model1_state::dpram_r ) return m_dpram->right_r(offset); } -WRITE8_MEMBER( model1_state::gen_outputs_w ) +void model1_state::gen_outputs_w(uint8_t data) { // generic output lines, output to outx where x = bit // eg. out0 = coin counter 1, see below for per-game descriptions @@ -623,7 +623,7 @@ WRITE8_MEMBER( model1_state::gen_outputs_w ) m_digits[1] = data; } -WRITE8_MEMBER( model1_state::vf_outputs_w ) +void model1_state::vf_outputs_w(uint8_t data) { // 7654---- unknown (not used?) // ----3--- start 2 lamp @@ -635,7 +635,7 @@ WRITE8_MEMBER( model1_state::vf_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::vr_outputs_w ) +void model1_state::vr_outputs_w(uint8_t data) { // 7------- race leader lamp // -6------ vr4 (green) lamp @@ -650,7 +650,7 @@ WRITE8_MEMBER( model1_state::vr_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::swa_outputs_w ) +void model1_state::swa_outputs_w(uint8_t data) { // 7------- unknown (not used?) // -6------ unknown (1 while in-game) @@ -665,7 +665,7 @@ WRITE8_MEMBER( model1_state::swa_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::wingwar_outputs_w ) +void model1_state::wingwar_outputs_w(uint8_t data) { // 7------- unknown (not used?) // -6------ view selector 4 lamp @@ -679,7 +679,7 @@ WRITE8_MEMBER( model1_state::wingwar_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::wingwar360_outputs_w ) +void model1_state::wingwar360_outputs_w(uint8_t data) { // 7654---- unknown (not used?) // ----3--- danger lamp @@ -691,7 +691,7 @@ WRITE8_MEMBER( model1_state::wingwar360_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::netmerc_outputs_w ) +void model1_state::netmerc_outputs_w(uint8_t data) { // 76------ unknown (not used?) // --54---- mvd backlights @@ -703,17 +703,17 @@ WRITE8_MEMBER( model1_state::netmerc_outputs_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model1_state::drive_board_w ) +void model1_state::drive_board_w(uint8_t data) { m_digits[0] = data; } -READ8_MEMBER( model1_state::r360_r ) +uint8_t model1_state::r360_r() { return m_r360_state; } -WRITE8_MEMBER( model1_state::r360_w ) +void model1_state::r360_w(uint8_t data) { /* this uses the feedback board protocol diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 8f500d03fca..b01f2d1d234 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -1182,27 +1182,27 @@ void model2_state::model2_5881_mem(address_map &map) // Interface board ID: 837-12079 // ALTERA FLEX + Sega 315-5338A -READ8_MEMBER( model2_state::lightgun_data_r ) +uint8_t model2_state::lightgun_data_r(offs_t offset) { uint16_t data = m_lightgun_ports[offset >> 1].read_safe(0); return BIT(offset, 0) ? (data >> 8) : data; } -READ8_MEMBER( model2_state::lightgun_mux_r ) +uint8_t model2_state::lightgun_mux_r() { if (m_lightgun_mux < 8) - return lightgun_data_r(space, m_lightgun_mux); + return lightgun_data_r(m_lightgun_mux); else - return lightgun_offscreen_r(space, 0); + return lightgun_offscreen_r(0); } -WRITE8_MEMBER( model2_state::lightgun_mux_w ) +void model2_state::lightgun_mux_w(uint8_t data) { m_lightgun_mux = data; } // handles offscreen gun trigger detection here -READ8_MEMBER( model2_state::lightgun_offscreen_r ) +uint8_t model2_state::lightgun_offscreen_r(offs_t offset) { // 5 percent border size const float BORDER_SIZE = 0.05f; @@ -1238,7 +1238,7 @@ READ8_MEMBER( model2_state::lightgun_offscreen_r ) // OUTPUTS //************************************************************************** -WRITE8_MEMBER( model2o_state::daytona_output_w ) +void model2o_state::daytona_output_w(uint8_t data) { // 7------- leader led // -6------ vr4 led @@ -1253,7 +1253,7 @@ WRITE8_MEMBER( model2o_state::daytona_output_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model2o_state::desert_output_w ) +void model2o_state::desert_output_w(uint8_t data) { // 7------- cannon motor // -6------ machine gun motor @@ -1268,7 +1268,7 @@ WRITE8_MEMBER( model2o_state::desert_output_w ) machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } -WRITE8_MEMBER( model2o_state::vcop_output_w ) +void model2o_state::vcop_output_w(uint8_t data) { // 7654---- unknown (not used?) // ----32-- start leds (always set together) @@ -1569,7 +1569,7 @@ void model2c_state::model2c_5881_mem(address_map &map) */ // simulate this so that it passes the initial checks -READ8_MEMBER( model2_state::rchase2_drive_board_r ) +uint8_t model2_state::rchase2_drive_board_r() { uint8_t data = 0xff; @@ -1585,12 +1585,12 @@ READ8_MEMBER( model2_state::rchase2_drive_board_r ) return data; } -WRITE8_MEMBER( model2_state::rchase2_drive_board_w ) +void model2_state::rchase2_drive_board_w(uint8_t data) { m_cmd_data = data; } -WRITE8_MEMBER( model2_state::drive_board_w ) +void model2_state::drive_board_w(uint8_t data) { m_driveio_comm_data = data; m_drivecpu->set_input_line(0, HOLD_LINE); @@ -1601,7 +1601,7 @@ WRITE8_MEMBER( model2_state::drive_board_w ) // INPUT HANDLING //************************************************************************** -WRITE8_MEMBER( model2_state::eeprom_w ) +void model2_state::eeprom_w(uint8_t data) { m_ctrlmode = BIT(data, 0); @@ -1610,7 +1610,7 @@ WRITE8_MEMBER( model2_state::eeprom_w ) m_eeprom->cs_write(BIT(data, 6) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( model2_state::in0_r ) +uint8_t model2_state::in0_r() { uint8_t data = m_in0->read(); @@ -2454,7 +2454,7 @@ void model2_state::scsp_map(address_map &map) map(0x000000, 0x07ffff).ram().share("soundram"); } -WRITE8_MEMBER(model2_state::scsp_irq) +void model2_state::scsp_irq(offs_t offset, uint8_t data) { m_audiocpu->set_input_line(offset, data); } @@ -2571,17 +2571,17 @@ void model2o_state::model2o(machine_config &config) M2COMM(config, "m2comm", 0); } -READ8_MEMBER(model2_state::driveio_portg_r) +uint8_t model2_state::driveio_portg_r() { return m_driveio_comm_data; } -READ8_MEMBER(model2_state::driveio_porth_r) +uint8_t model2_state::driveio_porth_r() { return m_driveio_comm_data; } -WRITE8_MEMBER(model2_state::driveio_port_w) +void model2_state::driveio_port_w(uint8_t data) { // TODO: hook up to the main CPU // popmessage("%02x",data); diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index e1d7eef66a2..6f7de140e41 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -1413,7 +1413,7 @@ MACHINE_RESET_MEMBER(model3_state,model3_21){ model3_init(0x21); } // INPUT HANDLING //************************************************************************** -WRITE8_MEMBER( model3_state::eeprom_w ) +void model3_state::eeprom_w(uint8_t data) { m_controls_bank = BIT(data, 0); @@ -1422,7 +1422,7 @@ WRITE8_MEMBER( model3_state::eeprom_w ) m_eeprom->cs_write(BIT(data, 6) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( model3_state::input_r ) +uint8_t model3_state::input_r() { if (m_controls_bank == 1) return (ioport("IN1")->read()); @@ -1430,7 +1430,7 @@ READ8_MEMBER( model3_state::input_r ) return (ioport("IN0")->read()); } -WRITE8_MEMBER( model3_state::lostwsga_ser1_w ) +void model3_state::lostwsga_ser1_w(uint8_t data) { switch (data) { @@ -1465,12 +1465,12 @@ WRITE8_MEMBER( model3_state::lostwsga_ser1_w ) } } -READ8_MEMBER( model3_state::lostwsga_ser2_r ) +uint8_t model3_state::lostwsga_ser2_r() { return m_serial_fifo2; } -WRITE8_MEMBER( model3_state::lostwsga_ser2_w ) +void model3_state::lostwsga_ser2_w(uint8_t data) { m_serial_fifo2 = data; } @@ -5882,7 +5882,7 @@ void model3_state::scsp2_map(address_map &map) map(0x000000, 0x07ffff).ram().share("soundram2"); } -WRITE8_MEMBER(model3_state::scsp_irq) +void model3_state::scsp_irq(offs_t offset, uint8_t data) { m_audiocpu->set_input_line(offset, data); } diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp index 7253545d3c0..3b17ab96cd1 100644 --- a/src/mame/drivers/mrflea.cpp +++ b/src/mame/drivers/mrflea.cpp @@ -87,7 +87,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mrflea_state::mrflea_slave_interrupt) m_pic->ir1_w(CLEAR_LINE); } -WRITE8_MEMBER(mrflea_state::mrflea_data1_w) +void mrflea_state::mrflea_data1_w(uint8_t data) { } diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index 6b9f898449a..257a486f3f9 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -2548,16 +2548,6 @@ static INPUT_PORTS_START( bikkuri ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END -READ8_MEMBER(nbmj8688_state::dipsw1_r) -{ - return m_nb1413m3->dipsw1_r(space,offset); -} - -READ8_MEMBER(nbmj8688_state::dipsw2_r) -{ - return m_nb1413m3->dipsw2_r(space,offset); -} - void nbmj8688_state::NBMJDRV_4096(machine_config &config) { /* basic machine hardware */ @@ -2584,8 +2574,8 @@ void nbmj8688_state::NBMJDRV_4096(machine_config &config) SPEAKER(config, "speaker").front_center(); ay8910_device &psg(AY8910(config, "psg", 1250000)); - psg.port_a_read_callback().set(FUNC(nbmj8688_state::dipsw1_r)); // DIPSW-A read - psg.port_b_read_callback().set(FUNC(nbmj8688_state::dipsw2_r)); // DIPSW-B read + psg.port_a_read_callback().set(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); // DIPSW-A read + psg.port_b_read_callback().set(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); // DIPSW-B read psg.add_route(ALL_OUTPUTS, "speaker", 0.35); DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC @@ -2772,8 +2762,8 @@ void nbmj8688_state::mbmj_p16bit_LCD(machine_config &config) SPEAKER(config, "speaker").front_center(); ay8910_device &psg(AY8910(config, "psg", 1250000)); - psg.port_a_read_callback().set(FUNC(nbmj8688_state::dipsw1_r)); // DIPSW-A read - psg.port_b_read_callback().set(FUNC(nbmj8688_state::dipsw2_r)); // DIPSW-B read + psg.port_a_read_callback().set(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); // DIPSW-A read + psg.port_b_read_callback().set(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); // DIPSW-B read psg.add_route(ALL_OUTPUTS, "speaker", 0.35); DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index ccf226021ef..267f980aa04 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -42,12 +42,12 @@ void nbmj9195_state::machine_start() save_item(NAME(m_mscoutm_inputport)); } -WRITE8_MEMBER(nbmj9195_state::soundbank_w) +void nbmj9195_state::soundbank_w(uint8_t data) { membank("soundbank")->set_entry(data & 0x03); } -WRITE8_MEMBER(nbmj9195_state::outcoin_flag_w) +void nbmj9195_state::outcoin_flag_w(uint8_t data) { // bit0: coin in counter // bit1: coin out counter @@ -68,7 +68,7 @@ int nbmj9195_state::dipsw_r() return (((ioport("DSWA")->read() & 0xff) | ((ioport("DSWB")->read() & 0xff) << 8)) >> m_dipswbitsel) & 0x01; } -WRITE8_MEMBER(nbmj9195_state::dipswbitsel_w) +void nbmj9195_state::dipswbitsel_w(uint8_t data) { switch (data & 0xc0) { @@ -87,12 +87,12 @@ WRITE8_MEMBER(nbmj9195_state::dipswbitsel_w) } } -WRITE8_MEMBER(nbmj9195_state::mscoutm_inputportsel_w) +void nbmj9195_state::mscoutm_inputportsel_w(uint8_t data) { m_mscoutm_inputport = (data ^ 0x1f); } -READ8_MEMBER(nbmj9195_state::mscoutm_dipsw_0_r) +uint8_t nbmj9195_state::mscoutm_dipsw_0_r() { // DIPSW A return (((ioport("DSWA")->read() & 0x01) << 7) | ((ioport("DSWA")->read() & 0x02) << 5) | @@ -101,7 +101,7 @@ READ8_MEMBER(nbmj9195_state::mscoutm_dipsw_0_r) ((ioport("DSWA")->read() & 0x40) >> 5) | ((ioport("DSWA")->read() & 0x80) >> 7)); } -READ8_MEMBER(nbmj9195_state::mscoutm_dipsw_1_r) +uint8_t nbmj9195_state::mscoutm_dipsw_1_r() { // DIPSW B return (((ioport("DSWB")->read() & 0x01) << 7) | ((ioport("DSWB")->read() & 0x02) << 5) | @@ -113,7 +113,7 @@ READ8_MEMBER(nbmj9195_state::mscoutm_dipsw_1_r) /* TMPZ84C011 PIO emulation */ -READ8_MEMBER(nbmj9195_state::mscoutm_cpu_portb_r) +uint8_t nbmj9195_state::mscoutm_cpu_portb_r() { // PLAYER1 KEY, DIPSW A/B switch (m_mscoutm_inputport) @@ -134,7 +134,7 @@ READ8_MEMBER(nbmj9195_state::mscoutm_cpu_portb_r) } } -READ8_MEMBER(nbmj9195_state::mscoutm_cpu_portc_r) +uint8_t nbmj9195_state::mscoutm_cpu_portc_r() { // PLAYER2 KEY switch (m_mscoutm_inputport) @@ -157,13 +157,13 @@ READ8_MEMBER(nbmj9195_state::mscoutm_cpu_portc_r) // other games -READ8_MEMBER(nbmj9195_state::others_cpu_porta_r) +uint8_t nbmj9195_state::others_cpu_porta_r() { // COIN IN, ETC... return ((ioport("SYSTEM")->read() & 0xfe) | m_outcoin_flag); } -READ8_MEMBER(nbmj9195_state::others_cpu_portb_r) +uint8_t nbmj9195_state::others_cpu_portb_r() { // PLAYER1 KEY, DIPSW A/B switch (m_inputport) @@ -183,7 +183,7 @@ READ8_MEMBER(nbmj9195_state::others_cpu_portb_r) } } -READ8_MEMBER(nbmj9195_state::others_cpu_portc_r) +uint8_t nbmj9195_state::others_cpu_portc_r() { // PLAYER2 KEY switch (m_inputport) @@ -203,7 +203,7 @@ READ8_MEMBER(nbmj9195_state::others_cpu_portc_r) } } -WRITE8_MEMBER(nbmj9195_state::soundcpu_porte_w) +void nbmj9195_state::soundcpu_porte_w(uint8_t data) { if (!(data & 0x01)) m_soundlatch->clear_w(); } diff --git a/src/mame/drivers/nichild.cpp b/src/mame/drivers/nichild.cpp index 7f3603dbfb2..caa2da669e3 100644 --- a/src/mame/drivers/nichild.cpp +++ b/src/mame/drivers/nichild.cpp @@ -52,14 +52,14 @@ public: void nichild(machine_config &config); private: - DECLARE_READ8_MEMBER(gfx_r); - DECLARE_READ8_MEMBER(mux_r); - DECLARE_WRITE8_MEMBER(mux_w); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_WRITE8_MEMBER(portb_w); - DECLARE_WRITE8_MEMBER(portc_w); - DECLARE_WRITE8_MEMBER(portd_w); - DECLARE_WRITE8_MEMBER(gfxbank_w); + uint8_t gfx_r(offs_t offset); + uint8_t mux_r(); + void mux_w(uint8_t data); + void porta_w(uint8_t data); + void portb_w(uint8_t data); + void portc_w(uint8_t data); + void portd_w(uint8_t data); + void gfxbank_w(uint8_t data); void nichild_io(address_map &map); void nichild_map(address_map &map); @@ -75,7 +75,7 @@ private: }; -READ8_MEMBER(nichild_state::gfx_r) +uint8_t nichild_state::gfx_r(offs_t offset) { uint32_t gfx_offset; @@ -90,40 +90,40 @@ READ8_MEMBER(nichild_state::gfx_r) //#include "debugger.h" -WRITE8_MEMBER(nichild_state::porta_w) +void nichild_state::porta_w(uint8_t data) { printf("PORTA %02x\n",data); // machine().debug_break(); } -WRITE8_MEMBER(nichild_state::portb_w) +void nichild_state::portb_w(uint8_t data) { printf("PORTB %02x\n",data); } -WRITE8_MEMBER(nichild_state::portc_w) +void nichild_state::portc_w(uint8_t data) { printf("PORTC %02x\n",data); } -WRITE8_MEMBER(nichild_state::portd_w) +void nichild_state::portd_w(uint8_t data) { printf("PORTD %02x\n",data); } -WRITE8_MEMBER(nichild_state::gfxbank_w) +void nichild_state::gfxbank_w(uint8_t data) { // TODO: ldquiz4 checks up to 0x30, what for? m_gfx_bank = data * 0x8000; } -READ8_MEMBER(nichild_state::mux_r) +uint8_t nichild_state::mux_r() { // TODO return 0xff; } -WRITE8_MEMBER(nichild_state::mux_w) +void nichild_state::mux_w(uint8_t data) { // ... } diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index 9bd242531fc..b26bc66eb9f 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -102,8 +102,8 @@ private: DECLARE_READ8_MEMBER(royalqn_comm_r); DECLARE_WRITE8_MEMBER(royalqn_comm_w); DECLARE_WRITE8_MEMBER(mux_w); - DECLARE_READ8_MEMBER(input_1p_r); - DECLARE_READ8_MEMBER(input_2p_r); + uint8_t input_1p_r(); + uint8_t input_2p_r(); DECLARE_WRITE8_MEMBER(output_w); DECLARE_READ8_MEMBER(sexygal_soundram_r); DECLARE_READ8_MEMBER(sexygal_unknown_sound_r); @@ -309,7 +309,7 @@ WRITE8_MEMBER(nightgal_state::mux_w) //printf("%02x\n", m_mux_data); } -READ8_MEMBER(nightgal_state::input_1p_r) +uint8_t nightgal_state::input_1p_r() { uint8_t cr_clear = m_io_cr_clear->read(); @@ -328,7 +328,7 @@ READ8_MEMBER(nightgal_state::input_1p_r) m_io_pl1_4->read() & m_io_pl1_5->read() & m_io_pl1_6->read()) | cr_clear; } -READ8_MEMBER(nightgal_state::input_2p_r) +uint8_t nightgal_state::input_2p_r() { uint8_t coin_port = m_io_coins->read(); diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 5f02e7ea0b8..27fb69507f2 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -96,7 +96,7 @@ READ16_MEMBER(niyanpai_state::musobana_inputport_0_r) return (portdata); } -WRITE16_MEMBER(niyanpai_state::tmp68301_parallel_port_w) +void niyanpai_state::tmp68301_parallel_port_w(uint16_t data) { // tmp68301_parallel_interface[0x05] // bit 0 coin counter diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 0220da15862..0a5da777a4a 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -62,9 +62,9 @@ private: DECLARE_READ8_MEMBER(z80_io_02_r); DECLARE_WRITE8_MEMBER(z80_io_17_w); DECLARE_WRITE8_MEMBER(z80_io_37_w); - DECLARE_WRITE8_MEMBER(i8155_a_w); - DECLARE_WRITE8_MEMBER(i8155_b_w); - DECLARE_WRITE8_MEMBER(i8155_c_w); + void i8155_a_w(uint8_t data); + void i8155_b_w(uint8_t data); + void i8155_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(i8155_timer_out); void paranoia_8085_io_map(address_map &map); void paranoia_8085_map(address_map &map); @@ -144,17 +144,17 @@ void paranoia_state::paranoia_z80_io_map(address_map &map) map(0x37, 0x37).w(FUNC(paranoia_state::z80_io_37_w)); } -WRITE8_MEMBER(paranoia_state::i8155_a_w) +void paranoia_state::i8155_a_w(uint8_t data) { //logerror("i8155 Port A: %02X\n", data); } -WRITE8_MEMBER(paranoia_state::i8155_b_w) +void paranoia_state::i8155_b_w(uint8_t data) { //logerror("i8155 Port B: %02X\n", data); } -WRITE8_MEMBER(paranoia_state::i8155_c_w) +void paranoia_state::i8155_c_w(uint8_t data) { //logerror("i8155 Port C: %02X\n", data); } diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 68e75995f4e..dfb52b9ac93 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -205,7 +205,7 @@ WRITE16_MEMBER(playmark_state::playmark_snd_command_w) } } -READ8_MEMBER(playmark_state::playmark_snd_command_r) +uint8_t playmark_state::playmark_snd_command_r() { int data = 0; @@ -223,7 +223,7 @@ READ8_MEMBER(playmark_state::playmark_snd_command_r) return data; } -READ8_MEMBER(playmark_state::playmark_snd_flag_r) +uint8_t playmark_state::playmark_snd_flag_r() { if (m_snd_flag) { @@ -235,7 +235,7 @@ READ8_MEMBER(playmark_state::playmark_snd_flag_r) } -WRITE8_MEMBER(playmark_state::playmark_oki_banking_w) +void playmark_state::playmark_oki_banking_w(uint8_t data) { logerror("%s Writing %02x to PortA (OKI bank select)\n",machine().describe_context(),data); @@ -244,12 +244,12 @@ WRITE8_MEMBER(playmark_state::playmark_oki_banking_w) m_okibank->set_entry(bank & (m_oki_numbanks - 1)); } -WRITE8_MEMBER(playmark_state::playmark_oki_w) +void playmark_state::playmark_oki_w(uint8_t data) { m_oki_command = data; } -WRITE8_MEMBER(playmark_state::playmark_snd_control_w) +void playmark_state::playmark_snd_control_w(uint8_t data) { /* This port controls communications to and from the 68K and the OKI device. @@ -272,7 +272,7 @@ WRITE8_MEMBER(playmark_state::playmark_snd_control_w) } } -WRITE8_MEMBER(playmark_state::hrdtimes_snd_control_w) +void playmark_state::hrdtimes_snd_control_w(uint8_t data) { /* This port controls communications to and from the 68K and the OKI device. See playmark_snd_control_w above. OKI banking is also handled here. */ diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp index f1a012750bb..ac6e418be19 100644 --- a/src/mame/drivers/ron.cpp +++ b/src/mame/drivers/ron.cpp @@ -64,11 +64,11 @@ private: DECLARE_READ8_MEMBER(p2_mux_r); DECLARE_WRITE8_MEMBER(mux_w); DECLARE_WRITE8_MEMBER(sound_cmd_w); - DECLARE_READ8_MEMBER(audio_cmd_r); - DECLARE_WRITE8_MEMBER(audio_p1_w); - DECLARE_WRITE8_MEMBER(audio_p2_w); + uint8_t audio_cmd_r(); + void audio_p1_w(uint8_t data); + void audio_p2_w(uint8_t data); DECLARE_READ_LINE_MEMBER(audio_t1_r); - DECLARE_WRITE8_MEMBER(ay_pa_w); + void ay_pa_w(uint8_t data); void ron_audio_io(address_map &map); void ron_audio_map(address_map &map); @@ -438,12 +438,12 @@ WRITE_LINE_MEMBER(ron_state::vblank_irq) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -READ8_MEMBER(ron_state::audio_cmd_r) +uint8_t ron_state::audio_cmd_r() { return m_sound_command << 3; } -WRITE8_MEMBER(ron_state::audio_p1_w) +void ron_state::audio_p1_w(uint8_t data) { //address_space &space = m_audiocpu->space(AS_PROGRAM); @@ -456,7 +456,7 @@ WRITE8_MEMBER(ron_state::audio_p1_w) m_ay->data_w(data); } -WRITE8_MEMBER(ron_state::audio_p2_w) +void ron_state::audio_p2_w(uint8_t data) { // TODO: guesswork, presumably f/f based // p2 ff @@ -482,7 +482,7 @@ READ_LINE_MEMBER(ron_state::audio_t1_r) return !BIT(m_sound_command, 6); } -WRITE8_MEMBER(ron_state::ay_pa_w) +void ron_state::ay_pa_w(uint8_t data) { } diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index b81750ea784..657a51e3c69 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -483,10 +483,10 @@ private: DECLARE_WRITE32_MEMBER(saturn_null_ram_w); void saturn_init_driver(int rgn); - DECLARE_READ8_MEMBER(saturn_pdr1_direct_r); - DECLARE_READ8_MEMBER(saturn_pdr2_direct_r); - DECLARE_WRITE8_MEMBER(saturn_pdr1_direct_w); - DECLARE_WRITE8_MEMBER(saturn_pdr2_direct_w); + uint8_t saturn_pdr1_direct_r(); + uint8_t saturn_pdr2_direct_r(); + void saturn_pdr1_direct_w(uint8_t data); + void saturn_pdr2_direct_w(uint8_t data); uint8_t m_direct_mux[2]; uint8_t saturn_direct_port_read(bool which); uint8_t smpc_direct_mode(uint16_t in_value, bool which); @@ -699,22 +699,22 @@ MACHINE_RESET_MEMBER(sat_console_state,saturn) m_vdp2.old_tvmd = -1; } -READ8_MEMBER( sat_console_state::saturn_pdr1_direct_r ) +uint8_t sat_console_state::saturn_pdr1_direct_r() { return saturn_direct_port_read(false); } -READ8_MEMBER( sat_console_state::saturn_pdr2_direct_r ) +uint8_t sat_console_state::saturn_pdr2_direct_r() { return saturn_direct_port_read(true); } -WRITE8_MEMBER( sat_console_state::saturn_pdr1_direct_w ) +void sat_console_state::saturn_pdr1_direct_w(uint8_t data) { m_direct_mux[0] = data; } -WRITE8_MEMBER( sat_console_state::saturn_pdr2_direct_w ) +void sat_console_state::saturn_pdr2_direct_w(uint8_t data) { m_direct_mux[1] = data; } diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index a10be682f5b..c1957d3ab6c 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -184,9 +184,9 @@ private: DECLARE_WRITE_LINE_MEMBER(vdp_lv6irqline_callback_c2); DECLARE_WRITE_LINE_MEMBER(vdp_lv4irqline_callback_c2); - DECLARE_READ8_MEMBER(io_portc_r); - DECLARE_WRITE8_MEMBER(io_portd_w); - DECLARE_WRITE8_MEMBER(io_porth_w); + uint8_t io_portc_r(); + void io_portd_w(uint8_t data); + void io_porth_w(uint8_t data); DECLARE_WRITE16_MEMBER( segac2_upd7759_w ); DECLARE_READ16_MEMBER( palette_r ); @@ -444,7 +444,7 @@ void segac2_state::recompute_palette_tables() Sega 315-5296 I/O chip ******************************************************************************/ -READ8_MEMBER(segac2_state::io_portc_r) +uint8_t segac2_state::io_portc_r() { // D7 : From MB3773P pin 1. (/RESET output) // D6 : From uPD7759 pin 18. (/BUSY output) @@ -452,7 +452,7 @@ READ8_MEMBER(segac2_state::io_portc_r) return 0xbf | busy; } -WRITE8_MEMBER(segac2_state::io_portd_w) +void segac2_state::io_portd_w(uint8_t data) { /* D7 : To pin 3 of JP15. (Watchdog clock control) @@ -470,7 +470,7 @@ WRITE8_MEMBER(segac2_state::io_portd_w) machine().bookkeeping().coin_counter_w(0, data & 0x01); } -WRITE8_MEMBER(segac2_state::io_porth_w) +void segac2_state::io_porth_w(uint8_t data) { /* D7 : To pin A19 of CN4 diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 93247f6ccaa..b73b75e57fc 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -297,7 +297,7 @@ WRITE8_MEMBER(segag80r_state::coin_count_w) * *************************************/ -WRITE8_MEMBER(segag80r_state::sindbadm_misc_w) +void segag80r_state::sindbadm_misc_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x02); m_audiocpu->set_input_line(INPUT_LINE_NMI, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index ee677c7015c..abfdf83238b 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -45,7 +45,7 @@ const uint32_t MASTER_CLOCK_8MHz = 8000000; // display enable, lamps, and coin counters //------------------------------------------------- -WRITE8_MEMBER( segahang_state::video_lamps_w ) +void segahang_state::video_lamps_w(uint8_t data) { // // Main PPI port B @@ -88,7 +88,7 @@ WRITE8_MEMBER( segahang_state::video_lamps_w ) // tilemap control and global sound mute //------------------------------------------------- -WRITE8_MEMBER( segahang_state::tilemap_sound_w ) +void segahang_state::tilemap_sound_w(uint8_t data) { // // Main PPI port C @@ -120,7 +120,7 @@ WRITE8_MEMBER( segahang_state::tilemap_sound_w ) // selects //------------------------------------------------- -WRITE8_MEMBER( segahang_state::sub_control_adc_w ) +void segahang_state::sub_control_adc_w(uint8_t data) { // // Sub PPI port A @@ -145,7 +145,7 @@ WRITE8_MEMBER( segahang_state::sub_control_adc_w ) // adc_status_r - get ADC status //------------------------------------------------- -READ8_MEMBER( segahang_state::adc_status_r ) +uint8_t segahang_state::adc_status_r() { // // D7 = 0 (left open) diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index 50b81dbb3eb..efb914a5742 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -60,12 +60,12 @@ public: DECLARE_READ_LINE_MEMBER(hopper_sensors_r); private: - DECLARE_READ8_MEMBER(coin_counter_r); - DECLARE_WRITE8_MEMBER(coin_counter_w); - DECLARE_WRITE8_MEMBER(hopper_w); - DECLARE_WRITE8_MEMBER(lamps1_w); - DECLARE_WRITE8_MEMBER(lamps2_w); - DECLARE_WRITE8_MEMBER(coinlockout_w); + uint8_t coin_counter_r(); + void coin_counter_w(uint8_t data); + void hopper_w(uint8_t data); + void lamps1_w(uint8_t data); + void lamps2_w(uint8_t data); + void coinlockout_w(uint8_t data); // driver_device overrides virtual void machine_start() override; @@ -90,34 +90,34 @@ private: }; -READ8_MEMBER(segajw_state::coin_counter_r) +uint8_t segajw_state::coin_counter_r() { return m_coin_counter ^ 0xff; } -WRITE8_MEMBER(segajw_state::coin_counter_w) +void segajw_state::coin_counter_w(uint8_t data) { m_coin_counter = data; } -WRITE8_MEMBER(segajw_state::hopper_w) +void segajw_state::hopper_w(uint8_t data) { m_hopper_start_cycles = data & 0x02 ? 0 : m_maincpu->total_cycles(); } -WRITE8_MEMBER(segajw_state::lamps1_w) +void segajw_state::lamps1_w(uint8_t data) { for (int i = 0; i < 8; i++) m_lamps[i] = BIT(data, i); } -WRITE8_MEMBER(segajw_state::lamps2_w) +void segajw_state::lamps2_w(uint8_t data) { for (int i = 0; i < 8; i++) m_lamps[8 + i] = BIT(data, i); } -WRITE8_MEMBER(segajw_state::coinlockout_w) +void segajw_state::coinlockout_w(uint8_t data) { machine().bookkeeping().coin_lockout_w(0, data & 1); diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index 194f33cb886..3e0e0ea9040 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -80,12 +80,12 @@ void seicross_state::machine_reset() -READ8_MEMBER(seicross_state::portB_r) +uint8_t seicross_state::portB_r() { return (m_portb & 0x9f) | (m_debug_port.read_safe(0) & 0x60); } -WRITE8_MEMBER(seicross_state::portB_w) +void seicross_state::portB_w(uint8_t data) { //logerror("PC %04x: 8910 port B = %02x\n", m_maincpu->pc(), data); /* bit 0 is IRQ enable */ diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index 6cb9436f92d..b46e8499195 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -422,7 +422,7 @@ void powerbls_state::powerbls_map(address_map &map) Sound MCU mapping */ -READ8_MEMBER(sslam_state::playmark_snd_command_r) +uint8_t sslam_state::playmark_snd_command_r() { uint8_t data = 0; @@ -434,12 +434,12 @@ READ8_MEMBER(sslam_state::playmark_snd_command_r) return data; } -WRITE8_MEMBER(sslam_state::playmark_oki_w) +void sslam_state::playmark_oki_w(uint8_t data) { m_oki_command = data; } -WRITE8_MEMBER(sslam_state::playmark_snd_control_w) +void sslam_state::playmark_snd_control_w(uint8_t data) { m_oki_control = data; diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp index c78ae5088e3..48a86334fe8 100644 --- a/src/mame/drivers/thief.cpp +++ b/src/mame/drivers/thief.cpp @@ -97,12 +97,12 @@ void thief_state::tape_set_motor( int bOn ) /***********************************************************/ -WRITE8_MEMBER( thief_state::thief_input_select_w ) +void thief_state::thief_input_select_w(uint8_t data) { m_input_select = data; } -WRITE8_MEMBER( thief_state::tape_control_w ) +void thief_state::tape_control_w(uint8_t data) { // avoid bogus coin counts after reset if (data == 0x00) @@ -121,7 +121,7 @@ WRITE8_MEMBER( thief_state::tape_control_w ) tape_set_audio(kCrashTrack, BIT(data, 6) ? 0 : 1); } -READ8_MEMBER( thief_state::thief_io_r ) +uint8_t thief_state::thief_io_r() { uint8_t data = 0xff; diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 0bacaae49da..a66c6e14d1b 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -204,10 +204,10 @@ public: void tourvision(machine_config &config); private: - DECLARE_WRITE8_MEMBER(tourvision_8085_d000_w); - DECLARE_WRITE8_MEMBER(tourvision_i8155_a_w); - DECLARE_WRITE8_MEMBER(tourvision_i8155_b_w); - DECLARE_WRITE8_MEMBER(tourvision_i8155_c_w); + void tourvision_8085_d000_w(uint8_t data); + void tourvision_i8155_a_w(uint8_t data); + void tourvision_i8155_b_w(uint8_t data); + void tourvision_i8155_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tourvision_timer_out); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -349,7 +349,7 @@ void tourvision_state::pce_io(address_map &map) map(0x00, 0x03).rw("huc6270", FUNC(huc6270_device::read), FUNC(huc6270_device::write)); } -WRITE8_MEMBER(tourvision_state::tourvision_8085_d000_w) +void tourvision_state::tourvision_8085_d000_w(uint8_t data) { //logerror( "D000 (8085) write %02x\n", data ); } @@ -368,18 +368,18 @@ void tourvision_state::tourvision_8085_map(address_map &map) map(0xf000, 0xf000).nopr(); // protection or internal counter ? there is sometimes some data in BIOS0 which is replaced by 0xff in BIOS1 } -WRITE8_MEMBER(tourvision_state::tourvision_i8155_a_w) +void tourvision_state::tourvision_i8155_a_w(uint8_t data) { //logerror("i8155 Port A: %02X\n", data); } -WRITE8_MEMBER(tourvision_state::tourvision_i8155_b_w) +void tourvision_state::tourvision_i8155_b_w(uint8_t data) { // Selects game slot in bits 0 - 1 //logerror("i8155 Port B: %02X\n", data); } -WRITE8_MEMBER(tourvision_state::tourvision_i8155_c_w) +void tourvision_state::tourvision_i8155_c_w(uint8_t data) { //logerror("i8155 Port C: %02X\n", data); } diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index baf3d20546c..249636c4e41 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -593,27 +593,27 @@ void tubep_state::rjammer_sound_portmap(address_map &map) } -WRITE8_MEMBER(tubep_state::ay8910_portA_0_w) +void tubep_state::ay8910_portA_0_w(uint8_t data) { //analog sound control } -WRITE8_MEMBER(tubep_state::ay8910_portB_0_w) +void tubep_state::ay8910_portB_0_w(uint8_t data) { //analog sound control } -WRITE8_MEMBER(tubep_state::ay8910_portA_1_w) +void tubep_state::ay8910_portA_1_w(uint8_t data) { //analog sound control } -WRITE8_MEMBER(tubep_state::ay8910_portB_1_w) +void tubep_state::ay8910_portB_1_w(uint8_t data) { //analog sound control } -WRITE8_MEMBER(tubep_state::ay8910_portA_2_w) +void tubep_state::ay8910_portA_2_w(uint8_t data) { //analog sound control } -WRITE8_MEMBER(tubep_state::ay8910_portB_2_w) +void tubep_state::ay8910_portB_2_w(uint8_t data) { //analog sound control } diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index c46f10a6e81..473ad31203c 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -46,8 +46,8 @@ public: /* devices */ required_device<cpu_device> m_subcpu; - DECLARE_READ8_MEMBER(angeklds_ff_r) { return 0xff; }; - DECLARE_WRITE8_MEMBER(angelkds_cpu_bank_write); + uint8_t angeklds_ff_r() { return 0xff; }; + void angelkds_cpu_bank_write(uint8_t data); DECLARE_WRITE8_MEMBER(angelkds_main_sound_w); DECLARE_READ8_MEMBER(angelkds_main_sound_r); DECLARE_WRITE8_MEMBER(angelkds_sub_sound_w); diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index e7f85f620f3..3ef2fc51cf1 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -77,9 +77,9 @@ class dc_state : public driver_device DECLARE_WRITE64_MEMBER( dc_g2_ctrl_w ); DECLARE_READ64_MEMBER( dc_modem_r ); DECLARE_WRITE64_MEMBER( dc_modem_w ); - DECLARE_WRITE8_MEMBER( g1_irq ); - DECLARE_WRITE8_MEMBER( pvr_irq ); - DECLARE_WRITE8_MEMBER( maple_irq ); + void g1_irq(uint8_t data); + void pvr_irq(uint8_t data); + void maple_irq(uint8_t data); DECLARE_READ16_MEMBER( soundram_r ); DECLARE_WRITE16_MEMBER( soundram_w ); DECLARE_WRITE_LINE_MEMBER(aica_irq); diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 2a4fe86a4b0..657682729f2 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -42,12 +42,12 @@ private: DECLARE_READ16_MEMBER(histryma_700000_r); DECLARE_READ16_MEMBER(bbprot_700000_r); DECLARE_WRITE16_MEMBER(fitfight_700000_w); - DECLARE_READ8_MEMBER(snd_porta_r); - DECLARE_READ8_MEMBER(snd_portb_r); - DECLARE_READ8_MEMBER(snd_portc_r); - DECLARE_WRITE8_MEMBER(snd_porta_w); - DECLARE_WRITE8_MEMBER(snd_portb_w); - DECLARE_WRITE8_MEMBER(snd_portc_w); + uint8_t snd_porta_r(); + uint8_t snd_portb_r(); + uint8_t snd_portc_r(); + void snd_porta_w(uint8_t data); + void snd_portb_w(uint8_t data); + void snd_portc_w(uint8_t data); DECLARE_WRITE16_MEMBER(fof_bak_tileram_w); DECLARE_WRITE16_MEMBER(fof_mid_tileram_w); DECLARE_WRITE16_MEMBER(fof_txt_tileram_w); diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 682c5976a74..1510154ec55 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -31,15 +31,15 @@ public: DECLARE_INPUT_CHANGED_MEMBER(right_coin_inserted); private: - DECLARE_READ8_MEMBER(sensors1_r); - DECLARE_READ8_MEMBER(sensors2_r); - DECLARE_WRITE8_MEMBER(lamp_w); - DECLARE_WRITE8_MEMBER(coin_w); + uint8_t sensors1_r(); + uint8_t sensors2_r(); + void lamp_w(uint8_t data); + void coin_w(uint8_t data); DECLARE_WRITE8_MEMBER(vram_fg_w); DECLARE_WRITE8_MEMBER(vram_bg_w); - DECLARE_WRITE8_MEMBER(scroll_x_w); - DECLARE_WRITE8_MEMBER(scroll_y_w); - DECLARE_WRITE8_MEMBER(gfxbank_w); + void scroll_x_w(uint8_t data); + void scroll_y_w(uint8_t data); + void gfxbank_w(uint8_t data); INTERRUPT_GEN_MEMBER(vblank_interrupt); diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 1200248fc90..3f5cfe627b8 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -64,8 +64,8 @@ private: DECLARE_WRITE16_MEMBER(cpu_irq_ack_w); DECLARE_READ8_MEMBER(sound_r); DECLARE_WRITE16_MEMBER(vreg_w); - DECLARE_WRITE8_MEMBER(ay8910_portB_0_w); - DECLARE_WRITE8_MEMBER(ay8910_portA_0_w); + void ay8910_portB_0_w(uint8_t data); + void ay8910_portA_0_w(uint8_t data); void magmax_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 31d43d03d77..05cc1430346 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -91,7 +91,7 @@ private: DECLARE_WRITE_LINE_MEMBER(rougien_sample_rom_lo_w); DECLARE_WRITE_LINE_MEMBER(rougien_sample_rom_hi_w); DECLARE_WRITE_LINE_MEMBER(rougien_sample_playback_w); - DECLARE_WRITE8_MEMBER(adpcm_data_w); + void adpcm_data_w(uint8_t data); DECLARE_WRITE8_MEMBER(mermaid_videoram2_w); DECLARE_WRITE8_MEMBER(mermaid_videoram_w); DECLARE_WRITE8_MEMBER(mermaid_colorram_w); diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 887c36f6b5c..8130af068d1 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -48,10 +48,10 @@ private: bool m_display_enable; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(keyboard_select_lo_w); - DECLARE_WRITE8_MEMBER(keyboard_select_hi_w); + void keyboard_select_lo_w(uint8_t data); + void keyboard_select_hi_w(uint8_t data); DECLARE_WRITE8_MEMBER(mjkjidai_videoram_w); - DECLARE_WRITE8_MEMBER(mjkjidai_ctrl_w); + void mjkjidai_ctrl_w(uint8_t data); DECLARE_WRITE8_MEMBER(adpcm_w); DECLARE_WRITE_LINE_MEMBER(adpcm_int); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index a18ca212966..e7109b98c90 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -145,8 +145,8 @@ private: u32 m_copro_ram_adr[4]; uint16_t m_r360_state; - DECLARE_READ8_MEMBER(r360_r); - DECLARE_WRITE8_MEMBER(r360_w); + uint8_t r360_r(); + void r360_w(uint8_t data); // Rendering virtual void video_start() override; @@ -348,14 +348,14 @@ private: output_finder<2> m_digits; output_finder<8> m_outs; DECLARE_READ8_MEMBER(dpram_r); - DECLARE_WRITE8_MEMBER(gen_outputs_w); - DECLARE_WRITE8_MEMBER(vf_outputs_w); - DECLARE_WRITE8_MEMBER(vr_outputs_w); - DECLARE_WRITE8_MEMBER(swa_outputs_w); - DECLARE_WRITE8_MEMBER(wingwar_outputs_w); - DECLARE_WRITE8_MEMBER(wingwar360_outputs_w); - DECLARE_WRITE8_MEMBER(netmerc_outputs_w); - DECLARE_WRITE8_MEMBER(drive_board_w); + void gen_outputs_w(uint8_t data); + void vf_outputs_w(uint8_t data); + void vr_outputs_w(uint8_t data); + void swa_outputs_w(uint8_t data); + void wingwar_outputs_w(uint8_t data); + void wingwar360_outputs_w(uint8_t data); + void netmerc_outputs_w(uint8_t data); + void drive_board_w(uint8_t data); }; #endif // MAME_INCLUDES_MODEL1_H diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index dbe87feb7d4..34ff8d6e633 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -169,18 +169,18 @@ protected: DECLARE_WRITE16_MEMBER(palette_w); DECLARE_READ16_MEMBER(colorxlat_r); DECLARE_WRITE16_MEMBER(colorxlat_w); - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_READ8_MEMBER(in0_r); + void eeprom_w(uint8_t data); + uint8_t in0_r(); DECLARE_READ32_MEMBER(fifo_control_2a_r); DECLARE_READ32_MEMBER(videoctl_r); DECLARE_WRITE32_MEMBER(videoctl_w); - DECLARE_READ8_MEMBER(rchase2_drive_board_r); - DECLARE_WRITE8_MEMBER(rchase2_drive_board_w); - DECLARE_WRITE8_MEMBER(drive_board_w); - DECLARE_READ8_MEMBER(lightgun_data_r); - DECLARE_READ8_MEMBER(lightgun_mux_r); - DECLARE_WRITE8_MEMBER(lightgun_mux_w); - DECLARE_READ8_MEMBER(lightgun_offscreen_r); + uint8_t rchase2_drive_board_r(); + void rchase2_drive_board_w(uint8_t data); + void drive_board_w(uint8_t data); + uint8_t lightgun_data_r(offs_t offset); + uint8_t lightgun_mux_r(); + void lightgun_mux_w(uint8_t data); + uint8_t lightgun_offscreen_r(offs_t offset); DECLARE_READ32_MEMBER(irq_request_r); DECLARE_WRITE32_MEMBER(irq_ack_w); DECLARE_READ32_MEMBER(irq_enable_r); @@ -188,8 +188,8 @@ protected: DECLARE_READ32_MEMBER(model2_serial_r); DECLARE_WRITE32_MEMBER(model2o_serial_w); DECLARE_WRITE32_MEMBER(model2_serial_w); - DECLARE_WRITE16_MEMBER(horizontal_sync_w); - DECLARE_WRITE16_MEMBER(vertical_sync_w); + void horizontal_sync_w(uint16_t data); + void vertical_sync_w(uint16_t data); DECLARE_READ32_MEMBER(doa_prot_r); DECLARE_READ32_MEMBER(doa_unk_r); void sega_0229_map(address_map &map); @@ -210,9 +210,9 @@ protected: DECLARE_READ8_MEMBER(tgpid_r); DECLARE_READ32_MEMBER(polygon_count_r); - DECLARE_READ8_MEMBER(driveio_portg_r); - DECLARE_READ8_MEMBER(driveio_porth_r); - DECLARE_WRITE8_MEMBER(driveio_port_w); + uint8_t driveio_portg_r(); + uint8_t driveio_porth_r(); + void driveio_port_w(uint8_t data); void push_geo_data(uint32_t data); DECLARE_VIDEO_START(model2); void reset_model2_scsp(); @@ -220,7 +220,7 @@ protected: // DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2); // DECLARE_WRITE_LINE_MEMBER(sound_ready_w); TIMER_DEVICE_CALLBACK_MEMBER(model2_timer_cb); - DECLARE_WRITE8_MEMBER(scsp_irq); + void scsp_irq(offs_t offset, uint8_t data); void model2_3d_frame_start( void ); void geo_parse( void ); @@ -399,9 +399,9 @@ public: protected: DECLARE_READ32_MEMBER(fifo_control_2o_r); - DECLARE_WRITE8_MEMBER(daytona_output_w); - DECLARE_WRITE8_MEMBER(desert_output_w); - DECLARE_WRITE8_MEMBER(vcop_output_w); + void daytona_output_w(uint8_t data); + void desert_output_w(uint8_t data); + void vcop_output_w(uint8_t data); void model2o_mem(address_map &map); }; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 018f61fcab5..40469919aa3 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -285,11 +285,11 @@ private: DECLARE_READ64_MEMBER(real3d_dma_r); DECLARE_WRITE64_MEMBER(real3d_dma_w); - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(lostwsga_ser1_w); - DECLARE_READ8_MEMBER(lostwsga_ser2_r); - DECLARE_WRITE8_MEMBER(lostwsga_ser2_w); + void eeprom_w(uint8_t data); + uint8_t input_r(); + void lostwsga_ser1_w(uint8_t data); + uint8_t lostwsga_ser2_r(); + void lostwsga_ser2_w(uint8_t data); DECLARE_READ64_MEMBER(model3_sys_r); DECLARE_WRITE64_MEMBER(model3_sys_w); @@ -319,7 +319,7 @@ private: TIMER_CALLBACK_MEMBER(model3_scan_timer_tick); TIMER_DEVICE_CALLBACK_MEMBER(model3_interrupt); void model3_exit(); - DECLARE_WRITE8_MEMBER(scsp_irq); + void scsp_irq(offs_t offset, uint8_t data); void real3d_dma_callback(uint32_t src, uint32_t dst, int length, int byteswap); uint32_t scsi_fetch(uint32_t dsp); void scsi_irq_callback(int state); diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 36bc915f5ae..d799a5f8800 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -48,7 +48,7 @@ private: required_device<screen_device> m_screen; required_device<palette_device> m_palette; - DECLARE_WRITE8_MEMBER(mrflea_data1_w); + void mrflea_data1_w(uint8_t data); DECLARE_WRITE8_MEMBER(mrflea_gfx_bank_w); DECLARE_WRITE8_MEMBER(mrflea_videoram_w); DECLARE_WRITE8_MEMBER(mrflea_spriteram_w); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 5ea25c47135..e09b56d661c 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -119,8 +119,6 @@ private: DECLARE_WRITE8_MEMBER(seiha_romsel_w); DECLARE_WRITE8_MEMBER(HD61830B_both_instr_w); DECLARE_WRITE8_MEMBER(HD61830B_both_data_w); - DECLARE_READ8_MEMBER(dipsw1_r); - DECLARE_READ8_MEMBER(dipsw2_r); DECLARE_WRITE8_MEMBER(barline_output_w); DECLARE_VIDEO_START(mbmj8688_pure_12bit); diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 3a2c7024c3b..161bff1fff3 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -114,16 +114,16 @@ private: int m_flipscreen_old[VRAM_MAX]; emu_timer *m_blitter_timer; - DECLARE_WRITE8_MEMBER(soundbank_w); + void soundbank_w(uint8_t data); DECLARE_WRITE8_MEMBER(inputportsel_w); - DECLARE_READ8_MEMBER(mscoutm_dipsw_0_r); - DECLARE_READ8_MEMBER(mscoutm_dipsw_1_r); - DECLARE_READ8_MEMBER(mscoutm_cpu_portb_r); - DECLARE_READ8_MEMBER(mscoutm_cpu_portc_r); - DECLARE_READ8_MEMBER(others_cpu_porta_r); - DECLARE_READ8_MEMBER(others_cpu_portb_r); - DECLARE_READ8_MEMBER(others_cpu_portc_r); - DECLARE_WRITE8_MEMBER(soundcpu_porte_w); + uint8_t mscoutm_dipsw_0_r(); + uint8_t mscoutm_dipsw_1_r(); + uint8_t mscoutm_cpu_portb_r(); + uint8_t mscoutm_cpu_portc_r(); + uint8_t others_cpu_porta_r(); + uint8_t others_cpu_portb_r(); + uint8_t others_cpu_portc_r(); + void soundcpu_porte_w(uint8_t data); DECLARE_WRITE8_MEMBER(palette_w); DECLARE_WRITE8_MEMBER(nb22090_palette_w); DECLARE_WRITE8_MEMBER(blitter_0_w); @@ -132,11 +132,11 @@ private: DECLARE_READ8_MEMBER(blitter_1_r); DECLARE_WRITE8_MEMBER(clut_0_w); DECLARE_WRITE8_MEMBER(clut_1_w); - DECLARE_WRITE8_MEMBER(clutsel_w); - DECLARE_WRITE8_MEMBER(gfxflag2_w); - DECLARE_WRITE8_MEMBER(outcoin_flag_w); - DECLARE_WRITE8_MEMBER(dipswbitsel_w); - DECLARE_WRITE8_MEMBER(mscoutm_inputportsel_w); + void clutsel_w(uint8_t data); + void gfxflag2_w(uint8_t data); + void outcoin_flag_w(uint8_t data); + void dipswbitsel_w(uint8_t data); + void mscoutm_inputportsel_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index aeb56fcf22f..1ddd950681c 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -84,7 +84,7 @@ private: DECLARE_WRITE8_MEMBER(clutsel_0_w); DECLARE_WRITE8_MEMBER(clutsel_1_w); DECLARE_WRITE8_MEMBER(clutsel_2_w); - DECLARE_WRITE16_MEMBER(tmp68301_parallel_port_w); + void tmp68301_parallel_port_w(uint16_t data); // musobana and derived machine configs DECLARE_READ16_MEMBER(musobana_inputport_0_r); diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 45bae1ca4a7..4c4508e366a 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -41,7 +41,7 @@ public: void survival_palette(palette_device &palette) const; void pleiads_palette(palette_device &palette) const; uint32_t screen_update_phoenix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER(survival_protection_r); + uint8_t survival_protection_r(); DECLARE_READ_LINE_MEMBER(survival_sid_callback); void condor(machine_config &config); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 9c11504b8a6..e9070277f17 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -90,11 +90,11 @@ protected: DECLARE_WRITE16_MEMBER(luckboomh_dispenser_w); DECLARE_WRITE16_MEMBER(hrdtimes_coin_w); DECLARE_WRITE16_MEMBER(playmark_snd_command_w); - DECLARE_READ8_MEMBER(playmark_snd_command_r); - DECLARE_READ8_MEMBER(playmark_snd_flag_r); - DECLARE_WRITE8_MEMBER(playmark_oki_w); - DECLARE_WRITE8_MEMBER(playmark_snd_control_w); - DECLARE_WRITE8_MEMBER(hrdtimes_snd_control_w); + uint8_t playmark_snd_command_r(); + uint8_t playmark_snd_flag_r(); + void playmark_oki_w(uint8_t data); + void playmark_snd_control_w(uint8_t data); + void hrdtimes_snd_control_w(uint8_t data); DECLARE_WRITE16_MEMBER(wbeachvl_txvideoram_w); DECLARE_WRITE16_MEMBER(wbeachvl_fgvideoram_w); DECLARE_WRITE16_MEMBER(wbeachvl_bgvideoram_w); @@ -105,7 +105,7 @@ protected: DECLARE_WRITE16_MEMBER(wbeachvl_scroll_w); DECLARE_WRITE16_MEMBER(excelsr_scroll_w); DECLARE_WRITE16_MEMBER(hrdtimes_scroll_w); - DECLARE_WRITE8_MEMBER(playmark_oki_banking_w); + void playmark_oki_banking_w(uint8_t data); TILE_GET_INFO_MEMBER(bigtwin_get_tx_tile_info); TILE_GET_INFO_MEMBER(bigtwin_get_fg_tile_info); TILE_GET_INFO_MEMBER(wbeachvl_get_tx_tile_info); diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index bef3385e5bb..5650bfdd80e 100644 --- a/src/mame/includes/saturn.h +++ b/src/mame/includes/saturn.h @@ -48,7 +48,7 @@ public: { } - DECLARE_WRITE8_MEMBER(scsp_irq); + void scsp_irq(offs_t offset, uint8_t data); // SMPC HLE delegates DECLARE_WRITE_LINE_MEMBER(master_sh2_reset_w); diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 7e11eada7f7..1954dbf080f 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -151,7 +151,7 @@ private: DECLARE_WRITE8_MEMBER(spaceod_sound_w); DECLARE_WRITE8_MEMBER(usb_ram_w); - DECLARE_WRITE8_MEMBER(sindbadm_misc_w); + void sindbadm_misc_w(uint8_t data); DECLARE_WRITE8_MEMBER(sindbadm_sn1_SN76496_w); DECLARE_WRITE8_MEMBER(sindbadm_sn2_SN76496_w); @@ -164,8 +164,8 @@ private: INTERRUPT_GEN_MEMBER(segag80r_vblank_start); IRQ_CALLBACK_MEMBER(segag80r_irq_ack); INTERRUPT_GEN_MEMBER(sindbadm_vblank_start); - DECLARE_WRITE8_MEMBER(sega005_sound_a_w); - DECLARE_WRITE8_MEMBER(sega005_sound_b_w); + void sega005_sound_a_w(uint8_t data); + void sega005_sound_b_w(uint8_t data); void vblank_latch_set(); void g80_set_palette_entry(int entry, uint8_t data); diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h index 41b5947eccd..9b3c9ed1a1f 100644 --- a/src/mame/includes/segahang.h +++ b/src/mame/includes/segahang.h @@ -74,10 +74,10 @@ public: private: // PPI read/write callbacks - DECLARE_WRITE8_MEMBER( video_lamps_w ); - DECLARE_WRITE8_MEMBER( tilemap_sound_w ); - DECLARE_WRITE8_MEMBER( sub_control_adc_w ); - DECLARE_READ8_MEMBER( adc_status_r ); + void video_lamps_w(uint8_t data); + void tilemap_sound_w(uint8_t data); + void sub_control_adc_w(uint8_t data); + uint8_t adc_status_r(); // main CPU read/write handlers uint8_t hangon_inputs_r(offs_t offset); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 73e0aaac085..e617bf9915a 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -59,8 +59,8 @@ private: DECLARE_WRITE8_MEMBER(videoram_w); DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_READ8_MEMBER(portB_r); - DECLARE_WRITE8_MEMBER(portB_w); + uint8_t portB_r(); + void portB_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 585c4b64db0..fc1fc61d7a1 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -67,9 +67,9 @@ protected: tilemap_t *m_md_tilemap; int m_sprites_x_offset; - DECLARE_READ8_MEMBER(playmark_snd_command_r); - DECLARE_WRITE8_MEMBER(playmark_oki_w); - DECLARE_WRITE8_MEMBER(playmark_snd_control_w); + uint8_t playmark_snd_command_r(); + void playmark_oki_w(uint8_t data); + void playmark_snd_control_w(uint8_t data); DECLARE_WRITE16_MEMBER(sslam_tx_tileram_w); DECLARE_WRITE16_MEMBER(sslam_md_tileram_w); DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w); diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index aa114c875e3..2ec835888cf 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -38,8 +38,8 @@ private: uint8_t m_write_mask; uint8_t m_video_control; coprocessor_t m_coprocessor; - DECLARE_WRITE8_MEMBER(thief_input_select_w); - DECLARE_READ8_MEMBER(thief_io_r); + void thief_input_select_w(uint8_t data); + uint8_t thief_io_r(); DECLARE_READ8_MEMBER(thief_context_ram_r); DECLARE_WRITE8_MEMBER(thief_context_ram_w); DECLARE_WRITE8_MEMBER(thief_context_bank_w); @@ -51,7 +51,7 @@ private: DECLARE_WRITE8_MEMBER(thief_blit_w); DECLARE_READ8_MEMBER(thief_coprocessor_r); DECLARE_WRITE8_MEMBER(thief_coprocessor_w); - DECLARE_WRITE8_MEMBER(tape_control_w); + void tape_control_w(uint8_t data); virtual void video_start() override; uint32_t screen_update_thief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index bb99db9a35e..cbabd962dc3 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -93,12 +93,12 @@ private: DECLARE_WRITE8_MEMBER(rjammer_background_page_w); DECLARE_WRITE8_MEMBER(rjammer_voice_startstop_w); DECLARE_WRITE8_MEMBER(rjammer_voice_frequency_select_w); - DECLARE_WRITE8_MEMBER(ay8910_portA_0_w); - DECLARE_WRITE8_MEMBER(ay8910_portB_0_w); - DECLARE_WRITE8_MEMBER(ay8910_portA_1_w); - DECLARE_WRITE8_MEMBER(ay8910_portB_1_w); - DECLARE_WRITE8_MEMBER(ay8910_portA_2_w); - DECLARE_WRITE8_MEMBER(ay8910_portB_2_w); + void ay8910_portA_0_w(uint8_t data); + void ay8910_portB_0_w(uint8_t data); + void ay8910_portA_1_w(uint8_t data); + void ay8910_portB_1_w(uint8_t data); + void ay8910_portA_2_w(uint8_t data); + void ay8910_portB_2_w(uint8_t data); DECLARE_MACHINE_START(tubep); DECLARE_MACHINE_RESET(tubep); virtual void video_start() override; diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 2be56d113ec..e10c6e46856 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -284,11 +284,11 @@ protected: DECLARE_WRITE8_MEMBER( carnival_audio_1_w ); DECLARE_WRITE8_MEMBER( carnival_audio_2_w ); DECLARE_READ_LINE_MEMBER( carnival_music_port_t1_r ); - DECLARE_WRITE8_MEMBER( carnivala_music_port_1_w ); - DECLARE_WRITE8_MEMBER( carnivala_music_port_2_w ); + void carnivala_music_port_1_w(uint8_t data); + void carnivala_music_port_2_w(uint8_t data); void carnival_psg_latch(); - DECLARE_WRITE8_MEMBER( carnivalb_music_port_1_w ); - DECLARE_WRITE8_MEMBER( carnivalb_music_port_2_w ); + void carnivalb_music_port_1_w(uint8_t data); + void carnivalb_music_port_2_w(uint8_t data); }; class headonsa_state : public vicdual_state diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index c81382b5661..f432e2aa96f 100644 --- a/src/mame/machine/dc.cpp +++ b/src/mame/machine/dc.cpp @@ -101,7 +101,7 @@ TIMER_CALLBACK_MEMBER(dc_state::g2_dma_irq) dc_update_interrupt_status(); } -WRITE8_MEMBER(dc_state::g1_irq) +void dc_state::g1_irq(uint8_t data) { switch(data) { case naomi_g1_device::DMA_GDROM_IRQ: @@ -111,7 +111,7 @@ WRITE8_MEMBER(dc_state::g1_irq) dc_update_interrupt_status(); } -WRITE8_MEMBER(dc_state::pvr_irq) +void dc_state::pvr_irq(uint8_t data) { switch(data) { case powervr2_device::EOXFER_YUV_IRQ: @@ -177,7 +177,7 @@ WRITE8_MEMBER(dc_state::pvr_irq) dc_update_interrupt_status(); } -WRITE8_MEMBER(dc_state::maple_irq) +void dc_state::maple_irq(uint8_t data) { switch(data) { case maple_dc_device::DMA_MAPLE_IRQ: diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp index ad6083b0ba3..e5756aa3a30 100644 --- a/src/mame/machine/nb1413m3.cpp +++ b/src/mame/machine/nb1413m3.cpp @@ -498,7 +498,7 @@ READ8_MEMBER( nb1413m3_device::inputport3_r ) } } -READ8_MEMBER( nb1413m3_device::dipsw1_r ) +uint8_t nb1413m3_device::dipsw1_r() { device_t &root = machine().root_device(); switch (m_nb1413m3_type) @@ -542,7 +542,7 @@ READ8_MEMBER( nb1413m3_device::dipsw1_r ) } } -READ8_MEMBER( nb1413m3_device::dipsw2_r ) +uint8_t nb1413m3_device::dipsw2_r() { device_t &root = machine().root_device(); switch (m_nb1413m3_type) diff --git a/src/mame/machine/nb1413m3.h b/src/mame/machine/nb1413m3.h index 4e3e8f36257..ec395b264f0 100644 --- a/src/mame/machine/nb1413m3.h +++ b/src/mame/machine/nb1413m3.h @@ -158,8 +158,8 @@ public: DECLARE_READ8_MEMBER( inputport1_r ); DECLARE_READ8_MEMBER( inputport2_r ); DECLARE_READ8_MEMBER( inputport3_r ); - DECLARE_READ8_MEMBER( dipsw1_r ); - DECLARE_READ8_MEMBER( dipsw2_r ); + uint8_t dipsw1_r(); + uint8_t dipsw2_r(); DECLARE_READ8_MEMBER( dipsw3_l_r ); DECLARE_READ8_MEMBER( dipsw3_h_r ); DECLARE_WRITE8_MEMBER( outcoin_w ); diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index 1f53662b96b..26ea96aa990 100644 --- a/src/mame/machine/saturn.cpp +++ b/src/mame/machine/saturn.cpp @@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(saturn_state::m68k_reset_callback) printf("m68k RESET opcode triggered\n"); } -WRITE8_MEMBER(saturn_state::scsp_irq) +void saturn_state::scsp_irq(offs_t offset, uint8_t data) { // don't bother the 68k if it's off if (!m_en_68k) diff --git a/src/mame/video/kopunch.cpp b/src/mame/video/kopunch.cpp index 417adbe8623..8715532a860 100644 --- a/src/mame/video/kopunch.cpp +++ b/src/mame/video/kopunch.cpp @@ -55,18 +55,18 @@ WRITE8_MEMBER(kopunch_state::vram_bg_w) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(kopunch_state::scroll_x_w) +void kopunch_state::scroll_x_w(uint8_t data) { m_scrollx = data; m_bg_tilemap->set_scrollx(0, data); } -WRITE8_MEMBER(kopunch_state::scroll_y_w) +void kopunch_state::scroll_y_w(uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } -WRITE8_MEMBER(kopunch_state::gfxbank_w) +void kopunch_state::gfxbank_w(uint8_t data) { // d0-d2: bg gfx bank if (m_gfxbank != (data & 0x07)) diff --git a/src/mame/video/mjkjidai.cpp b/src/mame/video/mjkjidai.cpp index 8a145252cc0..e8107753395 100644 --- a/src/mame/video/mjkjidai.cpp +++ b/src/mame/video/mjkjidai.cpp @@ -45,7 +45,7 @@ WRITE8_MEMBER(mjkjidai_state::mjkjidai_videoram_w) m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } -WRITE8_MEMBER(mjkjidai_state::mjkjidai_ctrl_w) +void mjkjidai_state::mjkjidai_ctrl_w(uint8_t data) { // logerror("%s: port c0 = %02x\n",m_maincpu->pc(),data); diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp index f63991d2ea3..c25785d28fc 100644 --- a/src/mame/video/model2.cpp +++ b/src/mame/video/model2.cpp @@ -856,14 +856,14 @@ void model2_renderer::model2_3d_render(triangle *tri, const rectangle &cliprect) (8,90) (504,90) */ -WRITE16_MEMBER(model2_state::horizontal_sync_w) +void model2_state::horizontal_sync_w(uint16_t data) { m_crtc_xoffset = 84 + (int16_t)data; // printf("H %04x %d %d\n",data,(int16_t)data,m_crtc_xoffset); m_poly->set_xoffset(m_crtc_xoffset); } -WRITE16_MEMBER(model2_state::vertical_sync_w) +void model2_state::vertical_sync_w(uint16_t data) { m_crtc_yoffset = 130 + (int16_t)data; // printf("V %04x %d %d\n",data,(int16_t)data,m_crtc_yoffset); diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index 2478f0eb781..d2cc84ccb6a 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -116,7 +116,7 @@ void nbmj9195_state::blitter_w(int offset, int data, int vram) } } -WRITE8_MEMBER(nbmj9195_state::clutsel_w) +void nbmj9195_state::clutsel_w(uint8_t data) { m_clutsel = data; } @@ -126,7 +126,7 @@ void nbmj9195_state::clut_w(int offset, int data, int vram) m_clut[vram][((m_clutsel & 0xff) * 0x10) + (offset & 0x0f)] = data; } -WRITE8_MEMBER(nbmj9195_state::gfxflag2_w) +void nbmj9195_state::gfxflag2_w(uint8_t data) { m_gfxflag2 = data; } diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp index acdb9f899f4..e70e13fb26c 100644 --- a/src/mame/video/phoenix.cpp +++ b/src/mame/video/phoenix.cpp @@ -419,7 +419,7 @@ READ8_MEMBER(phoenix_state::survival_input_port_0_r) return m_survival_input_latches[0]; } -READ8_MEMBER(phoenix_state::survival_protection_r) +uint8_t phoenix_state::survival_protection_r() { return m_survival_protection_value; } |