summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vip
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/bus/vip
parent333bff8de64dfaeb98134000412796b4fdef970b (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/vip')
-rw-r--r--src/devices/bus/vip/byteio.cpp6
-rw-r--r--src/devices/bus/vip/byteio.h10
-rw-r--r--src/devices/bus/vip/exp.cpp22
-rw-r--r--src/devices/bus/vip/exp.h30
-rw-r--r--src/devices/bus/vip/vp550.cpp4
-rw-r--r--src/devices/bus/vip/vp550.h4
-rw-r--r--src/devices/bus/vip/vp570.cpp8
-rw-r--r--src/devices/bus/vip/vp570.h8
-rw-r--r--src/devices/bus/vip/vp575.cpp24
-rw-r--r--src/devices/bus/vip/vp575.h16
-rw-r--r--src/devices/bus/vip/vp585.cpp4
-rw-r--r--src/devices/bus/vip/vp585.h6
-rw-r--r--src/devices/bus/vip/vp590.cpp14
-rw-r--r--src/devices/bus/vip/vp590.h16
-rw-r--r--src/devices/bus/vip/vp595.cpp4
-rw-r--r--src/devices/bus/vip/vp595.h4
-rw-r--r--src/devices/bus/vip/vp620.cpp4
-rw-r--r--src/devices/bus/vip/vp620.h6
-rw-r--r--src/devices/bus/vip/vp700.cpp6
-rw-r--r--src/devices/bus/vip/vp700.h4
20 files changed, 100 insertions, 100 deletions
diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp
index 871a60138f4..f4db30fd93d 100644
--- a/src/devices/bus/vip/byteio.cpp
+++ b/src/devices/bus/vip/byteio.cpp
@@ -42,7 +42,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine
// vip_byteio_port_device - constructor
//-------------------------------------------------
-vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_inst(*this), m_cart(nullptr)
@@ -71,8 +71,8 @@ void vip_byteio_port_device::device_reset()
}
-UINT8 vip_byteio_port_device::in_r() { UINT8 data = 0xff; if (m_cart != nullptr) data = m_cart->vip_in_r(); return data; }
-void vip_byteio_port_device::out_w(UINT8 data) { if (m_cart != nullptr) m_cart->vip_out_w(data); }
+uint8_t vip_byteio_port_device::in_r() { uint8_t data = 0xff; if (m_cart != nullptr) data = m_cart->vip_in_r(); return data; }
+void vip_byteio_port_device::out_w(uint8_t data) { if (m_cart != nullptr) m_cart->vip_out_w(data); }
READ_LINE_MEMBER( vip_byteio_port_device::ef3_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef3_r(); return state; }
READ_LINE_MEMBER( vip_byteio_port_device::ef4_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef4_r(); return state; }
WRITE_LINE_MEMBER( vip_byteio_port_device::q_w ) { if (m_cart != nullptr) m_cart->vip_q_w(state); }
diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h
index 8871e1f0d72..ce196dc20fd 100644
--- a/src/devices/bus/vip/byteio.h
+++ b/src/devices/bus/vip/byteio.h
@@ -72,13 +72,13 @@ class vip_byteio_port_device : public device_t,
{
public:
// construction/destruction
- vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _inst> void set_inst_callback(_inst inst) { m_write_inst.set_callback(inst); }
// computer interface
- UINT8 in_r();
- void out_w(UINT8 data);
+ uint8_t in_r();
+ void out_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( ef3_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
DECLARE_WRITE_LINE_MEMBER( q_w );
@@ -106,8 +106,8 @@ public:
// construction/destruction
device_vip_byteio_port_interface(const machine_config &mconfig, device_t &device);
- virtual UINT8 vip_in_r() { return 0xff; };
- virtual void vip_out_w(UINT8 data) { };
+ virtual uint8_t vip_in_r() { return 0xff; };
+ virtual void vip_out_w(uint8_t data) { };
virtual int vip_ef3_r() { return CLEAR_LINE; }
virtual int vip_ef4_r() { return CLEAR_LINE; }
diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp
index 59db0c4844d..a062ea14670 100644
--- a/src/devices/bus/vip/exp.cpp
+++ b/src/devices/bus/vip/exp.cpp
@@ -50,7 +50,7 @@ device_vip_expansion_card_interface::device_vip_expansion_card_interface(const m
// vip_expansion_slot_device - constructor
//-------------------------------------------------
-vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock, "vip_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_int(*this),
@@ -79,9 +79,9 @@ void vip_expansion_slot_device::device_start()
// program_r - program read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vip_expansion_slot_device::program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -96,7 +96,7 @@ UINT8 vip_expansion_slot_device::program_r(address_space &space, offs_t offset,
// program_w - program write
//-------------------------------------------------
-void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (m_card != nullptr)
{
@@ -109,9 +109,9 @@ void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, U
// io_r - io read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
+uint8_t vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -126,7 +126,7 @@ UINT8 vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
// io_w - io write
//-------------------------------------------------
-void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8 data)
+void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
@@ -139,9 +139,9 @@ void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8
// dma_r - dma read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
+uint8_t vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -156,7 +156,7 @@ UINT8 vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
// dma_w - dma write
//-------------------------------------------------
-void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, UINT8 data)
+void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
@@ -169,7 +169,7 @@ void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, UINT8
// screen_update -
//-------------------------------------------------
-UINT32 vip_expansion_slot_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vip_expansion_slot_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bool value = false;
diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h
index 8aad60fafc8..6c9d65b5b12 100644
--- a/src/devices/bus/vip/exp.h
+++ b/src/devices/bus/vip/exp.h
@@ -81,20 +81,20 @@ class vip_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); }
template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); }
template<class _Object> static devcb_base &set_dma_in_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_in.set_callback(object); }
// computer interface
- UINT8 program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh);
- void program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh);
- UINT8 io_r(address_space &space, offs_t offset);
- void io_w(address_space &space, offs_t offset, UINT8 data);
- UINT8 dma_r(address_space &space, offs_t offset);
- void dma_w(address_space &space, offs_t offset, UINT8 data);
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint8_t program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh);
+ void program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh);
+ uint8_t io_r(address_space &space, offs_t offset);
+ void io_w(address_space &space, offs_t offset, uint8_t data);
+ uint8_t dma_r(address_space &space, offs_t offset);
+ void dma_w(address_space &space, offs_t offset, uint8_t data);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ_LINE_MEMBER( ef1_r );
DECLARE_READ_LINE_MEMBER( ef3_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
@@ -131,16 +131,16 @@ public:
protected:
// runtime
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) { return 0xff; };
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) { };
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) { return 0xff; };
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) { };
- virtual UINT8 vip_io_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t vip_io_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) { };
- virtual UINT8 vip_dma_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t vip_dma_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) { };
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
virtual int vip_ef1_r() { return CLEAR_LINE; }
virtual int vip_ef3_r() { return CLEAR_LINE; }
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index dbf25a6a190..3d31b268c38 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -78,7 +78,7 @@ machine_config_constructor vp550_device::device_mconfig_additions() const
// vp550_device - constructor
//-------------------------------------------------
-vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP550, "VP550", tag, owner, clock, "vp550", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg_a(*this, CDP1863_A_TAG),
@@ -116,7 +116,7 @@ void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// vip_program_w - program write
//-------------------------------------------------
-void vp550_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp550_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (BIT(offset, 15))
{
diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h
index 99ba25b64fd..9f3f5a74fc7 100644
--- a/src/devices/bus/vip/vp550.h
+++ b/src/devices/bus/vip/vp550.h
@@ -28,7 +28,7 @@ class vp550_device : public device_t,
{
public:
// construction/destruction
- vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,7 +45,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_vip_expansion_card_interface overrides
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
virtual void vip_sc_w(int data) override;
virtual void vip_q_w(int state) override;
virtual void vip_run_w(int state) override;
diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp
index 42ec4119c21..1b8852438e7 100644
--- a/src/devices/bus/vip/vp570.cpp
+++ b/src/devices/bus/vip/vp570.cpp
@@ -59,7 +59,7 @@ ioport_constructor vp570_device::device_input_ports() const
// vp570_device - constructor
//-------------------------------------------------
-vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP570, "VP570", tag, owner, clock, "vp570", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -83,9 +83,9 @@ void vp570_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
offs_t base = m_base->read() << 12;
@@ -104,7 +104,7 @@ UINT8 vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, i
// vip_program_w - program write
//-------------------------------------------------
-void vp570_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp570_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
offs_t base = m_base->read() << 12;
diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h
index 745b96cff95..befde726eec 100644
--- a/src/devices/bus/vip/vp570.h
+++ b/src/devices/bus/vip/vp570.h
@@ -27,7 +27,7 @@ class vp570_device : public device_t,
{
public:
// construction/destruction
- vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp570_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;
@@ -37,11 +37,11 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
required_ioport m_base;
required_ioport m_sw1;
};
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 680a2a14369..6eaa17289f8 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -92,7 +92,7 @@ machine_config_constructor vp575_device::device_mconfig_additions() const
// vp575_device - constructor
//-------------------------------------------------
-vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP575, "VP575", tag, owner, clock, "vp575", __FILE__),
device_vip_expansion_card_interface(mconfig, *this)
{
@@ -124,9 +124,9 @@ void vp575_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -141,7 +141,7 @@ UINT8 vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, i
// vip_program_w - program write
//-------------------------------------------------
-void vp575_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp575_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
for (auto & elem : m_expansion_slot)
{
@@ -154,9 +154,9 @@ void vp575_device::vip_program_w(address_space &space, offs_t offset, UINT8 data
// vip_io_r - I/O read
//-------------------------------------------------
-UINT8 vp575_device::vip_io_r(address_space &space, offs_t offset)
+uint8_t vp575_device::vip_io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -171,7 +171,7 @@ UINT8 vp575_device::vip_io_r(address_space &space, offs_t offset)
// vip_io_w - I/O write
//-------------------------------------------------
-void vp575_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp575_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
for (auto & elem : m_expansion_slot)
{
@@ -184,9 +184,9 @@ void vp575_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
// vip_dma_r - DMA read
//-------------------------------------------------
-UINT8 vp575_device::vip_dma_r(address_space &space, offs_t offset)
+uint8_t vp575_device::vip_dma_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -201,7 +201,7 @@ UINT8 vp575_device::vip_dma_r(address_space &space, offs_t offset)
// vip_dma_w - DMA write
//-------------------------------------------------
-void vp575_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
+void vp575_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data)
{
for (auto & elem : m_expansion_slot)
{
@@ -214,9 +214,9 @@ void vp575_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
// vip_screen_update - screen update
//-------------------------------------------------
-UINT32 vp575_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vp575_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 data = 0;
+ uint32_t data = 0;
for (auto & elem : m_expansion_slot)
{
diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h
index a91bf188aef..05671cda9f8 100644
--- a/src/devices/bus/vip/vp575.h
+++ b/src/devices/bus/vip/vp575.h
@@ -35,7 +35,7 @@ class vp575_device : public device_t,
{
public:
// construction/destruction
- vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,13 +66,13 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
- virtual UINT8 vip_io_r(address_space &space, offs_t offset) override;
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 vip_dma_r(address_space &space, offs_t offset) override;
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
+ virtual uint8_t vip_io_r(address_space &space, offs_t offset) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t vip_dma_r(address_space &space, offs_t offset) override;
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
virtual int vip_ef1_r() override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp
index 81d73634fe1..d913c0ce497 100644
--- a/src/devices/bus/vip/vp585.cpp
+++ b/src/devices/bus/vip/vp585.cpp
@@ -79,7 +79,7 @@ ioport_constructor vp585_device::device_input_ports() const
// vp585_device - constructor
//-------------------------------------------------
-vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_j1(*this, "J1"),
@@ -103,7 +103,7 @@ void vp585_device::device_start()
// vip_io_w - I/O write
//-------------------------------------------------
-void vp585_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp585_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 0x02)
{
diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h
index 8ae23737b64..2390f2b3ab3 100644
--- a/src/devices/bus/vip/vp585.h
+++ b/src/devices/bus/vip/vp585.h
@@ -27,7 +27,7 @@ class vp585_device : public device_t,
{
public:
// construction/destruction
- vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp585_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;
@@ -37,7 +37,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
@@ -45,7 +45,7 @@ private:
required_ioport m_j1;
required_ioport m_j2;
- UINT8 m_keylatch;
+ uint8_t m_keylatch;
};
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index b9027a9c943..6f90c6d7473 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -136,7 +136,7 @@ ioport_constructor vp590_device::device_input_ports() const
// vp590_device - constructor
//-------------------------------------------------
-vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP590, "VP590", tag, owner, clock, "vp590", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_cgc(*this, CDP1862_TAG),
@@ -167,11 +167,11 @@ void vp590_device::device_start()
// vip_program_w - program write
//-------------------------------------------------
-void vp590_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp590_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (offset >= 0xc000 && offset < 0xe000)
{
- UINT8 mask = 0xff;
+ uint8_t mask = 0xff;
m_a12 = (offset & 0x1000) ? 1 : 0;
@@ -193,7 +193,7 @@ void vp590_device::vip_program_w(address_space &space, offs_t offset, UINT8 data
// vip_io_w - I/O write
//-------------------------------------------------
-void vp590_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp590_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -213,9 +213,9 @@ void vp590_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
// vip_dma_w - DMA write
//-------------------------------------------------
-void vp590_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
+void vp590_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data)
{
- UINT8 mask = 0xff;
+ uint8_t mask = 0xff;
if (!m_a12)
{
@@ -233,7 +233,7 @@ void vp590_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
// vip_screen_update - screen update
//-------------------------------------------------
-UINT32 vp590_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vp590_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
m_cgc->screen_update(screen, bitmap, cliprect);
diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h
index fe006db8e6d..d01630f3c59 100644
--- a/src/devices/bus/vip/vp590.h
+++ b/src/devices/bus/vip/vp590.h
@@ -29,7 +29,7 @@ class vp590_device : public device_t,
{
public:
// construction/destruction
- vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,22 +45,22 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
private:
required_device<cdp1862_device> m_cgc;
- optional_shared_ptr<UINT8> m_color_ram;
+ optional_shared_ptr<uint8_t> m_color_ram;
required_ioport m_j1;
required_ioport m_j2;
int m_a12;
- UINT8 m_color;
- UINT8 m_keylatch;
+ uint8_t m_color;
+ uint8_t m_keylatch;
};
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index d2ed10de18d..4e947245dd8 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -58,7 +58,7 @@ machine_config_constructor vp595_device::device_mconfig_additions() const
// vp595_device - constructor
//-------------------------------------------------
-vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP595, "VP595", tag, owner, clock, "vp595", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg(*this, CDP1863_TAG)
@@ -79,7 +79,7 @@ void vp595_device::device_start()
// vip_io_w - I/O write
//-------------------------------------------------
-void vp595_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp595_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 0x03)
{
diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h
index 43dcebd6d57..af1fde36094 100644
--- a/src/devices/bus/vip/vp595.h
+++ b/src/devices/bus/vip/vp595.h
@@ -28,7 +28,7 @@ class vp595_device : public device_t,
{
public:
// construction/destruction
- vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void vip_q_w(int state) override;
private:
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index 42a00b37444..45353701f27 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -61,7 +61,7 @@ machine_config_constructor vp620_device::device_mconfig_additions() const
// vp620_device - constructor
//-------------------------------------------------
-vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP620, "VP620", tag, owner, clock, "vp620", __FILE__),
device_vip_byteio_port_interface(mconfig, *this),
m_keydata(0),
@@ -83,7 +83,7 @@ void vp620_device::device_start()
// vip_in_r - byte input read
//-------------------------------------------------
-UINT8 vp620_device::vip_in_r()
+uint8_t vp620_device::vip_in_r()
{
return m_keydata;
}
diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h
index 036cf482e68..6d87bccc55e 100644
--- a/src/devices/bus/vip/vp620.h
+++ b/src/devices/bus/vip/vp620.h
@@ -28,7 +28,7 @@ class vp620_device : public device_t,
{
public:
// construction/destruction
- vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,11 +41,11 @@ protected:
virtual void device_start() override;
// device_vip_byteio_port_interface overrides
- virtual UINT8 vip_in_r() override;
+ virtual uint8_t vip_in_r() override;
virtual int vip_ef4_r() override;
private:
- UINT8 m_keydata;
+ uint8_t m_keydata;
int m_keystb;
};
diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp
index bfdfd488067..682913cfde4 100644
--- a/src/devices/bus/vip/vp700.cpp
+++ b/src/devices/bus/vip/vp700.cpp
@@ -45,7 +45,7 @@ const tiny_rom_entry *vp700_device::device_rom_region() const
// vp700_device - constructor
//-------------------------------------------------
-vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP700, "VP700", tag, owner, clock, "vp700", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_rom(*this, "vp700")
@@ -66,9 +66,9 @@ void vp700_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp700_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp700_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset < 0x1000)
{
diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h
index f3e515928a9..b305e27191d 100644
--- a/src/devices/bus/vip/vp700.h
+++ b/src/devices/bus/vip/vp700.h
@@ -28,7 +28,7 @@ class vp700_device : public device_t,
{
public:
// construction/destruction
- vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp700_device(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;
@@ -38,7 +38,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
private:
required_memory_region m_rom;