summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ata/ataintf.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ata/ataintf.h')
-rw-r--r--src/devices/bus/ata/ataintf.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/bus/ata/ataintf.h b/src/devices/bus/ata/ataintf.h
index ce2e501886a..45819c53436 100644
--- a/src/devices/bus/ata/ataintf.h
+++ b/src/devices/bus/ata/ataintf.h
@@ -59,7 +59,7 @@ public:
uint16_t read_dma();
void write_dma(uint16_t data);
- DECLARE_WRITE_LINE_MEMBER(write_dmack);
+ void write_dmack(int state);
protected:
abstract_ata_interface_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -86,15 +86,15 @@ protected:
};
private:
- DECLARE_WRITE_LINE_MEMBER(irq0_write_line);
- DECLARE_WRITE_LINE_MEMBER(dmarq0_write_line);
- DECLARE_WRITE_LINE_MEMBER(dasp0_write_line);
- DECLARE_WRITE_LINE_MEMBER(pdiag0_write_line);
+ void irq0_write_line(int state);
+ void dmarq0_write_line(int state);
+ void dasp0_write_line(int state);
+ void pdiag0_write_line(int state);
- DECLARE_WRITE_LINE_MEMBER(irq1_write_line);
- DECLARE_WRITE_LINE_MEMBER(dmarq1_write_line);
- DECLARE_WRITE_LINE_MEMBER(dasp1_write_line);
- DECLARE_WRITE_LINE_MEMBER(pdiag1_write_line);
+ void irq1_write_line(int state);
+ void dmarq1_write_line(int state);
+ void dasp1_write_line(int state);
+ void pdiag1_write_line(int state);
required_device_array<ata_slot_device, SLOT_COUNT> m_slot;
int m_irq[SLOT_COUNT];
@@ -133,15 +133,15 @@ public:
return *this;
}
- uint16_t read_cs0(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
- uint16_t read_cs1(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
- void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
- void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
+ uint16_t cs0_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
+ uint16_t cs1_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
+ void cs0_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
+ void cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
- DECLARE_READ16_MEMBER(cs0_r) { return read_cs0(offset, mem_mask); }
- DECLARE_READ16_MEMBER(cs1_r) { return read_cs1(offset, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs0_w) { write_cs0(offset, data, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs1_w) { write_cs1(offset, data, mem_mask); }
+ uint16_t cs0_swap_r(offs_t offset, uint16_t mem_mask = 0xffff) { return swapendian_int16(internal_read_cs0(offset, swapendian_int16(mem_mask))); }
+ uint16_t cs1_swap_r(offs_t offset, uint16_t mem_mask = 0xffff) { return swapendian_int16(internal_read_cs1(offset, swapendian_int16(mem_mask))); }
+ void cs0_swap_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, swapendian_int16(data), swapendian_int16(mem_mask)); }
+ void cs1_swap_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, swapendian_int16(data), swapendian_int16(mem_mask)); }
};
DECLARE_DEVICE_TYPE(ATA_INTERFACE, ata_interface_device)