summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/mgavegas.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mgavegas.cpp')
-rw-r--r--src/mame/drivers/mgavegas.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index c9b80303565..6fcd9c17ca5 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -130,17 +130,17 @@ private:
uint8_t m_mc;
uint8_t m_mr;
- DECLARE_READ8_MEMBER(start_read);
+ uint8_t start_read();
- DECLARE_WRITE8_MEMBER(w_a0);
- DECLARE_READ8_MEMBER(r_a0);
- DECLARE_WRITE8_MEMBER(cso1_w);
- DECLARE_WRITE8_MEMBER(cso2_w);
- DECLARE_WRITE8_MEMBER(csoki_w);
- DECLARE_READ8_MEMBER(csoki_r);
+ void w_a0(offs_t offset, uint8_t data);
+ uint8_t r_a0(offs_t offset);
+ void cso1_w(uint8_t data);
+ void cso2_w(uint8_t data);
+ void csoki_w(offs_t offset, uint8_t data);
+ uint8_t csoki_r(offs_t offset);
- DECLARE_READ8_MEMBER(ay8910_a_r);
- DECLARE_READ8_MEMBER(ay8910_b_r);
+ uint8_t ay8910_a_r();
+ uint8_t ay8910_b_r();
TIMER_DEVICE_CALLBACK_MEMBER(int_0);
@@ -269,7 +269,7 @@ uint64_t tmp;
}
-READ8_MEMBER( mgavegas_state::start_read )
+uint8_t mgavegas_state::start_read()
{
// in HW it look for /IOREQ going down to clear the IRQ line
if (m_int){
@@ -284,7 +284,7 @@ READ8_MEMBER( mgavegas_state::start_read )
/****************************
* Read/Write Handlers *
****************************/
-READ8_MEMBER(mgavegas_state::r_a0)
+uint8_t mgavegas_state::r_a0(offs_t offset)
{
uint8_t ret=0;
@@ -305,7 +305,7 @@ uint8_t ret=0;
return ret;
}
-WRITE8_MEMBER(mgavegas_state::w_a0)
+void mgavegas_state::w_a0(offs_t offset, uint8_t data)
{
if (LOG_AY8910)
logerror("write to %04X data = %02X \n",offset+0xa000,data);
@@ -335,25 +335,25 @@ WRITE8_MEMBER(mgavegas_state::w_a0)
-READ8_MEMBER(mgavegas_state::csoki_r)
+uint8_t mgavegas_state::csoki_r(offs_t offset)
{
-uint8_t ret=0;
+ uint8_t ret=0;
if (LOG_MSM5205)
logerror("read from %04X return %02X\n",offset+0xc800,ret);
return ret;
}
-WRITE8_MEMBER(mgavegas_state::csoki_w)
+void mgavegas_state::csoki_w(offs_t offset, uint8_t data)
{
if (LOG_MSM5205)
logerror("MSM5205 write to %04X data = %02X \n",offset+0xc800,data);
m_msm->reset_w(data&0x10>>4);
- m_msm->write_data(data&0x0f);
+ m_msm->data_w(data&0x0f);
}
-WRITE8_MEMBER(mgavegas_state::cso1_w)
+void mgavegas_state::cso1_w(uint8_t data)
{
if (LOG_CSO1)
logerror("write to CSO1 data = %02X\n",data);
@@ -372,7 +372,7 @@ WRITE8_MEMBER(mgavegas_state::cso1_w)
m_ticket->motor_w(m_hop);
}
-WRITE8_MEMBER(mgavegas_state::cso2_w)
+void mgavegas_state::cso2_w(uint8_t data)
{
if (LOG_CSO2)
logerror("write to CSO2 data = %02X\n",data);
@@ -390,7 +390,7 @@ WRITE8_MEMBER(mgavegas_state::cso2_w)
}
-READ8_MEMBER(mgavegas_state::ay8910_a_r)
+uint8_t mgavegas_state::ay8910_a_r()
{
uint8_t ret=0xff;
@@ -402,7 +402,7 @@ READ8_MEMBER(mgavegas_state::ay8910_a_r)
return ret;
}
-READ8_MEMBER(mgavegas_state::ay8910_b_r)
+uint8_t mgavegas_state::ay8910_b_r()
{
uint8_t ret=0xff;
@@ -557,13 +557,13 @@ void mgavegas_state::machine_reset()
void mgavegas_state::init_mgavegas21()
{
//hack to clear the irq on reti instruction
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00ea, 0x00ea, read8_delegate(*this, FUNC(mgavegas_state::start_read)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00ea, 0x00ea, read8smo_delegate(*this, FUNC(mgavegas_state::start_read)));
}
void mgavegas_state::init_mgavegas()
{
//hack to clear the irq on reti instruction
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e2, 0x00e2, read8_delegate(*this, FUNC(mgavegas_state::start_read)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e2, 0x00e2, read8smo_delegate(*this, FUNC(mgavegas_state::start_read)));
}
@@ -577,7 +577,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( mgavegas_state::int_0 )
void mgavegas_state::init_mgavegas133()
{
//hack to clear the irq on reti instruction
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00dd, 0x00dd, read8_delegate(*this, FUNC(mgavegas_state::start_read)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00dd, 0x00dd, read8smo_delegate(*this, FUNC(mgavegas_state::start_read)));
}
/*************************