summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/odyssey2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/odyssey2.cpp')
-rw-r--r--src/mame/drivers/odyssey2.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp
index e3b4e65ea48..dcac941e74d 100644
--- a/src/mame/drivers/odyssey2.cpp
+++ b/src/mame/drivers/odyssey2.cpp
@@ -35,10 +35,10 @@ public:
required_device<i8244_device> m_i8244;
required_device<o2_cart_slot_device> m_cart;
- UINT8 m_ram[256];
- UINT8 m_p1;
- UINT8 m_p2;
- UINT8 m_lum;
+ uint8_t m_ram[256];
+ uint8_t m_p1;
+ uint8_t m_p2;
+ uint8_t m_lum;
DECLARE_READ8_MEMBER(io_read);
DECLARE_WRITE8_MEMBER(io_write);
DECLARE_READ8_MEMBER(bus_read);
@@ -52,20 +52,20 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
DECLARE_PALETTE_INIT(odyssey2);
- UINT32 screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE16_MEMBER(scanline_postprocess);
protected:
/* constants */
- static const UINT8 P1_BANK_LO_BIT = 0x01;
- static const UINT8 P1_BANK_HI_BIT = 0x02;
- static const UINT8 P1_KEYBOARD_SCAN_ENABLE = 0x04; /* active low */
- static const UINT8 P1_VDC_ENABLE = 0x08; /* active low */
- static const UINT8 P1_EXT_RAM_ENABLE = 0x10; /* active low */
- static const UINT8 P1_VPP_ENABLE = 0x20; /* active low */
- static const UINT8 P1_VDC_COPY_MODE_ENABLE = 0x40;
- static const UINT8 P2_KEYBOARD_SELECT_MASK = 0x07; /* select row to scan */
+ static const uint8_t P1_BANK_LO_BIT = 0x01;
+ static const uint8_t P1_BANK_HI_BIT = 0x02;
+ static const uint8_t P1_KEYBOARD_SCAN_ENABLE = 0x04; /* active low */
+ static const uint8_t P1_VDC_ENABLE = 0x08; /* active low */
+ static const uint8_t P1_EXT_RAM_ENABLE = 0x10; /* active low */
+ static const uint8_t P1_VPP_ENABLE = 0x20; /* active low */
+ static const uint8_t P1_VDC_COPY_MODE_ENABLE = 0x40;
+ static const uint8_t P2_KEYBOARD_SELECT_MASK = 0x07; /* select row to scan */
required_ioport_array<6> m_keyboard;
required_ioport_array<2> m_joysticks;
@@ -93,8 +93,8 @@ public:
DECLARE_WRITE16_MEMBER(scanline_postprocess);
protected:
- UINT8 m_ic674_decode[8];
- UINT8 m_ic678_decode[8];
+ uint8_t m_ic674_decode[8];
+ uint8_t m_ic678_decode[8];
};
@@ -212,7 +212,7 @@ INPUT_PORTS_END
light back / grid colors
black, blue, green, light green, red, violet, yellow, light grey */
-const UINT8 odyssey2_colors[] =
+const uint8_t odyssey2_colors[] =
{
/* Background,Grid Dim */
0x00,0x00,0x00, /* Black */ // i r g b
@@ -247,7 +247,7 @@ PALETTE_INIT_MEMBER(odyssey2_state, odyssey2)
PALETTE_INIT_MEMBER(g7400_state, g7400)
{
- const UINT8 g7400_colors[] =
+ const uint8_t g7400_colors[] =
{
0x00,0x00,0x00, // Black
0x1A,0x37,0xBE, // Blue
@@ -277,7 +277,7 @@ PALETTE_INIT_MEMBER(g7400_state, g7400)
DRIVER_INIT_MEMBER(odyssey2_state,odyssey2)
{
- UINT8 *gfx = memregion("gfx1")->base();
+ uint8_t *gfx = memregion("gfx1")->base();
for (int i = 0; i < 256; i++)
{
@@ -438,7 +438,7 @@ WRITE16_MEMBER(g7400_state::scanline_postprocess)
int x_real_end = i8244_device::END_ACTIVE_SCAN - i8244_device::BORDER_SIZE + 5;
for ( int x = i8244_device::START_ACTIVE_SCAN; x < i8244_device::END_ACTIVE_SCAN; x++ )
{
- UINT16 d = bitmap->pix16( vpos, x );
+ uint16_t d = bitmap->pix16( vpos, x );
if ( ( ! m_ic678_decode[ d & 0x07 ] ) && x >= x_real_start && x < x_real_end && y >= 0 && y < 240 )
{
@@ -460,7 +460,7 @@ WRITE16_MEMBER(g7400_state::scanline_postprocess)
}
-UINT32 odyssey2_state::screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t odyssey2_state::screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
return m_i8244->screen_update(screen, bitmap, cliprect);
}
@@ -478,7 +478,7 @@ READ8_MEMBER(odyssey2_state::t1_read)
READ8_MEMBER(odyssey2_state::p1_read)
{
- UINT8 data = m_p1;
+ uint8_t data = m_p1;
return data;
}
@@ -494,7 +494,7 @@ WRITE8_MEMBER(odyssey2_state::p1_write)
READ8_MEMBER(odyssey2_state::p2_read)
{
- UINT8 h = 0xFF;
+ uint8_t h = 0xFF;
int i, j;
if (!(m_p1 & P1_KEYBOARD_SCAN_ENABLE))
@@ -544,7 +544,7 @@ WRITE8_MEMBER(g7400_state::p2_write)
READ8_MEMBER(odyssey2_state::bus_read)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if ((m_p2 & P2_KEYBOARD_SELECT_MASK) == 1)
{