diff options
author | cracyc <cracyc@users.noreply.github.com> | 2020-02-21 11:16:09 -0600 |
---|---|---|
committer | cracyc <cracyc@users.noreply.github.com> | 2020-02-21 11:16:09 -0600 |
commit | efc6bca3414bcc3b08d6c5fe58ef6579cd1130df (patch) | |
tree | 7489ab8c5f63e16f71395624c59f4162b65164be /src/mame | |
parent | 21dae89c14eee07166748ab7d73560514e853ee1 (diff) |
peoplepc: graphics (nw)
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/peoplepc.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index cbbf889e7d2..a8fae02f078 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -30,6 +30,7 @@ public: m_flop0(*this, "upd765:0"), m_flop1(*this, "upd765:1"), m_dmac(*this, "i8257"), + m_crtc(*this, "h46505"), m_gfxdecode(*this, "gfxdecode"), m_gvram(*this, "gvram"), m_cvram(*this, "cvram"), @@ -48,6 +49,7 @@ private: required_device<floppy_connector> m_flop0; required_device<floppy_connector> m_flop1; required_device<i8257_device> m_dmac; + required_device<hd6845s_device> m_crtc; required_device<gfxdecode_device> m_gfxdecode; required_shared_ptr<uint16_t> m_gvram; required_shared_ptr<uint16_t> m_cvram; @@ -59,6 +61,7 @@ private: DECLARE_WRITE_LINE_MEMBER(tty_clock_tick_w); DECLARE_WRITE_LINE_MEMBER(kbd_clock_tick_w); DECLARE_WRITE8_MEMBER(dmapg_w); + DECLARE_WRITE8_MEMBER(p7c_w); DECLARE_WRITE_LINE_MEMBER(tc_w); DECLARE_WRITE_LINE_MEMBER(hrq_w); DECLARE_READ8_MEMBER(memory_read_byte); @@ -67,7 +70,7 @@ private: image_init_result floppy_load(floppy_image_device *dev); void floppy_unload(floppy_image_device *dev); - uint8_t m_dma0pg; + uint8_t m_dma0pg, m_p7c; void peoplepc_io(address_map &map); void peoplepc_map(address_map &map); @@ -95,13 +98,12 @@ MC6845_UPDATE_ROW(peoplepc_state::update_row) for(i = 0; i < x_count; i++) { - if(0) + if(BIT(m_p7c, 1)) { - uint16_t offset = ((ma | (ra << 1)) << 4) + i; - uint8_t data = m_gvram[offset] >> (offset & 1 ? 8 : 0); + uint16_t data = m_gvram[((((ma / 40) * 16) + ra) * 64) + i]; - for(j = 8; j >= 0; j--) - bitmap.pix32(y, (i * 8) + j) = palette[( data & 1 << j ) ? 1 : 0]; + for(j = 15; j >= 0; j--) + bitmap.pix32(y, (i * 16) + j) = palette[BIT(data, j)]; } else { @@ -112,7 +114,7 @@ MC6845_UPDATE_ROW(peoplepc_state::update_row) if((data & 0x800) && (ra > 14)) chr = 0xff; for(j = 0; j < 8; j++) - bitmap.pix32(y, (i * 8) + j) = palette[(chr & (1 << j)) ? 1 : 0]; + bitmap.pix32(y, (i * 8) + j) = palette[BIT(chr, j)]; } } } @@ -148,6 +150,12 @@ WRITE8_MEMBER(peoplepc_state::dmapg_w) m_dma0pg = data; } +WRITE8_MEMBER(peoplepc_state::p7c_w) +{ + m_p7c = data; + m_crtc->set_hpixels_per_column(BIT(data, 1) ? 16 : 8); +} + WRITE_LINE_MEMBER(peoplepc_state::tc_w) { m_fdc->tc_w(state); @@ -224,6 +232,7 @@ void peoplepc_state::peoplepc_io(address_map &map) map(0x006c, 0x006c).w("h46505", FUNC(mc6845_device::address_w)); map(0x006e, 0x006e).rw("h46505", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0070, 0x0070).w(FUNC(peoplepc_state::dmapg_w)); + map(0x007c, 0x007c).w(FUNC(peoplepc_state::p7c_w)); } static void peoplepc_floppies(device_slot_interface &device) @@ -282,11 +291,11 @@ void peoplepc_state::olypeopl(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfxdecode_device::empty); PALETTE(config, m_palette, palette_device::MONOCHROME); - mc6845_device &crtc(HD6845S(config, "h46505", XTAL(22'000'000)/8)); // HD46505SP according to User's Guide - crtc.set_screen("screen"); - crtc.set_show_border_area(false); - crtc.set_char_width(8); - crtc.set_update_row_callback(FUNC(peoplepc_state::update_row)); + HD6845S(config, m_crtc, XTAL(22'000'000)/8); // HD46505SP according to User's Guide + m_crtc->set_screen("screen"); + m_crtc->set_show_border_area(false); + m_crtc->set_char_width(8); + m_crtc->set_update_row_callback(FUNC(peoplepc_state::update_row)); I8257(config, m_dmac, XTAL(14'745'600)/3); m_dmac->out_hrq_cb().set(FUNC(peoplepc_state::hrq_w)); |