summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2024-12-14 15:21:05 +0100
committer hap <happppp@users.noreply.github.com>2024-12-14 15:23:45 +0100
commitaf66ca419ba7092cd791e49ef681567955b8fd2f (patch)
tree10553cce5757234222fcd2cfb3695ea99061a752 /src/devices/bus
parent0ad1767ea3df4ffabb59229a6534fc5c446243c7 (diff)
m6502: rename m65c02 to w65c02 as well
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/a2bus/a2superdrive.cpp17
-rw-r--r--src/devices/bus/a2bus/transwarp.cpp10
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp4
-rw-r--r--src/devices/bus/bbc/tube/tube_rc6502.cpp4
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp2
-rw-r--r--src/devices/bus/cbmiec/fd2000.h4
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.h4
8 files changed, 23 insertions, 24 deletions
diff --git a/src/devices/bus/a2bus/a2superdrive.cpp b/src/devices/bus/a2bus/a2superdrive.cpp
index f9ce022a672..922c9bc0403 100644
--- a/src/devices/bus/a2bus/a2superdrive.cpp
+++ b/src/devices/bus/a2bus/a2superdrive.cpp
@@ -74,11 +74,10 @@ protected:
virtual void write_c800(uint16_t offset, uint8_t data) override;
private:
+ void w65c02_mem(address_map &map) ATTR_COLD;
- void m65c02_mem(address_map &map) ATTR_COLD;
-
- void m65c02_w(offs_t offset, uint8_t value);
- uint8_t m65c02_r(offs_t offset);
+ void w65c02_w(offs_t offset, uint8_t value);
+ uint8_t w65c02_r(offs_t offset);
void phases_w(uint8_t phases);
void sel35_w(int sel35);
@@ -111,10 +110,10 @@ const tiny_rom_entry *a2bus_superdrive_device::device_rom_region() const
return ROM_NAME( superdrive );
}
-void a2bus_superdrive_device::m65c02_mem(address_map &map)
+void a2bus_superdrive_device::w65c02_mem(address_map &map)
{
map(0x0000, 0x7fff).ram().share(m_ram);
- map(0x0a00, 0x0aff).rw(FUNC(a2bus_superdrive_device::m65c02_r), FUNC(a2bus_superdrive_device::m65c02_w));
+ map(0x0a00, 0x0aff).rw(FUNC(a2bus_superdrive_device::w65c02_r), FUNC(a2bus_superdrive_device::w65c02_w));
map(0x8000, 0xffff).rom().region(SUPERDRIVE_ROM_REGION, 0x0000);
}
@@ -123,7 +122,7 @@ void a2bus_superdrive_device::device_add_mconfig(machine_config &config)
{
W65C02S(config, m_65c02, DERIVED_CLOCK(2, 7)); /* ~ 2.046 MHz */
- m_65c02->set_addrmap(AS_PROGRAM, &a2bus_superdrive_device::m65c02_mem);
+ m_65c02->set_addrmap(AS_PROGRAM, &a2bus_superdrive_device::w65c02_mem);
SWIM1(config, m_fdc, C16M);
@@ -221,7 +220,7 @@ void a2bus_superdrive_device::write_c800(uint16_t offset, uint8_t data)
/* uc 65c02 i/o at $0a00 */
-void a2bus_superdrive_device::m65c02_w(offs_t offset, uint8_t value)
+void a2bus_superdrive_device::w65c02_w(offs_t offset, uint8_t value)
{
// $00-$0f = swim registers
// $40 = head sel low
@@ -265,7 +264,7 @@ void a2bus_superdrive_device::m65c02_w(offs_t offset, uint8_t value)
}
}
-uint8_t a2bus_superdrive_device::m65c02_r(offs_t offset)
+uint8_t a2bus_superdrive_device::w65c02_r(offs_t offset)
{
floppy_image_device *floppy = nullptr;
diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp
index da737f84e2f..34b3a3305b9 100644
--- a/src/devices/bus/a2bus/transwarp.cpp
+++ b/src/devices/bus/a2bus/transwarp.cpp
@@ -22,7 +22,7 @@
#include "emu.h"
#include "transwarp.h"
#include "cpu/m6502/m6502.h"
-#include "cpu/m6502/m65c02.h"
+#include "cpu/m6502/w65c02.h"
//**************************************************************************
@@ -65,7 +65,7 @@ private:
uint8_t dma_r(offs_t offset);
void dma_w(offs_t offset, uint8_t data);
- void m65c02_mem(address_map &map) ATTR_COLD;
+ void w65c02_mem(address_map &map) ATTR_COLD;
void hit_slot(int slot);
void hit_slot_joy();
@@ -77,7 +77,7 @@ private:
DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_TRANSWARP, device_a2bus_card_interface, a2bus_transwarp_device, "a2twarp", "Applied Engineering TransWarp")
-void a2bus_transwarp_device::m65c02_mem(address_map &map)
+void a2bus_transwarp_device::w65c02_mem(address_map &map)
{
map(0x0000, 0xffff).rw(FUNC(a2bus_transwarp_device::dma_r), FUNC(a2bus_transwarp_device::dma_w));
}
@@ -169,8 +169,8 @@ ioport_constructor a2bus_transwarp_device::device_input_ports() const
void a2bus_transwarp_device::device_add_mconfig(machine_config &config)
{
- M65C02(config, m_ourcpu, DERIVED_CLOCK(1, 2));
- m_ourcpu->set_addrmap(AS_PROGRAM, &a2bus_transwarp_device::m65c02_mem);
+ W65C02(config, m_ourcpu, DERIVED_CLOCK(1, 2));
+ m_ourcpu->set_addrmap(AS_PROGRAM, &a2bus_transwarp_device::w65c02_mem);
}
//**************************************************************************
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index dcca3ba692e..732fd38775a 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -134,8 +134,8 @@ void bbc_tube_6502_device::device_add_mconfig(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &bbc_tube_6502_device::tube_6502_mem);
TUBE(config, m_ula);
- m_ula->pnmi_handler().set_inputline(m_maincpu, M65C02_NMI_LINE);
- m_ula->pirq_handler().set_inputline(m_maincpu, M65C02_IRQ_LINE);
+ m_ula->pnmi_handler().set_inputline(m_maincpu, G65SC02_NMI_LINE);
+ m_ula->pirq_handler().set_inputline(m_maincpu, G65SC02_IRQ_LINE);
m_ula->prst_handler().set(FUNC(bbc_tube_6502_device::prst_w));
RAM(config, m_ram).set_default_size("64K").set_default_value(0);
diff --git a/src/devices/bus/bbc/tube/tube_rc6502.cpp b/src/devices/bus/bbc/tube/tube_rc6502.cpp
index 85f3fce1f11..70a0d1ea2d1 100644
--- a/src/devices/bus/bbc/tube/tube_rc6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_rc6502.cpp
@@ -135,8 +135,8 @@ void bbc_tube_rc6502_device::device_add_mconfig(machine_config &config)
add_common_devices(config);
TUBE(config, m_ula);
- m_ula->pnmi_handler().set_inputline(m_maincpu, M65C02_NMI_LINE);
- m_ula->pirq_handler().set_inputline(m_maincpu, M65C02_IRQ_LINE);
+ m_ula->pnmi_handler().set_inputline(m_maincpu, W65C02_NMI_LINE);
+ m_ula->pirq_handler().set_inputline(m_maincpu, W65C02_IRQ_LINE);
m_ula->prst_handler().set(FUNC(bbc_tube_rc6502_device::prst_w));
}
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 4b4834271a1..91b3cc9ae44 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -219,7 +219,7 @@ void fd2000_device::floppy_formats(format_registration &fr)
void fd2000_device::add_common_devices(machine_config &config)
{
- M65C02(config, m_maincpu, 24_MHz_XTAL / 12);
+ W65C02(config, m_maincpu, 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));
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 04ac1264f79..d632e77c11f 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -12,7 +12,7 @@
#pragma once
#include "cbmiec.h"
-#include "cpu/m6502/m65c02.h"
+#include "cpu/m6502/w65c02.h"
#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/upd765.h"
@@ -58,7 +58,7 @@ protected:
void add_common_devices(machine_config &config);
- required_device<m65c02_device> m_maincpu;
+ required_device<w65c02_device> m_maincpu;
required_device<upd765_family_device> m_fdc;
required_device<floppy_connector> m_floppy0;
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 9d9dcc114cf..950cf46b964 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -71,7 +71,7 @@ void cbm_serial_box_device::serial_box_mem(address_map &map)
void cbm_serial_box_device::device_add_mconfig(machine_config &config)
{
- M65C02(config, m_maincpu, XTAL(4'000'000)/4);
+ W65C02(config, m_maincpu, XTAL(4'000'000)/4);
m_maincpu->set_addrmap(AS_PROGRAM, &cbm_serial_box_device::serial_box_mem);
}
diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 4b51d5752ef..268013ffb45 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -12,7 +12,7 @@
#pragma once
#include "cbmiec.h"
-#include "cpu/m6502/m65c02.h"
+#include "cpu/m6502/w65c02.h"
@@ -43,7 +43,7 @@ protected:
void cbm_iec_reset(int state) override;
private:
- required_device<m65c02_device> m_maincpu;
+ required_device<w65c02_device> m_maincpu;
void serial_box_mem(address_map &map) ATTR_COLD;
};