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/coleco | |
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/coleco')
-rw-r--r-- | src/devices/bus/coleco/ctrl.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/coleco/ctrl.h | 6 | ||||
-rw-r--r-- | src/devices/bus/coleco/exp.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/coleco/exp.h | 8 | ||||
-rw-r--r-- | src/devices/bus/coleco/hand.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/coleco/hand.h | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/sac.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/coleco/sac.h | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/std.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/std.h | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/xin1.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/xin1.h | 6 |
12 files changed, 34 insertions, 34 deletions
diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp index 5b53be7c3cf..33359141805 100644 --- a/src/devices/bus/coleco/ctrl.cpp +++ b/src/devices/bus/coleco/ctrl.cpp @@ -44,7 +44,7 @@ device_colecovision_control_port_interface::device_colecovision_control_port_int // colecovision_control_port_device - constructor //------------------------------------------------- -colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECOVISION_CONTROL_PORT, "ColecoVision control port", tag, owner, clock, "colecovision_control_port", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr), m_write_irq(*this) diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h index a8c82ee23c4..6acabc2b8a1 100644 --- a/src/devices/bus/coleco/ctrl.h +++ b/src/devices/bus/coleco/ctrl.h @@ -48,7 +48,7 @@ public: device_colecovision_control_port_interface(const machine_config &mconfig, device_t &device); virtual ~device_colecovision_control_port_interface() { } - virtual UINT8 joy_r() { return 0xff; }; + virtual uint8_t joy_r() { return 0xff; }; virtual void common0_w(int state) { m_common0 = state; }; virtual void common1_w(int state) { m_common1 = state; }; @@ -67,14 +67,14 @@ class colecovision_control_port_device : public device_t, { public: // construction/destruction - colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~colecovision_control_port_device() { } // static configuration helpers template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<colecovision_control_port_device &>(device).m_write_irq.set_callback(object); } // computer interface - UINT8 read() { UINT8 data = 0xff; if (exists()) data = m_device->joy_r(); return data; } + uint8_t read() { uint8_t data = 0xff; if (exists()) data = m_device->joy_r(); return data; } DECLARE_READ8_MEMBER( read ) { return read(); } DECLARE_WRITE_LINE_MEMBER( common0_w ) { if (exists()) m_device->common0_w(state); } diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index c80af2f879d..3d93ae777b1 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -52,7 +52,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size) // colecovision_cartridge_slot_device - constructor //------------------------------------------------- -colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECOVISION_CARTRIDGE_SLOT, "ColecoVision cartridge port", tag, owner, clock, "coleco_cartridge_port", __FILE__), device_slot_interface(mconfig, *this), device_image_interface(mconfig, *this), m_card(nullptr) @@ -104,7 +104,7 @@ std::string colecovision_cartridge_slot_device::get_default_card_software() { if (open_image_file(mconfig().options())) { - UINT32 length = m_file->size(); + uint32_t length = m_file->size(); if (length == 0x100000 || length == 0x200000) return software_get_default_slot("xin1"); } @@ -116,7 +116,7 @@ std::string colecovision_cartridge_slot_device::get_default_card_software() // bd_r - cartridge data read //------------------------------------------------- -UINT8 colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (m_card != nullptr) { diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h index 19fa5b5e69c..58e75252dfd 100644 --- a/src/devices/bus/coleco/exp.h +++ b/src/devices/bus/coleco/exp.h @@ -66,11 +66,11 @@ class colecovision_cartridge_slot_device : public device_t, { public: // construction/destruction - colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~colecovision_cartridge_slot_device() { } // computer interface - UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000); + uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000); protected: // device-level overrides @@ -109,12 +109,12 @@ public: device_colecovision_cartridge_interface(const machine_config &mconfig, device_t &device); virtual ~device_colecovision_cartridge_interface() { } - virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } + virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } void rom_alloc(size_t size); protected: - UINT8 *m_rom; + uint8_t *m_rom; size_t m_rom_size; colecovision_cartridge_slot_device *m_slot; diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp index a00a1d89f4c..ce53e4246c2 100644 --- a/src/devices/bus/coleco/hand.cpp +++ b/src/devices/bus/coleco/hand.cpp @@ -19,8 +19,8 @@ const device_type COLECO_HAND_CONTROLLER = &device_creator<coleco_hand_controlle CUSTOM_INPUT_MEMBER( coleco_hand_controller_t::keypad_r ) { - UINT8 data = 0xf; - UINT16 keypad = m_io_keypad->read(); + uint8_t data = 0xf; + uint16_t keypad = m_io_keypad->read(); if (!BIT(keypad, 0)) data &= 0x0a; if (!BIT(keypad, 1)) data &= 0x0d; @@ -89,7 +89,7 @@ ioport_constructor coleco_hand_controller_t::device_input_ports() const // coleco_hand_controller_t - constructor //------------------------------------------------- -coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECO_HAND_CONTROLLER, "ColecoVision Hand Controller", tag, owner, clock, "coleco_hand", __FILE__), device_colecovision_control_port_interface(mconfig, *this), m_io_common0(*this, "COMMON0"), @@ -115,9 +115,9 @@ void coleco_hand_controller_t::device_start() // joy_r - joystick read //------------------------------------------------- -UINT8 coleco_hand_controller_t::joy_r() +uint8_t coleco_hand_controller_t::joy_r() { - UINT8 data = 0x7f; + uint8_t data = 0x7f; if (!m_common0) data &= m_io_common0->read(); if (!m_common1) data &= m_io_common1->read(); diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h index a43632e66db..e51296ce499 100644 --- a/src/devices/bus/coleco/hand.h +++ b/src/devices/bus/coleco/hand.h @@ -27,7 +27,7 @@ class coleco_hand_controller_t : public device_t, { public: // construction/destruction - coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -39,7 +39,7 @@ protected: virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 joy_r() override; + virtual uint8_t joy_r() override; private: required_ioport m_io_common0; diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp index 01a62b49323..ba05d15683e 100644 --- a/src/devices/bus/coleco/sac.cpp +++ b/src/devices/bus/coleco/sac.cpp @@ -19,8 +19,8 @@ const device_type COLECO_SUPER_ACTION_CONTROLLER = &device_creator<coleco_super_ CUSTOM_INPUT_MEMBER( coleco_super_action_controller_t::keypad_r ) { - UINT8 data = 0xf; - UINT16 keypad = m_io_keypad->read(); + uint8_t data = 0xf; + uint16_t keypad = m_io_keypad->read(); if (!BIT(keypad, 0)) data &= 0x0a; if (!BIT(keypad, 1)) data &= 0x0d; @@ -101,7 +101,7 @@ ioport_constructor coleco_super_action_controller_t::device_input_ports() const // coleco_super_action_controller_t - constructor //------------------------------------------------- -coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECO_SUPER_ACTION_CONTROLLER, "ColecoVision Super Action Controller", tag, owner, clock, "coleco_sac", __FILE__), device_colecovision_control_port_interface(mconfig, *this), m_io_common0(*this, "COMMON0"), @@ -127,9 +127,9 @@ void coleco_super_action_controller_t::device_start() // joy_r - joystick read //------------------------------------------------- -UINT8 coleco_super_action_controller_t::joy_r() +uint8_t coleco_super_action_controller_t::joy_r() { - UINT8 data = 0x7f; + uint8_t data = 0x7f; if (!m_common0) data &= m_io_common0->read(); if (!m_common1) data &= m_io_common1->read(); diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h index 51dcfae357f..4f90e225374 100644 --- a/src/devices/bus/coleco/sac.h +++ b/src/devices/bus/coleco/sac.h @@ -27,7 +27,7 @@ class coleco_super_action_controller_t : public device_t, { public: // construction/destruction - coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -40,7 +40,7 @@ protected: virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 joy_r() override; + virtual uint8_t joy_r() override; private: required_ioport m_io_common0; diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp index f66a0463eae..f8842a4aa9e 100644 --- a/src/devices/bus/coleco/std.cpp +++ b/src/devices/bus/coleco/std.cpp @@ -26,7 +26,7 @@ const device_type COLECOVISION_STANDARD = &device_creator<colecovision_standard_ // colecovision_standard_cartridge_device - constructor //------------------------------------------------- -colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECOVISION_STANDARD, "ColecoVision standard cartridge", tag, owner, clock, "colecovision_standard", __FILE__), device_colecovision_cartridge_interface(mconfig, *this) { @@ -46,7 +46,7 @@ void colecovision_standard_cartridge_device::device_start() // read - cartridge data read //------------------------------------------------- -UINT8 colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h index 4afde3809c9..ee3cb2adf1f 100644 --- a/src/devices/bus/coleco/std.h +++ b/src/devices/bus/coleco/std.h @@ -26,14 +26,14 @@ class colecovision_standard_cartridge_device : public device_t, { public: // construction/destruction - colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides virtual void device_start() override; // device_colecovision_expansion_card_interface overrides - virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; }; diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp index e46b65eeadd..77e55098156 100644 --- a/src/devices/bus/coleco/xin1.cpp +++ b/src/devices/bus/coleco/xin1.cpp @@ -26,7 +26,7 @@ const device_type COLECOVISION_XIN1 = &device_creator<colecovision_xin1_cartridg // colecovision_xin1_cartridge_device - constructor //------------------------------------------------- -colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, COLECOVISION_XIN1, "ColecoVision X-in-1 cartridge", tag, owner, clock, "colecovision_xin1", __FILE__), device_colecovision_cartridge_interface(mconfig, *this), m_current_offset(0) @@ -57,7 +57,7 @@ void colecovision_xin1_cartridge_device::device_reset() // read - cartridge data read //------------------------------------------------- -UINT8 colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h index defe4d8d4fa..14802eb95da 100644 --- a/src/devices/bus/coleco/xin1.h +++ b/src/devices/bus/coleco/xin1.h @@ -26,7 +26,7 @@ class colecovision_xin1_cartridge_device : public device_t, { public: // construction/destruction - colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides @@ -34,10 +34,10 @@ protected: virtual void device_reset() override; // device_colecovision_expansion_card_interface overrides - virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; private: - UINT32 m_current_offset; + uint32_t m_current_offset; }; |