summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-01-21 10:51:37 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-01-21 10:51:37 -0500
commit5a4d710e2608672b44aa94d5af001c3c069656b4 (patch)
treec7005e890bf55140e0d82cb42ad937952266df41 /src/devices/bus/cbmiec
parent40a05f4dbc1229e51a118e6c69998e52a5a12f65 (diff)
6522via.cpp: Distinguish some different VIA types
Diffstat (limited to 'src/devices/bus/cbmiec')
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp4
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp4
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp2
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index aae2baddc09..62d29d71115 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -964,7 +964,7 @@ void c1541_device_base::device_add_mconfig(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &c1541_device_base::c1541_mem);
//config.set_perfect_quantum(m_maincpu); FIXME: not safe in a slot device - add barriers
- VIA6522(config, m_via0, XTAL(16'000'000)/16);
+ MOS6522(config, m_via0, XTAL(16'000'000)/16);
m_via0->readpa_handler().set(FUNC(c1541_device_base::via0_pa_r));
m_via0->readpb_handler().set(FUNC(c1541_device_base::via0_pb_r));
m_via0->writepa_handler().set(FUNC(c1541_device_base::via0_pa_w));
@@ -972,7 +972,7 @@ void c1541_device_base::device_add_mconfig(machine_config &config)
m_via0->cb2_handler().set(FUNC(c1541_device_base::via0_ca2_w));
m_via0->irq_handler().set(FUNC(c1541_device_base::via0_irq_w));
- VIA6522(config, m_via1, XTAL(16'000'000)/16);
+ MOS6522(config, m_via1, XTAL(16'000'000)/16);
m_via1->readpa_handler().set(C64H156_TAG, FUNC(c64h156_device::yb_r));
m_via1->readpb_handler().set(FUNC(c1541_device_base::via1_pb_r));
m_via1->writepa_handler().set(C64H156_TAG, FUNC(c64h156_device::yb_w));
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index d08d92c8d7a..e711ce062ce 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -600,14 +600,14 @@ void c1571_device::add_base_mconfig(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &c1571_device::c1571_mem);
//config.set_perfect_quantum(m_maincpu); FIXME: not safe in a slot device - add barriers
- VIA6522(config, m_via0, 16_MHz_XTAL / 16);
+ MOS6522(config, m_via0, 16_MHz_XTAL / 16);
m_via0->readpa_handler().set(FUNC(c1571_device::via0_pa_r));
m_via0->readpb_handler().set(FUNC(c1571_device::via0_pb_r));
m_via0->writepa_handler().set(FUNC(c1571_device::via0_pa_w));
m_via0->writepb_handler().set(FUNC(c1571_device::via0_pb_w));
m_via0->irq_handler().set(FUNC(c1571_device::via0_irq_w));
- VIA6522(config, m_via1, 16_MHz_XTAL / 16);
+ MOS6522(config, m_via1, 16_MHz_XTAL / 16);
m_via1->readpa_handler().set(C64H156_TAG, FUNC(c64h156_device::yb_r));
m_via1->readpb_handler().set(FUNC(c1571_device::via1_pb_r));
m_via1->writepa_handler().set(C64H156_TAG, FUNC(c64h156_device::yb_w));
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 096f68a9641..104b0eb456e 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -78,8 +78,8 @@ void cmd_hd_device::device_add_mconfig(machine_config &config)
M6502(config, m_maincpu, 2000000);
m_maincpu->set_addrmap(AS_PROGRAM, &cmd_hd_device::mem_map);
- VIA6522(config, M6522_1_TAG, 2000000);
- VIA6522(config, M6522_2_TAG, 2000000);
+ MOS6522(config, M6522_1_TAG, 2000000);
+ MOS6522(config, M6522_2_TAG, 2000000);
I8255A(config, I8255A_TAG, 0);
RTC72421(config, RTC72421A_TAG, XTAL(32'768));
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 0ac6321c359..057c77c7db9 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -219,7 +219,7 @@ void fd2000_device::add_common_devices(machine_config &config)
{
M65C02(config, m_maincpu, 24_MHz_XTAL / 12);
- via6522_device &via(VIA6522(config, G65SC22P2_TAG, 24_MHz_XTAL / 12));
+ via6522_device &via(R65C22(config, G65SC22P2_TAG, 24_MHz_XTAL / 12));
via.readpa_handler().set(FUNC(fd2000_device::via_pa_r));
via.readpb_handler().set(FUNC(fd2000_device::via_pb_r));
via.writepa_handler().set(FUNC(fd2000_device::via_pa_w));
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index 27d418a749d..c5479a30b18 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -128,7 +128,7 @@ void cbm_interpod_device::device_add_mconfig(machine_config &config)
M6502(config, m_maincpu, 1000000);
m_maincpu->set_addrmap(AS_PROGRAM, &cbm_interpod_device::interpod_mem);
- VIA6522(config, m_via, 1000000);
+ MOS6522(config, m_via, 1000000);
MOS6532_NEW(config, m_riot, 1000000);