diff options
author | 2018-03-30 02:31:23 +1100 | |
---|---|---|
committer | 2018-03-30 02:31:23 +1100 | |
commit | 811b159b83900b693aea764807a48afd396fb185 (patch) | |
tree | 83c6ab77fd7045ebfd0cf77f2d1b8b51c9dd2376 /src/devices/bus/neogeo_ctrl/ctrl.cpp | |
parent | 16125666f732199946c9634b399980f7783fc752 (diff) |
neogeo: Further improvements:
* Removed LEDs/lamps from configurations that lack them.
* Hooked up coin lockouts.
* Improved I/O register mapping.
* Added controller detection connections for AES.
* Hooked up SPI-like outputs on SIT board used by irrmaze.
* Added layout for irrmaze showing most lamps.
* Irrmaze still missing card dispenser, air compressor and colour lamps.
Diffstat (limited to 'src/devices/bus/neogeo_ctrl/ctrl.cpp')
-rw-r--r-- | src/devices/bus/neogeo_ctrl/ctrl.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp index 4fb9914adb8..1f36549fe17 100644 --- a/src/devices/bus/neogeo_ctrl/ctrl.cpp +++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp @@ -115,18 +115,12 @@ void neogeo_control_port_device::device_start() uint8_t neogeo_control_port_device::read_ctrl() { - uint8_t data = 0xff; - if (m_device) - data &= m_device->read_ctrl(); - return data; + return m_device ? m_device->read_ctrl() : 0xff; } uint8_t neogeo_control_port_device::read_start_sel() { - uint8_t data = 0xff; - if (m_device) - data &= m_device->read_start_sel(); - return data; + return m_device ? m_device->read_start_sel() : 0xff; } @@ -170,26 +164,17 @@ void neogeo_ctrl_edge_port_device::device_start() READ8_MEMBER(neogeo_ctrl_edge_port_device::in0_r) { - uint8_t data = 0xff; - if (m_device) - data &= m_device->in0_r(space, offset, mem_mask); - return data; + return m_device ? m_device->in0_r(space, offset, mem_mask) : 0xff; } READ8_MEMBER(neogeo_ctrl_edge_port_device::in1_r) { - uint8_t data = 0xff; - if (m_device) - data &= m_device->in1_r(space, offset, mem_mask); - return data; + return m_device ? m_device->in1_r(space, offset, mem_mask) : 0xff; } uint8_t neogeo_ctrl_edge_port_device::read_start_sel() { - uint8_t data = 0xff; - if (m_device) - data &= m_device->read_start_sel(); - return data; + return m_device ? m_device->read_start_sel() : 0xff; } void neogeo_ctrl_edge_port_device::write_ctrlsel(uint8_t data) |