diff options
Diffstat (limited to 'src/mame/drivers/alphasma.cpp')
-rw-r--r-- | src/mame/drivers/alphasma.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 7d239676a02..8e2e440bcb9 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -47,7 +47,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_PALETTE_INIT(alphasmart); - virtual UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(kb_irq); DECLARE_READ8_MEMBER(kb_r); @@ -60,9 +60,9 @@ public: void update_lcdc(address_space &space, bool lcdc0, bool lcdc1); protected: - UINT8 m_matrix[2]; - UINT8 m_port_a; - UINT8 m_port_d; + uint8_t m_matrix[2]; + uint8_t m_port_a; + uint8_t m_port_d; std::unique_ptr<bitmap_ind16> m_tmp_bitmap; }; @@ -75,14 +75,14 @@ public: { } - required_shared_ptr<UINT8> m_intram; + required_shared_ptr<uint8_t> m_intram; DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); virtual DECLARE_WRITE8_MEMBER(port_a_w) override; private: - UINT8 m_lcd_ctrl; + uint8_t m_lcd_ctrl; }; INPUT_CHANGED_MEMBER(alphasmart_state::kb_irq) @@ -92,8 +92,8 @@ INPUT_CHANGED_MEMBER(alphasmart_state::kb_irq) READ8_MEMBER(alphasmart_state::kb_r) { - UINT16 matrix = (m_matrix[1]<<8) | m_matrix[0]; - UINT8 data = 0xff; + uint16_t matrix = (m_matrix[1]<<8) | m_matrix[0]; + uint8_t data = 0xff; for(int i=0; i<16; i++) if (!(matrix & (1<<i))) @@ -121,7 +121,7 @@ void alphasmart_state::update_lcdc(address_space &space, bool lcdc0, bool lcdc1) { if (m_matrix[1] & 0x04) { - UINT8 lcdc_data = 0; + uint8_t lcdc_data = 0; if (lcdc0) lcdc_data |= m_lcdc0->read(space, BIT(m_matrix[1], 1)); @@ -133,7 +133,7 @@ void alphasmart_state::update_lcdc(address_space &space, bool lcdc0, bool lcdc1) } else { - UINT8 lcdc_data = (m_port_d<<2) & 0xf0; + uint8_t lcdc_data = (m_port_d<<2) & 0xf0; if (lcdc0) m_lcdc0->write(space, BIT(m_matrix[1], 1), lcdc_data); @@ -145,7 +145,7 @@ void alphasmart_state::update_lcdc(address_space &space, bool lcdc0, bool lcdc1) WRITE8_MEMBER(alphasmart_state::port_a_w) { - UINT8 changed = (m_port_a ^ data) & data; + uint8_t changed = (m_port_a ^ data) & data; update_lcdc(space, changed & 0x80, changed & 0x20); m_rambank->set_entry(((data>>3) & 0x01) | ((data>>4) & 0x02)); m_port_a = data; @@ -193,7 +193,7 @@ WRITE8_MEMBER(asma2k_state::io_w) kb_matrixh_w(space, offset, data); else if (offset == 0x4000) { - UINT8 changed = (m_lcd_ctrl ^ data) & data; + uint8_t changed = (m_lcd_ctrl ^ data) & data; update_lcdc(space, changed & 0x01, changed & 0x02); m_lcd_ctrl = data; } @@ -390,7 +390,7 @@ PALETTE_INIT_MEMBER(alphasmart_state, alphasmart) palette.set_pen_color(1, rgb_t(92, 83, 88)); } -UINT32 alphasmart_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t alphasmart_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_lcdc0->screen_update(screen, *m_tmp_bitmap, cliprect); copybitmap(bitmap, *m_tmp_bitmap, 0, 0, 0, 0, cliprect); @@ -401,7 +401,7 @@ UINT32 alphasmart_state::screen_update(screen_device &screen, bitmap_ind16 &bitm void alphasmart_state::machine_start() { - UINT8* ram = m_ram->pointer(); + uint8_t* ram = m_ram->pointer(); m_rambank->configure_entries(0, 4, ram, 0x8000); m_nvram->set_base(ram, 0x8000*4); |