mirror of
https://github.com/holub/mame
synced 2025-04-24 09:20:02 +03:00
esprit.cpp: Updates (nw)
- Derive clocks from actual XTALs - Raw screen parameters - Character width is 9, not 8 - Separate configurations (different enough now) - Remove MCFG configuration macros - Add and map various devices, particularly for esprit3 - Note undumped (though probably unused) R6531 mask ROM
This commit is contained in:
AJR
parent
c8e840105b
commit
fb0d3803aa
@ -226,7 +226,7 @@ const double XTAL::known_xtals[] = {
|
||||
17'600'000, /* 17.6_MHz_XTAL LSI Octopus */
|
||||
17'734'470, /* 17.73447_MHz_XTAL (~4x PAL subcarrier) */
|
||||
17'734'472, /* 17.734472_MHz_XTAL actually ~4x PAL subcarrier */
|
||||
17'971'200, /* 17.9712_MHz_XTAL - */
|
||||
17'971'200, /* 17.9712_MHz_XTAL Compucolor II, Hazeltine Esprit III */
|
||||
18'000'000, /* 18_MHz_XTAL S.A.R, Ikari Warriors 3 */
|
||||
18'432'000, /* 18.432_MHz_XTAL Extremely common, used on 100's of PCBs (48000 * 384) */
|
||||
18'480'000, /* 18.48_MHz_XTAL Wyse WY-100 video */
|
||||
|
||||
@ -8,13 +8,17 @@ Hazeltine Esprit terminals.
|
||||
|
||||
Espirit: R6502P, R6531, HD46505RP, MC6850P, 16.5888
|
||||
|
||||
Espirit3: 2x R6551AP, HD46850P (6850), R6502BP, R6545-1AP, R6522AP, 1.8432, 17.9712
|
||||
Espirit3: 2x R6551AP, HD46850P (6850), R6502BP, R6545-1AP, R6522AP, RO-3-9333B, 1.8432, 17.9712
|
||||
|
||||
|
||||
************************************************************************************************************************************/
|
||||
|
||||
#include "emu.h"
|
||||
#include "cpu/m6502/m6502.h"
|
||||
#include "machine/input_merger.h"
|
||||
#include "machine/6850acia.h"
|
||||
#include "machine/6522via.h"
|
||||
#include "machine/mos6551.h"
|
||||
#include "video/mc6845.h"
|
||||
#include "emupal.h"
|
||||
#include "screen.h"
|
||||
@ -37,6 +41,7 @@ public:
|
||||
|
||||
private:
|
||||
MC6845_UPDATE_ROW(crtc_update_row);
|
||||
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr);
|
||||
|
||||
void mem3_map(address_map &map);
|
||||
void mem_map(address_map &map);
|
||||
@ -52,8 +57,10 @@ void esprit_state::mem_map(address_map &map)
|
||||
map.global_mask(0x7fff);
|
||||
map(0x0058, 0x0058).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
|
||||
map(0x0059, 0x0059).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
|
||||
map(0x0080, 0x1fff).ram();
|
||||
map(0x2000, 0x6fff).ram().share("videoram");
|
||||
map(0x0078, 0x0079).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
|
||||
map(0x0080, 0x00ff).mirror(0x100).ram();
|
||||
//map(0x0780, 0x078e).rw("rrioc", FUNC(r6531_device::io_r), FUNC(r6531_device::io_w));
|
||||
map(0x2000, 0x27ff).ram().share("videoram");
|
||||
map(0x7000, 0x7fff).rom().region("roms", 0);
|
||||
}
|
||||
|
||||
@ -61,30 +68,33 @@ void esprit_state::mem3_map(address_map &map)
|
||||
{
|
||||
map(0x0000, 0x202f).ram();
|
||||
map(0x2030, 0x3fff).ram().share("videoram"); // it might start at 3000
|
||||
map(0x81c0, 0x81c0).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
|
||||
map(0x81c1, 0x81c1).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
|
||||
map(0x81c0, 0x81c0).rw("crtc", FUNC(r6545_1_device::status_r), FUNC(r6545_1_device::address_w));
|
||||
map(0x81c1, 0x81c1).rw("crtc", FUNC(r6545_1_device::register_r), FUNC(r6545_1_device::register_w));
|
||||
map(0x93c0, 0x93c1).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
|
||||
map(0x95c0, 0x95c3).rw("acia1", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
|
||||
map(0x99c0, 0x99c3).rw("acia2", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
|
||||
map(0xb1c0, 0xb1cf).rw("via", FUNC(via6522_device::read), FUNC(via6522_device::write));
|
||||
map(0xe000, 0xffff).rom().region("roms", 0);
|
||||
}
|
||||
|
||||
static INPUT_PORTS_START( esprit )
|
||||
INPUT_PORTS_END
|
||||
|
||||
MC6845_UPDATE_ROW( esprit_state::crtc_update_row )
|
||||
MC6845_UPDATE_ROW(esprit_state::crtc_update_row)
|
||||
{
|
||||
const rgb_t *pens = m_palette->palette()->entry_list_raw();
|
||||
uint8_t chr,gfx;
|
||||
uint16_t mem,x;
|
||||
uint32_t *p = &bitmap.pix32(y);
|
||||
|
||||
for (x = 0; x < x_count; x++)
|
||||
for (uint16_t x = 0; x < x_count; x++)
|
||||
{
|
||||
mem = (ma + x) & 0x7ff;
|
||||
chr = m_p_videoram[mem];
|
||||
uint16_t mem = (ma + x) & 0x7ff;
|
||||
uint8_t chr = m_p_videoram[mem];
|
||||
|
||||
/* get pattern of pixels for that character scanline */
|
||||
gfx = m_p_chargen[(chr<<4) | ra] ^ ((x == cursor_x) ? 0xff : 0);
|
||||
uint16_t gfx = m_p_chargen[(chr<<4) | ra] ^ ((x == cursor_x) ? 0x1ff : 0);
|
||||
|
||||
/* Display a scanline of a character (8 pixels) */
|
||||
/* Display a scanline of a character (9 pixels) */
|
||||
*p++ = pens[BIT(gfx, 8)];
|
||||
*p++ = pens[BIT(gfx, 7)];
|
||||
*p++ = pens[BIT(gfx, 6)];
|
||||
*p++ = pens[BIT(gfx, 5)];
|
||||
@ -96,6 +106,10 @@ MC6845_UPDATE_ROW( esprit_state::crtc_update_row )
|
||||
}
|
||||
}
|
||||
|
||||
MC6845_ON_UPDATE_ADDR_CHANGED(esprit_state::crtc_update_addr)
|
||||
{
|
||||
}
|
||||
|
||||
/* F4 Character Displayer */
|
||||
static const gfx_layout esprit_charlayout =
|
||||
{
|
||||
@ -122,32 +136,69 @@ void esprit_state::init_init()
|
||||
}
|
||||
|
||||
|
||||
MACHINE_CONFIG_START(esprit_state::esprit)
|
||||
MCFG_DEVICE_ADD("maincpu", M6502, 1000000) // no idea of clock
|
||||
MCFG_DEVICE_PROGRAM_MAP(mem_map)
|
||||
void esprit_state::esprit(machine_config &config)
|
||||
{
|
||||
M6502(config, m_maincpu, 16.5888_MHz_XTAL / 18); // divider guessed
|
||||
m_maincpu->set_addrmap(AS_PROGRAM, &esprit_state::mem_map);
|
||||
|
||||
//R6531(config, "rrioc", 16.5888_MHz_XTAL / 18);
|
||||
|
||||
acia6850_device &acia(ACIA6850(config, "acia"));
|
||||
acia.irq_handler().set_inputline(m_maincpu, m6502_device::NMI_LINE);
|
||||
|
||||
/* video hardware */
|
||||
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
|
||||
MCFG_SCREEN_REFRESH_RATE(60)
|
||||
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not correct
|
||||
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
|
||||
MCFG_SCREEN_SIZE(32*8, 32*8)
|
||||
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
|
||||
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esprit)
|
||||
MCFG_PALETTE_ADD_MONOCHROME("palette")
|
||||
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
|
||||
screen.set_color(rgb_t::green());
|
||||
screen.set_raw(16.5888_MHz_XTAL, 900, 0, 720, 307, 0, 288);
|
||||
screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
|
||||
|
||||
GFXDECODE(config, "gfxdecode", "palette", gfx_esprit);
|
||||
PALETTE(config, m_palette, 2).set_init("palette", FUNC(palette_device::palette_init_monochrome));
|
||||
|
||||
/* Devices */
|
||||
MCFG_MC6845_ADD("crtc", MC6845, "screen", 1000000) // clk unknown
|
||||
MCFG_MC6845_SHOW_BORDER_AREA(false)
|
||||
MCFG_MC6845_CHAR_WIDTH(8)
|
||||
MCFG_MC6845_UPDATE_ROW_CB(esprit_state, crtc_update_row)
|
||||
MACHINE_CONFIG_END
|
||||
mc6845_device &crtc(MC6845(config, "crtc", 16.5888_MHz_XTAL / 9));
|
||||
crtc.set_screen("screen");
|
||||
crtc.set_show_border_area(false);
|
||||
crtc.set_char_width(9);
|
||||
crtc.set_update_row_callback(FUNC(esprit_state::crtc_update_row), this);
|
||||
}
|
||||
|
||||
MACHINE_CONFIG_START(esprit_state::esprit3)
|
||||
esprit(config);
|
||||
MCFG_DEVICE_MODIFY("maincpu")
|
||||
MCFG_DEVICE_PROGRAM_MAP(mem3_map)
|
||||
MACHINE_CONFIG_END
|
||||
void esprit_state::esprit3(machine_config &config)
|
||||
{
|
||||
M6502(config, m_maincpu, 17.9712_MHz_XTAL / 18); // divider guessed
|
||||
m_maincpu->set_addrmap(AS_PROGRAM, &esprit_state::mem3_map);
|
||||
|
||||
INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, m6502_device::IRQ_LINE);
|
||||
|
||||
ACIA6850(config, "acia");
|
||||
|
||||
mos6551_device &acia1(MOS6551(config, "acia1", 17.9712_MHz_XTAL / 18));
|
||||
acia1.set_xtal(1.8432_MHz_XTAL);
|
||||
acia1.irq_handler().set("mainirq", FUNC(input_merger_device::in_w<0>));
|
||||
|
||||
mos6551_device &acia2(MOS6551(config, "acia2", 17.9712_MHz_XTAL / 18));
|
||||
acia2.set_xtal(1.8432_MHz_XTAL);
|
||||
acia2.irq_handler().set("mainirq", FUNC(input_merger_device::in_w<1>));
|
||||
|
||||
via6522_device &via(VIA6522(config, "via", 17.9712_MHz_XTAL / 18));
|
||||
via.irq_handler().set("mainirq", FUNC(input_merger_device::in_w<2>));
|
||||
|
||||
/* video hardware */
|
||||
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
|
||||
screen.set_color(rgb_t::green());
|
||||
screen.set_raw(17.9712_MHz_XTAL, 936, 0, 720, 320, 0, 288);
|
||||
screen.set_screen_update("crtc", FUNC(r6545_1_device::screen_update));
|
||||
|
||||
GFXDECODE(config, "gfxdecode", "palette", gfx_esprit);
|
||||
PALETTE(config, m_palette, 2).set_init("palette", FUNC(palette_device::palette_init_monochrome));
|
||||
|
||||
r6545_1_device &crtc(R6545_1(config, "crtc", 17.9712_MHz_XTAL / 9));
|
||||
crtc.set_screen("screen");
|
||||
crtc.set_show_border_area(false);
|
||||
crtc.set_char_width(9);
|
||||
crtc.set_update_row_callback(FUNC(esprit_state::crtc_update_row), this);
|
||||
crtc.set_on_update_addr_change_callback(FUNC(esprit_state::crtc_update_addr), this);
|
||||
}
|
||||
|
||||
ROM_START( esprit )
|
||||
// Esprit
|
||||
@ -155,6 +206,8 @@ ROM_START( esprit )
|
||||
ROM_LOAD( "hazeltine_esprit.u19", 0x0000, 0x1000, CRC(6fdec792) SHA1(a1d1d68c8793e7e15ab5cd17682c299dff3985cb) )
|
||||
ROM_REGION( 0x1000, "chargen", ROMREGION_INVERT )
|
||||
ROM_LOAD( "hazeltine_esprit.u26", 0x0000, 0x0804, CRC(93f45f13) SHA1(1f493b44124c348759469e24fdfa8b7c52fe6fac) )
|
||||
ROM_REGION( 0x0800, "rrioc", 0 )
|
||||
ROM_LOAD( "r3198-11.u20", 0x0000, 0x0800, NO_DUMP ) // internal ROM apparently unused
|
||||
ROM_END
|
||||
|
||||
ROM_START( esprit3 )
|
||||
|
||||
Loading…
Reference in New Issue
Block a user