From 4d3a61f9daeb45df5dd4f95d7dabeff64ad9bafa Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Tue, 19 Dec 2017 19:07:12 +0100 Subject: [PATCH] memory: Remove some space parameters from the apple2 domain [O. Galibert] --- src/devices/bus/a2bus/a2alfam2.cpp | 12 ++-- src/devices/bus/a2bus/a2alfam2.h | 4 +- src/devices/bus/a2bus/a2applicard.cpp | 6 +- src/devices/bus/a2bus/a2applicard.h | 4 +- src/devices/bus/a2bus/a2arcadebd.cpp | 18 ++--- src/devices/bus/a2bus/a2arcadebd.h | 4 +- src/devices/bus/a2bus/a2bus.h | 16 ++--- src/devices/bus/a2bus/a2cffa.cpp | 10 +-- src/devices/bus/a2bus/a2cffa.h | 10 +-- src/devices/bus/a2bus/a2corvus.cpp | 16 ++--- src/devices/bus/a2bus/a2corvus.h | 8 +-- src/devices/bus/a2bus/a2diskii.cpp | 6 +- src/devices/bus/a2bus/a2diskii.h | 6 +- src/devices/bus/a2bus/a2diskiing.cpp | 10 +-- src/devices/bus/a2bus/a2diskiing.h | 6 +- src/devices/bus/a2bus/a2dx1.cpp | 4 +- src/devices/bus/a2bus/a2dx1.h | 4 +- src/devices/bus/a2bus/a2echoii.cpp | 8 +-- src/devices/bus/a2bus/a2echoii.h | 4 +- src/devices/bus/a2bus/a2hsscsi.cpp | 40 +++++------ src/devices/bus/a2bus/a2hsscsi.h | 12 ++-- src/devices/bus/a2bus/a2mcms.cpp | 28 ++++---- src/devices/bus/a2bus/a2mcms.h | 16 ++--- src/devices/bus/a2bus/a2memexp.cpp | 8 +-- src/devices/bus/a2bus/a2memexp.h | 8 +-- src/devices/bus/a2bus/a2midi.cpp | 12 ++-- src/devices/bus/a2bus/a2midi.h | 4 +- src/devices/bus/a2bus/a2mockingboard.cpp | 88 ++++++++++++------------ src/devices/bus/a2bus/a2mockingboard.h | 12 ++-- src/devices/bus/a2bus/a2pic.cpp | 6 +- src/devices/bus/a2bus/a2pic.h | 6 +- src/devices/bus/a2bus/a2sam.cpp | 2 +- src/devices/bus/a2bus/a2sam.h | 2 +- src/devices/bus/a2bus/a2scsi.cpp | 38 +++++----- src/devices/bus/a2bus/a2scsi.h | 12 ++-- src/devices/bus/a2bus/a2softcard.cpp | 2 +- src/devices/bus/a2bus/a2softcard.h | 2 +- src/devices/bus/a2bus/a2ssc.cpp | 14 ++-- src/devices/bus/a2bus/a2ssc.h | 8 +-- src/devices/bus/a2bus/a2swyft.cpp | 6 +- src/devices/bus/a2bus/a2swyft.h | 6 +- src/devices/bus/a2bus/a2themill.cpp | 4 +- src/devices/bus/a2bus/a2themill.h | 4 +- src/devices/bus/a2bus/a2thunderclock.cpp | 8 +-- src/devices/bus/a2bus/a2thunderclock.h | 8 +-- src/devices/bus/a2bus/a2ultraterm.cpp | 26 +++---- src/devices/bus/a2bus/a2ultraterm.h | 12 ++-- src/devices/bus/a2bus/a2videoterm.cpp | 22 +++--- src/devices/bus/a2bus/a2videoterm.h | 16 ++--- src/devices/bus/a2bus/a2vulcan.cpp | 10 +-- src/devices/bus/a2bus/a2vulcan.h | 10 +-- src/devices/bus/a2bus/a2zipdrive.cpp | 8 +-- src/devices/bus/a2bus/a2zipdrive.h | 8 +-- src/devices/bus/a2bus/agat7langcard.cpp | 8 +-- src/devices/bus/a2bus/agat7langcard.h | 8 +-- src/devices/bus/a2bus/agat7ram.cpp | 8 +-- src/devices/bus/a2bus/agat7ram.h | 8 +-- src/devices/bus/a2bus/agat840k_hle.cpp | 14 ++-- src/devices/bus/a2bus/agat840k_hle.h | 6 +- src/devices/bus/a2bus/corvfdc01.cpp | 22 +++--- src/devices/bus/a2bus/corvfdc01.h | 6 +- src/devices/bus/a2bus/corvfdc02.cpp | 12 ++-- src/devices/bus/a2bus/corvfdc02.h | 6 +- src/devices/bus/a2bus/ezcgi.cpp | 20 +++--- src/devices/bus/a2bus/ezcgi.h | 12 ++-- src/devices/bus/a2bus/laser128.cpp | 10 +-- src/devices/bus/a2bus/laser128.h | 10 +-- src/devices/bus/a2bus/mouse.cpp | 10 +-- src/devices/bus/a2bus/mouse.h | 6 +- src/devices/bus/a2bus/pc_xporter.cpp | 30 ++++---- src/devices/bus/a2bus/pc_xporter.h | 12 ++-- src/devices/bus/a2bus/ramcard128k.cpp | 8 +-- src/devices/bus/a2bus/ramcard128k.h | 8 +-- src/devices/bus/a2bus/ramcard16k.cpp | 8 +-- src/devices/bus/a2bus/ramcard16k.h | 8 +-- src/devices/bus/a2bus/ssbapple.cpp | 8 +-- src/devices/bus/a2bus/ssbapple.h | 4 +- src/devices/bus/a2bus/ssprite.cpp | 22 +++--- src/devices/bus/a2bus/ssprite.h | 4 +- src/devices/bus/a2bus/timemasterho.cpp | 12 ++-- src/devices/bus/a2bus/timemasterho.h | 8 +-- src/devices/machine/6821pia.h | 5 +- src/devices/machine/ncr5380n.cpp | 34 ++++----- src/devices/machine/upd765.cpp | 15 ++++ src/devices/machine/upd765.h | 3 + src/devices/machine/wozfdc.cpp | 8 +-- src/devices/machine/wozfdc.h | 8 +-- src/devices/sound/ay8910.cpp | 20 ++++++ src/devices/sound/ay8910.h | 4 ++ src/devices/sound/tms5220.cpp | 10 +++ src/devices/sound/tms5220.h | 3 + src/devices/video/mc6845.cpp | 20 ++++++ src/devices/video/mc6845.h | 4 ++ src/devices/video/tms9928a.cpp | 26 +++++-- src/devices/video/tms9928a.h | 5 ++ src/mame/drivers/agat.cpp | 20 +++--- src/mame/drivers/apple2.cpp | 16 ++--- src/mame/drivers/apple2e.cpp | 58 ++++++++-------- src/mame/includes/apple2.h | 2 +- src/mame/machine/apple2.cpp | 40 +++++------ src/mame/machine/apple2gs.cpp | 8 +-- src/mame/machine/apple3.cpp | 38 +++++----- src/mame/machine/concept.cpp | 8 +-- 103 files changed, 689 insertions(+), 588 deletions(-) diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index 901a648aa3e..e4636598f1f 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -116,7 +116,7 @@ void a2bus_sn76489_device::device_reset() m_latch0 = m_latch1 = m_latch2 = m_latch3 = 0; } -uint8_t a2bus_sn76489_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_sn76489_device::read_c0nx(uint8_t offset) { // SN76489 can't be read, it appears from the schematics this is what happens switch (offset) @@ -137,29 +137,29 @@ uint8_t a2bus_sn76489_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_sn76489_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_sn76489_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: - m_sn1->write(space, 0, data); + m_sn1->write(data); m_latch0 = data; break; case 1: - m_sn2->write(space, 0, data); + m_sn2->write(data); m_latch1 = data; break; case 2: - m_sn3->write(space, 0, data); + m_sn3->write(data); m_latch2 = data; break; case 3: if (m_has4thsn) { - m_sn4->write(space, 0, data); + m_sn4->write(data); m_latch3 = data; } break; diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h index f749a7a7ea6..48088cdffd6 100644 --- a/src/devices/bus/a2bus/a2alfam2.h +++ b/src/devices/bus/a2bus/a2alfam2.h @@ -33,8 +33,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_sn1; diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index 58449c8ce38..266902277dd 100644 --- a/src/devices/bus/a2bus/a2applicard.cpp +++ b/src/devices/bus/a2bus/a2applicard.cpp @@ -109,7 +109,7 @@ void a2bus_applicard_device::device_reset() m_z80stat = false; } -uint8_t a2bus_applicard_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_applicard_device::read_c0nx(uint8_t offset) { switch (offset & 0xf) { @@ -152,7 +152,7 @@ uint8_t a2bus_applicard_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_applicard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_applicard_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset & 0xf) { @@ -169,7 +169,7 @@ void a2bus_applicard_device::write_c0nx(address_space &space, uint8_t offset, ui case 5: case 6: case 7: - read_c0nx(space, offset); // let the read handler take care of these + read_c0nx(offset); // let the read handler take care of these break; } } diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h index 7262bca1a33..69f8a6d932f 100644 --- a/src/devices/bus/a2bus/a2applicard.h +++ b/src/devices/bus/a2bus/a2applicard.h @@ -41,8 +41,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_z80; diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 85dbe13e770..7da3f6cfee7 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -89,43 +89,43 @@ void a2bus_arcboard_device::device_reset() 6 - AY data */ -uint8_t a2bus_arcboard_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_arcboard_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return m_tms->vram_read(space, 0); + return m_tms->vram_read(); case 1: - return m_tms->register_read(space, 0); + return m_tms->register_read(); case 6: - return m_ay->data_r(space, 0); + return m_ay->data_r(); } return 0xff; } -void a2bus_arcboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_arcboard_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: case 2: - m_tms->vram_write(space, 0, data); + m_tms->vram_write(data); break; case 1: case 3: - m_tms->register_write(space, 0, data); + m_tms->register_write(data); break; case 5: - m_ay->address_w(space, 0, data); + m_ay->address_w(data); break; case 6: - m_ay->data_w(space, 0, data); + m_ay->data_w(data); break; } } diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h index 8690f7a8c03..9c0af1830fd 100644 --- a/src/devices/bus/a2bus/a2arcadebd.h +++ b/src/devices/bus/a2bus/a2arcadebd.h @@ -37,8 +37,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 9afff242bdf..1c8fb15b06f 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -152,15 +152,15 @@ public: // construction/destruction virtual ~device_a2bus_card_interface(); - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; } // C0nX - /DEVSEL - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); } - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) { return 0; } // CnXX - /IOSEL - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); } - virtual uint8_t read_c800(address_space &space, uint16_t offset) { return 0; } // C800 - /IOSTB - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); } + virtual uint8_t read_c0nx(uint8_t offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; } // C0nX - /DEVSEL + virtual void write_c0nx(uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); } + virtual uint8_t read_cnxx(uint8_t offset) { return 0; } // CnXX - /IOSEL + virtual void write_cnxx(uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); } + virtual uint8_t read_c800(uint16_t offset) { return 0; } // C800 - /IOSTB + virtual void write_c800(uint16_t offset, uint8_t data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); } virtual bool take_c800() { return true; } // override and return false if your card doesn't take over the c800 space - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) { return 0; } - virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) { } + virtual uint8_t read_inh_rom(uint16_t offset) { return 0; } + virtual void write_inh_rom(uint16_t offset, uint8_t data) { } virtual uint16_t inh_start() { return INH_START_INVALID; } virtual uint16_t inh_end() { return INH_END_INVALID; } virtual int inh_type() { return INH_NONE; } diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index 544d4480078..b90c0da3b48 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -129,7 +129,7 @@ void a2bus_cffa2000_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_cffa2000_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_cffa2000_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -170,7 +170,7 @@ uint8_t a2bus_cffa2000_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_cffa2000_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_cffa2000_device::write_c0nx(uint8_t offset, uint8_t data) { m_inwritecycle = false; @@ -214,7 +214,7 @@ void a2bus_cffa2000_device::write_c0nx(address_space &space, uint8_t offset, uin read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_cffa2000_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_cffa2000_device::read_cnxx(uint8_t offset) { int slotimg = m_slot * 0x100; @@ -226,12 +226,12 @@ uint8_t a2bus_cffa2000_device::read_cnxx(address_space &space, uint8_t offset) read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_cffa2000_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_cffa2000_device::read_c800(uint16_t offset) { return m_eeprom[offset+0x800]; } -void a2bus_cffa2000_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_cffa2000_device::write_c800(uint16_t offset, uint8_t data) { if (!m_writeprotect) { diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h index 3760523e443..09fd4cd5d0d 100644 --- a/src/devices/bus/a2bus/a2cffa.h +++ b/src/devices/bus/a2bus/a2cffa.h @@ -35,11 +35,11 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; required_device m_ata; diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index 6958950c9d8..a0e9916c8c2 100644 --- a/src/devices/bus/a2bus/a2corvus.cpp +++ b/src/devices/bus/a2bus/a2corvus.cpp @@ -129,18 +129,18 @@ void a2bus_corvus_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_corvus_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_corvus_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return m_corvushd->read(space, 0); + return m_corvushd->read(machine().dummy_space(), 0); case 1: - return m_corvushd->status_r(space, 0); + return m_corvushd->status_r(machine().dummy_space(), 0); default: - logerror("Corvus: read unhandled c0n%x (PC=%x)\n", offset, space.device().safe_pc()); + logerror("Corvus: read unhandled c0n%x (%s)\n", offset, machine().describe_context()); break; } @@ -152,11 +152,11 @@ uint8_t a2bus_corvus_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_corvus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_corvus_device::write_c0nx(uint8_t offset, uint8_t data) { if (offset == 0) { - m_corvushd->write(space, 0, data); + m_corvushd->write(machine().dummy_space(), 0, data); } } @@ -164,7 +164,7 @@ void a2bus_corvus_device::write_c0nx(address_space &space, uint8_t offset, uint8 read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_corvus_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_corvus_device::read_cnxx(uint8_t offset) { // one slot image at the end of the ROM, it appears return m_rom[offset+0x700]; @@ -174,7 +174,7 @@ uint8_t a2bus_corvus_device::read_cnxx(address_space &space, uint8_t offset) read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_corvus_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_corvus_device::read_c800(uint16_t offset) { return m_rom[offset & 0x7ff]; } diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h index 91e649eeb6b..a6d1a232eee 100644 --- a/src/devices/bus/a2bus/a2corvus.h +++ b/src/devices/bus/a2bus/a2corvus.h @@ -38,10 +38,10 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; required_device m_corvushd; diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index 35a006e8935..096b89a482c 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -132,7 +132,7 @@ void a2bus_floppy_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_floppy_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_floppy_device::read_c0nx(uint8_t offset) { return m_fdc->read(offset); } @@ -142,7 +142,7 @@ uint8_t a2bus_floppy_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_floppy_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_floppy_device::write_c0nx(uint8_t offset, uint8_t data) { m_fdc->write(offset, data); } @@ -151,7 +151,7 @@ void a2bus_floppy_device::write_c0nx(address_space &space, uint8_t offset, uint8 read_cnxx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_floppy_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_floppy_device::read_cnxx(uint8_t offset) { return m_rom[offset]; } diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h index b538243224e..b159d2c5278 100644 --- a/src/devices/bus/a2bus/a2diskii.h +++ b/src/devices/bus/a2bus/a2diskii.h @@ -34,9 +34,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; required_device m_fdc; diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 51a94015197..c9102b4afa1 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -93,9 +93,9 @@ void a2bus_diskiing_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_diskiing_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_diskiing_device::read_c0nx(uint8_t offset) { - return m_wozfdc->read(space, offset); + return m_wozfdc->read(offset); } @@ -103,16 +103,16 @@ uint8_t a2bus_diskiing_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_diskiing_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_diskiing_device::write_c0nx(uint8_t offset, uint8_t data) { - m_wozfdc->write(space, offset, data); + m_wozfdc->write(offset, data); } /*------------------------------------------------- read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_diskiing_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_diskiing_device::read_cnxx(uint8_t offset) { return m_rom[offset]; } diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h index 32390b84d80..06c6327018a 100644 --- a/src/devices/bus/a2bus/a2diskiing.h +++ b/src/devices/bus/a2bus/a2diskiing.h @@ -38,9 +38,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; private: required_device m_wozfdc; diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index 93be5b3f3f6..afe84fc260e 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -67,7 +67,7 @@ void a2bus_dx1_device::device_start() set_a2bus_device(); } -uint8_t a2bus_dx1_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_dx1_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -84,7 +84,7 @@ uint8_t a2bus_dx1_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_dx1_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_dx1_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h index afefd58785c..c4ea9f561e0 100644 --- a/src/devices/bus/a2bus/a2dx1.h +++ b/src/devices/bus/a2bus/a2dx1.h @@ -35,8 +35,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_dac; diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 124f15e4214..3382a8ed6a2 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -69,23 +69,23 @@ void a2bus_echoii_device::device_reset() { } -uint8_t a2bus_echoii_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_echoii_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return 0x1f | m_tms->status_r(space, 0); + return 0x1f | m_tms->status_r(); } return 0; } -void a2bus_echoii_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_echoii_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: - m_tms->data_w(space, offset, data); + m_tms->data_w(data); break; } } diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h index c41be251f6e..3fb9f468914 100644 --- a/src/devices/bus/a2bus/a2echoii.h +++ b/src/devices/bus/a2bus/a2echoii.h @@ -38,8 +38,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; }; diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index d7275b0f33e..c1cbfc205ec 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -129,7 +129,7 @@ void a2bus_hsscsi_device::device_start() // set_a2bus_device makes m_slot valid set_a2bus_device(); - m_rom = device().machine().root_device().memregion(this->subtag(SCSI_ROM_REGION).c_str())->base(); + m_rom = machine().root_device().memregion(this->subtag(SCSI_ROM_REGION).c_str())->base(); memset(m_ram, 0, 8192); @@ -154,7 +154,7 @@ void a2bus_hsscsi_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_hsscsi_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -166,8 +166,8 @@ uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset) case 5: case 6: case 7: -// printf("Read 5380 @ %x\n", offset); - return m_ncr5380->read(space, offset); +// logerror("Read 5380 @ %x\n", offset); + return m_ncr5380->read(machine().dummy_space(), offset); case 0xc: return 0x00; // indicate watchdog? @@ -179,7 +179,7 @@ uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset) return m_c0nf; default: - printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); + logerror("Read c0n%x (%s)\n", offset, machine().describe_context()); break; } @@ -191,7 +191,7 @@ uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_hsscsi_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -203,8 +203,8 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8 case 5: case 6: case 7: -// printf("%02x to 5380 reg %x\n", data, offset); - m_ncr5380->write(space, offset, data); +// logerror("%02x to 5380 reg %x\n", data, offset); + m_ncr5380->write(machine().dummy_space(), offset, data); break; #if 0 case 8: // DMA address low @@ -224,10 +224,10 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8 #endif case 0xd: // DMA enable / reset - printf("%02x to DMA enable/reset\n", data); + logerror("%02x to DMA enable/reset\n", data); if (data & 0x2) { - // printf("Resetting SCSI: %02x at %x\n", data, space.device().safe_pc()); + // logerror("Resetting SCSI: %02x at %s\n", data, machine().describe_context()); m_ncr5380->reset(); } break; @@ -235,17 +235,17 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8 case 0xe: m_c0ne = data; m_rombank = (data & 0x1f) * 0x400; - printf("c0ne to %x (ROM bank %x)\n", data & 0x1f, m_rombank); + logerror("c0ne to %x (ROM bank %x)\n", data & 0x1f, m_rombank); break; case 0xf: m_c0nf = data; m_rambank = (data & 0x7) * 0x400; - printf("c0nf to %x (RAM bank %x)\n", data & 0x7, m_rambank); + logerror("c0nf to %x (RAM bank %x)\n", data & 0x7, m_rambank); break; default: - printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); + logerror("Write %02x to c0n%x (%s)\n", data, offset, machine().describe_context()); break; } } @@ -254,28 +254,28 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8 read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_hsscsi_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_hsscsi_device::read_cnxx(uint8_t offset) { // one slot image at the start of the ROM, it appears return m_rom[offset]; } -void a2bus_hsscsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_hsscsi_device::write_cnxx(uint8_t offset, uint8_t data) { -// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc()); +// logerror("Write %02x to cn%02x (PC=%x)\n", data, offset, machine().describe_context()); } /*------------------------------------------------- read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_hsscsi_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_hsscsi_device::read_c800(uint16_t offset) { // bankswitched RAM at c800-cbff // bankswitched ROM at cc00-cfff if (offset < 0x400) { -// printf("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]); +// logerror("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]); if (m_816block) { return m_ncr5380->dma_r(); @@ -292,11 +292,11 @@ uint8_t a2bus_hsscsi_device::read_c800(address_space &space, uint16_t offset) /*------------------------------------------------- write_c800 - called for writes to this card's c800 space -------------------------------------------------*/ -void a2bus_hsscsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_hsscsi_device::write_c800(uint16_t offset, uint8_t data) { if (offset < 0x400) { -// printf("%02x to RAM at %x\n", data, offset+m_rambank); +// logerror("%02x to RAM at %x\n", data, offset+m_rambank); if (m_816block) { m_ncr5380->dma_w(data); diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h index 93a12eb142e..da96b3e8776 100644 --- a/src/devices/bus/a2bus/a2hsscsi.h +++ b/src/devices/bus/a2bus/a2hsscsi.h @@ -39,12 +39,12 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; required_device m_ncr5380; required_device m_scsibus; diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 4e308b49ff7..b45220313d0 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -92,32 +92,32 @@ void a2bus_mcms1_device::device_reset() // read once at c0n0 to disable 125 Hz IRQs // read once at c0n1 to enable 125 Hz IRQs -uint8_t a2bus_mcms1_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_mcms1_device::read_c0nx(uint8_t offset) { if (offset == 0) { - m_mcms->control_w(space, CTRL_IRQS, 0); + m_mcms->control_w(CTRL_IRQS, 0); } else if (offset == 1) { - m_mcms->control_w(space, CTRL_IRQS, 1); + m_mcms->control_w(CTRL_IRQS, 1); } return 0xff; } // read at Cn00: light gun in bit 7, bits 0-5 = 'random' number -uint8_t a2bus_mcms1_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_mcms1_device::read_cnxx(uint8_t offset) { return m_mcms->get_pen_rand(); } // write 0-255 to Cn00 to set the master volume -void a2bus_mcms1_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_mcms1_device::write_cnxx(uint8_t offset, uint8_t data) { if (offset == 0) { - m_mcms->control_w(space, CTRL_MASTERVOL, data); + m_mcms->control_w(CTRL_MASTERVOL, data); } } @@ -175,28 +175,28 @@ void a2bus_mcms2_device::device_reset() } // here to soak up false reads from indexed accesses -uint8_t a2bus_mcms2_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_mcms2_device::read_c0nx(uint8_t offset) { return 0xff; } // write once to c0n0 to disable the card (reset also disables) // write twice to c0n1 to enable the card (value doesn't matter) -void a2bus_mcms2_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_mcms2_device::write_c0nx(uint8_t offset, uint8_t data) { if (offset == 0) { - m_engine->control_w(space, CTRL_DMA, 0); + m_engine->control_w(CTRL_DMA, 0); } else if (offset == 1) { - m_engine->control_w(space, CTRL_DMA, 1); + m_engine->control_w(CTRL_DMA, 1); } } -void a2bus_mcms2_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_mcms2_device::write_cnxx(uint8_t offset, uint8_t data) { - m_engine->voiceregs_w(space, offset, data); + m_engine->voiceregs_w(offset, data); } @@ -307,7 +307,7 @@ void mcms_device::sound_stream_update(sound_stream &stream, stream_sample_t **in } } -WRITE8_MEMBER(mcms_device::voiceregs_w) +void mcms_device::voiceregs_w(offs_t offset, uint8_t data) { m_stream->update(); if (offset >= 0x20) @@ -346,7 +346,7 @@ WRITE8_MEMBER(mcms_device::voiceregs_w) } } -WRITE8_MEMBER(mcms_device::control_w) +void mcms_device::control_w(offs_t offset, uint8_t data) { m_stream->update(); diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index ea4041cb038..2a2a469049d 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -27,8 +27,8 @@ public: // construction/destruction mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(voiceregs_w); - DECLARE_WRITE8_MEMBER(control_w); + void voiceregs_w(offs_t offset, uint8_t data); + void control_w(offs_t offset, uint8_t data); uint8_t get_pen_rand(void) { m_stream->update(); return m_rand; } void set_bus_device(a2bus_mcms1_device *pDev) { m_pBusDevice = pDev; } @@ -79,9 +79,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override { return false; } private: @@ -104,9 +104,9 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override { return false; } private: diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index a7c2d975039..415ba20cbea 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -119,7 +119,7 @@ void a2bus_memexp_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_memexp_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_memexp_device::read_c0nx(uint8_t offset) { uint8_t retval = m_regs[offset]; @@ -143,7 +143,7 @@ uint8_t a2bus_memexp_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_memexp_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_memexp_device::write_c0nx(uint8_t offset, uint8_t data) { // printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); @@ -195,7 +195,7 @@ void a2bus_memexp_device::write_c0nx(address_space &space, uint8_t offset, uint8 read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_memexp_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_memexp_device::read_cnxx(uint8_t offset) { int slotimg = m_slot * 0x100; @@ -212,7 +212,7 @@ uint8_t a2bus_memexp_device::read_cnxx(address_space &space, uint8_t offset) read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_memexp_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_memexp_device::read_c800(uint16_t offset) { // c70a diags confirm: bit 1 of cn0F banks in the second half of the ROM if ((m_isramfactor) && (m_regs[0xf] & 0x01)) diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h index cb23f85c00f..2eeb3e157ae 100644 --- a/src/devices/bus/a2bus/a2memexp.h +++ b/src/devices/bus/a2bus/a2memexp.h @@ -38,10 +38,10 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; private: uint8_t *m_rom; diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index dc2f41457fe..e68f135469b 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -87,17 +87,17 @@ void a2bus_midi_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_midi_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_midi_device::read_c0nx(uint8_t offset) { // PTM at C0n0-C0n7, ACIA at C0n8-C0n9, drum sync (?) at C0nA-C0nB if (offset < 8) { - return m_ptm->read(space, offset & 7); + return m_ptm->read(machine().dummy_space(), offset & 7); } else if (offset == 8 || offset == 9) { - return m_acia->read(space, offset & 1); + return m_acia->read(machine().dummy_space(), offset & 1); } return 0; @@ -107,15 +107,15 @@ uint8_t a2bus_midi_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_midi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_midi_device::write_c0nx(uint8_t offset, uint8_t data) { if (offset < 8) { - m_ptm->write(space, offset & 7, data); + m_ptm->write(machine().dummy_space(), offset & 7, data); } else if (offset == 8 || offset == 9) { - m_acia->write(space, offset & 1, data); + m_acia->write(machine().dummy_space(), offset & 1, data); } } diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h index ac44d5c00d5..67da46ee89f 100644 --- a/src/devices/bus/a2bus/a2midi.h +++ b/src/devices/bus/a2bus/a2midi.h @@ -36,8 +36,8 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; required_device m_ptm; required_device m_acia; diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 565846ae6f6..ab00183ac7f 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -161,9 +161,9 @@ void a2bus_ayboard_device::device_reset() read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_ayboard_device::read_cnxx(uint8_t offset) { -// printf("Mockingboard(%d): read @ Cn%02X (PC=%x)\n", m_slot, offset, space.device().safe_pc()); +// logerror("Mockingboard(%d): read @ Cn%02X (PC=%x)\n", m_slot, offset, space.device().safe_pc()); if (m_isPhasor) { uint8_t retVal = 0; @@ -182,12 +182,12 @@ uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset) { if (viaSel & 1) { - retVal |= m_via1->read(space, offset & 0xf); + retVal |= m_via1->read(machine().dummy_space(), offset & 0xf); } if (viaSel & 2) { - retVal |= m_via2->read(space, offset & 0xf); + retVal |= m_via2->read(machine().dummy_space(), offset & 0xf); } } @@ -197,11 +197,11 @@ uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset) { if (offset <= 0x10) { - return m_via1->read(space, offset & 0xf); + return m_via1->read(machine().dummy_space(), offset & 0xf); } else if (offset >= 0x80 && offset <= 0x90) { - return m_via2->read(space, offset & 0xf); + return m_via2->read(machine().dummy_space(), offset & 0xf); } } @@ -212,7 +212,7 @@ uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset) write_cnxx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_ayboard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ayboard_device::write_cnxx(uint8_t offset, uint8_t data) { if (m_isPhasor) { @@ -229,15 +229,15 @@ void a2bus_ayboard_device::write_cnxx(address_space &space, uint8_t offset, uint viaSel = (offset & 0x80) ? 2 : 1; } -// printf("Phasor(%d): write %02x to Cn%02X (PC=%x) (native %d viaSel %d)\n", m_slot, data, offset, space.device().safe_pc(), m_PhasorNative ? 1 : 0, viaSel); +// logerror("Phasor(%d): write %02x to Cn%02X (PC=%x) (native %d viaSel %d)\n", m_slot, data, offset, space.device().safe_pc(), m_PhasorNative ? 1 : 0, viaSel); if (viaSel & 1) { - m_via1->write(space, offset&0xf, data); + m_via1->write(machine().dummy_space(), offset&0xf, data); } if (viaSel & 2) { - m_via2->write(space, offset&0xf, data); + m_via2->write(machine().dummy_space(), offset&0xf, data); } } } @@ -245,15 +245,15 @@ void a2bus_ayboard_device::write_cnxx(address_space &space, uint8_t offset, uint { if (offset <= 0x10) { - m_via1->write(space, offset & 0xf, data); + m_via1->write(machine().dummy_space(), offset & 0xf, data); } else if (offset >= 0x80 && offset <= 0x90) { - m_via2->write(space, offset & 0xf, data); + m_via2->write(machine().dummy_space(), offset & 0xf, data); } else { - printf("Mockingboard(%d): unk write %02x to Cn%02X (PC=%x)\n", m_slot, data, offset, space.device().safe_pc()); + logerror("Mockingboard(%d): unk write %02x to Cn%02X (%s)\n", m_slot, data, offset, machine().describe_context()); } } } @@ -292,10 +292,10 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) { if (!(data & 4)) { - m_ay1->reset_w(space, 0, 0); + m_ay1->reset_w(); if (m_isPhasor && m_PhasorNative) { - m_ay2->reset_w(space, 0, 0); + m_ay2->reset_w(); } } else @@ -308,15 +308,15 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) break; case 1: // BDIR=0, BC1=1 (read PSG) - m_porta1 = m_ay1->data_r(space, 0); + m_porta1 = m_ay1->data_r(); break; case 2: // BDIR=1, BC1=0 (write PSG) - m_ay1->data_w(space, 0, m_porta1); + m_ay1->data_w(m_porta1); break; case 3: // BDIR=1, BC1=1 (latch) - m_ay1->address_w(space, 0, m_porta1); + m_ay1->address_w(m_porta1); break; } } @@ -333,7 +333,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) chipSel = 1; } -// printf("Phasor: %02x to AY1/2 CS %02x (BDIR/BC1 %02x, data %02x)\n", m_porta1, chipSel, data & 3, data); +// logerror("Phasor: %02x to AY1/2 CS %02x (BDIR/BC1 %02x, data %02x)\n", m_porta1, chipSel, data & 3, data); switch (data & 3) { case 0: // BDIR=0, BC1=0 (inactive) @@ -342,33 +342,33 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) case 1: // BDIR=0, BC1=1 (read PSG) if (chipSel & 1) { - m_porta1 = m_ay1->data_r(space, 0); + m_porta1 = m_ay1->data_r(); } if (chipSel & 2) { - m_porta1 = m_ay2->data_r(space, 0); + m_porta1 = m_ay2->data_r(); } break; case 2: // BDIR=1, BC1=0 (write PSG) if (chipSel & 1) { - m_ay1->data_w(space, 0, m_porta1); + m_ay1->data_w(m_porta1); } if (chipSel & 2) { - m_ay2->data_w(space, 0, m_porta1); + m_ay2->data_w(m_porta1); } break; case 3: // BDIR=1, BC1=1 (latch) if (chipSel & 1) { - m_ay1->address_w(space, 0, m_porta1); + m_ay1->address_w(m_porta1); } if (chipSel & 2) { - m_ay2->address_w(space, 0, m_porta1); + m_ay2->address_w(m_porta1); } break; } @@ -387,12 +387,12 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) { if (m_isPhasor && m_PhasorNative) { - m_ay3->reset_w(space, 0, 0); - m_ay4->reset_w(space, 0, 0); + m_ay3->reset_w(); + m_ay4->reset_w(); } else { - m_ay2->reset_w(space, 0, 0); + m_ay2->reset_w(); } } else @@ -405,15 +405,15 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) break; case 1: // BDIR=0, BC1=1 (read PSG) - m_porta2 = m_ay2->data_r(space, 0); + m_porta2 = m_ay2->data_r(); break; case 2: // BDIR=1, BC1=0 (write PSG) - m_ay2->data_w(space, 0, m_porta2); + m_ay2->data_w(m_porta2); break; case 3: // BDIR=1, BC1=1 (latch) - m_ay2->address_w(space, 0, m_porta2); + m_ay2->address_w(m_porta2); break; } } @@ -430,7 +430,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) chipSel = 1; } -// printf("Phasor: %02x to AY3/4 CS %02x (BDIR/BC1 %02x, data %02x)\n", m_porta2, chipSel, data & 3, data); +// logerror("Phasor: %02x to AY3/4 CS %02x (BDIR/BC1 %02x, data %02x)\n", m_porta2, chipSel, data & 3, data); switch (data & 3) { case 0: // BDIR=0, BC1=0 (inactive) @@ -439,33 +439,33 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) case 1: // BDIR=0, BC1=1 (read PSG) if (chipSel & 1) { - m_porta2 = m_ay3->data_r(space, 0); + m_porta2 = m_ay3->data_r(); } if (chipSel & 2) { - m_porta2 = m_ay4->data_r(space, 0); + m_porta2 = m_ay4->data_r(); } break; case 2: // BDIR=1, BC1=0 (write PSG) if (chipSel & 1) { - m_ay3->data_w(space, 0, m_porta2); + m_ay3->data_w(m_porta2); } if (chipSel & 2) { - m_ay4->data_w(space, 0, m_porta2); + m_ay4->data_w(m_porta2); } break; case 3: // BDIR=1, BC1=1 (latch) if (chipSel & 1) { - m_ay3->address_w(space, 0, m_porta2); + m_ay3->address_w(m_porta2); } if (chipSel & 2) { - m_ay4->address_w(space, 0, m_porta2); + m_ay4->address_w(m_porta2); } break; } @@ -473,7 +473,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) } } -uint8_t a2bus_ayboard_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ayboard_device::read_c0nx(uint8_t offset) { if (m_isPhasor) { @@ -483,7 +483,7 @@ uint8_t a2bus_ayboard_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_ayboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ayboard_device::write_c0nx(uint8_t offset, uint8_t data) { if (m_isPhasor) { @@ -491,23 +491,23 @@ void a2bus_ayboard_device::write_c0nx(address_space &space, uint8_t offset, uint } } -uint8_t a2bus_echoplus_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_echoplus_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return 0x1f | m_tms->status_r(space, 0); + return 0x1f | m_tms->status_r(); } return 0; } -void a2bus_echoplus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_echoplus_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: - m_tms->data_w(space, offset, data); + m_tms->data_w(data); break; } } diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h index 7bb6e778abf..f647f1fc7a4 100644 --- a/src/devices/bus/a2bus/a2mockingboard.h +++ b/src/devices/bus/a2bus/a2mockingboard.h @@ -41,10 +41,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; required_device m_via1; required_device m_via2; @@ -82,8 +82,8 @@ public: protected: virtual void device_add_mconfig(machine_config &config) override; - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; required_device m_tms; }; diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 85de32a80ba..c00a82fd5a3 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -152,7 +152,7 @@ void a2bus_pic_device::device_timer(emu_timer &timer, device_timer_id tid, int p read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_pic_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_pic_device::read_cnxx(uint8_t offset) { m_autostrobe = true; @@ -168,7 +168,7 @@ uint8_t a2bus_pic_device::read_cnxx(address_space &space, uint8_t offset) read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_pic_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_pic_device::read_c0nx(uint8_t offset) { uint8_t rv = 0; @@ -211,7 +211,7 @@ uint8_t a2bus_pic_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_pic_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_pic_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h index 990307391f8..755700ef0b0 100644 --- a/src/devices/bus/a2bus/a2pic.h +++ b/src/devices/bus/a2bus/a2pic.h @@ -38,9 +38,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const override; - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; void start_strobe(); void clear_strobe(); diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp index d61bbbad383..c26a61ef4b3 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -63,7 +63,7 @@ void a2bus_sam_device::device_reset() { } -void a2bus_sam_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_sam_device::write_c0nx(uint8_t offset, uint8_t data) { m_dac->write(data); } diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h index f3a6307077f..6efa5c1e4ba 100644 --- a/src/devices/bus/a2bus/a2sam.h +++ b/src/devices/bus/a2bus/a2sam.h @@ -34,7 +34,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_dac; diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 8cb1becf96d..ad1c7a1730b 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -145,7 +145,7 @@ void a2bus_scsi_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_scsi_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -157,8 +157,8 @@ uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset) case 5: case 6: case 7: -// printf("Read 5380 @ %x\n", offset); - return m_ncr5380->read(space, offset); +// logerror("Read 5380 @ %x\n", offset); + return m_ncr5380->read(machine().dummy_space(), offset); case 8: // read and DACK return m_ncr5380->dma_r(); @@ -173,7 +173,7 @@ uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset) return m_drq; default: - printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); + logerror("Read c0n%x (%s)\n", offset, machine().describe_context()); break; } @@ -185,7 +185,7 @@ uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_scsi_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -197,8 +197,8 @@ void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t case 5: case 6: case 7: -// printf("%02x to 5380 reg %x\n", data, offset); - m_ncr5380->write(space, offset, data); +// logerror("%02x to 5380 reg %x\n", data, offset); + m_ncr5380->write(machine().dummy_space(), offset, data); break; case 8: // write and DACK @@ -223,28 +223,28 @@ void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t m_rambank = ((data>>4) & 0x7) * 0x400; m_rombank = (data & 0xf) * 0x400; m_bank = data; -// printf("RAM bank to %x, ROM bank to %x\n", m_rambank, m_rombank); +// logerror("RAM bank to %x, ROM bank to %x\n", m_rambank, m_rombank); m_816block = false; // does this reset block mode? break; case 0xb: // reset 5380 -// printf("Resetting SCSI: %02x at %x\n", data, space.device().safe_pc()); +// logerror("Resetting SCSI: %02x at %s\n", data, machine().describe_context()); m_ncr5380->reset(); m_816block = false; break; case 0xc: // set IIgs block mode DMA - printf("%02x to block-mode DMA mode\n", data); + logerror("%02x to block-mode DMA mode\n", data); m_816block = true; break; case 0xd: // set Mac-style pseudo-DMA -// printf("%02x to pseudo-DMA mode\n", data); +// logerror("%02x to pseudo-DMA mode\n", data); m_816block = false; break; default: - printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); + logerror("Write %02x to c0n%x (%s)\n", data, offset, machine().describe_context()); break; } } @@ -253,29 +253,29 @@ void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_scsi_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_scsi_device::read_cnxx(uint8_t offset) { // one slot image at the start of the ROM, it appears return m_rom[offset]; } -void a2bus_scsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_scsi_device::write_cnxx(uint8_t offset, uint8_t data) { // there are writes to cn0A, possibly misguided C0nA (bank select?) writes? -// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc()); +// logerror("Write %02x to cn%02x (%s)\n", data, offset, machine().describe_context()); } /*------------------------------------------------- read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_scsi_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_scsi_device::read_c800(uint16_t offset) { // bankswitched RAM at c800-cbff // bankswitched ROM at cc00-cfff if (offset < 0x400) { -// printf("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]); +// logerror("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]); if (m_816block) { return m_ncr5380->dma_r(); @@ -292,11 +292,11 @@ uint8_t a2bus_scsi_device::read_c800(address_space &space, uint16_t offset) /*------------------------------------------------- write_c800 - called for writes to this card's c800 space -------------------------------------------------*/ -void a2bus_scsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_scsi_device::write_c800(uint16_t offset, uint8_t data) { if (offset < 0x400) { -// printf("%02x to RAM at %x\n", data, offset+m_rambank); +// logerror("%02x to RAM at %x\n", data, offset+m_rambank); if (m_816block) { m_ncr5380->dma_w(data); diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h index 2083cf454d8..f1a556eeab7 100644 --- a/src/devices/bus/a2bus/a2scsi.h +++ b/src/devices/bus/a2bus/a2scsi.h @@ -39,12 +39,12 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; required_device m_ncr5380; required_device m_scsibus; diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index 94fa5c2d56f..dee94497ae2 100644 --- a/src/devices/bus/a2bus/a2softcard.cpp +++ b/src/devices/bus/a2bus/a2softcard.cpp @@ -78,7 +78,7 @@ void a2bus_softcard_device::device_reset() m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -void a2bus_softcard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_softcard_device::write_cnxx(uint8_t offset, uint8_t data) { if (!m_bEnabled) { diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h index 3e20e445696..4be8755d0b2 100644 --- a/src/devices/bus/a2bus/a2softcard.h +++ b/src/devices/bus/a2bus/a2softcard.h @@ -36,7 +36,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_z80; diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index 7fcf11c7e45..0ff201c038c 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -146,7 +146,7 @@ void a2bus_ssc_device::device_start() // set_a2bus_device makes m_slot valid set_a2bus_device(); - m_rom = device().machine().root_device().memregion(this->subtag(SSC_ROM_REGION).c_str())->base(); + m_rom = machine().root_device().memregion(this->subtag(SSC_ROM_REGION).c_str())->base(); } void a2bus_ssc_device::device_reset() @@ -158,7 +158,7 @@ void a2bus_ssc_device::device_reset() read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_ssc_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_ssc_device::read_cnxx(uint8_t offset) { return m_rom[(offset&0xff)+0x700]; } @@ -167,7 +167,7 @@ uint8_t a2bus_ssc_device::read_cnxx(address_space &space, uint8_t offset) read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_ssc_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_ssc_device::read_c800(uint16_t offset) { return m_rom[offset]; } @@ -176,7 +176,7 @@ uint8_t a2bus_ssc_device::read_c800(address_space &space, uint16_t offset) read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_ssc_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ssc_device::read_c0nx(uint8_t offset) { // dips at C0n1/C0n2, ACIA at C0n8/9/A/B @@ -191,7 +191,7 @@ uint8_t a2bus_ssc_device::read_c0nx(address_space &space, uint8_t offset) case 9: case 0xa: case 0xb: - return m_acia->read(space, offset-8); + return m_acia->read(machine().dummy_space(), offset-8); } @@ -202,7 +202,7 @@ uint8_t a2bus_ssc_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_ssc_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ssc_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -210,7 +210,7 @@ void a2bus_ssc_device::write_c0nx(address_space &space, uint8_t offset, uint8_t case 9: case 0xa: case 0xb: - m_acia->write(space, offset-8, data); + m_acia->write(machine().dummy_space(), offset-8, data); break; } } diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h index 8aff1a9bb2d..0e298bc7d96 100644 --- a/src/devices/bus/a2bus/a2ssc.h +++ b/src/devices/bus/a2bus/a2ssc.h @@ -35,10 +35,10 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const override; - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; required_ioport m_dsw1, m_dsw2; diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp index 1403120c74c..9ad3adbf84e 100644 --- a/src/devices/bus/a2bus/a2swyft.cpp +++ b/src/devices/bus/a2bus/a2swyft.cpp @@ -77,7 +77,7 @@ void a2bus_swyft_device::device_reset() recalc_slot_inh(); } -uint8_t a2bus_swyft_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_swyft_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -103,7 +103,7 @@ uint8_t a2bus_swyft_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_swyft_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_swyft_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -127,7 +127,7 @@ void a2bus_swyft_device::write_c0nx(address_space &space, uint8_t offset, uint8_ } } -uint8_t a2bus_swyft_device::read_inh_rom(address_space &space, uint16_t offset) +uint8_t a2bus_swyft_device::read_inh_rom(uint16_t offset) { offset -= 0xd000; diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h index 0215c4623ab..d160fb77a4c 100644 --- a/src/devices/bus/a2bus/a2swyft.h +++ b/src/devices/bus/a2bus/a2swyft.h @@ -35,9 +35,9 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_inh_rom(uint16_t offset) override; virtual uint16_t inh_start() override { return 0xd000; } virtual uint16_t inh_end() override { return 0xffff; } virtual int inh_type() override; diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp index 4f32c1a9be4..da06419d3c1 100644 --- a/src/devices/bus/a2bus/a2themill.cpp +++ b/src/devices/bus/a2bus/a2themill.cpp @@ -98,12 +98,12 @@ void a2bus_themill_device::device_reset() m_6809->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -uint8_t a2bus_themill_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_themill_device::read_c0nx(uint8_t offset) { return m_status; } -void a2bus_themill_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_themill_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h index d7ca7b10326..fde5d6266a7 100644 --- a/src/devices/bus/a2bus/a2themill.h +++ b/src/devices/bus/a2bus/a2themill.h @@ -38,8 +38,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; required_device m_6809; diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 1da4b5f333a..ce51acf1afc 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -107,7 +107,7 @@ void a2bus_thunderclock_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_thunderclock_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_thunderclock_device::read_c0nx(uint8_t offset) { return (m_dataout << 7); } @@ -117,7 +117,7 @@ uint8_t a2bus_thunderclock_device::read_c0nx(address_space &space, uint8_t offse write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_thunderclock_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_thunderclock_device::write_c0nx(uint8_t offset, uint8_t data) { // uPD1990AC hookup: // bit 0 = DATA IN? @@ -144,7 +144,7 @@ void a2bus_thunderclock_device::write_c0nx(address_space &space, uint8_t offset, read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_thunderclock_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_thunderclock_device::read_cnxx(uint8_t offset) { // ROM is primarily a c800 image, but the first page is also the CnXX ROM return m_rom[offset]; @@ -154,7 +154,7 @@ uint8_t a2bus_thunderclock_device::read_cnxx(address_space &space, uint8_t offse read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_thunderclock_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_thunderclock_device::read_c800(uint16_t offset) { return m_rom[offset]; } diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h index e7a45997f04..2f1e908a1cd 100644 --- a/src/devices/bus/a2bus/a2thunderclock.h +++ b/src/devices/bus/a2bus/a2thunderclock.h @@ -37,10 +37,10 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; required_device m_upd1990ac; diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 5abc3ea538f..c4c6763405a 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -160,9 +160,9 @@ void a2bus_videx160_device::device_start() // set_a2bus_device makes m_slot valid set_a2bus_device(); - m_rom = device().machine().root_device().memregion(this->subtag(ULTRATERM_ROM_REGION).c_str())->base(); + m_rom = machine().root_device().memregion(this->subtag(ULTRATERM_ROM_REGION).c_str())->base(); - m_chrrom = device().machine().root_device().memregion(this->subtag(ULTRATERM_GFX_REGION).c_str())->base(); + m_chrrom = machine().root_device().memregion(this->subtag(ULTRATERM_GFX_REGION).c_str())->base(); memset(m_ram, 0, 256*16); @@ -184,9 +184,9 @@ void a2bus_videx160_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_videx160_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_videx160_device::read_c0nx(uint8_t offset) { -// printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); +// printf("Read c0n%x (PC=%x)\n", offset, machine().describe_context()); if (!(m_ctrl1 & CT1_VTEMU)) { @@ -196,7 +196,7 @@ uint8_t a2bus_videx160_device::read_c0nx(address_space &space, uint8_t offset) switch (offset) { case 1: - return m_crtc->register_r(space, offset); // status_r? + return m_crtc->register_r(); // status_r? case 2: return m_ctrl1; @@ -213,18 +213,18 @@ uint8_t a2bus_videx160_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_videx160_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_videx160_device::write_c0nx(uint8_t offset, uint8_t data) { -// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); +// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, machine().describe_context()); switch (offset) { case 0: - m_crtc->address_w(space, offset, data); + m_crtc->address_w(data); break; case 1: - m_crtc->register_w(space, offset, data); + m_crtc->register_w(data); break; case 2: @@ -254,7 +254,7 @@ void a2bus_videx160_device::write_c0nx(address_space &space, uint8_t offset, uin read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_videx160_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_videx160_device::read_cnxx(uint8_t offset) { return m_rom[offset+(m_slot * 0x100)]; } @@ -263,7 +263,7 @@ uint8_t a2bus_videx160_device::read_cnxx(address_space &space, uint8_t offset) write_cnxx - called for writes to this card's cnxx space the firmware writes here to switch in our $C800 a lot -------------------------------------------------*/ -void a2bus_videx160_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_videx160_device::write_cnxx(uint8_t offset, uint8_t data) { } @@ -271,7 +271,7 @@ void a2bus_videx160_device::write_cnxx(address_space &space, uint8_t offset, uin read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_videx160_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_videx160_device::read_c800(uint16_t offset) { // ROM at c800-cbff // bankswitched RAM at cc00-cdff @@ -294,7 +294,7 @@ uint8_t a2bus_videx160_device::read_c800(address_space &space, uint16_t offset) /*------------------------------------------------- write_c800 - called for writes to this card's c800 space -------------------------------------------------*/ -void a2bus_videx160_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_videx160_device::write_c800(uint16_t offset, uint8_t data) { if (offset >= 0x400) { diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h index 65d2cb19452..b7dd4c9d3f5 100644 --- a/src/devices/bus/a2bus/a2ultraterm.h +++ b/src/devices/bus/a2bus/a2ultraterm.h @@ -33,12 +33,12 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; uint8_t *m_rom, *m_chrrom; uint8_t m_ram[256*16]; diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index db6ca59f3c7..c75e338195b 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -236,7 +236,7 @@ void a2bus_videx80_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_videx80_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_videx80_device::read_c0nx(uint8_t offset) { // printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); @@ -244,7 +244,7 @@ uint8_t a2bus_videx80_device::read_c0nx(address_space &space, uint8_t offset) if (offset == 1) { - return m_crtc->register_r(space, offset); // status_r? + return m_crtc->register_r(); // status_r? } return 0xff; @@ -255,17 +255,17 @@ uint8_t a2bus_videx80_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_videx80_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_videx80_device::write_c0nx(uint8_t offset, uint8_t data) { // printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); if (offset == 0) { - m_crtc->address_w(space, offset, data); + m_crtc->address_w(data); } else if (offset == 1) { - m_crtc->register_w(space, offset, data); + m_crtc->register_w(data); } m_rambank = ((offset>>2) & 3) * 512; @@ -275,17 +275,17 @@ void a2bus_videx80_device::write_c0nx(address_space &space, uint8_t offset, uint read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_videx80_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_videx80_device::read_cnxx(uint8_t offset) { return m_rom[offset+0x300]; } -uint8_t a2bus_ap16_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_ap16_device::read_cnxx(uint8_t offset) { return m_rom[offset+0x1f00]; } -uint8_t a2bus_ap16alt_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_ap16alt_device::read_cnxx(uint8_t offset) { return m_rom[offset+0xb00]; } @@ -294,7 +294,7 @@ uint8_t a2bus_ap16alt_device::read_cnxx(address_space &space, uint8_t offset) write_cnxx - called for writes to this card's cnxx space the firmware writes here to switch in our $C800 a lot -------------------------------------------------*/ -void a2bus_videx80_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_videx80_device::write_cnxx(uint8_t offset, uint8_t data) { } @@ -302,7 +302,7 @@ void a2bus_videx80_device::write_cnxx(address_space &space, uint8_t offset, uint read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_videx80_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_videx80_device::read_c800(uint16_t offset) { // ROM at c800-cbff // bankswitched RAM at cc00-cdff @@ -320,7 +320,7 @@ uint8_t a2bus_videx80_device::read_c800(address_space &space, uint16_t offset) /*------------------------------------------------- write_c800 - called for writes to this card's c800 space -------------------------------------------------*/ -void a2bus_videx80_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_videx80_device::write_c800(uint16_t offset, uint8_t data) { if (offset >= 0x400) { diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h index e39a3575dfb..ce761cf7092 100644 --- a/src/devices/bus/a2bus/a2videoterm.h +++ b/src/devices/bus/a2bus/a2videoterm.h @@ -33,12 +33,12 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; uint8_t *m_rom, *m_chrrom; uint8_t m_ram[512*4]; @@ -70,7 +70,7 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; protected: - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_cnxx(uint8_t offset) override; }; @@ -82,7 +82,7 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; protected: - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_cnxx(uint8_t offset) override; }; class a2bus_vtc1_device : public a2bus_videx80_device diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index fc96c0236df..89c64ce6775 100644 --- a/src/devices/bus/a2bus/a2vulcan.cpp +++ b/src/devices/bus/a2bus/a2vulcan.cpp @@ -163,7 +163,7 @@ void a2bus_vulcanbase_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_vulcanbase_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -206,7 +206,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_vulcanbase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_vulcanbase_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -260,7 +260,7 @@ void a2bus_vulcanbase_device::write_c0nx(address_space &space, uint8_t offset, u read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_vulcanbase_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_vulcanbase_device::read_cnxx(uint8_t offset) { int slotimg = m_slot * 0x100; @@ -272,7 +272,7 @@ uint8_t a2bus_vulcanbase_device::read_cnxx(address_space &space, uint8_t offset) read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_vulcanbase_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_vulcanbase_device::read_c800(uint16_t offset) { offset &= 0x7ff; if (offset < 0x400) // c800-cbff is banked RAM window, cc00-cfff is banked ROM window @@ -285,7 +285,7 @@ uint8_t a2bus_vulcanbase_device::read_c800(address_space &space, uint16_t offset return m_rom[offset+m_rombank]; } -void a2bus_vulcanbase_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_vulcanbase_device::write_c800(uint16_t offset, uint8_t data) { offset &= 0x7ff; if (offset < 0x400) diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h index 7745765791c..c3bacde05c5 100644 --- a/src/devices/bus/a2bus/a2vulcan.h +++ b/src/devices/bus/a2bus/a2vulcan.h @@ -33,11 +33,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; required_device m_ata; diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index 3fec919d5ac..6fe428864ff 100644 --- a/src/devices/bus/a2bus/a2zipdrive.cpp +++ b/src/devices/bus/a2bus/a2zipdrive.cpp @@ -99,7 +99,7 @@ void a2bus_zipdrivebase_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_zipdrivebase_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_zipdrivebase_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -134,7 +134,7 @@ uint8_t a2bus_zipdrivebase_device::read_c0nx(address_space &space, uint8_t offse write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_zipdrivebase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_zipdrivebase_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -172,7 +172,7 @@ void a2bus_zipdrivebase_device::write_c0nx(address_space &space, uint8_t offset, read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_zipdrivebase_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_zipdrivebase_device::read_cnxx(uint8_t offset) { int slotimg = m_slot * 0x100; @@ -184,7 +184,7 @@ uint8_t a2bus_zipdrivebase_device::read_cnxx(address_space &space, uint8_t offse read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_zipdrivebase_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_zipdrivebase_device::read_c800(uint16_t offset) { offset &= 0x7ff; diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index 5c1126c3814..8187e04cdd2 100644 --- a/src/devices/bus/a2bus/a2zipdrive.h +++ b/src/devices/bus/a2bus/a2zipdrive.h @@ -36,10 +36,10 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; required_device m_ata; diff --git a/src/devices/bus/a2bus/agat7langcard.cpp b/src/devices/bus/a2bus/agat7langcard.cpp index b4d2a168f38..c38234d67e7 100644 --- a/src/devices/bus/a2bus/agat7langcard.cpp +++ b/src/devices/bus/a2bus/agat7langcard.cpp @@ -106,7 +106,7 @@ void a2bus_agat7langcard_device::do_io(int offset) read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_agat7langcard_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_agat7langcard_device::read_cnxx(uint8_t offset) { return (0x80 | m_csr); } @@ -116,12 +116,12 @@ uint8_t a2bus_agat7langcard_device::read_cnxx(address_space &space, uint8_t offs write_cnxx - called for writes to this card's cnxx space -------------------------------------------------*/ -void a2bus_agat7langcard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_agat7langcard_device::write_cnxx(uint8_t offset, uint8_t data) { do_io(offset); } -uint8_t a2bus_agat7langcard_device::read_inh_rom(address_space &space, uint16_t offset) +uint8_t a2bus_agat7langcard_device::read_inh_rom(uint16_t offset) { assert(m_inh_state & INH_READ); // this should never happen @@ -133,7 +133,7 @@ uint8_t a2bus_agat7langcard_device::read_inh_rom(address_space &space, uint16_t return m_ram[(offset & 0x1fff) + 0x2000 + m_main_bank]; } -void a2bus_agat7langcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data) +void a2bus_agat7langcard_device::write_inh_rom(uint16_t offset, uint8_t data) { // are writes enabled? if (!(m_inh_state & INH_WRITE)) diff --git a/src/devices/bus/a2bus/agat7langcard.h b/src/devices/bus/a2bus/agat7langcard.h index be3a650a222..ef7004b5798 100644 --- a/src/devices/bus/a2bus/agat7langcard.h +++ b/src/devices/bus/a2bus/agat7langcard.h @@ -35,10 +35,10 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override; - virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_inh_rom(uint16_t offset) override; + virtual void write_inh_rom(uint16_t offset, uint8_t data) override; virtual uint16_t inh_start() override { return 0xd000; } virtual uint16_t inh_end() override { return 0xffff; } virtual int inh_type() override; diff --git a/src/devices/bus/a2bus/agat7ram.cpp b/src/devices/bus/a2bus/agat7ram.cpp index 51bbabb792c..965ab93f545 100644 --- a/src/devices/bus/a2bus/agat7ram.cpp +++ b/src/devices/bus/a2bus/agat7ram.cpp @@ -101,7 +101,7 @@ void a2bus_agat7ram_device::do_io(int offset) read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_agat7ram_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_agat7ram_device::read_cnxx(uint8_t offset) { return m_csr; } @@ -111,19 +111,19 @@ uint8_t a2bus_agat7ram_device::read_cnxx(address_space &space, uint8_t offset) write_cnxx - called for writes to this card's cnxx space -------------------------------------------------*/ -void a2bus_agat7ram_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_agat7ram_device::write_cnxx(uint8_t offset, uint8_t data) { do_io(offset); } -uint8_t a2bus_agat7ram_device::read_inh_rom(address_space &space, uint16_t offset) +uint8_t a2bus_agat7ram_device::read_inh_rom(uint16_t offset) { assert(m_inh_state & INH_READ); // this should never happen return m_ram[(offset & 0x3fff) + m_main_bank]; } -void a2bus_agat7ram_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data) +void a2bus_agat7ram_device::write_inh_rom(uint16_t offset, uint8_t data) { // are writes enabled? if ((m_inh_state & INH_WRITE) && !BIT(m_csr, 4)) diff --git a/src/devices/bus/a2bus/agat7ram.h b/src/devices/bus/a2bus/agat7ram.h index 3476e738179..343b197e3e8 100644 --- a/src/devices/bus/a2bus/agat7ram.h +++ b/src/devices/bus/a2bus/agat7ram.h @@ -35,10 +35,10 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override; - virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_inh_rom(uint16_t offset) override; + virtual void write_inh_rom(uint16_t offset, uint8_t data) override; virtual uint16_t inh_start() override { return 0x8000; } virtual uint16_t inh_end() override { return 0xbfff; } virtual int inh_type() override; diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp index 72217fbe464..8bffada8a58 100644 --- a/src/devices/bus/a2bus/agat840k_hle.cpp +++ b/src/devices/bus/a2bus/agat840k_hle.cpp @@ -260,18 +260,18 @@ void a2bus_agat840k_hle_device::device_timer(emu_timer &timer, device_timer_id i read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_agat840k_hle_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_agat840k_hle_device::read_c0nx(uint8_t offset) { u8 data; switch (offset) { case 0: case 1: case 2: case 3: - data = m_d14->read(space, offset); + data = m_d14->read(machine().dummy_space(), offset); break; case 4: case 5: case 6: case 7: - data = m_d15->read(space, offset - 4); + data = m_d15->read(machine().dummy_space(), offset - 4); break; default: @@ -287,16 +287,16 @@ uint8_t a2bus_agat840k_hle_device::read_c0nx(address_space &space, uint8_t offse write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_agat840k_hle_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_agat840k_hle_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: case 1: case 2: case 3: - m_d14->write(space, offset, data); + m_d14->write(machine().dummy_space(), offset, data); break; case 4: case 5: case 6: case 7: - m_d15->write(space, offset - 4, data); + m_d15->write(machine().dummy_space(), offset - 4, data); break; case 8: // write desync @@ -323,7 +323,7 @@ void a2bus_agat840k_hle_device::write_c0nx(address_space &space, uint8_t offset, read_cnxx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_agat840k_hle_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_agat840k_hle_device::read_cnxx(uint8_t offset) { return m_rom[offset]; } diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h index cab186c2c62..98586f5072b 100644 --- a/src/devices/bus/a2bus/agat840k_hle.h +++ b/src/devices/bus/a2bus/agat840k_hle.h @@ -60,9 +60,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; enum { diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index e0283a42034..2bc49498de2 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -148,7 +148,7 @@ void a2bus_corvfdc01_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_corvfdc01_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_corvfdc01_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -161,16 +161,16 @@ uint8_t a2bus_corvfdc01_device::read_c0nx(address_space &space, uint8_t offset) return m_fdc_local_status | LS_8IN_mask; case 8: // WD1793 at 8-11 - return m_wdfdc->status_r(space, offset); + return m_wdfdc->status_r(); case 9: - return m_wdfdc->track_r(space, offset); + return m_wdfdc->track_r(); case 10: - return m_wdfdc->sector_r(space, offset); + return m_wdfdc->sector_r(); case 11: - return m_wdfdc->data_r(space, offset); + return m_wdfdc->data_r(); } return 0xff; @@ -181,7 +181,7 @@ uint8_t a2bus_corvfdc01_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_corvfdc01_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_corvfdc01_device::write_c0nx(uint8_t offset, uint8_t data) { int current_drive; floppy_image_device *floppy = nullptr; @@ -228,19 +228,19 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, uint8_t offset, ui break; case 8: // FDC COMMAMD REG - m_wdfdc->cmd_w(space, offset, data); + m_wdfdc->cmd_w(data); break; case 9: // FDC TRACK REG - m_wdfdc->track_w(space, offset, data); + m_wdfdc->track_w(data); break; case 10: // FDC SECTOR REG - m_wdfdc->sector_w(space, offset, data); + m_wdfdc->sector_w(data); break; case 11: // FDC DATA REG - m_wdfdc->data_w(space, offset, data); + m_wdfdc->data_w(data); break; } } @@ -249,7 +249,7 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, uint8_t offset, ui read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_corvfdc01_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_corvfdc01_device::read_cnxx(uint8_t offset) { return m_rom[offset & 0x1f]; } diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h index 15fea0993b4..4472890f381 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -38,9 +38,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; required_device m_wdfdc; required_device m_con1; diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index 5b91dd1d5a4..e673fa4b634 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -128,15 +128,15 @@ void a2bus_corvfdc02_device::device_timer(emu_timer &timer, device_timer_id id, read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_corvfdc02_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_corvfdc02_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: // 765 FIFO - return m_fdc->fifo_r(space, 0); + return m_fdc->fifo_r(); case 1: // 765 MSR - return m_fdc->msr_r(space, 0); + return m_fdc->msr_r(); case 2: // buffer address return (m_bufptr>>1) & 0xff; @@ -164,14 +164,14 @@ uint8_t a2bus_corvfdc02_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_corvfdc02_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_corvfdc02_device::write_c0nx(uint8_t offset, uint8_t data) { floppy_image_device *floppy = nullptr; switch (offset) { case 0: // FDC FIFO write - m_fdc->fifo_w(space, offset, data); + m_fdc->fifo_w(data); break; case 1: // FDC ??? @@ -238,7 +238,7 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, uint8_t offset, ui read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_corvfdc02_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_corvfdc02_device::read_cnxx(uint8_t offset) { return m_rom[offset & 0x1f]; } diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index f1e149a88bb..4bed88667d3 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -39,9 +39,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; required_device m_fdc; required_device m_con1; diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index f1d782a80bc..325988a3a71 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -154,35 +154,35 @@ void a2bus_ezcgi_9958_device::device_reset() 1 - TMS write */ -uint8_t a2bus_ezcgi_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ezcgi_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return m_tms->vram_read(space, 0); + return m_tms->vram_read(); case 1: - return m_tms->register_read(space, 0); + return m_tms->register_read(); } return 0xff; } -void a2bus_ezcgi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ezcgi_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: - m_tms->vram_write(space, 0, data); + m_tms->vram_write(data); break; case 1: - m_tms->register_write(space, 0, data); + m_tms->register_write(data); break; } } -uint8_t a2bus_ezcgi_9938_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ezcgi_9938_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -196,7 +196,7 @@ uint8_t a2bus_ezcgi_9938_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ezcgi_9938_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { @@ -218,7 +218,7 @@ void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, uint8_t offset, u } } -uint8_t a2bus_ezcgi_9958_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ezcgi_9958_device::read_c0nx(uint8_t offset) { switch (offset) { @@ -232,7 +232,7 @@ uint8_t a2bus_ezcgi_9958_device::read_c0nx(address_space &space, uint8_t offset) return 0xff; } -void a2bus_ezcgi_9958_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ezcgi_9958_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h index 6c52e4cf9cd..b301bee332c 100644 --- a/src/devices/bus/a2bus/ezcgi.h +++ b/src/devices/bus/a2bus/ezcgi.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; required_device m_tms; @@ -64,8 +64,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; required_device m_tms; @@ -89,8 +89,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; required_device m_tms; diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp index 1224e6a980a..3b68c4e7852 100644 --- a/src/devices/bus/a2bus/laser128.cpp +++ b/src/devices/bus/a2bus/laser128.cpp @@ -68,21 +68,21 @@ void a2bus_laser128_device::device_reset() m_slot7_ram_bank = 0; } -uint8_t a2bus_laser128_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_laser128_device::read_c0nx(uint8_t offset) { return 0x00; } -void a2bus_laser128_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_laser128_device::write_c0nx(uint8_t offset, uint8_t data) { } -uint8_t a2bus_laser128_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_laser128_device::read_cnxx(uint8_t offset) { return m_rom[offset + (m_slot * 0x100) + 0x4000]; } -uint8_t a2bus_laser128_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_laser128_device::read_c800(uint16_t offset) { switch (m_slot) { @@ -109,7 +109,7 @@ uint8_t a2bus_laser128_device::read_c800(address_space &space, uint16_t offset) return 0xff; } -void a2bus_laser128_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_laser128_device::write_c800(uint16_t offset, uint8_t data) { if ((m_slot == 7) && (offset < 0x400)) { diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h index ea96fbdea52..a71f88e0c3d 100644 --- a/src/devices/bus/a2bus/laser128.h +++ b/src/devices/bus/a2bus/laser128.h @@ -35,11 +35,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; virtual bool take_c800() override; private: diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index b456851c9b2..ba005f57a82 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -203,25 +203,25 @@ void a2bus_mouse_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_mouse_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_mouse_device::read_c0nx(uint8_t offset) { - return m_pia->read(space, offset & 3); + return m_pia->reg_r(offset & 3); } /*------------------------------------------------- write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_mouse_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_mouse_device::write_c0nx(uint8_t offset, uint8_t data) { - m_pia->write(space, offset & 3, data); + m_pia->reg_w(offset & 3, data); } /*------------------------------------------------- read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_mouse_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_mouse_device::read_cnxx(uint8_t offset) { return m_rom[offset+m_rom_bank]; } diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h index 4b72a81a988..61d9fb332be 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -41,9 +41,9 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; DECLARE_WRITE8_MEMBER(pia_out_a); DECLARE_WRITE8_MEMBER(pia_out_b); diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 9b3b4c726f3..3567e8b7595 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -232,12 +232,12 @@ void a2bus_pcxporter_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_pcxporter_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_pcxporter_device::read_c0nx(uint8_t offset) { switch (offset) { default: - printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); + logerror("Read c0n%x (%s)\n", offset, machine().describe_context()); break; } @@ -249,12 +249,12 @@ uint8_t a2bus_pcxporter_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_pcxporter_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_pcxporter_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { default: - printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); + logerror("Write %02x to c0n%x (%s)\n", data, offset, machine().describe_context()); break; } } @@ -263,24 +263,24 @@ void a2bus_pcxporter_device::write_c0nx(address_space &space, uint8_t offset, ui read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_pcxporter_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_pcxporter_device::read_cnxx(uint8_t offset) { // read only to trigger C800? return 0xff; } -void a2bus_pcxporter_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_pcxporter_device::write_cnxx(uint8_t offset, uint8_t data) { - printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc()); + logerror("Write %02x to cn%02x (%s)\n", data, offset, machine().describe_context()); } /*------------------------------------------------- read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_pcxporter_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_pcxporter_device::read_c800(uint16_t offset) { -// printf("Read C800 at %x\n", offset + 0xc800); +// logerror("Read C800 at %x\n", offset + 0xc800); if (offset < 0x400) { @@ -315,7 +315,7 @@ uint8_t a2bus_pcxporter_device::read_c800(address_space &space, uint16_t offset) return rv; default: - //printf("Read $C800 at %x\n", offset + 0xc800); + //logerror("Read $C800 at %x\n", offset + 0xc800); break; } @@ -326,7 +326,7 @@ uint8_t a2bus_pcxporter_device::read_c800(address_space &space, uint16_t offset) /*------------------------------------------------- write_c800 - called for writes to this card's c800 space -------------------------------------------------*/ -void a2bus_pcxporter_device::write_c800(address_space &space, uint16_t offset, uint8_t data) +void a2bus_pcxporter_device::write_c800(uint16_t offset, uint8_t data) { if (offset < 0x400) { @@ -339,19 +339,19 @@ void a2bus_pcxporter_device::write_c800(address_space &space, uint16_t offset, u case 0x700: m_offset &= ~0xff; m_offset |= data; -// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc()); +// logerror("offset now %x (%s)\n", m_offset, machine().describe_context()); break; case 0x701: m_offset &= ~0xff00; m_offset |= (data<<8); -// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc()); +// logerror("offset now %x (%s)\n", m_offset, machine().describe_context()); break; case 0x702: m_offset &= ~0xff0000; m_offset |= (data<<16); -// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc()); +// logerror("offset now %x (%s)\n", m_offset, machine().describe_context()); break; case 0x703: // write w/increment @@ -435,7 +435,7 @@ void a2bus_pcxporter_device::write_c800(address_space &space, uint16_t offset, u break; default: -// printf("%02x to C800 at %x\n", data, offset + 0xc800); +// logerror("%02x to C800 at %x\n", data, offset + 0xc800); m_regs[offset] = data; break; } diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h index aa531af5f55..83452595dc4 100644 --- a/src/devices/bus/a2bus/pc_xporter.h +++ b/src/devices/bus/a2bus/pc_xporter.h @@ -41,12 +41,12 @@ public: DECLARE_READ16_MEMBER(pc_bios_r); // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; - virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_c800(uint16_t offset) override; + virtual void write_c800(uint16_t offset, uint8_t data) override; DECLARE_READ8_MEMBER( kbd_6502_r ); DECLARE_WRITE8_MEMBER( kbd_6502_w ); diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp index b98d2edfad9..4cc002466c6 100644 --- a/src/devices/bus/a2bus/ramcard128k.cpp +++ b/src/devices/bus/a2bus/ramcard128k.cpp @@ -139,7 +139,7 @@ void a2bus_ssramcard_device::do_io(int offset) read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_ssramcard_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ssramcard_device::read_c0nx(uint8_t offset) { do_io(offset & 0xf); return 0xff; @@ -150,12 +150,12 @@ uint8_t a2bus_ssramcard_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_ssramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ssramcard_device::write_c0nx(uint8_t offset, uint8_t data) { do_io(offset & 0xf); } -uint8_t a2bus_ssramcard_device::read_inh_rom(address_space &space, uint16_t offset) +uint8_t a2bus_ssramcard_device::read_inh_rom(uint16_t offset) { assert(m_inh_state & INH_READ); // this should never happen @@ -167,7 +167,7 @@ uint8_t a2bus_ssramcard_device::read_inh_rom(address_space &space, uint16_t offs return m_ram[(offset & 0x1fff) + 0x2000 + m_main_bank]; } -void a2bus_ssramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data) +void a2bus_ssramcard_device::write_inh_rom(uint16_t offset, uint8_t data) { // are writes enabled? if (!(m_inh_state & INH_WRITE)) diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h index a6ac119f200..ee3ac683514 100644 --- a/src/devices/bus/a2bus/ramcard128k.h +++ b/src/devices/bus/a2bus/ramcard128k.h @@ -34,10 +34,10 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override; - virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_inh_rom(uint16_t offset) override; + virtual void write_inh_rom(uint16_t offset, uint8_t data) override; virtual uint16_t inh_start() override { return 0xd000; } virtual uint16_t inh_end() override { return 0xffff; } virtual int inh_type() override; diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index d80bc9f4f6c..a320472e3f1 100644 --- a/src/devices/bus/a2bus/ramcard16k.cpp +++ b/src/devices/bus/a2bus/ramcard16k.cpp @@ -136,7 +136,7 @@ void a2bus_ramcard_device::do_io(int offset, bool writing) read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_ramcard_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ramcard_device::read_c0nx(uint8_t offset) { do_io(offset & 0xf, false); return 0xff; @@ -147,12 +147,12 @@ uint8_t a2bus_ramcard_device::read_c0nx(address_space &space, uint8_t offset) write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_ramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ramcard_device::write_c0nx(uint8_t offset, uint8_t data) { do_io(offset & 0xf, true); } -uint8_t a2bus_ramcard_device::read_inh_rom(address_space &space, uint16_t offset) +uint8_t a2bus_ramcard_device::read_inh_rom(uint16_t offset) { assert(m_inh_state & INH_READ); // this should never happen @@ -164,7 +164,7 @@ uint8_t a2bus_ramcard_device::read_inh_rom(address_space &space, uint16_t offset return m_ram[(offset & 0x1fff) + 0x2000]; } -void a2bus_ramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data) +void a2bus_ramcard_device::write_inh_rom(uint16_t offset, uint8_t data) { // are writes enabled? if (!(m_inh_state & INH_WRITE)) diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h index 43e8ca8b535..21edcd7a7fd 100644 --- a/src/devices/bus/a2bus/ramcard16k.h +++ b/src/devices/bus/a2bus/ramcard16k.h @@ -34,10 +34,10 @@ protected: virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override; - virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_inh_rom(uint16_t offset) override; + virtual void write_inh_rom(uint16_t offset, uint8_t data) override; virtual uint16_t inh_start() override { return 0xd000; } virtual uint16_t inh_end() override { return 0xffff; } virtual int inh_type() override; diff --git a/src/devices/bus/a2bus/ssbapple.cpp b/src/devices/bus/a2bus/ssbapple.cpp index cf432236e1a..0eabefedd49 100644 --- a/src/devices/bus/a2bus/ssbapple.cpp +++ b/src/devices/bus/a2bus/ssbapple.cpp @@ -80,12 +80,12 @@ bool a2bus_ssb_device::take_c800() return false; } -uint8_t a2bus_ssb_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_ssb_device::read_cnxx(uint8_t offset) { - return 0x1f | m_tms->status_r(space, 0); + return 0x1f | m_tms->status_r(); } -void a2bus_ssb_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ssb_device::write_cnxx(uint8_t offset, uint8_t data) { - m_tms->data_w(space, 0, data); + m_tms->data_w(data); } diff --git a/src/devices/bus/a2bus/ssbapple.h b/src/devices/bus/a2bus/ssbapple.h index fa03048d53a..def0db3c9d4 100644 --- a/src/devices/bus/a2bus/ssbapple.h +++ b/src/devices/bus/a2bus/ssbapple.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual void write_cnxx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; }; diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp index 5f101bcf6ac..0371de93dcf 100644 --- a/src/devices/bus/a2bus/ssprite.cpp +++ b/src/devices/bus/a2bus/ssprite.cpp @@ -96,44 +96,44 @@ void a2bus_ssprite_device::device_reset() */ -uint8_t a2bus_ssprite_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_ssprite_device::read_c0nx(uint8_t offset) { switch (offset) { case 0: - return m_tms->vram_read(space, 0); + return m_tms->vram_read(); case 1: - return m_tms->register_read(space, 0); + return m_tms->register_read(); case 2: - return 0x1f | m_tms5220->status_r(space, 0); // copied this line from a2echoii.cpp + return 0x1f | m_tms5220->status_r(); // copied this line from a2echoii.cpp case 14: case 15: - return m_ay->data_r(space, 0); + return m_ay->data_r(); } return 0xff; } -void a2bus_ssprite_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_ssprite_device::write_c0nx(uint8_t offset, uint8_t data) { switch (offset) { case 0: - m_tms->vram_write(space, 0, data); + m_tms->vram_write(data); break; case 1: - m_tms->register_write(space, 0, data); + m_tms->register_write(data); break; case 2: - m_tms5220->data_w(space, offset, data); + m_tms5220->data_w(data); break; case 12: case 13: - m_ay->data_w(space, 0, data); + m_ay->data_w(data); break; case 14: case 15: - m_ay->address_w(space, 0, data); + m_ay->address_w(data); break; } } diff --git a/src/devices/bus/a2bus/ssprite.h b/src/devices/bus/a2bus/ssprite.h index 8b5df012a51..590e172445c 100644 --- a/src/devices/bus/a2bus/ssprite.h +++ b/src/devices/bus/a2bus/ssprite.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 3a09d3e6c60..b2e532a7858 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -155,11 +155,11 @@ void a2bus_timemasterho_device::device_reset() read_c0nx - called for reads from this card's c0nx space -------------------------------------------------*/ -uint8_t a2bus_timemasterho_device::read_c0nx(address_space &space, uint8_t offset) +uint8_t a2bus_timemasterho_device::read_c0nx(uint8_t offset) { if (offset <= 3) { - return m_pia->read(space, offset); + return m_pia->reg_r(offset); } return 0xff; @@ -170,11 +170,11 @@ uint8_t a2bus_timemasterho_device::read_c0nx(address_space &space, uint8_t offse write_c0nx - called for writes to this card's c0nx space -------------------------------------------------*/ -void a2bus_timemasterho_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data) +void a2bus_timemasterho_device::write_c0nx(uint8_t offset, uint8_t data) { if (offset <= 3) { - m_pia->write(space, offset, data); + m_pia->reg_w(offset, data); } } @@ -182,7 +182,7 @@ void a2bus_timemasterho_device::write_c0nx(address_space &space, uint8_t offset, read_cnxx - called for reads from this card's cnxx space -------------------------------------------------*/ -uint8_t a2bus_timemasterho_device::read_cnxx(address_space &space, uint8_t offset) +uint8_t a2bus_timemasterho_device::read_cnxx(uint8_t offset) { if (m_started) { @@ -200,7 +200,7 @@ uint8_t a2bus_timemasterho_device::read_cnxx(address_space &space, uint8_t offse read_c800 - called for reads from this card's c800 space -------------------------------------------------*/ -uint8_t a2bus_timemasterho_device::read_c800(address_space &space, uint16_t offset) +uint8_t a2bus_timemasterho_device::read_c800(uint16_t offset) { return m_rom[offset+0xc00]; } diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h index d9f47a4e133..fcc71d6194f 100644 --- a/src/devices/bus/a2bus/timemasterho.h +++ b/src/devices/bus/a2bus/timemasterho.h @@ -39,10 +39,10 @@ protected: virtual ioport_constructor device_input_ports() const override; // overrides of standard a2bus slot functions - virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override; - virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override; - virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override; - virtual uint8_t read_c800(address_space &space, uint16_t offset) override; + virtual uint8_t read_c0nx(uint8_t offset) override; + virtual void write_c0nx(uint8_t offset, uint8_t data) override; + virtual uint8_t read_cnxx(uint8_t offset) override; + virtual uint8_t read_c800(uint16_t offset) override; required_device m_pia; required_device m_msm5832; diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index fb3cbb3a371..a7838451a1a 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -96,6 +96,9 @@ public: template static devcb_base &set_irqa_handler(device_t &device, Obj &&object) { return downcast(device).m_irqa_handler.set_callback(std::forward(object)); } template static devcb_base &set_irqb_handler(device_t &device, Obj &&object) { return downcast(device).m_irqb_handler.set_callback(std::forward(object)); } + uint8_t reg_r(uint8_t offset); + void reg_w(uint8_t offset, uint8_t data); + DECLARE_READ8_MEMBER( read ) { return reg_r(offset); } DECLARE_WRITE8_MEMBER( write ) { reg_w(offset, data); } DECLARE_READ8_MEMBER( read_alt ) { return reg_r(((offset << 1) & 0x02) | ((offset >> 1) & 0x01)); } @@ -134,8 +137,6 @@ protected: virtual void device_reset() override; private: - uint8_t reg_r(uint8_t offset); - void reg_w(uint8_t offset, uint8_t data); void update_interrupts(); diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp index e52f2ff73bc..c7d0492f73c 100644 --- a/src/devices/machine/ncr5380n.cpp +++ b/src/devices/machine/ncr5380n.cpp @@ -102,11 +102,11 @@ void ncr5380n_device::scsi_ctrl_changed() { uint32_t ctrl = scsi_bus->ctrl_r(); -// printf("scsi_ctrl_changed: lines now %x\n", ctrl); +// logerror("scsi_ctrl_changed: lines now %x\n", ctrl); /* if ((ctrl & (S_PHASE_MASK|S_SEL|S_BSY)) != last_phase) { - printf("phase now %d, REQ %x SEL %x BSY %x\n", ctrl & S_PHASE_MASK, ctrl & S_REQ, ctrl & S_SEL, ctrl & S_BSY); + logerror("phase now %d, REQ %x SEL %x BSY %x\n", ctrl & S_PHASE_MASK, ctrl & S_REQ, ctrl & S_SEL, ctrl & S_BSY); last_phase = (S_PHASE_MASK|S_SEL|S_BSY); }*/ @@ -122,7 +122,7 @@ void ncr5380n_device::scsi_ctrl_changed() // if BSY drops or the phase goes mismatch, that terminates the DMA if ((!(ctrl & S_BSY)) || !(m_busstatus & BAS_PHASEMATCH)) { -// printf("BSY dropped or phase mismatch during DMA, ending DMA\n"); +// logerror("BSY dropped or phase mismatch during DMA, ending DMA\n"); m_mode &= ~MODE_DMA; m_busstatus |= BAS_ENDOFDMA; drq_clear(); @@ -148,7 +148,7 @@ void ncr5380n_device::step(bool timeout) uint32_t data = scsi_bus->data_r(); if(0) - printf("%s: state=%d.%d %s\n", + logerror("%s: state=%d.%d %s\n", tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT, timeout ? "timeout" : "change"); @@ -167,7 +167,7 @@ void ncr5380n_device::step(bool timeout) int win; for(win=7; win>=0 && !(data & (1<data_w(scsi_refid, 0); scsi_bus->ctrl_w(scsi_refid, 0, S_ALL); @@ -230,7 +230,7 @@ void ncr5380n_device::step(bool timeout) break; default: - printf("%s: step() unexpected state %d.%d\n", + logerror("%s: step() unexpected state %d.%d\n", tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT); exit(0); @@ -313,7 +313,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w) // asserting to drive the data bus? if ((data & IC_DBUS) && !(m_icommand & IC_DBUS)) { -// printf("%s: driving data bus with %02x\n", tag(), m_outdata); +// logerror("%s: driving data bus with %02x\n", tag(), m_outdata); scsi_bus->data_w(scsi_refid, m_outdata); delay(2); } @@ -331,7 +331,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w) (data & IC_SEL ? S_SEL : 0) | (data & IC_ATN ? S_ATN : 0); -// printf("%s: changing control lines %04x\n", tag(), newdata); +// logerror("%s: changing control lines %04x\n", tag(), newdata); scsi_bus->ctrl_w(scsi_refid, newdata, S_RST|S_ACK|S_BSY|S_SEL|S_ATN); } @@ -346,7 +346,7 @@ READ8_MEMBER(ncr5380n_device::mode_r) WRITE8_MEMBER(ncr5380n_device::mode_w) { -// printf("%s: mode_w %02x (%08x)\n", tag(), data, space.device().safe_pc()); +// logerror("%s: mode_w %02x (%s)\n", tag(), data, machine().describe_context()); // arbitration bit being set? if ((data & MODE_ARBITRATE) && !(m_mode & MODE_ARBITRATE)) { @@ -374,13 +374,13 @@ WRITE8_MEMBER(ncr5380n_device::mode_w) READ8_MEMBER(ncr5380n_device::command_r) { -// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc()); +// logerror("%s: command_r %02x (%s)\n", tag(), m_tcommand, machine().describe_context()); return m_tcommand; } WRITE8_MEMBER(ncr5380n_device::command_w) { -// printf("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc()); +// logerror("%s: command_w %02x (%s)\n", tag(), data, machine().describe_context()); m_tcommand = data; // recalculate phase match @@ -424,7 +424,7 @@ READ8_MEMBER(ncr5380n_device::status_r) (ctrl & S_INP ? ST_IO : 0) | (ctrl & S_SEL ? ST_SEL : 0); -// printf("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc()); +// logerror("%s: status_r %02x (%s)\n", tag(), res, machine().describe_context()); return res; } @@ -439,14 +439,14 @@ READ8_MEMBER(ncr5380n_device::busandstatus_r) (ctrl & S_ATN ? BAS_ATN : 0) | (ctrl & S_ACK ? BAS_ACK : 0); -// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc()); +// logerror("%s: busandstatus_r %02x (%s)\n", tag(), res, machine().describe_context()); return res; } WRITE8_MEMBER(ncr5380n_device::startdmasend_w) { - printf("%02x to start dma send\n", data); + logerror("%02x to start dma send\n", data); drq_set(); } @@ -457,7 +457,7 @@ READ8_MEMBER(ncr5380n_device::indata_r) WRITE8_MEMBER(ncr5380n_device::startdmatargetrx_w) { - printf("%02x to start dma target Rx\n", data); + logerror("%02x to start dma target Rx\n", data); } READ8_MEMBER(ncr5380n_device::resetparityirq_r) @@ -467,7 +467,7 @@ READ8_MEMBER(ncr5380n_device::resetparityirq_r) WRITE8_MEMBER(ncr5380n_device::startdmainitrx_w) { -// printf("%02x to start dma initiator Rx\n", data); +// logerror("%02x to start dma initiator Rx\n", data); recv_byte(); } @@ -551,7 +551,7 @@ READ8_MEMBER(ncr5380n_device::read) WRITE8_MEMBER(ncr5380n_device::write) { -// printf("%x to 5380 @ %x\n", data, offset); +// logerror("%x to 5380 @ %x\n", data, offset); switch (offset & 7) { case 0: diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 474f8fb7fc3..c9f79cc72ac 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -357,6 +357,11 @@ WRITE8_MEMBER(upd765_family_device::tdr_w) } READ8_MEMBER(upd765_family_device::msr_r) +{ + return msr_r(); +} + +uint8_t upd765_family_device::msr_r() { uint32_t msr = 0; switch(main_phase) { @@ -409,6 +414,11 @@ void upd765_family_device::set_rate(int rate) } READ8_MEMBER(upd765_family_device::fifo_r) +{ + return fifo_r(); +} + +uint8_t upd765_family_device::fifo_r() { uint8_t r = 0xff; switch(main_phase) { @@ -440,6 +450,11 @@ READ8_MEMBER(upd765_family_device::fifo_r) } WRITE8_MEMBER(upd765_family_device::fifo_w) +{ + fifo_w(data); +} + +void upd765_family_device::fifo_w(uint8_t data) { switch(main_phase) { case PHASE_CMD: { diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index a920d7dd875..dc7f7b181a2 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -113,8 +113,11 @@ public: DECLARE_WRITE8_MEMBER(dor_w); DECLARE_READ8_MEMBER (tdr_r); DECLARE_WRITE8_MEMBER(tdr_w); + uint8_t msr_r(); DECLARE_READ8_MEMBER (msr_r); DECLARE_WRITE8_MEMBER(dsr_w); + uint8_t fifo_r(); + void fifo_w(uint8_t data); DECLARE_READ8_MEMBER (fifo_r); DECLARE_WRITE8_MEMBER(fifo_w); DECLARE_READ8_MEMBER (dir_r); diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp index df7570f7cd7..8e97ddfb1d3 100644 --- a/src/devices/machine/wozfdc.cpp +++ b/src/devices/machine/wozfdc.cpp @@ -193,7 +193,7 @@ void wozfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param read - called to read the FDC's registers -------------------------------------------------*/ -READ8_MEMBER(wozfdc_device::read) +uint8_t wozfdc_device::read(offs_t offset) { lss_sync(); control(offset); @@ -209,7 +209,7 @@ READ8_MEMBER(wozfdc_device::read) write - called to write the FDC's registers -------------------------------------------------*/ -WRITE8_MEMBER(wozfdc_device::write) +void wozfdc_device::write(offs_t offset, uint8_t data) { lss_sync(); control(offset); @@ -448,14 +448,14 @@ void appleiii_fdc_device::set_floppies_4(floppy_connector *f0, floppy_connector } } -READ8_MEMBER(appleiii_fdc_device::read_c0dx) +uint8_t appleiii_fdc_device::read_c0dx(uint8_t offset) { control_dx(offset); return 0xff; } -WRITE8_MEMBER(appleiii_fdc_device::write_c0dx) +void appleiii_fdc_device::write_c0dx(uint8_t offset, uint8_t data) { control_dx(offset); } diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h index 13c3205416d..3fae86420b0 100644 --- a/src/devices/machine/wozfdc.h +++ b/src/devices/machine/wozfdc.h @@ -30,8 +30,8 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: // construction/destruction @@ -96,8 +96,8 @@ public: void set_floppies_4(floppy_connector *f0, floppy_connector *f1, floppy_connector *f2, floppy_connector *f3); - DECLARE_READ8_MEMBER(read_c0dx); - DECLARE_WRITE8_MEMBER(write_c0dx); + uint8_t read_c0dx(uint8_t offset); + void write_c0dx(uint8_t offset, uint8_t data); protected: virtual void device_reset() override; diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index 10c29f88eed..bac8ed879f7 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -1394,6 +1394,21 @@ void ay8910_device::device_reset() * *************************************/ +u8 ay8910_device::data_r() +{ + return ay8910_read_ym(); +} + +void ay8910_device::address_w(u8 data) +{ + ay8910_write_ym(0, data); +} + +void ay8910_device::data_w(u8 data) +{ + ay8910_write_ym(1, data); +} + READ8_MEMBER( ay8910_device::data_r ) { return ay8910_read_ym(); @@ -1448,6 +1463,11 @@ WRITE8_MEMBER( ay8910_device::write_bc1_bc2 ) } WRITE8_MEMBER( ay8910_device::reset_w ) +{ + reset_w(); +} + +void ay8910_device::reset_w() { ay8910_reset_ym(); } diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h index ef796ee7071..717359d6dd7 100644 --- a/src/devices/sound/ay8910.h +++ b/src/devices/sound/ay8910.h @@ -96,8 +96,12 @@ public: DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( address_w ); DECLARE_WRITE8_MEMBER( data_w ); + u8 data_r(); + void address_w(u8 data); + void data_w(u8 data); /* /RES */ + void reset_w(); DECLARE_WRITE8_MEMBER( reset_w ); /* use this when BC1 == A0; here, BC1=0 selects 'data' and BC1=1 selects 'latch address' */ diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index 32052853a2a..a8955937fd1 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -2005,6 +2005,11 @@ WRITE8_MEMBER( tms5220_device::combined_rsq_wsq_w ) ***********************************************************************************************/ WRITE8_MEMBER( tms5220_device::data_w ) +{ + data_w(data); +} + +void tms5220_device::data_w(uint8_t data) { // prevent debugger from changing the internal state if (machine().side_effect_disabled()) return; @@ -2038,6 +2043,11 @@ WRITE8_MEMBER( tms5220_device::data_w ) ***********************************************************************************************/ READ8_MEMBER( tms5220_device::status_r ) +{ + return status_r(); +} + +uint8_t tms5220_device::status_r() { // prevent debugger from changing the internal state if (machine().side_effect_disabled()) return 0; diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index 9f3c93eef75..38b9983ac94 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -84,6 +84,9 @@ public: DECLARE_WRITE8_MEMBER( data_w ); DECLARE_READ8_MEMBER( status_r ); + void data_w(uint8_t data); + uint8_t status_r(); + READ_LINE_MEMBER( readyq_r ); READ_LINE_MEMBER( intq_r ); diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index 5723de82f57..9b265bc34cb 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -130,12 +130,22 @@ void mc6845_device::call_on_update_address(int strobe) WRITE8_MEMBER( mc6845_device::address_w ) +{ + address_w(data); +} + +void mc6845_device::address_w(uint8_t data) { m_register_address_latch = data & 0x1f; } READ8_MEMBER( mc6845_device::status_r ) +{ + return status_r(); +} + +uint8_t mc6845_device::status_r() { uint8_t ret = 0; @@ -179,6 +189,11 @@ void mc6845_device::transparent_update() READ8_MEMBER( mc6845_device::register_r ) +{ + return register_r(); +} + +uint8_t mc6845_device::register_r() { uint8_t ret = 0; @@ -201,6 +216,11 @@ READ8_MEMBER( mc6845_device::register_r ) WRITE8_MEMBER( mc6845_device::register_w ) +{ + register_w(data); +} + +void mc6845_device::register_w(uint8_t data) { LOG("%s:M6845 reg 0x%02x = 0x%02x\n", machine().describe_context(), m_register_address_latch, data); diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index ffb2dc373d7..e30cc081535 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -115,15 +115,19 @@ public: /* select one of the registers for reading or writing */ DECLARE_WRITE8_MEMBER( address_w ); + void address_w(uint8_t data); /* read from the status register */ DECLARE_READ8_MEMBER( status_r ); + uint8_t status_r(); /* read from the currently selected register */ DECLARE_READ8_MEMBER( register_r ); + uint8_t register_r(); /* write to the currently selected register */ DECLARE_WRITE8_MEMBER( register_w ); + void register_w(uint8_t data); // read display enable line state DECLARE_READ_LINE_MEMBER( de_r ); diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index fc9898ebea4..4d32f72274d 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -137,7 +137,7 @@ WRITE8_MEMBER( tms9928a_device::write ) register_write(space, 0, data); } -READ8_MEMBER( tms9928a_device::vram_read ) +u8 tms9928a_device::vram_read() { // prevent debugger from changing the address base if (machine().side_effect_disabled()) return 0; @@ -151,8 +151,12 @@ READ8_MEMBER( tms9928a_device::vram_read ) return data; } +READ8_MEMBER( tms9928a_device::vram_read ) +{ + return vram_read(); +} -WRITE8_MEMBER( tms9928a_device::vram_write ) +void tms9928a_device::vram_write(u8 data) { // prevent debugger from changing the address base if (machine().side_effect_disabled()) return; @@ -163,8 +167,12 @@ WRITE8_MEMBER( tms9928a_device::vram_write ) m_latch = 0; } +WRITE8_MEMBER( tms9928a_device::vram_write ) +{ + vram_write(data); +} -READ8_MEMBER( tms9928a_device::register_read ) +u8 tms9928a_device::register_read() { // prevent debugger from changing the internal state if (machine().side_effect_disabled()) return 0; @@ -178,6 +186,10 @@ READ8_MEMBER( tms9928a_device::register_read ) return data; } +READ8_MEMBER( tms9928a_device::register_read ) +{ + return register_read(); +} void tms9928a_device::check_interrupt() { @@ -292,7 +304,7 @@ void tms9928a_device::change_register(uint8_t reg, uint8_t val) } -WRITE8_MEMBER( tms9928a_device::register_write ) +void tms9928a_device::register_write(u8 data) { // prevent debugger from changing the internal state if (machine().side_effect_disabled()) return; @@ -312,7 +324,7 @@ WRITE8_MEMBER( tms9928a_device::register_write ) if ( !(data & 0x40) ) { /* read ahead */ - vram_read(space, 0); + vram_read(); } } m_latch = 0; @@ -325,6 +337,10 @@ WRITE8_MEMBER( tms9928a_device::register_write ) } } +WRITE8_MEMBER( tms9928a_device::register_write ) +{ + register_write(data); +} void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 7662bcc3eeb..fc8edee0c9f 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -100,6 +100,11 @@ public: DECLARE_READ8_MEMBER( register_read ); DECLARE_WRITE8_MEMBER( register_write ); + u8 vram_read(); + void vram_write(u8 data); + u8 register_read(); + void register_write(u8 data); + /* update the screen */ uint32_t screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ); bitmap_rgb32 &get_bitmap() { return m_tmpbmp; } diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp index c4790652148..18acb3af75a 100644 --- a/src/mame/drivers/agat.cpp +++ b/src/mame/drivers/agat.cpp @@ -469,7 +469,7 @@ READ8_MEMBER(agat7_state::c080_r) if (m_slotdevice[slot] != nullptr) { - return m_slotdevice[slot]->read_c0nx(space, offset % 0x10); + return m_slotdevice[slot]->read_c0nx(offset % 0x10); } } @@ -487,7 +487,7 @@ WRITE8_MEMBER(agat7_state::c080_w) if (m_slotdevice[slot] != nullptr) { - m_slotdevice[slot]->write_c0nx(space, offset % 0x10, data); + m_slotdevice[slot]->write_c0nx(offset % 0x10, data); } } @@ -507,7 +507,7 @@ READ8_MEMBER(agat7_state::c100_r) logerror("%s: c100_r %04X (slot %d) == %02X\n", machine().describe_context(), offset+0xc100, slotnum, data); - return m_slotdevice[slotnum]->read_cnxx(space, offset & 0xff); + return m_slotdevice[slotnum]->read_cnxx(offset & 0xff); } return read_floatingbus(); @@ -528,7 +528,7 @@ WRITE8_MEMBER(agat7_state::c100_w) m_cnxx_slot = slotnum; } - m_slotdevice[slotnum]->write_cnxx(space, offset & 0xff, data); + m_slotdevice[slotnum]->write_cnxx(offset & 0xff, data); } } @@ -548,7 +548,7 @@ READ8_MEMBER(agat7_state::c800_r) if ((m_cnxx_slot != -1) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - return m_slotdevice[m_cnxx_slot]->read_c800(space, offset & 0xfff); + return m_slotdevice[m_cnxx_slot]->read_c800(offset & 0xfff); } return read_floatingbus(); @@ -570,7 +570,7 @@ WRITE8_MEMBER(agat7_state::c800_w) if ((m_cnxx_slot != -1) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - m_slotdevice[m_cnxx_slot]->write_c800(space, offset & 0xfff, data); + m_slotdevice[m_cnxx_slot]->write_c800(offset & 0xfff, data); } } @@ -578,7 +578,7 @@ READ8_MEMBER(agat7_state::inh_r) { if (m_inh_slot != -1) { - return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); + return m_slotdevice[m_inh_slot]->read_inh_rom(offset + 0xd000); } assert(0); // hitting inh_r with invalid m_inh_slot should not be possible @@ -589,7 +589,7 @@ WRITE8_MEMBER(agat7_state::inh_w) { if (m_inh_slot != -1) { - m_slotdevice[m_inh_slot]->write_inh_rom(space, offset + 0xd000, data); + m_slotdevice[m_inh_slot]->write_inh_rom(offset + 0xd000, data); } } @@ -633,7 +633,7 @@ READ8_MEMBER(agat7_state::agat7_ram_r) else { if (m_agat7_ram_slot != -1) - return m_slotdevice[m_agat7_ram_slot]->read_inh_rom(space, offset + 0x8000); + return m_slotdevice[m_agat7_ram_slot]->read_inh_rom(offset + 0x8000); if (offset < m_ram_size) { if (m_agat7_membank == 0) @@ -661,7 +661,7 @@ WRITE8_MEMBER(agat7_state::agat7_ram_w) else { if (m_agat7_ram_slot != -1) - m_slotdevice[m_agat7_ram_slot]->write_inh_rom(space, offset + 0x8000, data); + m_slotdevice[m_agat7_ram_slot]->write_inh_rom(offset + 0x8000, data); else if (offset < m_ram_size) { if (m_agat7_membank == 0) diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 12e44b49892..2f9fe56a8c2 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -678,7 +678,7 @@ READ8_MEMBER(napple2_state::c080_r) if (m_slotdevice[slot] != nullptr) { - return m_slotdevice[slot]->read_c0nx(space, offset % 0x10); + return m_slotdevice[slot]->read_c0nx(offset % 0x10); } } @@ -694,7 +694,7 @@ WRITE8_MEMBER(napple2_state::c080_w) if (m_slotdevice[slot] != nullptr) { - m_slotdevice[slot]->write_c0nx(space, offset % 0x10, data); + m_slotdevice[slot]->write_c0nx(offset % 0x10, data); } } @@ -711,7 +711,7 @@ READ8_MEMBER(napple2_state::c100_r) m_cnxx_slot = slotnum; } - return m_slotdevice[slotnum]->read_cnxx(space, offset&0xff); + return m_slotdevice[slotnum]->read_cnxx(offset&0xff); } return read_floatingbus(); @@ -730,7 +730,7 @@ WRITE8_MEMBER(napple2_state::c100_w) m_cnxx_slot = slotnum; } - m_slotdevice[slotnum]->write_cnxx(space, offset&0xff, data); + m_slotdevice[slotnum]->write_cnxx(offset&0xff, data); } } @@ -748,7 +748,7 @@ READ8_MEMBER(napple2_state::c800_r) if ((m_cnxx_slot != -1) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - return m_slotdevice[m_cnxx_slot]->read_c800(space, offset&0xfff); + return m_slotdevice[m_cnxx_slot]->read_c800(offset&0xfff); } return read_floatingbus(); @@ -768,7 +768,7 @@ WRITE8_MEMBER(napple2_state::c800_w) if ((m_cnxx_slot != -1) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - m_slotdevice[m_cnxx_slot]->write_c800(space, offset&0xfff, data); + m_slotdevice[m_cnxx_slot]->write_c800(offset&0xfff, data); } } @@ -776,7 +776,7 @@ READ8_MEMBER(napple2_state::inh_r) { if (m_inh_slot != -1) { - return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); + return m_slotdevice[m_inh_slot]->read_inh_rom(offset + 0xd000); } assert(0); // hitting inh_r with invalid m_inh_slot should not be possible @@ -787,7 +787,7 @@ WRITE8_MEMBER(napple2_state::inh_w) { if (m_inh_slot != -1) { - m_slotdevice[m_inh_slot]->write_inh_rom(space, offset + 0xd000, data); + m_slotdevice[m_inh_slot]->write_inh_rom(offset + 0xd000, data); } } diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 8eb1f04fb0b..cefc26e00a7 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -429,9 +429,9 @@ private: uint8_t read_floatingbus(); void update_slotrom_banks(); void lc_update(int offset, bool writing); - uint8_t read_slot_rom(address_space &space, int slotbias, int offset); - void write_slot_rom(address_space &space, int slotbias, int offset, uint8_t data); - uint8_t read_int_rom(address_space &space, int slotbias, int offset); + uint8_t read_slot_rom(int slotbias, int offset); + void write_slot_rom(int slotbias, int offset, uint8_t data); + uint8_t read_int_rom(int slotbias, int offset); void auxbank_update(); void cec_lcrom_update(); void raise_irq(int irq); @@ -2083,7 +2083,7 @@ READ8_MEMBER(apple2e_state::c080_r) { if (m_slotdevice[slot] != nullptr) { - return m_slotdevice[slot]->read_c0nx(space, offset % 0x10); + return m_slotdevice[slot]->read_c0nx(offset % 0x10); } else { @@ -2113,7 +2113,7 @@ WRITE8_MEMBER(apple2e_state::c080_w) { if (m_slotdevice[slot] != nullptr) { - m_slotdevice[slot]->write_c0nx(space, offset % 0x10, data); + m_slotdevice[slot]->write_c0nx(offset % 0x10, data); } else { @@ -2139,7 +2139,7 @@ WRITE8_MEMBER(apple2e_state::c080_w) } } -uint8_t apple2e_state::read_slot_rom(address_space &space, int slotbias, int offset) +uint8_t apple2e_state::read_slot_rom(int slotbias, int offset) { int slotnum = ((offset>>8) & 0xf) + slotbias; @@ -2151,13 +2151,13 @@ uint8_t apple2e_state::read_slot_rom(address_space &space, int slotbias, int off update_slotrom_banks(); } - return m_slotdevice[slotnum]->read_cnxx(space, offset&0xff); + return m_slotdevice[slotnum]->read_cnxx(offset&0xff); } return read_floatingbus(); } -void apple2e_state::write_slot_rom(address_space &space, int slotbias, int offset, uint8_t data) +void apple2e_state::write_slot_rom(int slotbias, int offset, uint8_t data) { int slotnum = ((offset>>8) & 0xf) + slotbias; @@ -2169,25 +2169,25 @@ void apple2e_state::write_slot_rom(address_space &space, int slotbias, int offse update_slotrom_banks(); } - m_slotdevice[slotnum]->write_cnxx(space, offset&0xff, data); + m_slotdevice[slotnum]->write_cnxx(offset&0xff, data); } } -uint8_t apple2e_state::read_int_rom(address_space &space, int slotbias, int offset) +uint8_t apple2e_state::read_int_rom(int slotbias, int offset) { //return m_rom_ptr[slotbias + offset]; - return m_ds1315->read(space, slotbias + offset); + return m_ds1315->read(machine().dummy_space(), slotbias + offset); } READ8_MEMBER(apple2e_state::nsc_backing_r) { return m_rom_ptr[offset]; } -READ8_MEMBER(apple2e_state::c100_r) { return read_slot_rom(space, 1, offset); } -READ8_MEMBER(apple2e_state::c100_int_r) { return read_int_rom(space, 0x100, offset); } -READ8_MEMBER(apple2e_state::c100_int_bank_r) { return read_int_rom(space, 0x4100, offset); } +READ8_MEMBER(apple2e_state::c100_r) { return read_slot_rom(1, offset); } +READ8_MEMBER(apple2e_state::c100_int_r) { return read_int_rom(0x100, offset); } +READ8_MEMBER(apple2e_state::c100_int_bank_r) { return read_int_rom(0x4100, offset); } READ8_MEMBER(apple2e_state::c100_cec_r) { return m_rom_ptr[0xc100 + offset]; } READ8_MEMBER(apple2e_state::c100_cec_bank_r) { return m_rom_ptr[0x4100 + offset]; } -WRITE8_MEMBER(apple2e_state::c100_w) { write_slot_rom(space, 1, offset, data); } -READ8_MEMBER(apple2e_state::c300_r) { return read_slot_rom(space, 3, offset); } +WRITE8_MEMBER(apple2e_state::c100_w) { write_slot_rom(1, offset, data); } +READ8_MEMBER(apple2e_state::c300_r) { return read_slot_rom(3, offset); } READ8_MEMBER(apple2e_state::c300_int_r) { @@ -2196,7 +2196,7 @@ READ8_MEMBER(apple2e_state::c300_int_r) m_intc8rom = true; update_slotrom_banks(); } - return read_int_rom(space, 0x300, offset); + return read_int_rom(0x300, offset); } READ8_MEMBER(apple2e_state::c300_int_bank_r) @@ -2206,7 +2206,7 @@ READ8_MEMBER(apple2e_state::c300_int_bank_r) m_intc8rom = true; update_slotrom_banks(); } - return read_int_rom(space, 0x4300, offset); + return read_int_rom(0x4300, offset); } WRITE8_MEMBER(apple2e_state::c300_w) @@ -2217,31 +2217,31 @@ WRITE8_MEMBER(apple2e_state::c300_w) update_slotrom_banks(); } - write_slot_rom(space, 3, offset, data); + write_slot_rom(3, offset, data); } READ8_MEMBER(apple2e_state::c300_cec_r) { return m_rom_ptr[0xc300 + offset]; } READ8_MEMBER(apple2e_state::c300_cec_bank_r) { return m_rom_ptr[0x4300 + offset]; } -READ8_MEMBER(apple2e_state::c400_r) { return read_slot_rom(space, 4, offset); } +READ8_MEMBER(apple2e_state::c400_r) { return read_slot_rom(4, offset); } READ8_MEMBER(apple2e_state::c400_int_r) { if ((offset < 0x100) && (m_mockingboard4c)) { - return read_slot_rom(space, 4, offset); + return read_slot_rom(4, offset); } - return read_int_rom(space, 0x400, offset); + return read_int_rom(0x400, offset); } READ8_MEMBER(apple2e_state::c400_int_bank_r) { if ((offset < 0x100) && (m_mockingboard4c)) { - return read_slot_rom(space, 4, offset); + return read_slot_rom(4, offset); } - return read_int_rom(space, 0x4400, offset); + return read_int_rom(0x4400, offset); } WRITE8_MEMBER(apple2e_state::c400_w) @@ -2251,7 +2251,7 @@ WRITE8_MEMBER(apple2e_state::c400_w) m_mockingboard4c = true; } - write_slot_rom(space, 4, offset, data); + write_slot_rom(4, offset, data); } READ8_MEMBER(apple2e_state::c400_cec_r) { return m_rom_ptr[0xc400 + offset]; } @@ -2277,7 +2277,7 @@ READ8_MEMBER(apple2e_state::c800_r) if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - return m_slotdevice[m_cnxx_slot]->read_c800(space, offset&0xfff); + return m_slotdevice[m_cnxx_slot]->read_c800(offset&0xfff); } return read_floatingbus(); @@ -2344,7 +2344,7 @@ WRITE8_MEMBER(apple2e_state::c800_w) if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr)) { - m_slotdevice[m_cnxx_slot]->write_c800(space, offset&0xfff, data); + m_slotdevice[m_cnxx_slot]->write_c800(offset&0xfff, data); } } @@ -2355,7 +2355,7 @@ READ8_MEMBER(apple2e_state::inh_r) { if (m_inh_slot != -1) { - return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); + return m_slotdevice[m_inh_slot]->read_inh_rom(offset + 0xd000); } assert(0); // hitting inh_r with invalid m_inh_slot should not be possible @@ -2366,7 +2366,7 @@ WRITE8_MEMBER(apple2e_state::inh_w) { if (m_inh_slot != -1) { - m_slotdevice[m_inh_slot]->write_inh_rom(space, offset + 0xd000, data); + m_slotdevice[m_inh_slot]->write_inh_rom(offset + 0xd000, data); } } diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index 85a6dbc2e9c..c43e1dae2a0 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -369,7 +369,7 @@ public: void apple2_iwm_setdiskreg(uint8_t data); void apple2_init_common(); void apple2eplus_init_common(void *apple2cp_ce00_ram); - int8_t apple2_slotram_r(address_space &space, int slotnum, int offset); + int8_t apple2_slotram_r(int slotnum, int offset); int a2_no_ctrl_reset(); private: diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index 0995660c1a6..da75e20a484 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -388,7 +388,7 @@ READ8_MEMBER(apple2_state::apple2_c080_r) /* and if we can, read from the slot */ if (slotdevice != nullptr) { - return slotdevice->read_c0nx(space, offset % 0x10); + return slotdevice->read_c0nx(offset % 0x10); } } @@ -416,12 +416,12 @@ WRITE8_MEMBER(apple2_state::apple2_c080_w) /* and if we can, write to the slot */ if (slotdevice != nullptr) { - slotdevice->write_c0nx(space, offset % 0x10, data); + slotdevice->write_c0nx(offset % 0x10, data); } } /* returns default CnXX slotram for a slot space */ -int8_t apple2_state::apple2_slotram_r(address_space &space, int slotnum, int offset) +int8_t apple2_state::apple2_slotram_r(int slotnum, int offset) { if (m_slot_ram) { @@ -456,11 +456,11 @@ READ8_MEMBER(apple2_state::apple2_c1xx_r ) apple2_update_memory(); } - return slotdevice->read_cnxx(space, offset&0xff); + return slotdevice->read_cnxx(offset&0xff); } else { - return apple2_slotram_r(space, slotnum, offset); + return apple2_slotram_r(slotnum, offset); } // else fall through to floating bus @@ -479,7 +479,7 @@ WRITE8_MEMBER(apple2_state::apple2_c1xx_w ) if (slotdevice != nullptr) { - slotdevice->write_cnxx(space, offset&0xff, data); + slotdevice->write_cnxx(offset&0xff, data); } else { @@ -505,11 +505,11 @@ READ8_MEMBER(apple2_state::apple2_c3xx_r ) m_a2_cnxx_slot = slotnum; apple2_update_memory(); } - return slotdevice->read_cnxx(space, offset&0xff); + return slotdevice->read_cnxx(offset&0xff); } else { - return apple2_slotram_r(space, slotnum, offset); + return apple2_slotram_r(slotnum, offset); } // else fall through to floating bus @@ -533,7 +533,7 @@ WRITE8_MEMBER(apple2_state::apple2_c3xx_w ) m_a2_cnxx_slot = slotnum; apple2_update_memory(); } - slotdevice->write_cnxx(space, offset&0xff, data); + slotdevice->write_cnxx(offset&0xff, data); } else { @@ -558,11 +558,11 @@ READ8_MEMBER(apple2_state::apple2_c4xx_r ) m_a2_cnxx_slot = slotnum; apple2_update_memory(); } - return slotdevice->read_cnxx(space, offset&0xff); + return slotdevice->read_cnxx(offset&0xff); } else { - return apple2_slotram_r(space, slotnum, offset); + return apple2_slotram_r(slotnum, offset); } // else fall through to floating bus @@ -586,7 +586,7 @@ WRITE8_MEMBER ( apple2_state::apple2_c4xx_w ) m_a2_cnxx_slot = slotnum; apple2_update_memory(); } - slotdevice->write_cnxx(space, offset&0xff, data); + slotdevice->write_cnxx(offset&0xff, data); } else { @@ -626,7 +626,7 @@ READ8_MEMBER(apple2_state::apple2_c800_r ) if (slotdevice != nullptr) { - return slotdevice->read_c800(space, offset&0xfff); + return slotdevice->read_c800(offset&0xfff); } return apple2_getfloatingbusvalue(); @@ -640,7 +640,7 @@ WRITE8_MEMBER(apple2_state::apple2_c800_w ) if (slotdevice != nullptr) { - slotdevice->write_c800(space, offset&0xfff, data); + slotdevice->write_c800(offset&0xfff, data); } } @@ -652,7 +652,7 @@ READ8_MEMBER(apple2_state::apple2_ce00_r ) if (slotdevice != nullptr) { - return slotdevice->read_c800(space, (offset&0xfff) + 0x600); + return slotdevice->read_c800((offset&0xfff) + 0x600); } return apple2_getfloatingbusvalue(); @@ -666,7 +666,7 @@ WRITE8_MEMBER(apple2_state::apple2_ce00_w ) if (slotdevice != nullptr) { - slotdevice->write_c800(space, (offset&0xfff)+0x600, data); + slotdevice->write_c800((offset&0xfff)+0x600, data); } } @@ -678,7 +678,7 @@ READ8_MEMBER(apple2_state::apple2_inh_d000_r ) if (slotdevice != nullptr) { - return slotdevice->read_inh_rom(space, offset & 0xfff); + return slotdevice->read_inh_rom(offset & 0xfff); } return apple2_getfloatingbusvalue(); @@ -692,7 +692,7 @@ WRITE8_MEMBER(apple2_state::apple2_inh_d000_w ) if (slotdevice != nullptr) { - return slotdevice->write_inh_rom(space, offset & 0xfff, data); + return slotdevice->write_inh_rom(offset & 0xfff, data); } } @@ -704,7 +704,7 @@ READ8_MEMBER(apple2_state::apple2_inh_e000_r ) if (slotdevice != nullptr) { - return slotdevice->read_inh_rom(space, (offset & 0x1fff) + 0x1000); + return slotdevice->read_inh_rom((offset & 0x1fff) + 0x1000); } return apple2_getfloatingbusvalue(); @@ -718,7 +718,7 @@ WRITE8_MEMBER(apple2_state::apple2_inh_e000_w ) if (slotdevice != nullptr) { - slotdevice->write_inh_rom(space, (offset & 0x1fff) + 0x1000, data); + slotdevice->write_inh_rom((offset & 0x1fff) + 0x1000, data); } } diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index 3c094195d34..2febd952e20 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -1661,7 +1661,7 @@ uint8_t apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address) m_a2_cnxx_slot = slot; apple2_update_memory(); } - result = slotdevice->read_cnxx(space, address&0xff); + result = slotdevice->read_cnxx(address&0xff); } else { @@ -1690,7 +1690,7 @@ uint8_t apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address) if (slotdevice) { - result = slotdevice->read_c800(space, address&0x7ff); + result = slotdevice->read_c800(address&0x7ff); } else { @@ -1753,7 +1753,7 @@ void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, uin m_a2_cnxx_slot = slot; apple2_update_memory(); } - slotdevice->write_cnxx(space, address&0xff, data); + slotdevice->write_cnxx(address&0xff, data); } // (else slot is your card but there's no card inserted so the write goes nowhere) } @@ -1776,7 +1776,7 @@ void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, uin if (slotdevice) { - slotdevice->write_c800(space, address&0x7ff, data); + slotdevice->write_c800(address&0x7ff, data); } else { diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp index db295ef3571..59607ab2af4 100644 --- a/src/mame/machine/apple3.cpp +++ b/src/mame/machine/apple3.cpp @@ -203,7 +203,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) slotdevice = m_a2bus->get_a2bus_card(1); if (slotdevice != nullptr) { - result = slotdevice->read_c0nx(space, offset&0xf); + result = slotdevice->read_c0nx(offset&0xf); } break; @@ -214,7 +214,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) slotdevice = m_a2bus->get_a2bus_card(2); if (slotdevice != nullptr) { - result = slotdevice->read_c0nx(space, offset&0xf); + result = slotdevice->read_c0nx(offset&0xf); } break; @@ -225,7 +225,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) slotdevice = m_a2bus->get_a2bus_card(3); if (slotdevice != nullptr) { - result = slotdevice->read_c0nx(space, offset&0xf); + result = slotdevice->read_c0nx(offset&0xf); } break; @@ -236,14 +236,14 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) slotdevice = m_a2bus->get_a2bus_card(4); if (slotdevice != nullptr) { - result = slotdevice->read_c0nx(space, offset&0xf); + result = slotdevice->read_c0nx(offset&0xf); } break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: /* external drive stuff */ - m_fdc->read_c0dx(space, offset&0xf); + m_fdc->read_c0dx(offset&0xf); result = 0x00; break; @@ -277,24 +277,24 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) break; case 0xe0: case 0xe1: - result = m_fdc->read(space, offset&0xf); + result = m_fdc->read(offset&0xf); m_va = offset & 1; break; case 0xe2: case 0xe3: - result = m_fdc->read(space, offset&0xf); + result = m_fdc->read(offset&0xf); m_vb = offset & 1; break; case 0xe4: case 0xe5: - result = m_fdc->read(space, offset&0xf); + result = m_fdc->read(offset&0xf); m_vc = offset & 1; break; case 0xe6: case 0xe7: case 0xe8: case 0xe9: case 0xea: case 0xeb: case 0xec: case 0xed: case 0xee: case 0xef: - result = m_fdc->read(space, offset&0xf); + result = m_fdc->read(offset&0xf); break; case 0xf0: @@ -383,7 +383,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) slotdevice = m_a2bus->get_a2bus_card(1); if (slotdevice != nullptr) { - slotdevice->write_c0nx(space, offset&0xf, data); + slotdevice->write_c0nx(offset&0xf, data); } break; @@ -394,7 +394,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) slotdevice = m_a2bus->get_a2bus_card(2); if (slotdevice != nullptr) { - slotdevice->write_c0nx(space, offset&0xf, data); + slotdevice->write_c0nx(offset&0xf, data); } break; @@ -405,7 +405,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) slotdevice = m_a2bus->get_a2bus_card(3); if (slotdevice != nullptr) { - slotdevice->write_c0nx(space, offset&0xf, data); + slotdevice->write_c0nx(offset&0xf, data); } break; @@ -416,14 +416,14 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) slotdevice = m_a2bus->get_a2bus_card(4); if (slotdevice != nullptr) { - slotdevice->write_c0nx(space, offset&0xf, data); + slotdevice->write_c0nx(offset&0xf, data); } break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: /* external drive stuff */ - m_fdc->write_c0dx(space, offset&0xf, data); + m_fdc->write_c0dx(offset&0xf, data); break; case 0xd8: case 0xd9: @@ -459,7 +459,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) case 0xe4: case 0xe5: case 0xe6: case 0xe7: case 0xe8: case 0xe9: case 0xea: case 0xeb: case 0xec: case 0xed: case 0xee: case 0xef: - m_fdc->write(space, offset&0xf, data); + m_fdc->write(offset&0xf, data); break; case 0xf0: @@ -860,7 +860,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) m_cnxx_slot = ((offset>>8) & 7); } - return slotdevice->read_cnxx(space, offset&0xff); + return slotdevice->read_cnxx(offset&0xff); } } } @@ -887,7 +887,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) if (slotdevice != nullptr) { - rv = slotdevice->read_c800(space, offset&0x7ff); + rv = slotdevice->read_c800(offset&0x7ff); } } } @@ -992,7 +992,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) m_cnxx_slot = ((offset>>8) & 7); } - slotdevice->write_cnxx(space, offset&0xff, data); + slotdevice->write_cnxx(offset&0xff, data); } } } @@ -1025,7 +1025,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) if (slotdevice != nullptr) { - slotdevice->write_c800(space, offset&0x7ff, data); + slotdevice->write_c800(offset&0x7ff, data); } } } diff --git a/src/mame/machine/concept.cpp b/src/mame/machine/concept.cpp index 12486edf4f6..e01e982e8b5 100644 --- a/src/mame/machine/concept.cpp +++ b/src/mame/machine/concept.cpp @@ -189,7 +189,7 @@ READ16_MEMBER(concept_state::concept_io_r) if (card) { - return card->read_c0nx(space, offset & 0x0f); + return card->read_c0nx(offset & 0x0f); } return 0xff; @@ -212,7 +212,7 @@ READ16_MEMBER(concept_state::concept_io_r) if (card) { - return card->read_cnxx(space, offset & 0xff); + return card->read_cnxx(offset & 0xff); } } break; @@ -303,7 +303,7 @@ WRITE16_MEMBER(concept_state::concept_io_w) if (card) { - return card->write_c0nx(space, offset & 0x0f, data); + return card->write_c0nx(offset & 0x0f, data); } } break; @@ -324,7 +324,7 @@ WRITE16_MEMBER(concept_state::concept_io_w) if (card) { - return card->write_cnxx(space, offset & 0xff, data); + return card->write_cnxx(offset & 0xff, data); } } break;