diff options
author | Robbbert <Robbbert@users.noreply.github.com> | 2017-02-14 15:53:07 +1100 |
---|---|---|
committer | Robbbert <Robbbert@users.noreply.github.com> | 2017-02-14 15:53:07 +1100 |
commit | 2654773c5f7cdcd5ae44d35c391a9972cad11121 (patch) | |
tree | 4365ff504aa913475825a967c8f0e594b9d85542 /src/mame/drivers/alphatro.cpp | |
parent | ff1c7e85fa20a2d21de80a3c22cdbbb8c1777c6a (diff) |
(nw) Finished converting m_p_chargen to required region, and associated cleanups.
Diffstat (limited to 'src/mame/drivers/alphatro.cpp')
-rw-r--r-- | src/mame/drivers/alphatro.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index 81a44ad2160..10960dd493d 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -61,13 +61,14 @@ public: alphatro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") + , m_p_chargen(*this, "chargen") , m_maincpu(*this, "maincpu") , m_crtc(*this, "crtc") , m_usart(*this, "usart") , m_cass(*this, "cassette") , m_beep(*this, "beeper") - , m_p_ram(*this, "main_ram"), - m_palette(*this, "palette") + , m_p_ram(*this, "main_ram") + , m_palette(*this, "palette") { } DECLARE_READ8_MEMBER(port10_r); @@ -79,27 +80,25 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_c); TIMER_DEVICE_CALLBACK_MEMBER(timer_p); MC6845_UPDATE_ROW(crtc_update_row); - required_shared_ptr<uint8_t> m_p_videoram; - uint8_t *m_p_chargen; - uint8_t m_flashcnt; private: - uint8_t m_timer_bit; - uint8_t m_cass_data[4]; + required_shared_ptr<u8> m_p_videoram; + u8 m_flashcnt; + u8 m_timer_bit; + u8 m_cass_data[4]; bool m_cass_state; bool m_cassold; emu_timer* m_sys_timer; - virtual void video_start() override; virtual void machine_start() override; virtual void machine_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + required_region_ptr<u8> m_p_chargen; required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; required_device<i8251_device> m_usart; required_device<cassette_image_device> m_cass; required_device<beep_device> m_beep; - required_shared_ptr<uint8_t> m_p_ram; -public: + required_shared_ptr<u8> m_p_ram; required_device<palette_device> m_palette; }; @@ -151,20 +150,15 @@ WRITE_LINE_MEMBER( alphatro_state::write_usart_clock ) m_usart->write_rxc(state); } -void alphatro_state::video_start() -{ - m_p_chargen = memregion("chargen")->base(); -} - MC6845_UPDATE_ROW( alphatro_state::crtc_update_row ) { const rgb_t *pens = m_palette->palette()->entry_list_raw(); bool palette = BIT(ioport("CONFIG")->read(), 5); if (y==0) m_flashcnt++; bool inv; - uint8_t chr,gfx,attr,bg,fg; - uint16_t mem,x; - uint32_t *p = &bitmap.pix32(y); + u8 chr,gfx,attr,bg,fg; + u16 mem,x; + u32 *p = &bitmap.pix32(y); for (x = 0; x < x_count; x++) { @@ -191,7 +185,7 @@ MC6845_UPDATE_ROW( alphatro_state::crtc_update_row ) if (inv) { - uint8_t t = bg; + u8 t = bg; bg = fg; fg = t; } @@ -381,7 +375,7 @@ void alphatro_state::machine_start() void alphatro_state::machine_reset() { // do what the IPL does - uint8_t* ROM = memregion("roms")->base(); + u8* ROM = memregion("roms")->base(); m_maincpu->set_pc(0xe000); // If BASIC is missing then it boots into the Monitor memcpy(m_p_ram, ROM, 0x6000); // Copy BASIC to RAM @@ -434,7 +428,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(alphatro_state::timer_p) { /* cassette - turn 1200/2400Hz to a bit */ m_cass_data[1]++; - uint8_t cass_ws = (m_cass->input() > +0.03) ? 1 : 0; + u8 cass_ws = (m_cass->input() > +0.03) ? 1 : 0; if (cass_ws != m_cass_data[0]) { |