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/odyssey2 | |
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/odyssey2')
-rw-r--r-- | src/devices/bus/odyssey2/chess.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/chess.h | 2 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/rom.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/rom.h | 8 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/slot.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/slot.h | 20 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/voice.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/voice.h | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp index 8885733923c..9ddd62b7f6a 100644 --- a/src/devices/bus/odyssey2/chess.cpp +++ b/src/devices/bus/odyssey2/chess.cpp @@ -22,7 +22,7 @@ const device_type O2_ROM_CHESS = &device_creator<o2_chess_device>; -o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : o2_rom_device(mconfig, O2_ROM_CHESS, "Odyssey 2 BASIC Carts", tag, owner, clock, "o2_chess", __FILE__), m_cpu(*this, "subcpu") { diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h index 4cfefa10347..86c5822decf 100644 --- a/src/devices/bus/odyssey2/chess.h +++ b/src/devices/bus/odyssey2/chess.h @@ -17,7 +17,7 @@ class o2_chess_device : public o2_rom_device public: // construction/destruction - o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); private: required_device<nsc800_device> m_cpu; diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index dd2a3739bea..dac96ec563a 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -22,26 +22,26 @@ const device_type O2_ROM_12K = &device_creator<o2_rom12_device>; const device_type O2_ROM_16K = &device_creator<o2_rom16_device>; -o2_rom_device::o2_rom_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) +o2_rom_device::o2_rom_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_o2_cart_interface(mconfig, *this), m_bank_base(0) { } -o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, O2_ROM_STD, "Odyssey 2 Standard Carts", tag, owner, clock, "o2_rom", __FILE__), device_o2_cart_interface( mconfig, *this ), m_bank_base(0) { } -o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : o2_rom_device(mconfig, O2_ROM_12K, "Odyssey 2 12K Carts", tag, owner, clock, "o2_rom12", __FILE__) { } -o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : o2_rom_device(mconfig, O2_ROM_16K, "Odyssey 2 16K Carts", tag, owner, clock, "o2_rom16", __FILE__) { } diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 7f82a0c0e1a..d3931e96b88 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -13,8 +13,8 @@ class o2_rom_device : public device_t, { public: // construction/destruction - o2_rom_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); - o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom_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); + o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device-level overrides virtual void device_start() override; @@ -36,7 +36,7 @@ class o2_rom12_device : public o2_rom_device { public: // construction/destruction - o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04) override; @@ -49,7 +49,7 @@ class o2_rom16_device : public o2_rom_device { public: // construction/destruction - o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04) override; diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index 3ae5091568b..2593647a23c 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -45,7 +45,7 @@ device_o2_cart_interface::~device_o2_cart_interface() // rom_alloc - alloc the space for the cart //------------------------------------------------- -void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag) +void device_o2_cart_interface::rom_alloc(uint32_t size, const char *tag) { if (m_rom == nullptr) { @@ -59,7 +59,7 @@ void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag) // ram_alloc - alloc the space for the ram //------------------------------------------------- -void device_o2_cart_interface::ram_alloc(UINT32 size) +void device_o2_cart_interface::ram_alloc(uint32_t size) { m_ram.resize(size); } @@ -72,7 +72,7 @@ void device_o2_cart_interface::ram_alloc(UINT32 size) //------------------------------------------------- // o2_cart_slot_device - constructor //------------------------------------------------- -o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, O2_CART_SLOT, "Odyssey 2 Cartridge Slot", tag, owner, clock, "o2_cart_slot", __FILE__), device_image_interface(mconfig, *this), device_slot_interface(mconfig, *this), @@ -162,7 +162,7 @@ image_init_result o2_cart_slot_device::call_load() { if (m_cart) { - UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom"); + uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom"); m_cart->rom_alloc(size, tag()); if (software_entry() == nullptr) @@ -203,7 +203,7 @@ std::string o2_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = m_file->size(); + uint32_t size = m_file->size(); int type = O2_STD; if (size == 12288) diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index 454239d8a5a..bb8bb7674a5 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -39,18 +39,18 @@ public: virtual DECLARE_WRITE8_MEMBER(io_write) {} virtual DECLARE_READ8_MEMBER(t0_read) { return 0; } - void rom_alloc(UINT32 size, const char *tag); - void ram_alloc(UINT32 size); - UINT8* get_rom_base() { return m_rom; } - UINT8* get_ram_base() { return &m_ram[0]; } - UINT32 get_rom_size() { return m_rom_size; } - UINT32 get_ram_size() { return m_ram.size(); } + void rom_alloc(uint32_t size, const char *tag); + void ram_alloc(uint32_t size); + uint8_t* get_rom_base() { return m_rom; } + uint8_t* get_ram_base() { return &m_ram[0]; } + uint32_t get_rom_size() { return m_rom_size; } + uint32_t get_ram_size() { return m_ram.size(); } protected: // internal state - UINT8 *m_rom; - UINT32 m_rom_size; - std::vector<UINT8> m_ram; + uint8_t *m_rom; + uint32_t m_rom_size; + std::vector<uint8_t> m_ram; }; @@ -62,7 +62,7 @@ class o2_cart_slot_device : public device_t, { public: // construction/destruction - o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~o2_cart_slot_device(); // device-level overrides diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 0f1f702a541..b46d7010226 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -23,7 +23,7 @@ const device_type O2_ROM_VOICE = &device_creator<o2_voice_device>; -o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : o2_rom_device(mconfig, O2_ROM_VOICE, "Odyssey 2 The Voice Passthrough Cart", tag, owner, clock, "o2_voice", __FILE__), m_speech(*this, "sp0256_speech"), m_subslot(*this, "subslot"), diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h index b841189f149..8c82aeeab31 100644 --- a/src/devices/bus/odyssey2/voice.h +++ b/src/devices/bus/odyssey2/voice.h @@ -14,7 +14,7 @@ class o2_voice_device : public o2_rom_device { public: // construction/destruction - o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device-level overrides virtual void device_start() override; |