diff options
author | 2019-03-10 16:39:27 -0400 | |
---|---|---|
committer | 2019-03-10 16:39:27 -0400 | |
commit | 82b8fb912d75f423c639d236a68bd4fccef36747 (patch) | |
tree | e15ce91e67863fc416c6c7833e795b04a8d84d08 /src/devices/bus/bbc | |
parent | 7f50bbafaa8792beadb2b056deaee317033cbcee (diff) |
bus/bbc/fdc, i8271: Simplify read/write handlers (nw)
Diffstat (limited to 'src/devices/bus/bbc')
-rw-r--r-- | src/devices/bus/bbc/fdc/acorn.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/acorn.h | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/ams.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/ams.h | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/cumana.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/cumana.h | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/cv1797.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/cv1797.h | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/fdc.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/fdc.h | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/microware.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/microware.h | 4 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/opus.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/opus.h | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/watford.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/bbc/fdc/watford.h | 8 |
16 files changed, 56 insertions, 56 deletions
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp index dd5d8f28559..0df7b38b076 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -166,30 +166,30 @@ void bbc_acorn1770_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_acorn8271_device::read) +uint8_t bbc_acorn8271_device::read(offs_t offset) { uint8_t data; if (offset & 0x04) { - data = m_fdc->data_r(space , 0); + data = m_fdc->data_r(); } else { - data = m_fdc->read(space, offset & 0x03); + data = m_fdc->read(offset & 0x03); } return data; } -WRITE8_MEMBER(bbc_acorn8271_device::write) +void bbc_acorn8271_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { - m_fdc->data_w(space, 0, data); + m_fdc->data_w(data); } else { - m_fdc->write(space, offset & 0x03, data); + m_fdc->write(offset & 0x03, data); } } @@ -207,7 +207,7 @@ WRITE_LINE_MEMBER(bbc_acorn8271_device::side_w) } -READ8_MEMBER(bbc_acorn1770_device::read) +uint8_t bbc_acorn1770_device::read(offs_t offset) { uint8_t data = 0xff; @@ -222,7 +222,7 @@ READ8_MEMBER(bbc_acorn1770_device::read) return data; } -WRITE8_MEMBER(bbc_acorn1770_device::write) +void bbc_acorn1770_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h index 951b7e33e1d..13b434b156b 100644 --- a/src/devices/bus/bbc/fdc/acorn.h +++ b/src/devices/bus/bbc/fdc/acorn.h @@ -42,8 +42,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER(motor_w); @@ -70,8 +70,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); diff --git a/src/devices/bus/bbc/fdc/ams.cpp b/src/devices/bus/bbc/fdc/ams.cpp index 02af01be5c5..db9eb7e3012 100644 --- a/src/devices/bus/bbc/fdc/ams.cpp +++ b/src/devices/bus/bbc/fdc/ams.cpp @@ -89,30 +89,30 @@ void bbc_ams3_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_ams3_device::read) +uint8_t bbc_ams3_device::read(offs_t offset) { uint8_t data; if (offset & 0x04) { - data = m_fdc->data_r(space , 0); + data = m_fdc->data_r(); } else { - data = m_fdc->read(space, offset & 0x03); + data = m_fdc->read(offset & 0x03); } return data; } -WRITE8_MEMBER(bbc_ams3_device::write) +void bbc_ams3_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { - m_fdc->data_w(space, 0, data); + m_fdc->data_w(data); } else { - m_fdc->write(space, offset & 0x03, data); + m_fdc->write(offset & 0x03, data); } } diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h index a97a6b762c5..304666b5392 100644 --- a/src/devices/bus/bbc/fdc/ams.h +++ b/src/devices/bus/bbc/fdc/ams.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index 23cecd3ebcf..f4490b1922d 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -137,7 +137,7 @@ void bbc_cumanafdc_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_cumanafdc_device::read) +uint8_t bbc_cumanafdc_device::read(offs_t offset) { uint8_t data; @@ -152,7 +152,7 @@ READ8_MEMBER(bbc_cumanafdc_device::read) return data; } -WRITE8_MEMBER(bbc_cumanafdc_device::write) +void bbc_cumanafdc_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h index 5b2439000ec..6e1a4f25011 100644 --- a/src/devices/bus/bbc/fdc/cumana.h +++ b/src/devices/bus/bbc/fdc/cumana.h @@ -39,8 +39,8 @@ protected: // device-level overrides virtual void device_start() override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; required_device<mb8877_device> m_fdc; required_device<floppy_connector> m_floppy0; diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp index 98f54718c42..d14098a3fa3 100644 --- a/src/devices/bus/bbc/fdc/cv1797.cpp +++ b/src/devices/bus/bbc/fdc/cv1797.cpp @@ -100,7 +100,7 @@ void bbc_cv1797_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_cv1797_device::read) +uint8_t bbc_cv1797_device::read(offs_t offset) { uint8_t data; @@ -115,7 +115,7 @@ READ8_MEMBER(bbc_cv1797_device::read) return data; } -WRITE8_MEMBER(bbc_cv1797_device::write) +void bbc_cv1797_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/cv1797.h b/src/devices/bus/bbc/fdc/cv1797.h index a887a1b18a4..86207c8fcd0 100644 --- a/src/devices/bus/bbc/fdc/cv1797.h +++ b/src/devices/bus/bbc/fdc/cv1797.h @@ -40,8 +40,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp index 10f9131351f..2269bb3370a 100644 --- a/src/devices/bus/bbc/fdc/fdc.cpp +++ b/src/devices/bus/bbc/fdc/fdc.cpp @@ -89,10 +89,10 @@ void bbc_fdc_slot_device::device_reset() // read //------------------------------------------------- -READ8_MEMBER(bbc_fdc_slot_device::read) +uint8_t bbc_fdc_slot_device::read(offs_t offset) { if (m_card) - return m_card->read(space, offset); + return m_card->read(offset); else return 0xff; } @@ -101,10 +101,10 @@ READ8_MEMBER(bbc_fdc_slot_device::read) // write //------------------------------------------------- -WRITE8_MEMBER(bbc_fdc_slot_device::write) +void bbc_fdc_slot_device::write(offs_t offset, uint8_t data) { if (m_card) - m_card->write(space, offset, data); + m_card->write(offset, data); } //------------------------------------------------- diff --git a/src/devices/bus/bbc/fdc/fdc.h b/src/devices/bus/bbc/fdc/fdc.h index 0cc256961ee..3264172a25d 100644 --- a/src/devices/bus/bbc/fdc/fdc.h +++ b/src/devices/bus/bbc/fdc/fdc.h @@ -41,8 +41,8 @@ public: auto intrq_wr_callback() { return m_intrq_cb.bind(); } auto drq_wr_callback() { return m_drq_cb.bind(); } - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( intrq_w ) { m_intrq_cb(state); } DECLARE_WRITE_LINE_MEMBER( drq_w) { m_drq_cb(state); } @@ -66,8 +66,8 @@ private: class device_bbc_fdc_interface : public device_slot_card_interface { public: - virtual DECLARE_READ8_MEMBER(read) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write) { } + virtual uint8_t read(offs_t offset) { return 0xff; } + virtual void write(offs_t offset, uint8_t data) { } protected: device_bbc_fdc_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/bbc/fdc/microware.cpp b/src/devices/bus/bbc/fdc/microware.cpp index 29489af382c..477ac0f3f9e 100644 --- a/src/devices/bus/bbc/fdc/microware.cpp +++ b/src/devices/bus/bbc/fdc/microware.cpp @@ -101,7 +101,7 @@ void bbc_microware_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_microware_device::read) +uint8_t bbc_microware_device::read(offs_t offset) { uint8_t data; @@ -116,7 +116,7 @@ READ8_MEMBER(bbc_microware_device::read) return data; } -WRITE8_MEMBER(bbc_microware_device::write) +void bbc_microware_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/microware.h b/src/devices/bus/bbc/fdc/microware.h index 117159b407d..61c0cb358cf 100644 --- a/src/devices/bus/bbc/fdc/microware.h +++ b/src/devices/bus/bbc/fdc/microware.h @@ -42,8 +42,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index 2724e7a7e0f..f6b07df6bcb 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -212,7 +212,7 @@ void bbc_opusfdc_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_opus8272_device::read) +uint8_t bbc_opus8272_device::read(offs_t offset) { uint8_t data = 0xff; @@ -240,7 +240,7 @@ READ8_MEMBER(bbc_opus8272_device::read) return data; } -WRITE8_MEMBER(bbc_opus8272_device::write) +void bbc_opus8272_device::write(offs_t offset, uint8_t data) { floppy_image_device *floppy = nullptr; @@ -265,7 +265,7 @@ WRITE8_MEMBER(bbc_opus8272_device::write) } -READ8_MEMBER(bbc_opusfdc_device::read) +uint8_t bbc_opusfdc_device::read(offs_t offset) { uint8_t data; @@ -280,7 +280,7 @@ READ8_MEMBER(bbc_opusfdc_device::read) return data; } -WRITE8_MEMBER(bbc_opusfdc_device::write) +void bbc_opusfdc_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h index 721f3ebab5c..033fccc02c4 100644 --- a/src/devices/bus/bbc/fdc/opus.h +++ b/src/devices/bus/bbc/fdc/opus.h @@ -36,8 +36,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: required_device<i8272a_device> m_fdc; @@ -62,8 +62,8 @@ protected: // device-level overrides virtual void device_start() override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; required_device<wd_fdc_device_base> m_fdc; required_device<floppy_connector> m_floppy0; diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index b888840314f..4c3f31344ee 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -147,7 +147,7 @@ void bbc_weddb3_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbc_weddb2_device::read) +uint8_t bbc_weddb2_device::read(offs_t offset) { uint8_t data; @@ -162,7 +162,7 @@ READ8_MEMBER(bbc_weddb2_device::read) return data; } -WRITE8_MEMBER(bbc_weddb2_device::write) +void bbc_weddb2_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { @@ -192,7 +192,7 @@ WRITE8_MEMBER(bbc_weddb2_device::write) } } -READ8_MEMBER(bbc_weddb3_device::read) +uint8_t bbc_weddb3_device::read(offs_t offset) { uint8_t data; @@ -207,7 +207,7 @@ READ8_MEMBER(bbc_weddb3_device::read) return data; } -WRITE8_MEMBER(bbc_weddb3_device::write) +void bbc_weddb3_device::write(offs_t offset, uint8_t data) { if (offset & 0x04) { diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h index 02bbf59f523..2f1cfa65c64 100644 --- a/src/devices/bus/bbc/fdc/watford.h +++ b/src/devices/bus/bbc/fdc/watford.h @@ -45,8 +45,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: required_device<wd_fdc_device_base> m_fdc; @@ -68,8 +68,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: required_device<wd_fdc_device_base> m_fdc; |