diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-27 18:33:26 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-27 18:33:26 +0200 |
commit | 66649d7a63e9e77e65573e96f4b3c514199275a5 (patch) | |
tree | 1eb8d665433f6068352d436d00826ab29c267493 /src/devices/machine | |
parent | ba62cea8b476f3b61a5d18dd819294d4ce053d5f (diff) |
drivers starting with f, g and h: some macro removal (nw)
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/phi.cpp | 10 | ||||
-rw-r--r-- | src/devices/machine/phi.h | 8 | ||||
-rw-r--r-- | src/devices/machine/s3c2400.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/s3c2400.h | 4 | ||||
-rw-r--r-- | src/devices/machine/s3c2410.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/s3c2410.h | 4 | ||||
-rw-r--r-- | src/devices/machine/s3c2440.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/s3c2440.h | 4 | ||||
-rw-r--r-- | src/devices/machine/s3c24xx.hxx | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index 5c1028c01c1..c131f2f3191 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -266,12 +266,12 @@ void phi_device::set_ext_signal(phi_488_signal_t signal , int state) } } -WRITE16_MEMBER(phi_device::reg16_w) +void phi_device::reg16_w(offs_t offset, uint16_t data) { int_reg_w(offset , data & REG_ALL_MASK); } -READ16_MEMBER(phi_device::reg16_r) +uint16_t phi_device::reg16_r(offs_t offset) { uint16_t res; @@ -334,14 +334,14 @@ READ16_MEMBER(phi_device::reg16_r) return res; } -WRITE8_MEMBER(phi_device::reg8_w) +void phi_device::reg8_w(offs_t offset, uint8_t data) { int_reg_w(offset , data); } -READ8_MEMBER(phi_device::reg8_r) +uint8_t phi_device::reg8_r(offs_t offset) { - return (uint8_t)reg16_r(space , offset , mem_mask); + return (uint8_t)reg16_r(offset); } void phi_device::device_start() diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h index dc3d0d76fd2..755f073a2d9 100644 --- a/src/devices/machine/phi.h +++ b/src/devices/machine/phi.h @@ -84,10 +84,10 @@ public: // 2 13 // 1 14 // 0 15 - DECLARE_WRITE16_MEMBER(reg16_w); - DECLARE_READ16_MEMBER(reg16_r); - DECLARE_WRITE8_MEMBER(reg8_w); - DECLARE_READ8_MEMBER(reg8_r); + void reg16_w(offs_t offset, uint16_t data); + uint16_t reg16_r(offs_t offset); + void reg8_w(offs_t offset, uint8_t data); + uint8_t reg8_r(offs_t offset); protected: phi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp index 00fbd49c2c5..ef779fb47c1 100644 --- a/src/devices/machine/s3c2400.cpp +++ b/src/devices/machine/s3c2400.cpp @@ -218,7 +218,7 @@ void s3c2400_device::device_start() space.install_readwrite_handler(0x14600040, 0x1460005b, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_dma_2_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_dma_2_w))); space.install_readwrite_handler(0x14600060, 0x1460007b, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_dma_3_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_dma_3_w))); space.install_readwrite_handler(0x14800000, 0x14800017, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_clkpow_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_clkpow_w))); - space.install_readwrite_handler(0x14a00000, 0x14a003ff, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_w))); + space.install_readwrite_handler(0x14a00000, 0x14a003ff, read32s_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_r)), write32s_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_w))); space.install_readwrite_handler(0x14a00400, 0x14a007ff, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_palette_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_lcd_palette_w))); space.install_readwrite_handler(0x15000000, 0x1500002b, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_uart_0_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_uart_0_w))); space.install_readwrite_handler(0x15004000, 0x1500402b, read32_delegate(*this, FUNC(s3c2400_device::s3c24xx_uart_1_r)), write32_delegate(*this, FUNC(s3c2400_device::s3c24xx_uart_1_w))); diff --git a/src/devices/machine/s3c2400.h b/src/devices/machine/s3c2400.h index 6c5bdf4d40f..969356dd0a4 100644 --- a/src/devices/machine/s3c2400.h +++ b/src/devices/machine/s3c2400.h @@ -172,14 +172,14 @@ protected: void s3c24xx_video_start(); void bitmap_blend( bitmap_rgb32 &bitmap_dst, bitmap_rgb32 &bitmap_src_1, bitmap_rgb32 &bitmap_src_2); uint32_t s3c24xx_video_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - READ32_MEMBER( s3c24xx_lcd_r ); + uint32_t s3c24xx_lcd_r(offs_t offset, uint32_t mem_mask = ~0); int s3c24xx_lcd_configure_tft(); int s3c24xx_lcd_configure_stn(); int s3c24xx_lcd_configure(); void s3c24xx_lcd_start(); void s3c24xx_lcd_stop(); void s3c24xx_lcd_recalc(); - WRITE32_MEMBER( s3c24xx_lcd_w ); + void s3c24xx_lcd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); READ32_MEMBER( s3c24xx_lcd_palette_r ); WRITE32_MEMBER( s3c24xx_lcd_palette_w ); void s3c24xx_clkpow_reset(); diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp index 4c5f102123e..0922ec6b192 100644 --- a/src/devices/machine/s3c2410.cpp +++ b/src/devices/machine/s3c2410.cpp @@ -280,7 +280,7 @@ void s3c2410_device::device_start() space.install_readwrite_handler( 0x4b000080, 0x4b0000a3, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_dma_2_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_dma_2_w))); space.install_readwrite_handler( 0x4b0000c0, 0x4b0000e3, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_dma_3_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_dma_3_w))); space.install_readwrite_handler( 0x4c000000, 0x4c000017, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_clkpow_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_clkpow_w))); - space.install_readwrite_handler( 0x4d000000, 0x4d000063, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_w))); + space.install_readwrite_handler( 0x4d000000, 0x4d000063, read32s_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_r)), write32s_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_w))); space.install_readwrite_handler( 0x4d000400, 0x4d0007ff, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_palette_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_lcd_palette_w))); space.install_readwrite_handler( 0x4e000000, 0x4e000017, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_nand_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_nand_w))); space.install_readwrite_handler( 0x50000000, 0x5000002b, read32_delegate(*this, FUNC(s3c2410_device::s3c24xx_uart_0_r)), write32_delegate(*this, FUNC(s3c2410_device::s3c24xx_uart_0_w))); diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h index 9c270d5802f..52474fcbd79 100644 --- a/src/devices/machine/s3c2410.h +++ b/src/devices/machine/s3c2410.h @@ -157,7 +157,7 @@ public: DECLARE_WRITE_LINE_MEMBER( frnb_w ); - READ32_MEMBER( s3c24xx_lcd_r ); + uint32_t s3c24xx_lcd_r(offs_t offset, uint32_t mem_mask = ~0); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -207,7 +207,7 @@ protected: void s3c24xx_lcd_start(); void s3c24xx_lcd_stop(); void s3c24xx_lcd_recalc(); - WRITE32_MEMBER( s3c24xx_lcd_w ); + void s3c24xx_lcd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); READ32_MEMBER( s3c24xx_lcd_palette_r ); WRITE32_MEMBER( s3c24xx_lcd_palette_w ); void s3c24xx_clkpow_reset(); diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp index d20b8f9688b..4da695d6d38 100644 --- a/src/devices/machine/s3c2440.cpp +++ b/src/devices/machine/s3c2440.cpp @@ -295,7 +295,7 @@ void s3c2440_device::device_start() space.install_readwrite_handler(0x4b000080, 0x4b0000a3, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_dma_2_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_dma_2_w))); space.install_readwrite_handler(0x4b0000c0, 0x4b0000e3, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_dma_3_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_dma_3_w))); space.install_readwrite_handler(0x4c000000, 0x4c00001b, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_clkpow_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_clkpow_w))); - space.install_readwrite_handler(0x4d000000, 0x4d000063, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_w))); + space.install_readwrite_handler(0x4d000000, 0x4d000063, read32s_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_r)), write32s_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_w))); space.install_readwrite_handler(0x4d000400, 0x4d0007ff, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_palette_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_lcd_palette_w))); space.install_readwrite_handler(0x4e000000, 0x4e00003f, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_nand_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_nand_w))); space.install_readwrite_handler(0x4f000000, 0x4f0000a3, read32_delegate(*this, FUNC(s3c2440_device::s3c24xx_cam_r)), write32_delegate(*this, FUNC(s3c2440_device::s3c24xx_cam_w))); diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h index 9c3cfa9c337..062bf50f7a6 100644 --- a/src/devices/machine/s3c2440.h +++ b/src/devices/machine/s3c2440.h @@ -220,14 +220,14 @@ protected: void s3c24xx_video_start(); void bitmap_blend( bitmap_rgb32 &bitmap_dst, bitmap_rgb32 &bitmap_src_1, bitmap_rgb32 &bitmap_src_2); uint32_t s3c24xx_video_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - READ32_MEMBER( s3c24xx_lcd_r ); + uint32_t s3c24xx_lcd_r(offs_t offset, uint32_t mem_mask = ~0); int s3c24xx_lcd_configure_tft(); int s3c24xx_lcd_configure_stn(); int s3c24xx_lcd_configure(); void s3c24xx_lcd_start(); void s3c24xx_lcd_stop(); void s3c24xx_lcd_recalc(); - WRITE32_MEMBER( s3c24xx_lcd_w ); + void s3c24xx_lcd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); READ32_MEMBER( s3c24xx_lcd_palette_r ); WRITE32_MEMBER( s3c24xx_lcd_palette_w ); void s3c24xx_clkpow_reset(); diff --git a/src/devices/machine/s3c24xx.hxx b/src/devices/machine/s3c24xx.hxx index 707daa62318..61abe85789e 100644 --- a/src/devices/machine/s3c24xx.hxx +++ b/src/devices/machine/s3c24xx.hxx @@ -791,7 +791,7 @@ uint32_t S3C24_CLASS_NAME::s3c24xx_video_update(screen_device &screen, bitmap_rg } -READ32_MEMBER( S3C24_CLASS_NAME::s3c24xx_lcd_r ) +uint32_t S3C24_CLASS_NAME::s3c24xx_lcd_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_lcd.regs)[offset]; switch (offset) @@ -953,7 +953,7 @@ void S3C24_CLASS_NAME::s3c24xx_lcd_recalc() } } -WRITE32_MEMBER( S3C24_CLASS_NAME::s3c24xx_lcd_w ) +void S3C24_CLASS_NAME::s3c24xx_lcd_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_lcd.regs)[offset]; LOGMASKED(LOG_LCD_REGS, "%s: lcd write: %08X = %08X & %08x\n", machine().describe_context(), S3C24XX_BASE_LCD + (offset << 2), data, mem_mask); |