summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/studio2.cpp
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/mame/drivers/studio2.cpp
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/mame/drivers/studio2.cpp')
-rw-r--r--src/mame/drivers/studio2.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index fac2de99592..054ab581824 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -241,7 +241,7 @@ public:
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( studio2_cart_load );
/* keyboard state */
- UINT8 m_keylatch;
+ uint8_t m_keylatch;
};
class visicom_state : public studio2_state
@@ -253,10 +253,10 @@ public:
m_color1_ram(*this, "color1_ram")
{ }
- virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- required_shared_ptr<UINT8> m_color0_ram;
- required_shared_ptr<UINT8> m_color1_ram;
+ required_shared_ptr<uint8_t> m_color0_ram;
+ required_shared_ptr<uint8_t> m_color1_ram;
DECLARE_WRITE8_MEMBER( dma_w );
};
@@ -282,8 +282,8 @@ public:
DECLARE_READ_LINE_MEMBER( gdata_r );
/* video state */
- required_shared_ptr<UINT8> m_color_ram;
- UINT8 m_color;
+ required_shared_ptr<uint8_t> m_color_ram;
+ uint8_t m_color;
};
@@ -407,7 +407,7 @@ static const rgb_t VISICOM_PALETTE[] =
rgb_t(0xef, 0x45, 0x4a)
};
-UINT32 visicom_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t visicom_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
m_vdc->screen_update(screen, bitmap, cliprect);
@@ -458,9 +458,9 @@ WRITE8_MEMBER( visicom_state::dma_w )
int sx = m_screen->hpos() + 4;
int y = m_screen->vpos();
- UINT8 addr = offset & 0xff;
- UINT8 color0 = m_color0_ram[addr];
- UINT8 color1 = m_color1_ram[addr];
+ uint8_t addr = offset & 0xff;
+ uint8_t color0 = m_color0_ram[addr];
+ uint8_t color1 = m_color1_ram[addr];
for (int x = 0; x < 8; x++)
{
@@ -473,7 +473,7 @@ WRITE8_MEMBER( visicom_state::dma_w )
WRITE8_MEMBER( mpt02_state::dma_w )
{
- UINT8 addr = ((offset & 0xe0) >> 2) | (offset & 0x07);
+ uint8_t addr = ((offset & 0xe0) >> 2) | (offset & 0x07);
m_color = m_color_ram[addr];
@@ -528,7 +528,7 @@ void mpt02_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
{
- UINT32 size;
+ uint32_t size;
// always alloc 3K, even if range $400-$600 is not read by the system (RAM is present there)
m_cart->rom_alloc(0xc00, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
@@ -537,9 +537,9 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
{
if (image.is_filetype("st2"))
{
- UINT8 header[0x100];
- UINT8 catalogue[10], title[32], pages[64];
- UINT8 blocks;
+ uint8_t header[0x100];
+ uint8_t catalogue[10], title[32], pages[64];
+ uint8_t blocks;
if (image.length() <= 0x100)
{
@@ -568,7 +568,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
logerror("ST2 invalid block %u to %04x\n", block, pages[block] << 8);
else
{
- UINT16 offset = (pages[block] << 8) - 0x400;
+ uint16_t offset = (pages[block] << 8) - 0x400;
logerror("ST2 Reading block %u to %04x\n", block, offset);
image.fread(m_cart->get_rom_base() + offset, 0x100);
}