summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-06-09 00:25:48 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-06-09 00:26:09 -0400
commit95830cc2582e09d585d86fe8367350c2ec94361e (patch)
treee2038d321e73cb21e99249ad6ee6088dc16e3c96
parent6ee703b76c31d0807764b591038c44c84fa58300 (diff)
a2videoterm & clones: Correct display/CRTC clocks and character widths (nw)
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp92
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h8
-rw-r--r--src/emu/xtal.cpp1
3 files changed, 94 insertions, 7 deletions
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 35cb657afd9..1d2d0b1fa20 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -48,8 +48,6 @@ DEFINE_DEVICE_TYPE(A2BUS_AEVIEWMASTER80, a2bus_aevm80_device, "a2aevm80", "Ap
#define VIDEOTERM_SCREEN_NAME "vterm_screen"
#define VIDEOTERM_MC6845_NAME "mc6845_vterm"
-#define MDA_CLOCK 16257000
-
ROM_START( a2videoterm )
ROM_REGION(0x400, VIDEOTERM_ROM_REGION, 0)
ROM_LOAD( "videx videoterm rom 2.4.bin", 0x000000, 0x000400, CRC(bbe3bb28) SHA1(bb653836e84850ce3197f461d4e19355f738cfbf) )
@@ -119,18 +117,63 @@ ROM_END
void a2bus_videx80_device::device_add_mconfig(machine_config &config)
{
- screen_device &screen(SCREEN(config, VIDEOTERM_SCREEN_NAME, SCREEN_TYPE_RASTER)); // 560x216? (80x24 7x9 characters)
- screen.set_raw(MDA_CLOCK, 882, 0, 720, 370, 0, 350);
+ screen_device &screen(SCREEN(config, VIDEOTERM_SCREEN_NAME, SCREEN_TYPE_RASTER));
+ screen.set_raw(17.43_MHz_XTAL, 1107, 0, 720, 315, 0, 216);
screen.set_screen_update(VIDEOTERM_MC6845_NAME, FUNC(mc6845_device::screen_update));
- MC6845(config, m_crtc, MDA_CLOCK/9);
+ HD6845S(config, m_crtc, 17.43_MHz_XTAL / 9);
m_crtc->set_screen(VIDEOTERM_SCREEN_NAME);
m_crtc->set_show_border_area(false);
- m_crtc->set_char_width(8);
+ m_crtc->set_char_width(9);
m_crtc->set_update_row_callback(FUNC(a2bus_videx80_device::crtc_update_row), this);
m_crtc->out_vsync_callback().set(FUNC(a2bus_videx80_device::vsync_changed));
}
+void a2bus_ap16_device::device_add_mconfig(machine_config &config)
+{
+ a2bus_videx80_device::device_add_mconfig(config);
+
+ subdevice<screen_device>(VIDEOTERM_SCREEN_NAME)->set_raw(16_MHz_XTAL, 1026, 0, 720, 313, 0, 216);
+
+ m_crtc->set_clock(16_MHz_XTAL / 9);
+}
+
+void a2bus_ap16alt_device::device_add_mconfig(machine_config &config)
+{
+ a2bus_videx80_device::device_add_mconfig(config);
+
+ subdevice<screen_device>(VIDEOTERM_SCREEN_NAME)->set_raw(18_MHz_XTAL, 1152, 0, 720, 315, 0, 216);
+
+ m_crtc->set_clock(18_MHz_XTAL / 9);
+}
+
+void a2bus_vtc1_device::device_add_mconfig(machine_config &config)
+{
+ a2bus_videx80_device::device_add_mconfig(config);
+
+ subdevice<screen_device>(VIDEOTERM_SCREEN_NAME)->set_raw(14'742'000, 945, 0, 720, 260, 0, 216); // clock uncertain
+
+ m_crtc->set_clock(14'742'000 / 9);
+}
+
+void a2bus_vtc2_device::device_add_mconfig(machine_config &config)
+{
+ a2bus_videx80_device::device_add_mconfig(config);
+
+ subdevice<screen_device>(VIDEOTERM_SCREEN_NAME)->set_raw(17.43_MHz_XTAL, 1116, 0, 720, 260, 0, 216);
+}
+
+void a2bus_aevm80_device::device_add_mconfig(machine_config &config)
+{
+ a2bus_videx80_device::device_add_mconfig(config);
+
+ subdevice<screen_device>(VIDEOTERM_SCREEN_NAME)->set_raw(18_MHz_XTAL, 1280, 0, 800, 234, 0, 216);
+
+ m_crtc->set_clock(18_MHz_XTAL / 10);
+ m_crtc->set_char_width(10);
+ m_crtc->set_update_row_callback(FUNC(a2bus_aevm80_device::crtc_update_row_alt), this);
+}
+
//-------------------------------------------------
// rom_region - device-specific ROM region
//-------------------------------------------------
@@ -355,6 +398,43 @@ MC6845_UPDATE_ROW( a2bus_videx80_device::crtc_update_row )
*p = palette[( data & 0x04 ) ? fg : bg]; p++;
*p = palette[( data & 0x02 ) ? fg : bg]; p++;
*p = palette[( data & 0x01 ) ? fg : bg]; p++;
+ *p = bg; p++;
+ }
+}
+
+MC6845_UPDATE_ROW( a2bus_videx80_device::crtc_update_row_alt )
+{
+ const rgb_t *palette = m_palette->palette()->entry_list_raw();
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ra; //( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ int i;
+
+ for ( i = 0; i < x_count; i++ )
+ {
+ uint16_t offset = ( ma + i ) & 0x7ff;
+ uint8_t chr = m_ram[ offset ];
+ uint8_t data = m_chrrom[ chr_base + chr * 16 ];
+ uint8_t fg = 15;
+ uint8_t bg = 0;
+
+ if ( i == cursor_x )
+ {
+ if ( m_framecnt & 0x08 )
+ {
+ data = 0xFF;
+ }
+ }
+
+ *p = palette[( data & 0x80 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x40 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x20 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x10 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x08 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x04 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x02 ) ? fg : bg]; p++;
+ *p = palette[( data & 0x01 ) ? fg : bg]; p++;
+ *p = bg; p++;
+ *p = bg; p++;
}
}
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 13d87dad602..9bf456aaae6 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -47,10 +47,11 @@ protected:
required_device<mc6845_device> m_crtc;
required_device<device_palette_interface> m_palette;
-private:
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
+ MC6845_UPDATE_ROW(crtc_update_row_alt);
+private:
int m_rambank;
};
@@ -67,6 +68,7 @@ class a2bus_ap16_device : public a2bus_videx80_device
public:
a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
@@ -79,6 +81,7 @@ class a2bus_ap16alt_device : public a2bus_videx80_device
public:
a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
@@ -90,6 +93,7 @@ class a2bus_vtc1_device : public a2bus_videx80_device
public:
a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -98,6 +102,7 @@ class a2bus_vtc2_device : public a2bus_videx80_device
public:
a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -106,6 +111,7 @@ class a2bus_aevm80_device : public a2bus_videx80_device
public:
a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp
index f454535a9e2..09ffe528d3a 100644
--- a/src/emu/xtal.cpp
+++ b/src/emu/xtal.cpp
@@ -242,6 +242,7 @@ const double XTAL::known_xtals[] = {
17'064'000, /* 17.064_MHz_XTAL Memorex 1377 */
17'350'000, /* 17.35_MHz_XTAL ITT Courier 1700 */
17'360'000, /* 17.36_MHz_XTAL OMTI Series 10 SCSI controller */
+ 17'430'000, /* 17.43_MHz_XTAL Videx Videoterm */
17'550'000, /* 17.55_MHz_XTAL HP 264x display clock (50 Hz configuration) */
17'600'000, /* 17.6_MHz_XTAL LSI Octopus */
17'734'470, /* 17.73447_MHz_XTAL (~4x PAL subcarrier) */