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/sg1000_exp | |
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/sg1000_exp')
-rw-r--r-- | src/devices/bus/sg1000_exp/fm_unit.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/fm_unit.h | 8 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sg1000exp.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sg1000exp.h | 10 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sk1100.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sk1100.h | 6 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp index 41142e95bbf..fdb380e79b2 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.cpp +++ b/src/devices/bus/sg1000_exp/fm_unit.cpp @@ -72,7 +72,7 @@ machine_config_constructor sega_fm_unit_device::device_mconfig_additions() const // sega_fm_unit_device - constructor //------------------------------------------------- -sega_fm_unit_device::sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sega_fm_unit_device::sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA_FM_UNIT, "Sega FM Sound Unit", tag, owner, clock, "sega_fm_unit", __FILE__), device_sg1000_expansion_slot_interface(mconfig, *this), m_ym(*this, "ym2413"), @@ -147,13 +147,13 @@ WRITE8_MEMBER(sega_fm_unit_device::peripheral_w) } -bool sega_fm_unit_device::is_readable(UINT8 offset) +bool sega_fm_unit_device::is_readable(uint8_t offset) { return (offset <= 3) ? true : false; } -bool sega_fm_unit_device::is_writeable(UINT8 offset) +bool sega_fm_unit_device::is_writeable(uint8_t offset) { return (offset <= 3) ? true : false; } diff --git a/src/devices/bus/sg1000_exp/fm_unit.h b/src/devices/bus/sg1000_exp/fm_unit.h index 9f71ff81190..b821b00c6fd 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.h +++ b/src/devices/bus/sg1000_exp/fm_unit.h @@ -30,7 +30,7 @@ class sega_fm_unit_device : public device_t, { public: // construction/destruction - sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides @@ -40,13 +40,13 @@ protected: // device_sg1000_expansion_slot_interface overrides virtual DECLARE_READ8_MEMBER(peripheral_r) override; virtual DECLARE_WRITE8_MEMBER(peripheral_w) override; - virtual bool is_readable(UINT8 offset) override; - virtual bool is_writeable(UINT8 offset) override; + virtual bool is_readable(uint8_t offset) override; + virtual bool is_writeable(uint8_t offset) override; private: required_device<ym2413_device> m_ym; optional_device<segapsg_device> m_psg; - UINT8 m_audio_control; + uint8_t m_audio_control; }; diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp index 0460efccbef..9560905de41 100644 --- a/src/devices/bus/sg1000_exp/sg1000exp.cpp +++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp @@ -53,7 +53,7 @@ device_sg1000_expansion_slot_interface::~device_sg1000_expansion_slot_interface( // sg1000_expansion_slot_device - constructor //------------------------------------------------- -sg1000_expansion_slot_device::sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sg1000_expansion_slot_device::sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SG1000_EXPANSION_SLOT, "Sega SG-1000 expansion slot", tag, owner, clock, "sg1000_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_device(nullptr) { @@ -85,7 +85,7 @@ void sg1000_expansion_slot_device::device_start() READ8_MEMBER(sg1000_expansion_slot_device::read) { - UINT8 data = 0xff; + uint8_t data = 0xff; if (m_device) data = m_device->peripheral_r(space, offset & 0x07); return data; @@ -98,7 +98,7 @@ WRITE8_MEMBER(sg1000_expansion_slot_device::write) } -bool sg1000_expansion_slot_device::is_readable(UINT8 offset) +bool sg1000_expansion_slot_device::is_readable(uint8_t offset) { if (m_device) return m_device->is_readable(offset & 0x07); @@ -106,7 +106,7 @@ bool sg1000_expansion_slot_device::is_readable(UINT8 offset) } -bool sg1000_expansion_slot_device::is_writeable(UINT8 offset) +bool sg1000_expansion_slot_device::is_writeable(uint8_t offset) { if (m_device) return m_device->is_writeable(offset & 0x07); diff --git a/src/devices/bus/sg1000_exp/sg1000exp.h b/src/devices/bus/sg1000_exp/sg1000exp.h index 183ee9ea948..12cecb1bc89 100644 --- a/src/devices/bus/sg1000_exp/sg1000exp.h +++ b/src/devices/bus/sg1000_exp/sg1000exp.h @@ -43,13 +43,13 @@ class sg1000_expansion_slot_device : public device_t, { public: // construction/destruction - sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~sg1000_expansion_slot_device(); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); - bool is_readable(UINT8 offset); - bool is_writeable(UINT8 offset); + bool is_readable(uint8_t offset); + bool is_writeable(uint8_t offset); protected: // device-level overrides @@ -73,8 +73,8 @@ public: virtual DECLARE_READ8_MEMBER(peripheral_r) { return 0xff; }; virtual DECLARE_WRITE8_MEMBER(peripheral_w) { }; - virtual bool is_readable(UINT8 offset) { return true; }; - virtual bool is_writeable(UINT8 offset) { return true; }; + virtual bool is_readable(uint8_t offset) { return true; }; + virtual bool is_writeable(uint8_t offset) { return true; }; protected: sg1000_expansion_slot_device *m_port; diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp index b6c2e037748..275a73b67b8 100644 --- a/src/devices/bus/sg1000_exp/sk1100.cpp +++ b/src/devices/bus/sg1000_exp/sk1100.cpp @@ -186,7 +186,7 @@ machine_config_constructor sega_sk1100_device::device_mconfig_additions() const // sega_sk1100_device - constructor //------------------------------------------------- -sega_sk1100_device::sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sega_sk1100_device::sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA_SK1100, "Sega SK-1100 Keyboard", tag, owner, clock, "sega_sk1100", __FILE__), device_sg1000_expansion_slot_interface(mconfig, *this), m_cassette(*this, "cassette"), @@ -229,7 +229,7 @@ WRITE8_MEMBER(sega_sk1100_device::peripheral_w) } -bool sega_sk1100_device::is_readable(UINT8 offset) +bool sega_sk1100_device::is_readable(uint8_t offset) { return (m_keylatch != 0x07 ? true : false); } @@ -273,7 +273,7 @@ READ8_MEMBER( sega_sk1100_device::ppi_pb_r ) */ /* keyboard */ - UINT8 data = m_pb[m_keylatch]->read(); + uint8_t data = m_pb[m_keylatch]->read(); /* cartridge contact */ data |= 0x10; diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h index 8ee058e9d5e..592ee0dd5b5 100644 --- a/src/devices/bus/sg1000_exp/sk1100.h +++ b/src/devices/bus/sg1000_exp/sk1100.h @@ -34,7 +34,7 @@ class sega_sk1100_device : public device_t, { public: // construction/destruction - sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -51,7 +51,7 @@ protected: // device_sg1000_expansion_slot_interface overrides virtual DECLARE_READ8_MEMBER(peripheral_r) override; virtual DECLARE_WRITE8_MEMBER(peripheral_w) override; - virtual bool is_readable(UINT8 offset) override; + virtual bool is_readable(uint8_t offset) override; private: required_device<cassette_image_device> m_cassette; @@ -60,7 +60,7 @@ private: required_ioport_array<8> m_pb; /* keyboard state */ - UINT8 m_keylatch; + uint8_t m_keylatch; }; |