summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ieee488/d9060.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ieee488/d9060.cpp')
-rw-r--r--src/devices/bus/ieee488/d9060.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 58a34acae64..3020fa41f42 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -19,8 +19,8 @@
Start the PET emulator with the D9060 attached on the IEEE-488 bus,
with the new CHD mounted:
- $ mess pet8032 -ieee8 d9060 -hard tm602s.chd
- $ mess pet8032 -ieee8 d9090 -hard tm603s.chd
+ $ mame pet8032 -ieee8 d9060 -hard tm602s.chd
+ $ mame pet8032 -ieee8 d9090 -hard tm603s.chd
Enter 'HEADER "LABEL",D0,I01' to format the hard drive.
Wait up to 1 hour and 20 minutes.
@@ -107,10 +107,10 @@ const tiny_rom_entry *d9060_device_base::device_rom_region() const
void d9060_device_base::main_mem(address_map &map)
{
- map(0x0000, 0x007f).mirror(0x0100).m(m_riot0, FUNC(mos6532_new_device::ram_map));
- map(0x0080, 0x00ff).mirror(0x0100).m(m_riot1, FUNC(mos6532_new_device::ram_map));
- map(0x0200, 0x021f).mirror(0x0d60).m(m_riot0, FUNC(mos6532_new_device::io_map));
- map(0x0280, 0x029f).mirror(0x0d60).m(m_riot1, FUNC(mos6532_new_device::io_map));
+ map(0x0000, 0x007f).mirror(0x0100).m(m_riot0, FUNC(mos6532_device::ram_map));
+ map(0x0080, 0x00ff).mirror(0x0100).m(m_riot1, FUNC(mos6532_device::ram_map));
+ map(0x0200, 0x021f).mirror(0x0d60).m(m_riot0, FUNC(mos6532_device::io_map));
+ map(0x0280, 0x029f).mirror(0x0d60).m(m_riot1, FUNC(mos6532_device::io_map));
map(0x1000, 0x13ff).mirror(0x0c00).ram().share("share1");
map(0x2000, 0x23ff).mirror(0x0c00).ram().share("share2");
map(0x3000, 0x33ff).mirror(0x0c00).ram().share("share3");
@@ -136,7 +136,7 @@ void d9060_device_base::hdc_mem(address_map &map)
// riot6532 0
//-------------------------------------------------
-READ8_MEMBER( d9060_device_base::dio_r )
+uint8_t d9060_device_base::dio_r()
{
/*
@@ -153,11 +153,11 @@ READ8_MEMBER( d9060_device_base::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
-WRITE8_MEMBER( d9060_device_base::dio_w )
+void d9060_device_base::dio_w(uint8_t data)
{
/*
@@ -182,7 +182,7 @@ WRITE8_MEMBER( d9060_device_base::dio_w )
// riot6532 1
//-------------------------------------------------
-READ8_MEMBER( d9060_device_base::riot1_pa_r )
+uint8_t d9060_device_base::riot1_pa_r()
{
/*
@@ -213,7 +213,7 @@ READ8_MEMBER( d9060_device_base::riot1_pa_r )
return data;
}
-WRITE8_MEMBER( d9060_device_base::riot1_pa_w )
+void d9060_device_base::riot1_pa_w(uint8_t data)
{
/*
@@ -248,7 +248,7 @@ WRITE8_MEMBER( d9060_device_base::riot1_pa_w )
update_ieee_signals();
}
-READ8_MEMBER( d9060_device_base::riot1_pb_r )
+uint8_t d9060_device_base::riot1_pb_r()
{
/*
@@ -279,7 +279,7 @@ READ8_MEMBER( d9060_device_base::riot1_pb_r )
return data;
}
-WRITE8_MEMBER( d9060_device_base::riot1_pb_w )
+void d9060_device_base::riot1_pb_w(uint8_t data)
{
/*
@@ -307,7 +307,7 @@ WRITE8_MEMBER( d9060_device_base::riot1_pb_w )
}
-WRITE8_MEMBER( d9060_device_base::via_pb_w )
+void d9060_device_base::via_pb_w(uint8_t data)
{
/*
@@ -328,12 +328,12 @@ WRITE8_MEMBER( d9060_device_base::via_pb_w )
m_sasibus->write_rst(BIT(data, 1));
}
-WRITE_LINE_MEMBER( d9060_device_base::ack_w )
+void d9060_device_base::ack_w(int state)
{
m_sasibus->write_ack(!state);
}
-WRITE_LINE_MEMBER( d9060_device_base::enable_w )
+void d9060_device_base::enable_w(int state)
{
m_enable = state;
@@ -347,7 +347,7 @@ WRITE_LINE_MEMBER( d9060_device_base::enable_w )
}
}
-WRITE8_MEMBER( d9060_device_base::scsi_data_w )
+void d9060_device_base::scsi_data_w(uint8_t data)
{
m_data = data;
@@ -368,11 +368,11 @@ void d9060_device_base::device_add_mconfig(machine_config &config)
M6502(config, m_maincpu, XTAL(4'000'000)/4);
m_maincpu->set_addrmap(AS_PROGRAM, &d9060_device::main_mem);
- MOS6532_NEW(config, m_riot0, XTAL(4'000'000)/4);
+ MOS6532(config, m_riot0, XTAL(4'000'000)/4);
m_riot0->pa_rd_callback().set(FUNC(d9060_device_base::dio_r));
m_riot0->pb_wr_callback().set(FUNC(d9060_device_base::dio_w));
- MOS6532_NEW(config, m_riot1, XTAL(4'000'000)/4);
+ MOS6532(config, m_riot1, XTAL(4'000'000)/4);
m_riot1->pa_rd_callback().set(FUNC(d9060_device_base::riot1_pa_r));
m_riot1->pa_wr_callback().set(FUNC(d9060_device_base::riot1_pa_w));
m_riot1->pb_rd_callback().set(FUNC(d9060_device_base::riot1_pb_r));
@@ -383,7 +383,7 @@ void d9060_device_base::device_add_mconfig(machine_config &config)
M6502(config, m_hdccpu, XTAL(4'000'000)/4);
m_hdccpu->set_addrmap(AS_PROGRAM, &d9060_device::hdc_mem);
- VIA6522(config, m_via, XTAL(4'000'000)/4);
+ MOS6522(config, m_via, XTAL(4'000'000)/4);
m_via->writepa_handler().set(FUNC(d9060_device_base::scsi_data_w));
m_via->writepb_handler().set(FUNC(d9060_device_base::via_pb_w));
m_via->ca2_handler().set(FUNC(d9060_device_base::ack_w));
@@ -542,7 +542,7 @@ void d9060_device_base::device_reset()
m_hdccpu->set_input_line(M6502_SET_OVERFLOW, ASSERT_LINE);
- m_riot1->pa7_w(1);
+ m_riot1->pa_bit_w<7>(1);
}
@@ -554,7 +554,7 @@ void d9060_device_base::ieee488_atn(int state)
{
update_ieee_signals();
- m_riot1->pa7_w(state);
+ m_riot1->pa_bit_w<7>(state);
}