summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes_ctrl/zapper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nes_ctrl/zapper.cpp')
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 422b9664f5e..82821ee2ad9 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -44,7 +44,7 @@ ioport_constructor nes_zapper_device::device_input_ports() const
// nes_zapper_device - constructor
//-------------------------------------------------
-nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ZAPPER, "Nintendo Zapper Lightgun", tag, owner, clock, "nes_zapper", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_lightx(*this, "ZAPPER_X"),
@@ -76,9 +76,9 @@ void nes_zapper_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_zapper_device::read_bit34()
+uint8_t nes_zapper_device::read_bit34()
{
- UINT8 ret = m_trigger->read();
+ uint8_t ret = m_trigger->read();
if (!m_port->m_brightpixel_cb.isnull() &&
m_port->m_brightpixel_cb(m_lightx->read(), m_lighty->read()))
ret &= ~0x08; // sprite hit
@@ -87,9 +87,9 @@ UINT8 nes_zapper_device::read_bit34()
return ret;
}
-UINT8 nes_zapper_device::read_exp(offs_t offset)
+uint8_t nes_zapper_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) // $4017
ret |= nes_zapper_device::read_bit34();
return ret;