diff options
Diffstat (limited to 'src/devices/bus/newbrain')
-rw-r--r-- | src/devices/bus/newbrain/eim.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/newbrain/eim.h | 12 | ||||
-rw-r--r-- | src/devices/bus/newbrain/exp.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/newbrain/exp.h | 18 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.h | 10 |
6 files changed, 35 insertions, 35 deletions
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index 599267b3ffb..7be6e38d6cf 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -119,7 +119,7 @@ machine_config_constructor newbrain_eim_t::device_mconfig_additions() const // newbrain_eim_t - constructor //------------------------------------------------- -newbrain_eim_t::newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +newbrain_eim_t::newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NEWBRAIN_EIM, "Newbrain EIM", tag, owner, clock, "newbrain_eim", __FILE__), device_newbrain_expansion_slot_interface(mconfig, *this), m_ctc(*this, Z80CTC_TAG), @@ -156,7 +156,7 @@ void newbrain_eim_t::device_reset() // mreq_r - memory request read //------------------------------------------------- -UINT8 newbrain_eim_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_eim_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return m_exp->mreq_r(space, offset, data, romov, exrm, raminh); } @@ -166,7 +166,7 @@ UINT8 newbrain_eim_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bo // mreq_w - memory request write //------------------------------------------------- -void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { m_exp->mreq_w(space, offset, data, romov, exrm, raminh); } @@ -176,7 +176,7 @@ void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, UINT8 data, boo // iorq_r - I/O request read //------------------------------------------------- -UINT8 newbrain_eim_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) +uint8_t newbrain_eim_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return m_exp->iorq_r(space, offset, data, prtov); } @@ -186,7 +186,7 @@ UINT8 newbrain_eim_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bo // iorq_w - I/O request write //------------------------------------------------- -void newbrain_eim_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) +void newbrain_eim_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { m_exp->iorq_w(space, offset, data, prtov); } diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h index 2512321783a..824de3daf69 100644 --- a/src/devices/bus/newbrain/eim.h +++ b/src/devices/bus/newbrain/eim.h @@ -32,7 +32,7 @@ class newbrain_eim_t : public device_t, { public: // construction/destruction - newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -58,17 +58,17 @@ protected: virtual void device_reset() override; // device_newbrain_expansion_slot_interface overrides - virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override; - virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override; - virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) override; - virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) override; + virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; + virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; private: required_device<z80ctc_device> m_ctc; required_device<acia6850_device> m_acia; required_device<newbrain_expansion_slot_t> m_exp; required_memory_region m_rom; - optional_shared_ptr<UINT8> m_ram; + optional_shared_ptr<uint8_t> m_ram; int m_aciaint; int m_anint; diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp index b5ddf149114..85684823493 100644 --- a/src/devices/bus/newbrain/exp.cpp +++ b/src/devices/bus/newbrain/exp.cpp @@ -42,7 +42,7 @@ device_newbrain_expansion_slot_interface::device_newbrain_expansion_slot_interfa // newbrain_expansion_slot_t - constructor //------------------------------------------------- -newbrain_expansion_slot_t::newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +newbrain_expansion_slot_t::newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NEWBRAIN_EXPANSION_SLOT, "NewBrain expansion port", tag, owner, clock, "newbrain_expansion_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr) { @@ -76,7 +76,7 @@ void newbrain_expansion_slot_t::device_reset() // mreq_r - memory request read //------------------------------------------------- -UINT8 newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { if (m_card != nullptr) { @@ -91,7 +91,7 @@ UINT8 newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, UIN // mreq_w - memory request write //------------------------------------------------- -void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { if (m_card != nullptr) { @@ -104,7 +104,7 @@ void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, UINT // iorq_r - I/O request read //------------------------------------------------- -UINT8 newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) +uint8_t newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { if (m_card != nullptr) { @@ -119,7 +119,7 @@ UINT8 newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, UIN // iorq_w - I/O request write //------------------------------------------------- -void newbrain_expansion_slot_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) +void newbrain_expansion_slot_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { if (m_card != nullptr) { diff --git a/src/devices/bus/newbrain/exp.h b/src/devices/bus/newbrain/exp.h index 52702a08b85..a81194945df 100644 --- a/src/devices/bus/newbrain/exp.h +++ b/src/devices/bus/newbrain/exp.h @@ -74,15 +74,15 @@ class newbrain_expansion_slot_t : public device_t, { public: // construction/destruction - newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~newbrain_expansion_slot_t() { } // computer interface - UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh); - void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh); + uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); + void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); - UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov); - void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov); + uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov); + void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov); protected: // device-level overrides @@ -104,12 +104,12 @@ public: virtual ~device_newbrain_expansion_slot_interface() { } // memory access - virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) { return data; }; - virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) { }; + virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; }; + virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { }; // I/O access - virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) { return data; }; - virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) { }; + virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return data; }; + virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { }; protected: newbrain_expansion_slot_t *m_slot; diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index d4fadb9df70..f8965589fb5 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -136,7 +136,7 @@ machine_config_constructor newbrain_fdc_t::device_mconfig_additions() const // newbrain_fdc_t - constructor //------------------------------------------------- -newbrain_fdc_t::newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +newbrain_fdc_t::newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NEWBRAIN_FDC, "NewBrain FDC", tag, owner, clock, "newbrain_fdc", __FILE__), device_newbrain_expansion_slot_interface(mconfig, *this), m_maincpu(*this, Z80_TAG), @@ -183,7 +183,7 @@ void newbrain_fdc_t::device_reset() // mreq_r - memory request read //------------------------------------------------- -UINT8 newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return m_exp->mreq_r(space, offset, data, romov, exrm, raminh); } @@ -193,7 +193,7 @@ UINT8 newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bo // mreq_w - memory request write //------------------------------------------------- -void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) +void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { m_exp->mreq_w(space, offset, data, romov, exrm, raminh); } @@ -203,7 +203,7 @@ void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, UINT8 data, boo // iorq_r - I/O request read //------------------------------------------------- -UINT8 newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) +uint8_t newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return m_exp->iorq_r(space, offset, data, prtov); } @@ -213,7 +213,7 @@ UINT8 newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bo // iorq_w - I/O request write //------------------------------------------------- -void newbrain_fdc_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) +void newbrain_fdc_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { m_exp->iorq_w(space, offset, data, prtov); diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h index fdb0e5f4fca..2d2d2bc8576 100644 --- a/src/devices/bus/newbrain/fdc.h +++ b/src/devices/bus/newbrain/fdc.h @@ -29,7 +29,7 @@ class newbrain_fdc_t : public device_t, { public: // construction/destruction - newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -46,10 +46,10 @@ protected: virtual void device_reset() override; // device_newbrain_expansion_slot_interface overrides - virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override; - virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override; - virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) override; - virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) override; + virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; + virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; private: required_device<z80_device> m_maincpu; |