diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/bus/vtech | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/devices/bus/vtech')
-rw-r--r-- | src/devices/bus/vtech/ioexp/ioexp.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/ioexp.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/joystick.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/joystick.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/printer.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/printer.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/floppy.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/floppy.h | 4 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memexp.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memexp.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memory.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memory.h | 16 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rs232.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rs232.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rtty.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rtty.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/wordpro.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/wordpro.h | 2 |
18 files changed, 32 insertions, 32 deletions
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp index 55671583558..4967e305c31 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.cpp +++ b/src/devices/bus/vtech/ioexp/ioexp.cpp @@ -26,7 +26,7 @@ const device_type IOEXP_SLOT = &device_creator<ioexp_slot_device>; // ioexp_slot_device - constructor //------------------------------------------------- -ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, IOEXP_SLOT, "Peripheral Expansion Slot", tag, owner, clock, "ioexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_io(nullptr), diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index bd98a4aaeb1..e00479761a0 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -51,7 +51,7 @@ class ioexp_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~ioexp_slot_device(); void set_io_space(address_space *io); diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp index 38e9732d17a..c9084f7559c 100644 --- a/src/devices/bus/vtech/ioexp/joystick.cpp +++ b/src/devices/bus/vtech/ioexp/joystick.cpp @@ -64,7 +64,7 @@ ioport_constructor joystick_interface_device::device_input_ports() const // joystick_interface_device - constructor //------------------------------------------------- -joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, JOYSTICK_INTERFACE, "Laser/VZ Joystick Interface", tag, owner, clock, "joystick", __FILE__), device_ioexp_interface(mconfig, *this), m_joy0(*this, "joystick_0"), @@ -98,7 +98,7 @@ void joystick_interface_device::device_reset() READ8_MEMBER( joystick_interface_device::joystick_r ) { - UINT8 data = 0xff; + uint8_t data = 0xff; if (!BIT(offset, 0)) data &= m_joy0->read(); if (!BIT(offset, 1)) data &= m_joy0_arm->read(); diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h index 1575dde42f2..30d1fdb4239 100644 --- a/src/devices/bus/vtech/ioexp/joystick.h +++ b/src/devices/bus/vtech/ioexp/joystick.h @@ -28,7 +28,7 @@ class joystick_interface_device : public device_t, public device_ioexp_interface { public: // construction/destruction - joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_READ8_MEMBER( joystick_r ); diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index a122c9fa2c7..a80ab27ebdc 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -43,7 +43,7 @@ machine_config_constructor printer_interface_device::device_mconfig_additions() // printer_interface_device - constructor //------------------------------------------------- -printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PRINTER_INTERFACE, "Laser/VZ Printer Interface", tag, owner, clock, "printer", __FILE__), device_ioexp_interface(mconfig, *this), m_centronics(*this, "centronics"), diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index 0f2b8746400..0b0e8dbe6e1 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -28,7 +28,7 @@ class printer_interface_device : public device_t, public device_ioexp_interface { public: // construction/destruction - printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_WRITE_LINE_MEMBER( busy_w ); DECLARE_READ8_MEMBER( busy_r ); diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index 6f3196f64e0..6da28bee463 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -67,7 +67,7 @@ machine_config_constructor floppy_controller_device::device_mconfig_additions() // floppy_controller_device - constructor //------------------------------------------------- -floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, FLOPPY_CONTROLLER, "Laser/VZ Floppy Disk Controller", tag, owner, clock, "laserfdc", __FILE__), device_memexp_interface(mconfig, *this), m_memexp(*this, "mem"), @@ -92,7 +92,7 @@ void floppy_controller_device::device_start() // TODO: save m_write_buffer and rebuild m_floppy after load - UINT8 *bios = memregion("software")->base(); + uint8_t *bios = memregion("software")->base(); // Obvious bugs... must have worked by sheer luck and very subtle // timings. Our current z80 is not subtle enough. @@ -138,7 +138,7 @@ void floppy_controller_device::device_reset() WRITE8_MEMBER(floppy_controller_device::latch_w) { - UINT8 diff = m_latch ^ data; + uint8_t diff = m_latch ^ data; m_latch = data; floppy_image_device *newflop = nullptr; diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h index e12dea6ffb2..9daa4fe2ee7 100644 --- a/src/devices/bus/vtech/memexp/floppy.h +++ b/src/devices/bus/vtech/memexp/floppy.h @@ -29,7 +29,7 @@ class floppy_controller_device : public device_t, public device_memexp_interface { public: // construction/destruction - floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_ADDRESS_MAP(map, 8); @@ -48,7 +48,7 @@ protected: required_device<floppy_connector> m_floppy0, m_floppy1; floppy_image_device *m_floppy; - UINT8 m_latch, m_shifter; + uint8_t m_latch, m_shifter; bool m_latching_inverter; int m_current_cyl; attotime m_last_latching_inverter_update_time; diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp index 5b547103645..9415ea68320 100644 --- a/src/devices/bus/vtech/memexp/memexp.cpp +++ b/src/devices/bus/vtech/memexp/memexp.cpp @@ -26,7 +26,7 @@ const device_type MEMEXP_SLOT = &device_creator<memexp_slot_device>; // memexp_slot_device - constructor //------------------------------------------------- -memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MEMEXP_SLOT, "Memory Expansion Slot", tag, owner, clock, "memexp_slot", __FILE__), device_slot_interface(mconfig, *this), m_program(nullptr), diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index 1026ddb2bba..ca2d677c724 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -67,7 +67,7 @@ class memexp_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~memexp_slot_device(); void set_program_space(address_space *program); diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp index 5b4b9d71701..b294f4a8ff8 100644 --- a/src/devices/bus/vtech/memexp/memory.cpp +++ b/src/devices/bus/vtech/memexp/memory.cpp @@ -27,7 +27,7 @@ const device_type LASER_64K = &device_creator<laser_64k_device>; // laser110_16k_device - constructor //------------------------------------------------- -laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LASER110_16K, "Laser 110/200/VZ-200 16k Memory", tag, owner, clock, "laser110_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -60,7 +60,7 @@ void laser110_16k_device::device_reset() // laser210_16k_device - constructor //------------------------------------------------- -laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LASER210_16K, "Laser 210/VZ-200 (DSE) 16k Memory", tag, owner, clock, "laser210_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -93,7 +93,7 @@ void laser210_16k_device::device_reset() // laser310_16k_device - constructor //------------------------------------------------- -laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LASER310_16K, "Laser 310/VZ-300 16k Memory", tag, owner, clock, "laser310_16k", __FILE__), device_memexp_interface(mconfig, *this) { @@ -126,7 +126,7 @@ void laser310_16k_device::device_reset() // laser_64k_device - constructor //------------------------------------------------- -laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LASER_64K, "Laser/VZ 64k Memory", tag, owner, clock, "laser_64k", __FILE__), device_memexp_interface(mconfig, *this) { diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h index 87518d20123..bfc727d652e 100644 --- a/src/devices/bus/vtech/memexp/memory.h +++ b/src/devices/bus/vtech/memexp/memory.h @@ -25,14 +25,14 @@ class laser110_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual void device_start() override; virtual void device_reset() override; private: - std::vector<UINT8> m_ram; + std::vector<uint8_t> m_ram; }; // ======================> laser210_16k_device @@ -41,14 +41,14 @@ class laser210_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual void device_start() override; virtual void device_reset() override; private: - std::vector<UINT8> m_ram; + std::vector<uint8_t> m_ram; }; // ======================> laser310_16k_device @@ -57,14 +57,14 @@ class laser310_16k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual void device_start() override; virtual void device_reset() override; private: - std::vector<UINT8> m_ram; + std::vector<uint8_t> m_ram; }; // ======================> laser_64k_device @@ -73,7 +73,7 @@ class laser_64k_device : public device_t, public device_memexp_interface { public: // construction/destruction - laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_WRITE8_MEMBER( bankswitch_w ); @@ -82,7 +82,7 @@ protected: virtual void device_reset() override; private: - std::vector<UINT8> m_ram; + std::vector<uint8_t> m_ram; }; // device type definition diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index 254664acbf7..1cac4d8212d 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -53,7 +53,7 @@ machine_config_constructor rs232_interface_device::device_mconfig_additions() co // rs232_interface_device - constructor //------------------------------------------------- -rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RS232_INTERFACE, "DSE VZ-200/300 RS-232 Interface", tag, owner, clock, "vz_rs232", __FILE__), device_memexp_interface(mconfig, *this), m_rs232(*this, "rs232"), diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h index eef273da255..f235670bb3d 100644 --- a/src/devices/bus/vtech/memexp/rs232.h +++ b/src/devices/bus/vtech/memexp/rs232.h @@ -26,7 +26,7 @@ class rs232_interface_device : public device_t, public device_memexp_interface { public: // construction/destruction - rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_WRITE_LINE_MEMBER( rs232_rx_w ); DECLARE_READ8_MEMBER( receive_data_r ); diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp index b44a81c370a..b1416fbdad1 100644 --- a/src/devices/bus/vtech/memexp/rtty.cpp +++ b/src/devices/bus/vtech/memexp/rtty.cpp @@ -38,7 +38,7 @@ const tiny_rom_entry *rtty_interface_device::device_rom_region() const // rtty_interface_device - constructor //------------------------------------------------- -rtty_interface_device::rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +rtty_interface_device::rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RTTY_INTERFACE, "DSE VZ-200/300 RTTY Interface", tag, owner, clock, "vz_rtty", __FILE__), device_memexp_interface(mconfig, *this) { diff --git a/src/devices/bus/vtech/memexp/rtty.h b/src/devices/bus/vtech/memexp/rtty.h index 1b96c611ece..fb65ce1f513 100644 --- a/src/devices/bus/vtech/memexp/rtty.h +++ b/src/devices/bus/vtech/memexp/rtty.h @@ -25,7 +25,7 @@ class rtty_interface_device : public device_t, public device_memexp_interface { public: // construction/destruction - rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_READ8_MEMBER( receive_data_r ); DECLARE_WRITE8_MEMBER( transmit_data_w ); diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp index 1eb51c23d82..570fe3e431d 100644 --- a/src/devices/bus/vtech/memexp/wordpro.cpp +++ b/src/devices/bus/vtech/memexp/wordpro.cpp @@ -40,7 +40,7 @@ const tiny_rom_entry *wordpro_device::device_rom_region() const // wordpro_device - constructor //------------------------------------------------- -wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WORDPRO, "DSE VZ-300 WordPro", tag, owner, clock, "wordpro", __FILE__), device_memexp_interface(mconfig, *this) { diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h index 288a7fb565d..51e5b412ab1 100644 --- a/src/devices/bus/vtech/memexp/wordpro.h +++ b/src/devices/bus/vtech/memexp/wordpro.h @@ -25,7 +25,7 @@ class wordpro_device : public device_t, public device_memexp_interface { public: // construction/destruction - wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; |