diff options
Diffstat (limited to 'src/mame/drivers/d6800.cpp')
-rw-r--r-- | src/mame/drivers/d6800.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 3302f68dbc8..800d7c4a4c5 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -72,7 +72,7 @@ public: DECLARE_READ8_MEMBER( d6800_keyboard_r ); DECLARE_WRITE8_MEMBER( d6800_keyboard_w ); DECLARE_WRITE_LINE_MEMBER( d6800_screen_w ); - UINT32 screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(d6800_c); TIMER_DEVICE_CALLBACK_MEMBER(d6800_p); DECLARE_QUICKLOAD_LOAD_MEMBER( d6800 ); @@ -81,7 +81,7 @@ protected: required_device<cassette_image_device> m_cass; required_device<pia6821_device> m_pia; required_device<beep_device> m_beeper; - required_shared_ptr<UINT8> m_videoram; + required_shared_ptr<uint8_t> m_videoram; required_ioport m_io_x0; required_ioport m_io_x1; required_ioport m_io_x2; @@ -92,11 +92,11 @@ protected: required_ioport m_io_y3; required_ioport m_io_shift; private: - UINT8 m_rtc; + uint8_t m_rtc; bool m_cb2; bool m_cassold; - UINT8 m_cass_data[4]; - UINT8 m_portb; + uint8_t m_cass_data[4]; + uint8_t m_portb; virtual void machine_start() override; virtual void machine_reset() override; }; @@ -181,13 +181,13 @@ INPUT_PORTS_END /* Video */ -UINT32 d6800_state::screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t d6800_state::screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - UINT8 x,y,gfx=0; + uint8_t x,y,gfx=0; for (y = 0; y < 32; y++) { - UINT16 *p = &bitmap.pix16(y); + uint16_t *p = &bitmap.pix16(y); for (x = 0; x < 8; x++) { @@ -233,7 +233,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(d6800_state::d6800_p) if (m_rtc > 159) m_rtc = 0; - UINT8 data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read(); + uint8_t data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read(); int ca1 = (data == 255) ? 0 : 1; int ca2 = m_io_shift->read(); int cb1 = (m_rtc) ? 1 : 0; @@ -244,7 +244,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(d6800_state::d6800_p) /* cassette - turn 1200/2400Hz to a bit */ m_cass_data[1]++; - UINT8 cass_ws = (m_cass->input() > +0.03) ? 1 : 0; + uint8_t cass_ws = (m_cass->input() > +0.03) ? 1 : 0; if (cass_ws != m_cass_data[0]) { @@ -294,7 +294,7 @@ READ8_MEMBER( d6800_state::d6800_keyboard_r ) lines around and reads it another way. This isolates the key that was pressed. */ - UINT8 data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read() + uint8_t data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read() & m_io_y0->read() & m_io_y1->read() & m_io_y2->read() & m_io_y3->read(); return data; @@ -344,7 +344,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) int quick_addr = 0x200; int exec_addr = 0xc000; int quick_length; - std::vector<UINT8> quick_data; + std::vector<uint8_t> quick_data; int read_; image_init_result result = image_init_result::FAIL; |