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/apricot | |
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/apricot')
-rw-r--r-- | src/devices/bus/apricot/expansion/expansion.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/apricot/expansion/expansion.h | 6 | ||||
-rw-r--r-- | src/devices/bus/apricot/expansion/ram.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/apricot/expansion/ram.h | 12 | ||||
-rw-r--r-- | src/devices/bus/apricot/keyboard/hle.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/apricot/keyboard/hle.h | 8 | ||||
-rw-r--r-- | src/devices/bus/apricot/keyboard/keyboard.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/apricot/keyboard/keyboard.h | 2 |
8 files changed, 25 insertions, 25 deletions
diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp index 5dd7eb5ae58..cf1152c7ac3 100644 --- a/src/devices/bus/apricot/expansion/expansion.cpp +++ b/src/devices/bus/apricot/expansion/expansion.cpp @@ -19,14 +19,14 @@ const device_type APRICOT_EXPANSION_SLOT = &device_creator<apricot_expansion_slo // apricot_expansion_slot_device - constructor //------------------------------------------------- -apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_EXPANSION_SLOT, "Apricot Expansion Slot", tag, owner, clock, "apricot_exp_slot", __FILE__), device_slot_interface(mconfig, *this) { } apricot_expansion_slot_device::apricot_expansion_slot_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) : + 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_interface(mconfig, *this) { @@ -58,7 +58,7 @@ const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_ // apricot_expansion_bus_device - constructor //------------------------------------------------- -apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__), m_program(nullptr), m_io(nullptr), diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h index fc581f50fb4..506a13d19b1 100644 --- a/src/devices/bus/apricot/expansion/expansion.h +++ b/src/devices/bus/apricot/expansion/expansion.h @@ -97,9 +97,9 @@ class apricot_expansion_slot_device : public device_t, public device_slot_interf { public: // construction/destruction - apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); apricot_expansion_slot_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); + const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -115,7 +115,7 @@ class apricot_expansion_bus_device : public device_t { public: // construction/destruction - apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~apricot_expansion_bus_device(); template<class _Object> static devcb_base &set_dma1_handler(device_t &device, _Object object) diff --git a/src/devices/bus/apricot/expansion/ram.cpp b/src/devices/bus/apricot/expansion/ram.cpp index 2221ae37227..59711b127cd 100644 --- a/src/devices/bus/apricot/expansion/ram.cpp +++ b/src/devices/bus/apricot/expansion/ram.cpp @@ -42,7 +42,7 @@ ioport_constructor apricot_256k_ram_device::device_input_ports() const // apricot_256k_ram_device - constructor //------------------------------------------------- -apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_256K_RAM, "Apricot 256K RAM Expansion Board", tag, owner, clock, "apricot_256k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_sw(*this, "sw") @@ -96,7 +96,7 @@ ioport_constructor apricot_128k_ram_device::device_input_ports() const // apricot_128_512k_ram_device - constructor //------------------------------------------------- -apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_128K_RAM, "Apricot 128/512K RAM Expansion Board (128K)", tag, owner, clock, "apricot_128k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_strap(*this, "strap") @@ -150,7 +150,7 @@ ioport_constructor apricot_512k_ram_device::device_input_ports() const // apricot_128_512k_ram_device - constructor //------------------------------------------------- -apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_512K_RAM, "Apricot 128/512K RAM Expansion Board (512K)", tag, owner, clock, "apricot_512k_ram", __FILE__), device_apricot_expansion_card_interface(mconfig, *this), m_strap(*this, "strap") diff --git a/src/devices/bus/apricot/expansion/ram.h b/src/devices/bus/apricot/expansion/ram.h index c2b2f771953..719a51cbc4f 100644 --- a/src/devices/bus/apricot/expansion/ram.h +++ b/src/devices/bus/apricot/expansion/ram.h @@ -26,7 +26,7 @@ class apricot_256k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual ioport_constructor device_input_ports() const override; @@ -36,7 +36,7 @@ protected: private: required_ioport m_sw; - std::vector<UINT16> m_ram; + std::vector<uint16_t> m_ram; }; @@ -46,7 +46,7 @@ class apricot_128k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual ioport_constructor device_input_ports() const override; @@ -56,7 +56,7 @@ protected: private: required_ioport m_strap; - std::vector<UINT16> m_ram; + std::vector<uint16_t> m_ram; }; @@ -66,7 +66,7 @@ class apricot_512k_ram_device : public device_t, public device_apricot_expansion { public: // construction/destruction - apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual ioport_constructor device_input_ports() const override; @@ -76,7 +76,7 @@ protected: private: required_ioport m_strap; - std::vector<UINT16> m_ram; + std::vector<uint16_t> m_ram; }; diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index 5315cb6e31a..8fbbb796ef1 100644 --- a/src/devices/bus/apricot/keyboard/hle.cpp +++ b/src/devices/bus/apricot/keyboard/hle.cpp @@ -207,7 +207,7 @@ machine_config_constructor apricot_keyboard_hle_device::device_mconfig_additions // apricot_keyboard_hle_device - constructor //------------------------------------------------- -apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_KEYBOARD_HLE, "Apricot Keyboard (HLE)", tag, owner, clock, "apricotkb_hle", __FILE__), device_apricot_keyboard_interface(mconfig, *this), device_buffered_serial_interface(mconfig, *this), @@ -258,7 +258,7 @@ void apricot_keyboard_hle_device::tra_callback() // received_byte - handle received byte //------------------------------------------------- -void apricot_keyboard_hle_device::received_byte(UINT8 byte) +void apricot_keyboard_hle_device::received_byte(uint8_t byte) { if ((byte & 0xf0) == 0xf0) { @@ -317,7 +317,7 @@ void apricot_keyboard_hle_device::received_byte(UINT8 byte) // key_make - handle a key being pressed //------------------------------------------------- -void apricot_keyboard_hle_device::key_make(UINT8 row, UINT8 column) +void apricot_keyboard_hle_device::key_make(uint8_t row, uint8_t column) { // send the make code transmit_byte((row << 3) | column); @@ -327,7 +327,7 @@ void apricot_keyboard_hle_device::key_make(UINT8 row, UINT8 column) // key_break - handle a key being released //------------------------------------------------- -void apricot_keyboard_hle_device::key_break(UINT8 row, UINT8 column) +void apricot_keyboard_hle_device::key_break(uint8_t row, uint8_t column) { // send the break code transmit_byte(0x80 | (row << 3) | column); diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h index 8ef520824a8..e1cef569472 100644 --- a/src/devices/bus/apricot/keyboard/hle.h +++ b/src/devices/bus/apricot/keyboard/hle.h @@ -30,7 +30,7 @@ class apricot_keyboard_hle_device : public device_t, { public: // construction/destruction - apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from host virtual void out_w(int state) override; @@ -44,11 +44,11 @@ protected: // device_buffered_serial_interface overrides virtual void tra_callback() override; - virtual void received_byte(UINT8 byte) override; + virtual void received_byte(uint8_t byte) override; // device_matrix_keyboard_interface overrides - virtual void key_make(UINT8 row, UINT8 column) override; - virtual void key_break(UINT8 row, UINT8 column) override; + virtual void key_make(uint8_t row, uint8_t column) override; + virtual void key_break(uint8_t row, uint8_t column) override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp index e045b319e4f..8d53eac72b5 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.cpp +++ b/src/devices/bus/apricot/keyboard/keyboard.cpp @@ -25,7 +25,7 @@ const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_ // apricot_keyboard_bus_device - constructor //------------------------------------------------- -apricot_keyboard_bus_device::apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_keyboard_bus_device::apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APRICOT_KEYBOARD_INTERFACE, "Apricot Keyboard Interface", tag, owner, clock, "apricot_kbd", __FILE__), device_slot_interface(mconfig, *this), m_kbd(nullptr), diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h index 46398f30a3d..ae37e7d7897 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.h +++ b/src/devices/bus/apricot/keyboard/keyboard.h @@ -59,7 +59,7 @@ class apricot_keyboard_bus_device : public device_t, public device_slot_interfac { public: // construction/destruction - apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~apricot_keyboard_bus_device(); // callbacks |