From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: 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 --- src/devices/bus/svi3x8/expander/expander.cpp | 2 +- src/devices/bus/svi3x8/expander/expander.h | 2 +- src/devices/bus/svi3x8/expander/sv601.cpp | 2 +- src/devices/bus/svi3x8/expander/sv601.h | 2 +- src/devices/bus/svi3x8/expander/sv602.cpp | 2 +- src/devices/bus/svi3x8/expander/sv602.h | 2 +- src/devices/bus/svi3x8/expander/sv603.cpp | 4 ++-- src/devices/bus/svi3x8/expander/sv603.h | 2 +- src/devices/bus/svi3x8/slot/slot.cpp | 8 ++++---- src/devices/bus/svi3x8/slot/slot.h | 4 ++-- src/devices/bus/svi3x8/slot/sv801.cpp | 2 +- src/devices/bus/svi3x8/slot/sv801.h | 2 +- src/devices/bus/svi3x8/slot/sv802.cpp | 2 +- src/devices/bus/svi3x8/slot/sv802.h | 2 +- src/devices/bus/svi3x8/slot/sv803.cpp | 4 ++-- src/devices/bus/svi3x8/slot/sv803.h | 4 ++-- src/devices/bus/svi3x8/slot/sv805.cpp | 2 +- src/devices/bus/svi3x8/slot/sv805.h | 2 +- src/devices/bus/svi3x8/slot/sv806.cpp | 6 +++--- src/devices/bus/svi3x8/slot/sv806.h | 4 ++-- src/devices/bus/svi3x8/slot/sv807.cpp | 6 +++--- src/devices/bus/svi3x8/slot/sv807.h | 6 +++--- 22 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/devices/bus/svi3x8') diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp index 4ce0145f667..176b697a634 100644 --- a/src/devices/bus/svi3x8/expander/expander.cpp +++ b/src/devices/bus/svi3x8/expander/expander.cpp @@ -26,7 +26,7 @@ const device_type SVI_EXPANDER = &device_creator; // svi_expander_device - constructor //------------------------------------------------- -svi_expander_device::svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +svi_expander_device::svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SVI_EXPANDER, "SVI 318/328 Expander Bus", tag, owner, clock, "svi_expander", __FILE__), device_slot_interface(mconfig, *this), m_module(nullptr), diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h index 98c2b8af348..9dc4a76422b 100644 --- a/src/devices/bus/svi3x8/expander/expander.h +++ b/src/devices/bus/svi3x8/expander/expander.h @@ -83,7 +83,7 @@ class svi_expander_device : public device_t, public device_slot_interface { public: // construction/destruction - svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~svi_expander_device(); // callbacks diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp index 6f29b12b6e2..60b116e0a72 100644 --- a/src/devices/bus/svi3x8/expander/sv601.cpp +++ b/src/devices/bus/svi3x8/expander/sv601.cpp @@ -48,7 +48,7 @@ machine_config_constructor sv601_device::device_mconfig_additions() const // sv601_device - constructor //------------------------------------------------- -sv601_device::sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv601_device::sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV601, "SV-601 Super Expander", tag, owner, clock, "sv601", __FILE__), device_svi_expander_interface(mconfig, *this), m_slotbus(*this, "slotbus") diff --git a/src/devices/bus/svi3x8/expander/sv601.h b/src/devices/bus/svi3x8/expander/sv601.h index 1e0eb86c507..3db3719b884 100644 --- a/src/devices/bus/svi3x8/expander/sv601.h +++ b/src/devices/bus/svi3x8/expander/sv601.h @@ -26,7 +26,7 @@ class sv601_device : public device_t, public device_svi_expander_interface { public: // construction/destruction - sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from slots WRITE_LINE_MEMBER( int_w ); diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp index aef20a8e464..1a05777cb8e 100644 --- a/src/devices/bus/svi3x8/expander/sv602.cpp +++ b/src/devices/bus/svi3x8/expander/sv602.cpp @@ -42,7 +42,7 @@ machine_config_constructor sv602_device::device_mconfig_additions() const // sv602_device - constructor //------------------------------------------------- -sv602_device::sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv602_device::sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV602, "SV-602 Single Slot Expander", tag, owner, clock, "sv602", __FILE__), device_svi_expander_interface(mconfig, *this), m_slotbus(*this, "slotbus") diff --git a/src/devices/bus/svi3x8/expander/sv602.h b/src/devices/bus/svi3x8/expander/sv602.h index 2026302d293..0abaccd6d4d 100644 --- a/src/devices/bus/svi3x8/expander/sv602.h +++ b/src/devices/bus/svi3x8/expander/sv602.h @@ -26,7 +26,7 @@ class sv602_device : public device_t, public device_svi_expander_interface { public: // construction/destruction - sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from slots WRITE_LINE_MEMBER( int_w ); diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index f6baca7d2ac..1adc323377e 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -59,7 +59,7 @@ machine_config_constructor sv603_device::device_mconfig_additions() const DEVICE_IMAGE_LOAD_MEMBER( sv603_device, cartridge ) { - UINT32 size = m_cart_rom->common_get_size("rom"); + uint32_t size = m_cart_rom->common_get_size("rom"); m_cart_rom->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart_rom->common_load_rom(m_cart_rom->get_rom_base(), size, "rom"); @@ -76,7 +76,7 @@ DEVICE_IMAGE_LOAD_MEMBER( sv603_device, cartridge ) // sv603_device - constructor //------------------------------------------------- -sv603_device::sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv603_device::sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV603, "SV-603 Coleco Game Adapter", tag, owner, clock, "sv603", __FILE__), device_svi_expander_interface(mconfig, *this), m_bios(*this, "bios"), diff --git a/src/devices/bus/svi3x8/expander/sv603.h b/src/devices/bus/svi3x8/expander/sv603.h index eb58a51b003..aec93de11a0 100644 --- a/src/devices/bus/svi3x8/expander/sv603.h +++ b/src/devices/bus/svi3x8/expander/sv603.h @@ -28,7 +28,7 @@ class sv603_device : public device_t, public device_svi_expander_interface { public: // construction/destruction - sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from host virtual DECLARE_READ8_MEMBER( mreq_r ) override; diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp index d713f2d3322..87564889d82 100644 --- a/src/devices/bus/svi3x8/slot/slot.cpp +++ b/src/devices/bus/svi3x8/slot/slot.cpp @@ -19,7 +19,7 @@ const device_type SVI_SLOT_BUS = &device_creator; // svi_slot_bus_device - constructor //------------------------------------------------- -svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SVI_SLOT_BUS, "SVI Slot Bus", tag, owner, clock, "svislotbus", __FILE__), m_int_handler(*this), m_romdis_handler(*this), @@ -73,7 +73,7 @@ void svi_slot_bus_device::add_card(device_svi_slot_interface *card) READ8_MEMBER( svi_slot_bus_device::mreq_r ) { device_svi_slot_interface *entry = m_dev.first(); - UINT8 data = 0xff; + uint8_t data = 0xff; while (entry) { @@ -106,7 +106,7 @@ WRITE8_MEMBER( svi_slot_bus_device::mreq_w ) READ8_MEMBER( svi_slot_bus_device::iorq_r ) { device_svi_slot_interface *entry = m_dev.first(); - UINT8 data = 0xff; + uint8_t data = 0xff; while (entry) { @@ -203,7 +203,7 @@ const device_type SVI_SLOT = &device_creator; // svi_slot_device - constructor //------------------------------------------------- -svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SVI_SLOT, "SVI Slot", tag, owner, clock, "svislot", __FILE__), device_slot_interface(mconfig, *this), m_bus_tag(nullptr) diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h index f7f2be940ef..ba636d0e9cc 100644 --- a/src/devices/bus/svi3x8/slot/slot.h +++ b/src/devices/bus/svi3x8/slot/slot.h @@ -76,7 +76,7 @@ class svi_slot_bus_device : public device_t { public: // construction/destruction - svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~svi_slot_bus_device(); // callbacks @@ -128,7 +128,7 @@ class svi_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // inline configuration static void set_bus(device_t &device, device_t *owner, const char *bus_tag); diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index bccfd1539eb..892d8047ad5 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -55,7 +55,7 @@ machine_config_constructor sv801_device::device_mconfig_additions() const // sv801_device - constructor //------------------------------------------------- -sv801_device::sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv801_device::sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV801, "SV-801 Disk Controller", tag, owner, clock, "sv801", __FILE__), device_svi_slot_interface(mconfig, *this), m_fdc(*this, "fdc"), diff --git a/src/devices/bus/svi3x8/slot/sv801.h b/src/devices/bus/svi3x8/slot/sv801.h index 2f670f05ad1..e3354faeff6 100644 --- a/src/devices/bus/svi3x8/slot/sv801.h +++ b/src/devices/bus/svi3x8/slot/sv801.h @@ -27,7 +27,7 @@ class sv801_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp index adeed63588b..710d17e4971 100644 --- a/src/devices/bus/svi3x8/slot/sv802.cpp +++ b/src/devices/bus/svi3x8/slot/sv802.cpp @@ -41,7 +41,7 @@ machine_config_constructor sv802_device::device_mconfig_additions() const // sv802_device - constructor //------------------------------------------------- -sv802_device::sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv802_device::sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV805, "SV-802 Centronics Printer Interface", tag, owner, clock, "sv802", __FILE__), device_svi_slot_interface(mconfig, *this), m_centronics(*this, "centronics"), diff --git a/src/devices/bus/svi3x8/slot/sv802.h b/src/devices/bus/svi3x8/slot/sv802.h index 0b363c035ed..3950ce05274 100644 --- a/src/devices/bus/svi3x8/slot/sv802.h +++ b/src/devices/bus/svi3x8/slot/sv802.h @@ -27,7 +27,7 @@ class sv802_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual DECLARE_READ8_MEMBER( iorq_r ) override; virtual DECLARE_WRITE8_MEMBER( iorq_w ) override; diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp index 8db3cf1f601..a8665b04ab8 100644 --- a/src/devices/bus/svi3x8/slot/sv803.cpp +++ b/src/devices/bus/svi3x8/slot/sv803.cpp @@ -24,11 +24,11 @@ const device_type SV803 = &device_creator; // sv803_device - constructor //------------------------------------------------- -sv803_device::sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv803_device::sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV803, "SV-803 16k RAM Cartridge", tag, owner, clock, "sv803", __FILE__), device_svi_slot_interface(mconfig, *this) { - m_ram = std::make_unique(0x4000); + m_ram = std::make_unique(0x4000); memset(m_ram.get(), 0xff, 0x4000); } diff --git a/src/devices/bus/svi3x8/slot/sv803.h b/src/devices/bus/svi3x8/slot/sv803.h index 9dea0ea9180..b930e647cdc 100644 --- a/src/devices/bus/svi3x8/slot/sv803.h +++ b/src/devices/bus/svi3x8/slot/sv803.h @@ -25,7 +25,7 @@ class sv803_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual DECLARE_READ8_MEMBER( mreq_r ) override; virtual DECLARE_WRITE8_MEMBER( mreq_w ) override; @@ -35,7 +35,7 @@ protected: virtual void device_reset() override; private: - std::unique_ptr m_ram; + std::unique_ptr m_ram; }; // device type definition diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp index 71ba5b69820..2eb1e217671 100644 --- a/src/devices/bus/svi3x8/slot/sv805.cpp +++ b/src/devices/bus/svi3x8/slot/sv805.cpp @@ -48,7 +48,7 @@ machine_config_constructor sv805_device::device_mconfig_additions() const // sv805_device - constructor //------------------------------------------------- -sv805_device::sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv805_device::sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV805, "SV-805 RS-232 Interface", tag, owner, clock, "sv805", __FILE__), device_svi_slot_interface(mconfig, *this), m_uart(*this, "uart"), diff --git a/src/devices/bus/svi3x8/slot/sv805.h b/src/devices/bus/svi3x8/slot/sv805.h index 6d64ef54256..fda554f901c 100644 --- a/src/devices/bus/svi3x8/slot/sv805.h +++ b/src/devices/bus/svi3x8/slot/sv805.h @@ -27,7 +27,7 @@ class sv805_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual DECLARE_READ8_MEMBER( iorq_r ) override; virtual DECLARE_WRITE8_MEMBER( iorq_w ) override; diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp index 87f35b268f7..13b0ebd105d 100644 --- a/src/devices/bus/svi3x8/slot/sv806.cpp +++ b/src/devices/bus/svi3x8/slot/sv806.cpp @@ -64,7 +64,7 @@ machine_config_constructor sv806_device::device_mconfig_additions() const // sv806_device - constructor //------------------------------------------------- -sv806_device::sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv806_device::sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV806, "SV-806 80 Column Cartridge", tag, owner, clock, "sv806", __FILE__), device_svi_slot_interface(mconfig, *this), m_crtc(*this, "crtc"), @@ -72,7 +72,7 @@ sv806_device::sv806_device(const machine_config &mconfig, const char *tag, devic m_gfx(*this, "gfx"), m_ram_enabled(0) { - m_ram = std::make_unique(0x800); + m_ram = std::make_unique(0x800); memset(m_ram.get(), 0xff, 0x800); } @@ -98,7 +98,7 @@ MC6845_UPDATE_ROW( sv806_device::crtc_update_row ) for (int i = 0; i < x_count; i++) { - UINT8 data = m_gfx->u8((m_ram[(ma + i) & 0x7ff] << 4) | ra); + uint8_t data = m_gfx->u8((m_ram[(ma + i) & 0x7ff] << 4) | ra); if (i == cursor_x) data = 0xff; diff --git a/src/devices/bus/svi3x8/slot/sv806.h b/src/devices/bus/svi3x8/slot/sv806.h index 2a3071ed8ec..336a2ea99d7 100644 --- a/src/devices/bus/svi3x8/slot/sv806.h +++ b/src/devices/bus/svi3x8/slot/sv806.h @@ -26,7 +26,7 @@ class sv806_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual DECLARE_READ8_MEMBER( mreq_r ) override; virtual DECLARE_WRITE8_MEMBER( mreq_w ) override; @@ -45,7 +45,7 @@ private: required_device m_palette; required_memory_region m_gfx; - std::unique_ptr m_ram; + std::unique_ptr m_ram; int m_ram_enabled; }; diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp index 4f55f6c8e30..17cd09f603f 100644 --- a/src/devices/bus/svi3x8/slot/sv807.cpp +++ b/src/devices/bus/svi3x8/slot/sv807.cpp @@ -75,14 +75,14 @@ ioport_constructor sv807_device::device_input_ports() const // sv807_device - constructor //------------------------------------------------- -sv807_device::sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sv807_device::sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SV803, "SV-807 64k RAM Cartridge", tag, owner, clock, "sv807", __FILE__), device_svi_slot_interface(mconfig, *this), m_switch(*this, "S"), m_bk21(1), m_bk22(1), m_bk31(1), m_bk32(1) { - m_ram_bank1 = std::make_unique(0x8000); - m_ram_bank2 = std::make_unique(0x8000); + m_ram_bank1 = std::make_unique(0x8000); + m_ram_bank2 = std::make_unique(0x8000); memset(m_ram_bank1.get(), 0xff, 0x8000); memset(m_ram_bank2.get(), 0xff, 0x8000); } diff --git a/src/devices/bus/svi3x8/slot/sv807.h b/src/devices/bus/svi3x8/slot/sv807.h index deebb9bf79e..1e2139372d5 100644 --- a/src/devices/bus/svi3x8/slot/sv807.h +++ b/src/devices/bus/svi3x8/slot/sv807.h @@ -25,7 +25,7 @@ class sv807_device : public device_t, public device_svi_slot_interface { public: // construction/destruction - sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sv807_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; @@ -45,8 +45,8 @@ protected: private: required_ioport m_switch; - std::unique_ptr m_ram_bank1; - std::unique_ptr m_ram_bank2; + std::unique_ptr m_ram_bank1; + std::unique_ptr m_ram_bank2; int m_bk21; int m_bk22; -- cgit v1.2.3-70-g09d2