diff options
Diffstat (limited to 'src/devices/bus/cbmiec')
-rw-r--r-- | src/devices/bus/cbmiec/c1541.h | 17 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1571.h | 3 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1581.h | 3 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/cmdhd.h | 8 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/fd2000.h | 8 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/interpod.h | 4 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/serialbox.h | 3 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1515.h | 6 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1520.h | 4 |
9 files changed, 34 insertions, 22 deletions
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 36b4dac257e..f9706441c4f 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -261,28 +261,25 @@ public: // construction/destruction c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void c1541pdc_mem(address_map &map); protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_READ8_MEMBER( pia_r ); - DECLARE_WRITE8_MEMBER( pia_w ); - -protected: +private: required_device<pia6821_device> m_pia; required_device<output_latch_device> m_cent_data_out; required_memory_region m_mmu_rom; -private: + DECLARE_READ8_MEMBER( pia_r ); + DECLARE_WRITE8_MEMBER( pia_w ); DECLARE_WRITE8_MEMBER( pia_pa_w ); DECLARE_READ8_MEMBER( pia_pb_r ); DECLARE_WRITE8_MEMBER( pia_pb_w ); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void c1541pdc_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 272b5ffc123..0679dff686b 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -166,7 +166,6 @@ public: // construction/destruction mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void mini_chief_mem(address_map &map); protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -176,6 +175,8 @@ private: DECLARE_READ8_MEMBER( cia_pa_r ); DECLARE_WRITE8_MEMBER( cia_pa_w ); DECLARE_WRITE8_MEMBER( cia_pb_w ); + + void mini_chief_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 17332c6aab3..64c616bad45 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -39,7 +39,6 @@ public: // construction/destruction c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void c1581_mem(address_map &map); protected: c1581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -74,6 +73,8 @@ private: DECLARE_READ8_MEMBER( cia_pb_r ); DECLARE_WRITE8_MEMBER( cia_pb_w ); + void c1581_mem(address_map &map); + DECLARE_FLOPPY_FORMATS( floppy_formats ); required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h index e2b1e99df84..9749f81f547 100644 --- a/src/devices/bus/cbmiec/cmdhd.h +++ b/src/devices/bus/cbmiec/cmdhd.h @@ -40,9 +40,6 @@ public: // construction/destruction cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( led_w ); - - void cmd_hd_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -58,8 +55,13 @@ protected: void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; +private: required_device<cpu_device> m_maincpu; required_device<scsi_port_device> m_scsibus; + + DECLARE_WRITE8_MEMBER( led_w ); + + void cmd_hd_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 29525a54490..740c1ce6441 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -47,7 +47,6 @@ public: //DECLARE_FLOPPY_FORMATS( floppy_formats ); - void fd2000_mem(address_map &map); protected: fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -68,6 +67,9 @@ protected: required_device<m65c02_device> m_maincpu; required_device<upd765_family_device> m_fdc; required_device<floppy_connector> m_floppy0; + +private: + void fd2000_mem(address_map &map); }; @@ -79,10 +81,12 @@ public: // construction/destruction fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void fd4000_mem(address_map &map); protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; + +private: + void fd4000_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h index 18940128f03..cc6e07f7c7a 100644 --- a/src/devices/bus/cbmiec/interpod.h +++ b/src/devices/bus/cbmiec/interpod.h @@ -49,7 +49,6 @@ public: // construction/destruction interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void interpod_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -59,11 +58,14 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; +private: required_device<cpu_device> m_maincpu; required_device<via6522_device> m_via; required_device<mos6532_new_device> m_riot; required_device<acia6850_device> m_acia; required_device<ieee488_device> m_ieee; + + void interpod_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h index 6400fe92ff5..396f9a85927 100644 --- a/src/devices/bus/cbmiec/serialbox.h +++ b/src/devices/bus/cbmiec/serialbox.h @@ -36,7 +36,6 @@ public: // construction/destruction serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void serial_box_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +52,8 @@ protected: private: required_device<m65c02_device> m_maincpu; + + void serial_box_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h index 94ed0d236a7..1b84636e6d3 100644 --- a/src/devices/bus/cbmiec/vic1515.h +++ b/src/devices/bus/cbmiec/vic1515.h @@ -28,8 +28,6 @@ public: // construction/destruction vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void vic1515_io(address_map &map); - void vic1515_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -44,6 +42,10 @@ protected: void cbm_iec_atn(int state) override; void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; + +private: + void vic1515_io(address_map &map); + void vic1515_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h index 19ec85de510..e31eec855dc 100644 --- a/src/devices/bus/cbmiec/vic1520.h +++ b/src/devices/bus/cbmiec/vic1520.h @@ -28,7 +28,6 @@ public: // construction/destruction vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void vic1520_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -43,6 +42,9 @@ protected: void cbm_iec_atn(int state) override; void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; + +private: + void vic1520_mem(address_map &map); }; |