diff options
Diffstat (limited to 'src/devices/machine/i80130.h')
-rw-r--r-- | src/devices/machine/i80130.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h index a2306fe0b1f..de6067961c7 100644 --- a/src/devices/machine/i80130.h +++ b/src/devices/machine/i80130.h @@ -62,10 +62,6 @@ public: virtual DECLARE_ADDRESS_MAP(rom_map, 16); virtual DECLARE_ADDRESS_MAP(io_map, 16); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - uint8_t inta_r() { return m_pic->acknowledge(); } DECLARE_WRITE_LINE_MEMBER( ir0_w ) { m_pic->ir0_w(state); } @@ -77,11 +73,6 @@ public: DECLARE_WRITE_LINE_MEMBER( ir6_w ) { m_pic->ir6_w(state); } DECLARE_WRITE_LINE_MEMBER( ir7_w ) { m_pic->ir7_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( systick_w ) { m_write_systick(state); } - DECLARE_WRITE_LINE_MEMBER( delay_w ) { m_write_delay(state); } - DECLARE_WRITE_LINE_MEMBER( baud_w ) { m_write_baud(state); } - DECLARE_READ16_MEMBER( io_r ); DECLARE_WRITE16_MEMBER( io_w ); @@ -89,7 +80,11 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; +private: required_device<pic8259_device> m_pic; required_device<pit8254_device> m_pit; @@ -99,6 +94,11 @@ protected: devcb_write_line m_write_systick; devcb_write_line m_write_delay; devcb_write_line m_write_baud; + + DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } + DECLARE_WRITE_LINE_MEMBER( systick_w ) { m_write_systick(state); } + DECLARE_WRITE_LINE_MEMBER( delay_w ) { m_write_delay(state); } + DECLARE_WRITE_LINE_MEMBER( baud_w ) { m_write_baud(state); } }; |