From a015a9d884a1e98a1ed4e4f5e87301c2ff3c6be6 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 23 Feb 2019 07:49:41 -0500 Subject: wy60: Populate and hook up a few things (nw) wy30p: Display is supposed to have 26 lines (nw) --- src/mame/drivers/wy30p.cpp | 2 +- src/mame/drivers/wy60.cpp | 73 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/mame/drivers/wy30p.cpp b/src/mame/drivers/wy30p.cpp index dfdf3f45873..3f4fe049978 100644 --- a/src/mame/drivers/wy30p.cpp +++ b/src/mame/drivers/wy30p.cpp @@ -93,7 +93,7 @@ void wy30p_state::wy30p(machine_config &config) EEPROM_ER5911_8BIT(config, m_eeprom); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(31.2795_MHz_XTAL * 2 / 3, 1050, 0, 800, 331, 0, 300); // divider and dimensions guessed + m_screen->set_raw(31.2795_MHz_XTAL * 2 / 3, 1050, 0, 800, 331, 0, 312); // divider and dimensions guessed m_screen->set_screen_update(FUNC(wy30p_state::screen_update)); } diff --git a/src/mame/drivers/wy60.cpp b/src/mame/drivers/wy60.cpp index 09381d15ba6..ef05208733c 100644 --- a/src/mame/drivers/wy60.cpp +++ b/src/mame/drivers/wy60.cpp @@ -10,6 +10,7 @@ #include "cpu/mcs51/mcs51.h" //#include "machine/i2cmem.h" #include "machine/mc2661.h" +#include "video/scn2674.h" #include "screen.h" class wy60_state : public driver_device @@ -17,7 +18,7 @@ class wy60_state : public driver_device public: wy60_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) - , m_screen(*this, "screen") + , m_pvtc(*this, "pvtc") , m_sio(*this, "sio") { } @@ -29,12 +30,18 @@ protected: virtual void driver_start() override; private: - u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + SCN2672_DRAW_CHARACTER_MEMBER(draw_character); + + u8 pvtc_r(offs_t offset); + void pvtc_w(offs_t offset, u8 data); + u8 sio_r(offs_t offset); + void sio_w(offs_t offset, u8 data); void prog_map(address_map &map); void ext_map(address_map &map); + void row_buffer_map(address_map &map); - required_device m_screen; + required_device m_pvtc; required_device m_sio; }; @@ -43,19 +50,49 @@ void wy60_state::machine_start() { } -u32 wy60_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +SCN2672_DRAW_CHARACTER_MEMBER(wy60_state::draw_character) { - return 0; +} + +u8 wy60_state::pvtc_r(offs_t offset) +{ + return m_pvtc->read(offset >> 8); +} + +void wy60_state::pvtc_w(offs_t offset, u8 data) +{ + m_pvtc->write(offset >> 8, data); +} + +u8 wy60_state::sio_r(offs_t offset) +{ + return m_sio->read(offset >> 8); +} + +void wy60_state::sio_w(offs_t offset, u8 data) +{ + m_sio->write(offset >> 8, data); } void wy60_state::prog_map(address_map &map) { // TODO: EA banking? - map(0x0000, 0xffff).rom().region("wyseprog", 0); + map(0x0000, 0xffff).rom().region("coderom", 0); } void wy60_state::ext_map(address_map &map) { + map(0x0000, 0x1fff).ram().share("charram"); + map(0x2000, 0x3fff).ram().share("attrram"); + map(0xa000, 0xa7ff).mirror(0x1800).rw(FUNC(wy60_state::pvtc_r), FUNC(wy60_state::pvtc_w)); + map(0xc000, 0xc3ff).mirror(0xc00).r(FUNC(wy60_state::sio_r)); + map(0xd000, 0xd3ff).mirror(0xc00).w(FUNC(wy60_state::sio_w)); +} + +void wy60_state::row_buffer_map(address_map &map) +{ + map.global_mask(0x0ff); + map(0x000, 0x0ff).ram(); } @@ -70,12 +107,22 @@ void wy60_state::wy60(machine_config &config) //X2404(config, m_eeprom); - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(26.58_MHz_XTAL, 1000, 0, 800, 443, 0, 416); // 26.580 kHz horizontal - //m_screen->set_raw(39.71_MHz_XTAL, 1494, 0, 1188, 443, 0, 416); - m_screen->set_screen_update(FUNC(wy60_state::screen_update)); + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_raw(26.58_MHz_XTAL, 1000, 0, 800, 443, 0, 416); // 26.580 kHz horizontal + //screen.set_raw(39.71_MHz_XTAL, 1494, 0, 1188, 443, 0, 416); + screen.set_screen_update("pvtc", FUNC(scn2672_device::screen_update)); + + SCN2672(config, m_pvtc, 26.58_MHz_XTAL / 10); // custom-marked as Motorola SC67336P (205001-02) + m_pvtc->set_screen("screen"); + m_pvtc->set_character_width(10); // 9 in 132-column mode + m_pvtc->set_addrmap(0, &wy60_state::row_buffer_map); + m_pvtc->set_addrmap(1, &wy60_state::row_buffer_map); + m_pvtc->set_display_callback(FUNC(wy60_state::draw_character)); + //m_pvtc->intr_callback().set_inputline("maincpu", MCS51_T0_LINE); + //m_pvtc->breq_callback().set_inputline("maincpu", MCS51_INT0_LINE); MC2661(config, m_sio, 4.9152_MHz_XTAL); // SCN2661B + //m_sio->rxrdy_handler().set_inputline("maincpu", MCS51_INT1_LINE); } // CPU: 8051(202008-03) @@ -90,7 +137,7 @@ ROM_START(wy60) ROM_REGION(0x1000, "maincpu", 0) ROM_LOAD("202008-03.bin", 0x0000, 0x1000, NO_DUMP) - ROM_REGION(0x10000, "wyseprog", 0) + ROM_REGION(0x10000, "coderom", 0) ROM_LOAD("193003-01.u9", 0x00000, 0x10000, CRC(26de0ea4) SHA1(91409f98a3990b514fbcb7de2eb45944bf5b95bc)) ROM_END @@ -98,13 +145,13 @@ ROM_START(wy60a) ROM_REGION(0x1000, "maincpu", 0) ROM_LOAD("202008-03.bin", 0x0000, 0x1000, NO_DUMP) - ROM_REGION(0x10000, "wyseprog", 0) + ROM_REGION(0x10000, "coderom", 0) ROM_LOAD("wy-60_4k.u6", 0x00000, 0x10000, CRC(6daf2824) SHA1(23cd039ec7ae71b0742e8eebf75be8cd5992e3fd)) ROM_END void wy60_state::driver_start() { - uint8_t *rom = memregion("wyseprog")->base(); + uint8_t *rom = memregion("coderom")->base(); for (offs_t base = 0x00000; base < 0x10000; base += 0x2000) { std::vector orig(&rom[base], &rom[base + 0x2000]); -- cgit v1.2.3