summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2019-11-10 22:24:14 -0500
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2019-11-10 22:25:57 -0500
commitc67f75fdd79c071a7c9d8d3cecf3001ecd04c933 (patch)
treef91e7a011661eadcbe4fcf98eea790ced3856379 /src/devices
parent3e0e72a9376589e86757cbacc4ef4a789c147c6a (diff)
thomson.cpp: Improve floppy device encapsulation (nw)
- Eliminate all global-level static variables and functions in thomflop.cpp - Simplify read/write handlers for floppy interfaces mc6843: Simplify read/write handlers (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp2
-rw-r--r--src/devices/machine/mc6843.cpp4
-rw-r--r--src/devices/machine/mc6843.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index b445efc7c4d..d5ce2f39598 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -141,7 +141,7 @@ void bml3bus_mp1805_device::device_start()
// install into memory
address_space &space_prg = space();
- space_prg.install_readwrite_handler(0xff18, 0xff1f, read8_delegate(*m_mc6843, FUNC(mc6843_device::read)), write8_delegate(*m_mc6843, FUNC(mc6843_device::write)));
+ space_prg.install_readwrite_handler(0xff18, 0xff1f, read8sm_delegate(*m_mc6843, FUNC(mc6843_device::read)), write8sm_delegate(*m_mc6843, FUNC(mc6843_device::write)));
space_prg.install_readwrite_handler(0xff20, 0xff20, read8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w)));
// overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work...
uint8_t *mainrom = device().machine().root_device().memregion("maincpu")->base();
diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp
index e41aeeaf9d3..597cc7ee865 100644
--- a/src/devices/machine/mc6843.cpp
+++ b/src/devices/machine/mc6843.cpp
@@ -451,7 +451,7 @@ void mc6843_device::device_timer(emu_timer &timer, device_timer_id id, int param
-READ8_MEMBER( mc6843_device::read )
+uint8_t mc6843_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -590,7 +590,7 @@ READ8_MEMBER( mc6843_device::read )
return data;
}
-WRITE8_MEMBER( mc6843_device::write )
+void mc6843_device::write(offs_t offset, uint8_t data)
{
switch ( offset ) {
case 0: /* Data Output Register (DOR) */
diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h
index c75ba561548..895e80d9458 100644
--- a/src/devices/machine/mc6843.h
+++ b/src/devices/machine/mc6843.h
@@ -32,8 +32,8 @@ public:
auto irq() { return m_write_irq.bind(); }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
void set_drive(int drive);
void set_side(int side);