From 56cbfdb6005fa06a7773654ea3a943113b965074 Mon Sep 17 00:00:00 2001 From: mooglyguy Date: Mon, 22 Jun 2020 15:46:37 +0200 Subject: merge fixes, nw --- src/devices/machine/pxa255.cpp | 4 ++-- src/mame/drivers/zaurus.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index e8710f7d891..7ab7457f757 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -755,7 +755,7 @@ void pxa255_periphs_device::intc_w(offs_t offset, uint32_t data, uint32_t mem_ma */ -uint32_t pxa255_periphs_device::gpio_r(offs_t offset, uint32_t mem_mask) +void pxa255_periphs_device::gpio_bit_w(offs_t offset, uint8_t data, uint8_t mem_mask) { const uint32_t val = (data != 0 ? 1 : 0); LOGMASKED(LOG_GPIO, "pxa255: GPIO%d written: %d\n", offset, val); @@ -1353,7 +1353,7 @@ void pxa255_periphs_device::lcd_w(address_space &space, offs_t offset, uint32_t } } -uin32_t pxa255_periphs_device::power_r(offs_t offset, uint32_t mem_mask) +uint32_t pxa255_periphs_device::power_r(offs_t offset, uint32_t mem_mask) { switch(PXA255_POWER_BASE_ADDR | (offset << 2)) { diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index 8ca785c4901..cc0ffd84454 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1468,7 +1468,7 @@ void zaurus_state::zaurus_map(address_map &map) INPUT_CHANGED_MEMBER( zaurus_state::system_start ) { - m_pxa_periphs->gpio_bit_w(m_maincpu->space(AS_PROGRAM), 10, m_power->read()); + m_pxa_periphs->gpio_bit_w(10, m_power->read()); } static INPUT_PORTS_START( zaurus ) -- cgit v1.2.3