diff options
Diffstat (limited to 'src/mame/drivers/sapi1.cpp')
-rw-r--r-- | src/mame/drivers/sapi1.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index a389456c315..bd4a9591b7e 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -58,7 +58,7 @@ public: { } - optional_shared_ptr<UINT8> m_p_videoram; + optional_shared_ptr<uint8_t> m_p_videoram; DECLARE_READ8_MEMBER(sapi1_keyboard_r); DECLARE_WRITE8_MEMBER(sapi1_keyboard_w); DECLARE_READ8_MEMBER(sapi2_keyboard_status_r); @@ -74,13 +74,13 @@ public: DECLARE_MACHINE_RESET(sapi1); DECLARE_MACHINE_RESET(sapizps3); MC6845_UPDATE_ROW(crtc_update_row); - UINT32 screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - UINT32 screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); private: - UINT8 m_term_data; - UINT8 m_keyboard_mask; - UINT8 m_refresh_counter; - UINT8 m_zps3_25; + uint8_t m_term_data; + uint8_t m_keyboard_mask; + uint8_t m_refresh_counter; + uint8_t m_zps3_25; optional_memory_bank m_bank1; // Only for sapi3 required_ioport m_line0; required_ioport m_line1; @@ -92,7 +92,7 @@ public: optional_device<palette_device> m_palette; }; -static const UINT8 MHB2501[] = { +static const uint8_t MHB2501[] = { 0x0c,0x11,0x13,0x15,0x17,0x10,0x0e,0x00, // @ 0x04,0x0a,0x11,0x11,0x1f,0x11,0x11,0x00, // A 0x1e,0x11,0x11,0x1e,0x11,0x11,0x1e,0x00, // B @@ -301,11 +301,11 @@ INPUT_PORTS_END **************************************/ -UINT32 sapi1_state::screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t sapi1_state::screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bool val; - UINT16 addr,xpos; - UINT8 chr,attr,ra,x,y,b; + uint16_t addr,xpos; + uint8_t chr,attr,ra,x,y,b; for(y = 0; y < 24; y++ ) { @@ -354,11 +354,11 @@ UINT32 sapi1_state::screen_update_sapi1(screen_device &screen, bitmap_ind16 &bit } // The attributes seem to be different on this one, they need to be understood, so disabled for now -UINT32 sapi1_state::screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t sapi1_state::screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bool val; - UINT16 addr,xpos; - UINT8 chr,attr,ra,x,y,b; + uint16_t addr,xpos; + uint8_t chr,attr,ra,x,y,b; for(y = 0; y < 20; y++ ) { @@ -411,9 +411,9 @@ UINT32 sapi1_state::screen_update_sapi3(screen_device &screen, bitmap_ind16 &bit MC6845_UPDATE_ROW( sapi1_state::crtc_update_row ) { const rgb_t *palette = m_palette->palette()->entry_list_raw(); - UINT8 chr,gfx,inv; - UINT16 mem,x; - UINT32 *p = &bitmap.pix32(y); + uint8_t chr,gfx,inv; + uint16_t mem,x; + uint32_t *p = &bitmap.pix32(y); for (x = 0; x < x_count; x++) { @@ -443,7 +443,7 @@ MC6845_UPDATE_ROW( sapi1_state::crtc_update_row ) READ8_MEMBER( sapi1_state::sapi1_keyboard_r ) { - UINT8 key = 0xff; + uint8_t key = 0xff; if (BIT(m_keyboard_mask, 0)) { key &= m_line0->read(); } if (BIT(m_keyboard_mask, 1)) { key &= m_line1->read(); } if (BIT(m_keyboard_mask, 2)) { key &= m_line2->read(); } @@ -464,7 +464,7 @@ READ8_MEMBER( sapi1_state::sapi2_keyboard_status_r) READ8_MEMBER( sapi1_state::sapi2_keyboard_data_r) { - UINT8 ret = ~m_term_data; + uint8_t ret = ~m_term_data; m_term_data = 0; return ret; } @@ -516,19 +516,19 @@ MACHINE_RESET_MEMBER( sapi1_state, sapizps3 ) DRIVER_INIT_MEMBER( sapi1_state, sapizps3 ) { - UINT8 *RAM = memregion("maincpu")->base(); + uint8_t *RAM = memregion("maincpu")->base(); m_bank1->configure_entries(0, 2, &RAM[0x0000], 0x10000); } DRIVER_INIT_MEMBER( sapi1_state, sapizps3a ) { - UINT8 *RAM = memregion("maincpu")->base(); + uint8_t *RAM = memregion("maincpu")->base(); m_bank1->configure_entries(0, 2, &RAM[0x0000], 0xf800); } DRIVER_INIT_MEMBER( sapi1_state, sapizps3b ) { - UINT8 *RAM = memregion("maincpu")->base(); + uint8_t *RAM = memregion("maincpu")->base(); m_bank1->configure_entries(0, 2, &RAM[0x0000], 0x10000); } |