diff options
author | Curt Coder <curtcoder@mail.com> | 2013-06-10 13:45:13 +0000 |
---|---|---|
committer | Curt Coder <curtcoder@mail.com> | 2013-06-10 13:45:13 +0000 |
commit | cd6679975b84acaca5ed0aad6ffbad47151f61b7 (patch) | |
tree | 3270fce28395109e6b1f362cf16f40a2335fb71e | |
parent | c5ea7f4e42c87c2c42a7b111cd44b3fa2a10b93d (diff) |
Cleanup. (nw)
-rw-r--r-- | src/emu/memory.h | 16 | ||||
-rw-r--r-- | src/mess/drivers/abc80x.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/c900.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/portfoli.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/tdv2324.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/tek410x.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/tiki100.c | 2 | ||||
-rw-r--r-- | src/mess/includes/cosmicos.h | 2 | ||||
-rw-r--r-- | src/mess/includes/eti660.h | 2 | ||||
-rw-r--r-- | src/mess/includes/ql.h | 2 | ||||
-rw-r--r-- | src/mess/includes/studio2.h | 4 | ||||
-rw-r--r-- | src/mess/includes/tdv2324.h | 2 | ||||
-rw-r--r-- | src/mess/includes/tmc2000e.h | 2 | ||||
-rw-r--r-- | src/mess/includes/xerox820.h | 1 | ||||
-rw-r--r-- | src/mess/machine/ep64_exdos.c | 2 | ||||
-rw-r--r-- | src/mess/machine/isa_wdxt_gen.c | 2 | ||||
-rw-r--r-- | src/mess/machine/wangpckb.c | 4 |
17 files changed, 23 insertions, 36 deletions
diff --git a/src/emu/memory.h b/src/emu/memory.h index 2dc6d242944..3fa84a7eaa6 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -946,14 +946,14 @@ private: #define READ64_DELEGATE(_class, _member) read64_delegate(FUNC(_class::_member), this) #define WRITE64_DELEGATE(_class, _member) write64_delegate(FUNC(_class::_member), this) -#define READ8_DEVICE_DELEGATE(_class, _device, _member) read8_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE8_DEVICE_DELEGATE(_class, _device, _member) write8_delegate(FUNC(_class::_member), (_class *)_device) -#define READ16_DEVICE_DELEGATE(_class, _device, _member) read16_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE16_DEVICE_DELEGATE(_class, _device, _member) write16_delegate(FUNC(_class::_member), (_class *)_device) -#define READ32_DEVICE_DELEGATE(_class, _device, _member) read32_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE32_DEVICE_DELEGATE(_class, _device, _member) write32_delegate(FUNC(_class::_member), (_class *)_device) -#define READ64_DEVICE_DELEGATE(_class, _device, _member) read64_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE64_DEVICE_DELEGATE(_class, _device, _member) write64_delegate(FUNC(_class::_member), (_class *)_device) +#define READ8_DEVICE_DELEGATE(_device, _class, _member) read8_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE8_DEVICE_DELEGATE(_device, _class, _member) write8_delegate(FUNC(_class::_member), (_class *)_device) +#define READ16_DEVICE_DELEGATE(_device, _class, _member) read16_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE16_DEVICE_DELEGATE(_device, _class, _member) write16_delegate(FUNC(_class::_member), (_class *)_device) +#define READ32_DEVICE_DELEGATE(_device, _class, _member) read32_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE32_DEVICE_DELEGATE(_device, _class, _member) write32_delegate(FUNC(_class::_member), (_class *)_device) +#define READ64_DEVICE_DELEGATE(_device, _class, _member) read64_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE64_DEVICE_DELEGATE(_device, _class, _member) write64_delegate(FUNC(_class::_member), (_class *)_device) // helper macro for merging data with the memory mask diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c index f8f7416154d..fbba09255a2 100644 --- a/src/mess/drivers/abc80x.c +++ b/src/mess/drivers/abc80x.c @@ -315,7 +315,7 @@ void abc806_state::bankswitch() program.install_read_bank(0x7000, 0x77ff, bank_name); program.unmap_write(0x7000, 0x77ff); - program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r),this), write8_delegate(FUNC(abc806_state::charram_w),this)); + program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, READ8_DELEGATE(abc806_state, charram_r), WRITE8_DELEGATE(abc806_state, charram_w)); membank(bank_name)->set_entry(0); break; @@ -350,7 +350,7 @@ void abc806_state::bankswitch() if (start_addr == 0x7000) { program.install_readwrite_bank(0x7000, 0x77ff, bank_name); - program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r), this), write8_delegate(FUNC(abc806_state::charram_w), this)); + program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, READ8_DELEGATE(abc806_state, charram_r), WRITE8_DELEGATE(abc806_state, charram_w)); } else { diff --git a/src/mess/drivers/c900.c b/src/mess/drivers/c900.c index af25ae445ff..e0cbf113de2 100644 --- a/src/mess/drivers/c900.c +++ b/src/mess/drivers/c900.c @@ -19,7 +19,7 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; }; @@ -33,7 +33,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( c900 ) INPUT_PORTS_END -UINT32 c900_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 c900_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 5de68ccb648..0a6f5bc89c7 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -865,11 +865,11 @@ void portfolio_state::machine_reset() switch (m_pid) { case PID_SERIAL: - io.install_readwrite_handler(0x8070, 0x8077, read8_delegate(FUNC(ins8250_device::ins8250_r), (ins8250_device*)m_uart), write8_delegate(FUNC(ins8250_device::ins8250_w), (ins8250_device*)m_uart)); + io.install_readwrite_handler(0x8070, 0x8077, READ8_DEVICE_DELEGATE(m_uart, ins8250_device, ins8250_r), WRITE8_DEVICE_DELEGATE(m_uart, ins8250_device, ins8250_w)); break; case PID_PARALLEL: - io.install_readwrite_handler(0x8078, 0x807b, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi)); + io.install_readwrite_handler(0x8078, 0x807b, READ8_DEVICE_DELEGATE(m_ppi, i8255_device, read), WRITE8_DEVICE_DELEGATE(m_ppi, i8255_device, write)); break; } } diff --git a/src/mess/drivers/tdv2324.c b/src/mess/drivers/tdv2324.c index 24827117ebd..92be610249e 100644 --- a/src/mess/drivers/tdv2324.c +++ b/src/mess/drivers/tdv2324.c @@ -230,7 +230,7 @@ void tdv2324_state::video_start() // SCREEN_UPDATE_IND16( tdv2324 ) //------------------------------------------------- -UINT32 tdv2324_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 tdv2324_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } diff --git a/src/mess/drivers/tek410x.c b/src/mess/drivers/tek410x.c index 24f18d5abce..e3d1e993299 100644 --- a/src/mess/drivers/tek410x.c +++ b/src/mess/drivers/tek410x.c @@ -30,7 +30,7 @@ public: virtual void machine_start(); virtual void video_start(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /* Memory Maps */ @@ -54,7 +54,7 @@ void tek4107a_state::video_start() { } -UINT32 tek4107a_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 tek4107a_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c index 72c424a10ac..aacb690b92a 100644 --- a/src/mess/drivers/tiki100.c +++ b/src/mess/drivers/tiki100.c @@ -54,7 +54,7 @@ void tiki100_state::bankswitch() else { /* GFXRAM, GFXRAM, RAM */ - program.install_readwrite_handler(0x0000, 0x7fff, read8_delegate(FUNC(tiki100_state::gfxram_r), this), write8_delegate(FUNC(tiki100_state::gfxram_w), this)); + program.install_readwrite_handler(0x0000, 0x7fff, READ8_DELEGATE(tiki100_state, gfxram_r), WRITE8_DELEGATE(tiki100_state, gfxram_w)); program.install_readwrite_bank(0x8000, 0xffff, "bank3"); membank("bank1")->set_entry(BANK_VIDEO_RAM); diff --git a/src/mess/includes/cosmicos.h b/src/mess/includes/cosmicos.h index f631f2425d3..fc0c0c4f175 100644 --- a/src/mess/includes/cosmicos.h +++ b/src/mess/includes/cosmicos.h @@ -76,8 +76,6 @@ public: virtual void machine_start(); virtual void machine_reset(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( video_off_r ); DECLARE_READ8_MEMBER( video_on_r ); DECLARE_WRITE8_MEMBER( audio_latch_w ); diff --git a/src/mess/includes/eti660.h b/src/mess/includes/eti660.h index 5c8a6a779fe..35c54927fca 100644 --- a/src/mess/includes/eti660.h +++ b/src/mess/includes/eti660.h @@ -49,8 +49,6 @@ public: required_ioport m_pa3; required_ioport m_special; - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( pia_r ); DECLARE_WRITE8_MEMBER( pia_w ); DECLARE_WRITE8_MEMBER( colorram_w ); diff --git a/src/mess/includes/ql.h b/src/mess/includes/ql.h index 902d2f5b659..d126b90040b 100644 --- a/src/mess/includes/ql.h +++ b/src/mess/includes/ql.h @@ -121,8 +121,6 @@ public: virtual void machine_start(); virtual void machine_reset(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( ipc_w ); DECLARE_WRITE8_MEMBER( ipc_port1_w ); DECLARE_WRITE8_MEMBER( ipc_port2_w ); diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h index 7efedfab25e..a8714b266a8 100644 --- a/src/mess/includes/studio2.h +++ b/src/mess/includes/studio2.h @@ -45,8 +45,6 @@ public: virtual void machine_start(); virtual void machine_reset(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( dispon_r ); DECLARE_WRITE8_MEMBER( keylatch_w ); DECLARE_WRITE8_MEMBER( dispon_w ); @@ -92,8 +90,6 @@ public: virtual void machine_reset(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( dma_w ); DECLARE_READ_LINE_MEMBER( rdata_r ); DECLARE_READ_LINE_MEMBER( bdata_r ); diff --git a/src/mess/includes/tdv2324.h b/src/mess/includes/tdv2324.h index 337769c9b36..f7e605da2af 100644 --- a/src/mess/includes/tdv2324.h +++ b/src/mess/includes/tdv2324.h @@ -68,7 +68,7 @@ public: required_device<tms9927_device> m_tms; virtual void video_start(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( tdv2324_main_io_30 ); DECLARE_READ8_MEMBER( tdv2324_main_io_e6 ); diff --git a/src/mess/includes/tmc2000e.h b/src/mess/includes/tmc2000e.h index b81fe4001dd..526c9a935ad 100644 --- a/src/mess/includes/tmc2000e.h +++ b/src/mess/includes/tmc2000e.h @@ -54,8 +54,6 @@ public: virtual void machine_start(); virtual void machine_reset(); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( vismac_r ); DECLARE_WRITE8_MEMBER( vismac_w ); DECLARE_READ8_MEMBER( floppy_r ); diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h index bd3c2fbae5d..9e6c2eed8ac 100644 --- a/src/mess/includes/xerox820.h +++ b/src/mess/includes/xerox820.h @@ -89,7 +89,6 @@ public: DECLARE_WRITE_LINE_MEMBER( drq_w ); DECLARE_WRITE8_MEMBER( kbd_w ); DECLARE_WRITE_LINE_MEMBER( fr_w ); - DECLARE_WRITE_LINE_MEMBER( ft_w ); void bankswitch(int bank); void update_nmi(); diff --git a/src/mess/machine/ep64_exdos.c b/src/mess/machine/ep64_exdos.c index dc035ddbb73..4c7b5be1e5f 100644 --- a/src/mess/machine/ep64_exdos.c +++ b/src/mess/machine/ep64_exdos.c @@ -154,7 +154,7 @@ void ep64_exdos_device::device_start() { m_slot->program().install_rom(0x080000, 0x087fff, 0, 0, m_rom->base()); - m_slot->io().install_readwrite_handler(0x10, 0x13, 0, 0x04, READ8_DEVICE_DELEGATE(wd_fdc_t, m_fdc, read), WRITE8_DEVICE_DELEGATE(wd_fdc_t, m_fdc, write)); + m_slot->io().install_readwrite_handler(0x10, 0x13, 0, 0x04, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, write)); m_slot->io().install_readwrite_handler(0x18, 0x18, 0, 0x04, READ8_DELEGATE(ep64_exdos_device, read), WRITE8_DELEGATE(ep64_exdos_device, write)); } diff --git a/src/mess/machine/isa_wdxt_gen.c b/src/mess/machine/isa_wdxt_gen.c index b16de6bc2cb..b9d534d5431 100644 --- a/src/mess/machine/isa_wdxt_gen.c +++ b/src/mess/machine/isa_wdxt_gen.c @@ -229,7 +229,7 @@ void wdxt_gen_device::device_start() { set_isa_device(); m_isa->install_rom(this, 0xc8000, 0xc9fff, 0, 0, "hdc", "hdc"); - m_isa->install_device(0x0320, 0x0323, 0, 0, read8_delegate(FUNC(wd11c00_17_device::io_r), (wd11c00_17_device*)m_host), write8_delegate(FUNC(wd11c00_17_device::io_w), (wd11c00_17_device*)m_host)); + m_isa->install_device(0x0320, 0x0323, 0, 0, READ8_DEVICE_DELEGATE(m_host, wd11c00_17_device, io_r), WRITE8_DEVICE_DELEGATE(m_host, wd11c00_17_device, io_w)); m_isa->set_dma_channel(3, this, FALSE); } diff --git a/src/mess/machine/wangpckb.c b/src/mess/machine/wangpckb.c index 241965d25d7..eb9267684f9 100644 --- a/src/mess/machine/wangpckb.c +++ b/src/mess/machine/wangpckb.c @@ -413,8 +413,8 @@ wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, co void wangpc_keyboard_device::device_start() { // set serial callbacks - i8051_set_serial_tx_callback(m_maincpu, write8_delegate(FUNC(wangpc_keyboard_device::mcs51_tx_callback),this)); - i8051_set_serial_rx_callback(m_maincpu, read8_delegate(FUNC(wangpc_keyboard_device::mcs51_rx_callback),this)); + i8051_set_serial_tx_callback(m_maincpu, WRITE8_DELEGATE(wangpc_keyboard_device, mcs51_tx_callback)); + i8051_set_serial_rx_callback(m_maincpu, READ8_DELEGATE(wangpc_keyboard_device, mcs51_rx_callback)); set_data_frame(8, 2, SERIAL_PARITY_NONE); } |