diff options
Diffstat (limited to 'src/mess/includes/xerox820.h')
-rw-r--r-- | src/mess/includes/xerox820.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h index 0acd99d3650..d1b92383e7c 100644 --- a/src/mess/includes/xerox820.h +++ b/src/mess/includes/xerox820.h @@ -5,15 +5,16 @@ #include "emu.h" #include "bus/scsi/sa1403d.h" +#include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "cpu/i86/i86.h" #include "machine/com8116.h" -#include "machine/keyboard.h" #include "machine/ram.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" #include "machine/wd_fdc.h" +#include "machine/x820kb.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" @@ -35,6 +36,7 @@ #define SASIBUS_TAG "sasi" #define RS232_A_TAG "rs232a" #define RS232_B_TAG "rs232b" +#define KEYBOARD_TAG "kb" #define XEROX820_VIDEORAM_SIZE 0x1000 #define XEROX820_VIDEORAM_MASK 0x0fff @@ -42,24 +44,25 @@ class xerox820_state : public driver_device { public: - xerox820_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_kbpio(*this, Z80PIO_KB_TAG), - m_ctc(*this, Z80CTC_TAG), - m_sio(*this, Z80SIO_TAG), - m_fdc(*this, FD1771_TAG), - m_ram(*this, RAM_TAG), - m_palette(*this, "palette"), - m_floppy0(*this, FD1771_TAG":0"), - m_floppy1(*this, FD1771_TAG":1"), - m_rom(*this, Z80_TAG), - m_char_rom(*this, "chargen"), - m_video_ram(*this, "video_ram"), - m_fdc_irq(0), - m_fdc_drq(0), - m_8n5(0), - m_400_460(0) + xerox820_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, Z80_TAG), + m_kbpio(*this, Z80PIO_KB_TAG), + m_ctc(*this, Z80CTC_TAG), + m_sio(*this, Z80SIO_TAG), + m_fdc(*this, FD1771_TAG), + m_ram(*this, RAM_TAG), + m_palette(*this, "palette"), + m_floppy0(*this, FD1771_TAG":0"), + m_floppy1(*this, FD1771_TAG":1"), + m_kb(*this, KEYBOARD_TAG), + m_rom(*this, Z80_TAG), + m_char_rom(*this, "chargen"), + m_video_ram(*this, "video_ram"), + m_fdc_irq(0), + m_fdc_drq(0), + m_8n5(0), + m_400_460(0) { } virtual void machine_start(); @@ -76,6 +79,7 @@ public: required_device<palette_device> m_palette; required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; + required_device<xerox_820_keyboard_t> m_kb; required_memory_region m_rom; required_memory_region m_char_rom; required_shared_ptr<UINT8> m_video_ram; @@ -89,7 +93,6 @@ public: DECLARE_READ8_MEMBER( kbpio_pb_r ); DECLARE_WRITE_LINE_MEMBER( intrq_w ); DECLARE_WRITE_LINE_MEMBER( drq_w ); - DECLARE_WRITE8_MEMBER( kbd_w ); DECLARE_WRITE_LINE_MEMBER( fr_w ); DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); @@ -97,9 +100,6 @@ public: void bankswitch(int bank); void update_nmi(); - /* keyboard state */ - int m_keydata; /* keyboard data */ - /* video state */ UINT8 m_scroll; /* vertical scroll */ UINT8 m_framecnt; |