summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ieee488/hp9895.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ieee488/hp9895.h')
-rw-r--r--src/devices/bus/ieee488/hp9895.h54
1 files changed, 28 insertions, 26 deletions
diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h
index 001a03abd56..d30a5fac85f 100644
--- a/src/devices/bus/ieee488/hp9895.h
+++ b/src/devices/bus/ieee488/hp9895.h
@@ -26,11 +26,6 @@ public:
// construction/destruction
hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
- virtual ioport_constructor device_input_ports() const override;
- virtual const tiny_rom_entry *device_rom_region() const override;
- virtual machine_config_constructor device_mconfig_additions() const override;
-
// device_ieee488_interface overrides
virtual void ieee488_eoi(int state) override;
virtual void ieee488_dav(int state) override;
@@ -41,27 +36,6 @@ public:
virtual void ieee488_atn(int state) override;
virtual void ieee488_ren(int state) override;
- // PHI write CBs
- DECLARE_WRITE_LINE_MEMBER(phi_eoi_w);
- DECLARE_WRITE_LINE_MEMBER(phi_dav_w);
- DECLARE_WRITE_LINE_MEMBER(phi_nrfd_w);
- DECLARE_WRITE_LINE_MEMBER(phi_ndac_w);
- DECLARE_WRITE_LINE_MEMBER(phi_ifc_w);
- DECLARE_WRITE_LINE_MEMBER(phi_srq_w);
- DECLARE_WRITE_LINE_MEMBER(phi_atn_w);
- DECLARE_WRITE_LINE_MEMBER(phi_ren_w);
-
- // PHI DIO r/w CBs
- DECLARE_READ8_MEMBER(phi_dio_r);
- DECLARE_WRITE8_MEMBER(phi_dio_w);
-
- // PHI IRQ/Z80 NMI
- DECLARE_WRITE_LINE_MEMBER(phi_int_w);
-
- // PHI register read & Z80 IRQ
- DECLARE_READ8_MEMBER(phi_reg_r);
- DECLARE_WRITE16_MEMBER(z80_m1_w);
-
// Floppy interface
DECLARE_WRITE8_MEMBER(data_w);
DECLARE_WRITE8_MEMBER(clock_w);
@@ -76,6 +50,9 @@ public:
DECLARE_READ8_MEMBER(switches_r);
DECLARE_READ8_MEMBER(switches2_r);
+ // PHI register read
+ DECLARE_READ8_MEMBER(phi_reg_r);
+
// Floppy drive interface
void floppy_ready_cb(floppy_image_device *floppy , int state);
@@ -84,7 +61,32 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ // device-level overrides
+ virtual ioport_constructor device_input_ports() const override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
+ virtual void device_add_mconfig(machine_config &config) override;
+
private:
+ // PHI write CBs
+ DECLARE_WRITE_LINE_MEMBER(phi_eoi_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_dav_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_nrfd_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_ndac_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_ifc_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_srq_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_atn_w);
+ DECLARE_WRITE_LINE_MEMBER(phi_ren_w);
+
+ // PHI DIO r/w CBs
+ DECLARE_READ8_MEMBER(phi_dio_r);
+ DECLARE_WRITE8_MEMBER(phi_dio_w);
+
+ // PHI IRQ/Z80 NMI
+ DECLARE_WRITE_LINE_MEMBER(phi_int_w);
+
+ // Z80 IRQ
+ DECLARE_WRITE16_MEMBER(z80_m1_w);
+
required_device<z80_device> m_cpu;
required_device<phi_device> m_phi;
required_device<floppy_connector> m_drives[ 2 ];