diff options
Diffstat (limited to 'src/devices/bus/oricext')
-rw-r--r-- | src/devices/bus/oricext/jasmin.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/oricext/jasmin.h | 4 | ||||
-rw-r--r-- | src/devices/bus/oricext/microdisc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/oricext/microdisc.h | 6 | ||||
-rw-r--r-- | src/devices/bus/oricext/oricext.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/oricext/oricext.h | 8 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 8383fc5ddcd..e2e1bdb04a8 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -42,7 +42,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, jasmin_device) AM_RANGE(0x3fc, 0x3ff) AM_WRITE(select_w) ADDRESS_MAP_END -jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : oricext_device(mconfig, JASMIN, "Jasmin floppy drive interface", tag, owner, clock, "jasmin", __FILE__), fdc(*this, "fdc"), side_sel(false), fdc_reset(false), ram_access(false), rom_access(false), jasmin_rom(nullptr), cur_floppy(nullptr) { diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h index 9befe4a2900..8b4047be695 100644 --- a/src/devices/bus/oricext/jasmin.h +++ b/src/devices/bus/oricext/jasmin.h @@ -12,7 +12,7 @@ extern const device_type JASMIN; class jasmin_device : public oricext_device { public: - jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~jasmin_device(); DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -28,7 +28,7 @@ protected: required_device<wd1770_t> fdc; bool side_sel, fdc_reset, ram_access, rom_access, select[4]; - UINT8 *jasmin_rom; + uint8_t *jasmin_rom; floppy_image_device *cur_floppy, *floppies[4]; virtual void device_start() override; diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index f4b1e6f1678..6268c1860f4 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -37,7 +37,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, microdisc_device) AM_RANGE(0x318, 0x318) AM_READ(port_318_r) ADDRESS_MAP_END -microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : oricext_device(mconfig, MICRODISC, "Microdisc floppy drive interface", tag, owner, clock, "microdisc", __FILE__), fdc(*this, "fdc"), microdisc_rom(nullptr), port_314(0), intrq_state(false), drq_state(false), hld_state(false) { diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index 663e7fbf029..c4cc450db4f 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -12,7 +12,7 @@ extern const device_type MICRODISC; class microdisc_device : public oricext_device { public: - microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~microdisc_device(); DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -38,9 +38,9 @@ protected: required_device<fd1793_t> fdc; - UINT8 *microdisc_rom; + uint8_t *microdisc_rom; floppy_image_device *floppies[4]; - UINT8 port_314; + uint8_t port_314; bool intrq_state, drq_state, hld_state; virtual void device_start() override; diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index 2c1894b385c..1499bf8c544 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -6,7 +6,7 @@ const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>; -oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__), device_slot_interface(mconfig, *this), irq_handler(*this), @@ -40,7 +40,7 @@ void oricext_connector::device_config_complete() dev->set_cputag(cputag); } -oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this), cputag(nullptr), @@ -72,8 +72,8 @@ void oricext_device::device_start() bank_c000_w = membank(":bank_c000_w"); bank_e000_w = membank(":bank_e000_w"); bank_f800_w = membank(":bank_f800_w"); - rom = (UINT8 *)machine().root_device().memregion(cputag)->base(); - ram = (UINT8 *)memshare(":ram")->ptr(); + rom = (uint8_t *)machine().root_device().memregion(cputag)->base(); + ram = (uint8_t *)memshare(":ram")->ptr(); memset(junk_read, 0xff, sizeof(junk_read)); memset(junk_write, 0x00, sizeof(junk_write)); diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index 738850a40b5..bf423ad852c 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -25,7 +25,7 @@ class oricext_connector: public device_t, public device_slot_interface { public: - oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~oricext_connector(); void set_cputag(const char *tag); @@ -43,7 +43,7 @@ class oricext_device : public device_t, public device_slot_card_interface { public: - oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); void set_cputag(const char *tag); DECLARE_WRITE_LINE_MEMBER(irq_w); @@ -53,8 +53,8 @@ protected: m6502_device *cpu; oricext_connector *connector; memory_bank *bank_c000_r, *bank_e000_r, *bank_f800_r, *bank_c000_w, *bank_e000_w, *bank_f800_w; - UINT8 *rom, *ram; - UINT8 junk_read[8192], junk_write[8192]; + uint8_t *rom, *ram; + uint8_t junk_read[8192], junk_write[8192]; virtual void device_start() override; }; |