diff options
Diffstat (limited to 'src/devices/bus/abcbus/lux21046.h')
-rw-r--r-- | src/devices/bus/abcbus/lux21046.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index 703c419e776..3f83864b476 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -14,7 +14,6 @@ #include "abcbus.h" #include "cpu/z80/z80.h" #include "machine/z80daisy.h" -#include "formats/abc800_dsk.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" #include "machine/z80dma.h" @@ -77,27 +76,26 @@ protected: virtual void abcbus_c3(uint8_t data) override; virtual void abcbus_c4(uint8_t data) override; - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); - required_device<floppy_connector> m_floppy0; - required_device<floppy_connector> m_floppy1; + required_device_array<floppy_connector, 2> m_floppy; private: - DECLARE_WRITE_LINE_MEMBER( dma_int_w ); + void dma_int_w(int state); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); - DECLARE_READ8_MEMBER(io_read_byte); - DECLARE_WRITE8_MEMBER(io_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); + uint8_t io_read_byte(offs_t offset); + void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + void fdc_intrq_w(int state); - DECLARE_READ8_MEMBER( out_r ); - DECLARE_WRITE8_MEMBER( inp_w ); - DECLARE_WRITE8_MEMBER( _4b_w ); - DECLARE_WRITE8_MEMBER( _9b_w ); - DECLARE_WRITE8_MEMBER( _8a_w ); - DECLARE_READ8_MEMBER( _9a_r ); + uint8_t out_r(); + void inp_w(uint8_t data); + void _4b_w(uint8_t data); + void _9b_w(uint8_t data); + void _8a_w(uint8_t data); + uint8_t _9a_r(offs_t offset); void luxor_55_21046_io(address_map &map); void luxor_55_21046_mem(address_map &map); @@ -105,15 +103,15 @@ private: required_device<z80_device> m_maincpu; required_device<z80dma_device> m_dma; required_device<fd1793_device> m_fdc; - floppy_image_device *m_floppy; + floppy_image_device *m_selected_floppy; required_ioport m_sw1; required_ioport m_sw2; required_ioport m_sw3; bool m_cs; // card selected - uint8_t m_status; // ABC BUS status - uint8_t m_out; // ABC BUS data in - uint8_t m_inp; // ABC BUS data out + uint8_t m_status; // ABC BUS status + uint8_t m_out; // ABC BUS data in + uint8_t m_inp; // ABC BUS data out bool m_fdc_irq; // FDC interrupt int m_dma_irq; // DMA interrupt int m_busy; // busy bit |