diff options
Diffstat (limited to 'src/devices/machine/s3c44b0.cpp')
-rw-r--r-- | src/devices/machine/s3c44b0.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 009b400210e..6672127e20f 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -717,7 +717,7 @@ uint32_t s3c44b0_device::video_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -READ32_MEMBER( s3c44b0_device::lcd_r ) +uint32_t s3c44b0_device::lcd_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_lcd.regs)[offset]; switch (offset) @@ -820,7 +820,7 @@ void s3c44b0_device::lcd_recalc() lcd_stop(); } -WRITE32_MEMBER( s3c44b0_device::lcd_w ) +void s3c44b0_device::lcd_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_lcd.regs)[offset]; // verboselog( *this, 9, "(LCD) %08X <- %08X\n", S3C44B0_BASE_LCD + (offset << 2), data); @@ -851,14 +851,14 @@ uint32_t s3c44b0_device::get_mclk() return (uint32_t)((double)((mdiv + 8) * clock()) / (double)((pdiv + 2) * (1 << sdiv))); } -READ32_MEMBER( s3c44b0_device::clkpow_r ) +uint32_t s3c44b0_device::clkpow_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_clkpow.regs)[offset]; verboselog( *this, 9, "(CLKPOW) %08X -> %08X\n", S3C44B0_BASE_CLKPOW + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::clkpow_w ) +void s3c44b0_device::clkpow_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(CLKPOW) %08X <- %08X\n", S3C44B0_BASE_CLKPOW + (offset << 2), data); COMBINE_DATA(&((uint32_t*)&m_clkpow.regs)[offset]); @@ -973,14 +973,14 @@ void s3c44b0_device::request_eint(uint32_t number) } } -READ32_MEMBER( s3c44b0_device::irq_r ) +uint32_t s3c44b0_device::irq_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_irq.regs)[offset]; verboselog( *this, 9, "(IRQ) %08X -> %08X\n", S3C44B0_BASE_INT + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::irq_w ) +void s3c44b0_device::irq_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(IRQ) %08X <- %08X\n", S3C44B0_BASE_INT + (offset << 2), data); COMBINE_DATA(&((uint32_t*)&m_irq.regs)[offset]); @@ -1023,7 +1023,7 @@ uint16_t s3c44b0_device::pwm_calc_observation(int ch) return cnto; } -READ32_MEMBER( s3c44b0_device::pwm_r ) +uint32_t s3c44b0_device::pwm_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_pwm.regs)[offset]; switch (offset) @@ -1178,7 +1178,7 @@ void s3c44b0_device::pwm_recalc(int timer) pwm_stop(timer); } -WRITE32_MEMBER( s3c44b0_device::pwm_w ) +void s3c44b0_device::pwm_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_pwm.regs)[offset]; verboselog( *this, 9, "(PWM) %08X <- %08X\n", S3C44B0_BASE_PWM + (offset << 2), data); @@ -1344,7 +1344,7 @@ void s3c44b0_device::iic_resume() m_iic.timer->adjust(attotime::from_usec( 1), 0); } -READ32_MEMBER( s3c44b0_device::iic_r ) +uint32_t s3c44b0_device::iic_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_iic.regs)[offset]; switch (offset) @@ -1359,7 +1359,7 @@ READ32_MEMBER( s3c44b0_device::iic_r ) return data; } -WRITE32_MEMBER( s3c44b0_device::iic_w ) +void s3c44b0_device::iic_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_iic.regs)[offset]; verboselog( *this, 9, "(IIC) %08X <- %08X\n", S3C44B0_BASE_IIC + (offset << 2), data); @@ -1469,7 +1469,7 @@ inline void s3c44b0_device::iface_gpio_port_w(int port, uint32_t data) (m_port_w_cb)(port, data, 0xffff); } -READ32_MEMBER( s3c44b0_device::gpio_r ) +uint32_t s3c44b0_device::gpio_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_gpio.regs)[offset]; switch (offset) @@ -1514,7 +1514,7 @@ READ32_MEMBER( s3c44b0_device::gpio_r ) return data; } -WRITE32_MEMBER( s3c44b0_device::gpio_w ) +void s3c44b0_device::gpio_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_gpio.regs)[offset]; verboselog( *this, 9, "(GPIO) %08X <- %08X\n", S3C44B0_BASE_GPIO + (offset << 2), data); @@ -1614,27 +1614,27 @@ void s3c44b0_device::uart_w(int ch, uint32_t offset, uint32_t data, uint32_t mem } } -READ32_MEMBER( s3c44b0_device::uart_0_r ) +uint32_t s3c44b0_device::uart_0_r(offs_t offset, uint32_t mem_mask) { uint32_t data = uart_r(0, offset); // verboselog( *this, 9, "(UART 0) %08X -> %08X\n", S3C44B0_BASE_UART_0 + (offset << 2), data); return data; } -READ32_MEMBER( s3c44b0_device::uart_1_r ) +uint32_t s3c44b0_device::uart_1_r(offs_t offset, uint32_t mem_mask) { uint32_t data = uart_r(1, offset); // verboselog( *this, 9, "(UART 1) %08X -> %08X\n", S3C44B0_BASE_UART_1 + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::uart_0_w ) +void s3c44b0_device::uart_0_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(UART 0) %08X <- %08X (%08X)\n", S3C44B0_BASE_UART_0 + (offset << 2), data, mem_mask); uart_w(0, offset, data, mem_mask); } -WRITE32_MEMBER( s3c44b0_device::uart_1_w ) +void s3c44b0_device::uart_1_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(UART 1) %08X <- %08X (%08X)\n", S3C44B0_BASE_UART_1 + (offset << 2), data, mem_mask); uart_w(1, offset, data, mem_mask); @@ -1665,7 +1665,7 @@ uint16_t s3c44b0_device::wdt_calc_current_count() return 0; } -READ32_MEMBER( s3c44b0_device::wdt_r ) +uint32_t s3c44b0_device::wdt_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_wdt.regs)[offset]; switch (offset) @@ -1713,7 +1713,7 @@ void s3c44b0_device::wdt_recalc() wdt_stop(); } -WRITE32_MEMBER( s3c44b0_device::wdt_w ) +void s3c44b0_device::wdt_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_wdt.regs)[offset]; verboselog( *this, 9, "(WDT) %08X <- %08X\n", S3C44B0_BASE_WDT + (offset << 2), data); @@ -1747,14 +1747,14 @@ TIMER_CALLBACK_MEMBER( s3c44b0_device::wdt_timer_exp ) /* CPU Wrapper */ -READ32_MEMBER( s3c44b0_device::cpuwrap_r ) +uint32_t s3c44b0_device::cpuwrap_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_cpuwrap.regs)[offset]; verboselog( *this, 9, "(CPUWRAP) %08X -> %08X\n", S3C44B0_BASE_CPU_WRAPPER + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::cpuwrap_w ) +void s3c44b0_device::cpuwrap_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(CPUWRAP) %08X <- %08X\n", S3C44B0_BASE_CPU_WRAPPER + (offset << 2), data); COMBINE_DATA(&((uint32_t*)&m_cpuwrap.regs)[offset]); @@ -1762,7 +1762,7 @@ WRITE32_MEMBER( s3c44b0_device::cpuwrap_w ) /* A/D Converter */ -READ32_MEMBER( s3c44b0_device::adc_r ) +uint32_t s3c44b0_device::adc_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_adc.regs)[offset]; verboselog( *this, 9, "(ADC) %08X -> %08X\n", S3C44B0_BASE_ADC + (offset << 2), data); @@ -1796,7 +1796,7 @@ void s3c44b0_device::adc_recalc() adc_stop(); } -WRITE32_MEMBER( s3c44b0_device::adc_w ) +void s3c44b0_device::adc_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_wdt.regs)[offset]; verboselog( *this, 9, "(ADC) %08X <- %08X\n", S3C44B0_BASE_ADC + (offset << 2), data); @@ -1824,7 +1824,7 @@ TIMER_CALLBACK_MEMBER( s3c44b0_device::adc_timer_exp ) /* SIO */ -READ32_MEMBER( s3c44b0_device::sio_r ) +uint32_t s3c44b0_device::sio_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_sio.regs)[offset]; verboselog( *this, 9, "(SIO) %08X -> %08X\n", S3C44B0_BASE_SIO + (offset << 2), data); @@ -1860,7 +1860,7 @@ void s3c44b0_device::sio_recalc() sio_stop(); } -WRITE32_MEMBER( s3c44b0_device::sio_w ) +void s3c44b0_device::sio_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_sio.regs)[offset]; verboselog( *this, 9, "(SIO) %08X <- %08X\n", S3C44B0_BASE_SIO + (offset << 2), data); @@ -1893,7 +1893,7 @@ TIMER_CALLBACK_MEMBER( s3c44b0_device::sio_timer_exp ) /* IIS */ -inline void s3c44b0_device::iface_i2s_data_w(address_space &space, int ch, uint16_t data) +inline void s3c44b0_device::iface_i2s_data_w(int ch, uint16_t data) { if (!m_data_w_cb.isnull()) (m_data_w_cb)(ch, data, 0); @@ -1920,14 +1920,14 @@ void s3c44b0_device::iis_stop() m_iis.timer->adjust(attotime::never, 0); } -READ32_MEMBER( s3c44b0_device::iis_r ) +uint32_t s3c44b0_device::iis_r(offs_t offset, uint32_t mem_mask) { uint32_t data = ((uint32_t*)&m_iis.regs)[offset]; verboselog( *this, 9, "(IIS) %08X -> %08X\n", S3C44B0_BASE_IIS + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::iis_w ) +void s3c44b0_device::iis_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old_value = ((uint32_t*)&m_iis.regs)[offset]; verboselog( *this, 9, "(IIS) %08X <- %08X\n", S3C44B0_BASE_IIS + (offset << 2), data); @@ -1962,8 +1962,8 @@ WRITE32_MEMBER( s3c44b0_device::iis_w ) if (m_iis.fifo_index == 2) { m_iis.fifo_index = 0; - iface_i2s_data_w(space, 0, m_iis.fifo[0]); - iface_i2s_data_w(space, 1, m_iis.fifo[1]); + iface_i2s_data_w(0, m_iis.fifo[0]); + iface_i2s_data_w(1, m_iis.fifo[1]); } } break; @@ -2067,27 +2067,27 @@ void s3c44b0_device::zdma_w(int ch, uint32_t offset, uint32_t data, uint32_t mem } } -READ32_MEMBER( s3c44b0_device::zdma_0_r ) +uint32_t s3c44b0_device::zdma_0_r(offs_t offset, uint32_t mem_mask) { uint32_t data = zdma_r(0, offset); verboselog( *this, 9, "(ZDMA 0) %08X -> %08X\n", S3C44B0_BASE_ZDMA_0 + (offset << 2), data); return data; } -READ32_MEMBER( s3c44b0_device::zdma_1_r ) +uint32_t s3c44b0_device::zdma_1_r(offs_t offset, uint32_t mem_mask) { uint32_t data = zdma_r(1, offset); verboselog( *this, 9, "(ZDMA 1) %08X -> %08X\n", S3C44B0_BASE_ZDMA_1 + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::zdma_0_w ) +void s3c44b0_device::zdma_0_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(ZDMA 0) %08X <- %08X (%08X)\n", S3C44B0_BASE_ZDMA_0 + (offset << 2), data, mem_mask); zdma_w(0, offset, data, mem_mask); } -WRITE32_MEMBER( s3c44b0_device::zdma_1_w ) +void s3c44b0_device::zdma_1_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(ZDMA 1) %08X <- %08X (%08X)\n", S3C44B0_BASE_ZDMA_1 + (offset << 2), data, mem_mask); zdma_w(1, offset, data, mem_mask); @@ -2207,27 +2207,27 @@ void s3c44b0_device::bdma_w(int ch, uint32_t offset, uint32_t data, uint32_t mem } } -READ32_MEMBER( s3c44b0_device::bdma_0_r ) +uint32_t s3c44b0_device::bdma_0_r(offs_t offset, uint32_t mem_mask) { uint32_t data = bdma_r(0, offset); verboselog( *this, 9, "(BDMA 0) %08X -> %08X\n", S3C44B0_BASE_BDMA_0 + (offset << 2), data); return data; } -READ32_MEMBER( s3c44b0_device::bdma_1_r ) +uint32_t s3c44b0_device::bdma_1_r(offs_t offset, uint32_t mem_mask) { uint32_t data = bdma_r(1, offset); verboselog( *this, 9, "(BDMA 1) %08X -> %08X\n", S3C44B0_BASE_BDMA_1 + (offset << 2), data); return data; } -WRITE32_MEMBER( s3c44b0_device::bdma_0_w ) +void s3c44b0_device::bdma_0_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(BDMA 0) %08X <- %08X (%08X)\n", S3C44B0_BASE_BDMA_0 + (offset << 2), data, mem_mask); bdma_w(0, offset, data, mem_mask); } -WRITE32_MEMBER( s3c44b0_device::bdma_1_w ) +void s3c44b0_device::bdma_1_w(offs_t offset, uint32_t data, uint32_t mem_mask) { verboselog( *this, 9, "(BDMA 1) %08X <- %08X (%08X)\n", S3C44B0_BASE_BDMA_1 + (offset << 2), data, mem_mask); bdma_w(1, offset, data, mem_mask); |