summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/midxunit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/midxunit.cpp')
-rw-r--r--src/mame/machine/midxunit.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/machine/midxunit.cpp b/src/mame/machine/midxunit.cpp
index 9e2ab1df0ff..762a092b331 100644
--- a/src/mame/machine/midxunit.cpp
+++ b/src/mame/machine/midxunit.cpp
@@ -29,12 +29,12 @@
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_cmos_r)
+uint16_t midxunit_state::midxunit_cmos_r(offs_t offset)
{
return m_nvram[offset];
}
-WRITE16_MEMBER(midxunit_state::midxunit_cmos_w)
+void midxunit_state::midxunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_nvram+offset);
}
@@ -46,7 +46,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_cmos_w)
*
*************************************/
-WRITE16_MEMBER(midxunit_state::midxunit_io_w)
+void midxunit_state::midxunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int oldword, newword;
@@ -80,7 +80,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_io_w)
}
-WRITE16_MEMBER(midxunit_state::midxunit_unknown_w)
+void midxunit_state::midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int offs = offset / 0x40000;
@@ -105,7 +105,7 @@ WRITE_LINE_MEMBER(midxunit_state::adc_int_w)
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_status_r)
+uint16_t midxunit_state::midxunit_status_r()
{
/* low bit indicates whether the ADC is done reading the current input */
return (m_midway_serial_pic->status_r() << 1) | (m_adc_int ? 1 : 0);
@@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(midxunit_state::midxunit_dcs_output_full)
}
-READ16_MEMBER(midxunit_state::midxunit_uart_r)
+uint16_t midxunit_state::midxunit_uart_r(offs_t offset)
{
int result = 0;
@@ -152,7 +152,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midxunit_sound_state_r(space, 0, 0xffff);
+ int temp = midxunit_sound_state_r();
result |= (temp & 0x800) >> 9;
result |= (~temp & 0x400) >> 10;
machine().scheduler().synchronize();
@@ -167,7 +167,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: read from the DCS system */
else
- result = midxunit_sound_r(space, 0, 0xffff);
+ result = midxunit_sound_r();
break;
case 5: /* register 5 seems to be like 3, but with in/out swapped */
@@ -179,7 +179,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midxunit_sound_state_r(space, 0, 0xffff);
+ int temp = midxunit_sound_state_r();
result |= (temp & 0x800) >> 11;
result |= (~temp & 0x400) >> 8;
machine().scheduler().synchronize();
@@ -196,7 +196,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
}
-WRITE16_MEMBER(midxunit_state::midxunit_uart_w)
+void midxunit_state::midxunit_uart_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* convert to a byte offset, ignoring MSB writes */
if ((offset & 1) || !ACCESSING_BITS_0_7)
@@ -215,7 +215,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_uart_w)
/* non-loopback case: send to the DCS system */
else
- midxunit_sound_w(space, 0, data, mem_mask);
+ midxunit_sound_w(0, data, mem_mask);
break;
case 5: /* register 5 write seems to reset things */
@@ -282,19 +282,19 @@ void midxunit_state::machine_reset()
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_security_r)
+uint16_t midxunit_state::midxunit_security_r()
{
return m_midway_serial_pic->read();
}
-WRITE16_MEMBER(midxunit_state::midxunit_security_w)
+void midxunit_state::midxunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_security_bits = data & 0x0f;
}
-WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w)
+void midxunit_state::midxunit_security_clock_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && ACCESSING_BITS_0_7)
m_midway_serial_pic->write(((~data & 2) << 3) | m_security_bits);
@@ -308,7 +308,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w)
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_sound_r)
+uint16_t midxunit_state::midxunit_sound_r()
{
LOGMASKED(LOG_SOUND, "%08X:Sound read\n", m_maincpu->pc());
@@ -316,13 +316,13 @@ READ16_MEMBER(midxunit_state::midxunit_sound_r)
}
-READ16_MEMBER(midxunit_state::midxunit_sound_state_r)
+uint16_t midxunit_state::midxunit_sound_state_r()
{
return m_dcs->control_r();
}
-WRITE16_MEMBER(midxunit_state::midxunit_sound_w)
+void midxunit_state::midxunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* check for out-of-bounds accesses */
if (offset)