diff options
author | 2017-12-17 15:31:20 +0000 | |
---|---|---|
committer | 2017-12-20 09:15:11 +0000 | |
commit | f1a8729c5c2cd575a1815afea20b48113edf389b (patch) | |
tree | 380ffa12cba7626d304c9452b01290804caf41e1 /src/devices/machine/atadev.h | |
parent | 286bc6b5126d1a2eec11fdca8c437bed88793e68 (diff) |
ATA: Simplified class hierarchy so there is no ambiguity with 16 & 32 bit methods. Removed the memory system read/write handler trampolines from the ATA devices as they are not required. (nw)
Diffstat (limited to 'src/devices/machine/atadev.h')
-rw-r--r-- | src/devices/machine/atadev.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/devices/machine/atadev.h b/src/devices/machine/atadev.h index 8cc9404b6e8..85d76bbd16a 100644 --- a/src/devices/machine/atadev.h +++ b/src/devices/machine/atadev.h @@ -20,22 +20,17 @@ class ata_interface_device; class device_ata_interface : public device_slot_card_interface { - friend class ata_interface_device; + friend class abstract_ata_interface_device; public: device_ata_interface(const machine_config &mconfig, device_t &device); - DECLARE_READ16_MEMBER(read16_cs0); - DECLARE_READ16_MEMBER(read16_cs1); - DECLARE_WRITE16_MEMBER(write16_cs0); - DECLARE_WRITE16_MEMBER(write16_cs1); - virtual uint16_t read_dma() = 0; - virtual u16 read16_cs0(offs_t offset, u16 mem_mask = 0xffff) = 0; - virtual u16 read16_cs1(offs_t offset, u16 mem_mask = 0xffff) = 0; + virtual uint16_t read_cs0(offs_t offset, uint16_t mem_mask = 0xffff) = 0; + virtual uint16_t read_cs1(offs_t offset, uint16_t mem_mask = 0xffff) = 0; virtual void write_dma(uint16_t data) = 0; - virtual void write16_cs0(offs_t offset, u16 data, u16 mem_mask = 0xffff) = 0; - virtual void write16_cs1(offs_t offset, u16 data, u16 mem_mask = 0xffff) = 0; + virtual void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) = 0; + virtual void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) = 0; virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) = 0; virtual DECLARE_WRITE_LINE_MEMBER(write_csel) = 0; |