diff options
Diffstat (limited to 'src/devices/bus/ieee488/c2040.h')
-rw-r--r-- | src/devices/bus/ieee488/c2040.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index 1b7c1c69618..010f055d392 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -16,7 +16,7 @@ #include "cpu/m6502/m6502.h" #include "cpu/m6502/m6504.h" #include "machine/6522via.h" -#include "machine/mos6530n.h" +#include "machine/mos6530.h" @@ -32,13 +32,13 @@ public: // construction/destruction c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( dio_r ); - DECLARE_WRITE8_MEMBER( dio_w ); - DECLARE_READ8_MEMBER( riot1_pa_r ); - DECLARE_WRITE8_MEMBER( riot1_pa_w ); - DECLARE_READ8_MEMBER( riot1_pb_r ); - DECLARE_WRITE8_MEMBER( riot1_pb_w ); - DECLARE_WRITE8_MEMBER( via_pb_w ); + uint8_t dio_r(); + void dio_w(uint8_t data); + uint8_t riot1_pa_r(); + void riot1_pa_w(uint8_t data); + uint8_t riot1_pb_r(); + void riot1_pb_w(uint8_t data); + void via_pb_w(uint8_t data); void c2040_fdc_mem(address_map &map); void c2040_main_mem(address_map &map); @@ -69,13 +69,13 @@ protected: void add_common_devices(machine_config &config); inline void update_ieee_signals(); - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); required_device<m6502_device> m_maincpu; required_device<m6504_device> m_fdccpu; - required_device<mos6532_new_device> m_riot0; - required_device<mos6532_new_device> m_riot1; - required_device<mos6530_new_device> m_miot; + required_device<mos6532_device> m_riot0; + required_device<mos6532_device> m_riot1; + required_device<mos6530_device> m_miot; required_device<via6522_device> m_via; required_device<floppy_image_device> m_floppy0; optional_device<floppy_image_device> m_floppy1; @@ -106,7 +106,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); }; @@ -124,7 +124,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_FLOPPY_FORMATS( floppy_formats ); + static void floppy_formats(format_registration &fr); }; |