diff options
Diffstat (limited to 'src/devices/bus/lpci/southbridge.h')
-rw-r--r-- | src/devices/bus/lpci/southbridge.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 3ffe7033412..92953a5df0f 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -83,10 +83,10 @@ protected: void pc_select_dma_channel(int channel, bool state); private: - DECLARE_READ8_MEMBER(at_page8_r); - DECLARE_WRITE8_MEMBER(at_page8_w); - DECLARE_READ8_MEMBER(at_portb_r); - DECLARE_WRITE8_MEMBER(at_portb_w); + uint8_t at_page8_r(offs_t offset); + void at_page8_w(offs_t offset, uint8_t data); + uint8_t at_portb_r(); + void at_portb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(iochck_w); uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); @@ -117,23 +117,23 @@ private: DECLARE_WRITE_LINE_MEMBER(pc_dack6_w); DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); - DECLARE_READ32_MEMBER(ide1_read32_cs0_r); - DECLARE_WRITE32_MEMBER(ide1_write32_cs0_w); - DECLARE_READ32_MEMBER(ide2_read32_cs0_r); - DECLARE_WRITE32_MEMBER(ide2_write32_cs0_w); - DECLARE_READ8_MEMBER(ide1_read_cs1_r); - DECLARE_WRITE8_MEMBER(ide1_write_cs1_w); - DECLARE_READ8_MEMBER(ide2_read_cs1_r); - DECLARE_WRITE8_MEMBER(ide2_write_cs1_w); - - DECLARE_READ8_MEMBER(at_dma8237_2_r); - DECLARE_WRITE8_MEMBER(at_dma8237_2_w); + uint32_t ide1_read32_cs0_r(offs_t offset, uint32_t mem_mask = ~0); + void ide1_write32_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t ide2_read32_cs0_r(offs_t offset, uint32_t mem_mask = ~0); + void ide2_write32_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint8_t ide1_read_cs1_r(); + void ide1_write_cs1_w(uint8_t data); + uint8_t ide2_read_cs1_r(); + void ide2_write_cs1_w(uint8_t data); + + uint8_t at_dma8237_2_r(offs_t offset); + void at_dma8237_2_w(offs_t offset, uint8_t data); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma_read_word(offs_t offset); void pc_dma_write_word(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(eisa_irq_read); - DECLARE_WRITE8_MEMBER(eisa_irq_write); + uint8_t eisa_irq_read(offs_t offset); + void eisa_irq_write(offs_t offset, uint8_t data); }; // ======================> southbridge_extended_device @@ -159,7 +159,7 @@ protected: required_device<pc_kbdc_device> m_pc_kbdc; private: - DECLARE_WRITE8_MEMBER(write_rtc); + void write_rtc(offs_t offset, uint8_t data); }; #endif // MAME_BUS_LPCI_SOUTHBRIDGE_H |