diff options
Diffstat (limited to 'src/mame/drivers/mpu4vid.cpp')
-rw-r--r-- | src/mame/drivers/mpu4vid.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index e2bcaf3a50d..1d69eb0ef83 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -202,16 +202,16 @@ TODO: struct ef9369_t { - UINT32 addr; - UINT16 clut[16]; /* 13-bits - a marking bit and a 444 color */ + uint32_t addr; + uint16_t clut[16]; /* 13-bits - a marking bit and a 444 color */ }; struct bt471_t { - UINT8 address; - UINT8 addr_cnt; - UINT8 pixmask; - UINT8 command; + uint8_t address; + uint8_t addr_cnt; + uint8_t pixmask; + uint8_t command; rgb_t color; }; @@ -236,8 +236,8 @@ public: required_device<m68000_base_device> m_videocpu; optional_device<scn2674_device> m_scn2674; - optional_shared_ptr<UINT16> m_vid_vidram; - optional_shared_ptr<UINT16> m_vid_mainram; + optional_shared_ptr<uint16_t> m_vid_vidram; + optional_shared_ptr<uint16_t> m_vid_mainram; required_device<acia6850_device> m_acia_0; required_device<acia6850_device> m_acia_1; required_device<ptm6840_device> m_ptm; @@ -249,10 +249,10 @@ public: struct bt471_t m_bt471; //Video - UINT8 m_m6840_irq_state; - UINT8 m_m6850_irq_state; + uint8_t m_m6840_irq_state; + uint8_t m_m6850_irq_state; int m_gfx_index; - INT8 m_cur[2]; + int8_t m_cur[2]; DECLARE_DRIVER_INIT(crmazea); @@ -404,8 +404,8 @@ SCN2674_DRAW_CHARACTER_MEMBER(mpu4vid_state::display_pixels) { if(!lg) { - UINT16 tile = m_vid_mainram[address & 0x7fff]; - const UINT8 *line = m_gfxdecode->gfx(m_gfx_index+0)->get_data(tile & 0xfff); + uint16_t tile = m_vid_mainram[address & 0x7fff]; + const uint8_t *line = m_gfxdecode->gfx(m_gfx_index+0)->get_data(tile & 0xfff); int offset = m_gfxdecode->gfx(m_gfx_index+0)->rowbytes() * linecount; for(int i = 0; i < 8; i++) bitmap.pix32(y, x + i) = (tile >> 12) ? m_palette->pen(line[offset + i]) : m_palette->black_pen(); @@ -441,7 +441,7 @@ VIDEO_START_MEMBER(mpu4vid_state,mpu4_vid) assert(m_gfx_index != MAX_GFX_ELEMENTS); /* create the char set (gfx will then be updated dynamically from RAM) */ - m_gfxdecode->set_gfx(m_gfx_index+0, std::make_unique<gfx_element>(*m_palette, mpu4_vid_char_8x8_layout, reinterpret_cast<UINT8 *>(m_vid_vidram.target()), NATIVE_ENDIAN_VALUE_LE_BE(8,0), m_palette->entries() / 16, 0)); + m_gfxdecode->set_gfx(m_gfx_index+0, std::make_unique<gfx_element>(*m_palette, mpu4_vid_char_8x8_layout, reinterpret_cast<uint8_t *>(m_vid_vidram.target()), NATIVE_ENDIAN_VALUE_LE_BE(8,0), m_palette->entries() / 16, 0)); } @@ -466,7 +466,7 @@ WRITE8_MEMBER(mpu4vid_state::ef9369_w ) /* Data register */ else { - UINT32 entry = pal.addr >> 1; + uint32_t entry = pal.addr >> 1; if ((pal.addr & 1) == 0) { @@ -475,7 +475,7 @@ WRITE8_MEMBER(mpu4vid_state::ef9369_w ) } else { - UINT16 col; + uint16_t col; pal.clut[entry] &= ~0x1f00; pal.clut[entry] |= (data & 0x1f) << 8; @@ -499,7 +499,7 @@ READ8_MEMBER(mpu4vid_state::ef9369_r ) struct ef9369_t &pal = m_pal; if ((offset & 1) == 0) { - UINT16 col = pal.clut[pal.addr >> 1]; + uint16_t col = pal.clut[pal.addr >> 1]; /* if ((pal.addr & 1) == 0) return col & 0xff; @@ -547,7 +547,7 @@ WRITE8_MEMBER(mpu4vid_state::bt471_w ) } case 0x1: { - UINT8 *addr_cnt = &bt471.addr_cnt; + uint8_t *addr_cnt = &bt471.addr_cnt; rgb_t *color = &bt471.color; color[*addr_cnt] = data; @@ -601,15 +601,15 @@ READ8_MEMBER(mpu4vid_state::pia_ic5_porta_track_r) LOG(("%s: IC5 PIA Read of Port A (AUX1)\n",machine().describe_context())); - UINT8 data = m_aux1_port->read(); + uint8_t data = m_aux1_port->read(); - INT8 dx = m_trackx_port->read(); - INT8 dy = m_tracky_port->read(); + int8_t dx = m_trackx_port->read(); + int8_t dy = m_tracky_port->read(); m_cur[0] = dy + dx; m_cur[1] = dy - dx; - UINT8 xa, xb, ya, yb; + uint8_t xa, xb, ya, yb; /* generate pulses for the input port (A and B are 1 unit out of phase for direction sensing)*/ xa = ((m_cur[0] + 1) & 3) <= 1; @@ -1795,7 +1795,7 @@ DRIVER_INIT_MEMBER(mpu4vid_state,cybcas) void mpu4vid_state::mpu4vid_char_cheat( int address) { - UINT8* cheattable = memregion( "video" )->base()+address; + uint8_t* cheattable = memregion( "video" )->base()+address; m_current_chr_table = blank_data; for (int i=0;i<72;i++) { |