Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 23:42:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

laser500: MT 07022, MT 07131

Browse Source 
MT 07022: some keys are not working
MT 07131: correct dump of character generator
This commit is contained in:
Robbbert 2018-12-22 11:02:48 +11:00
parent 77c9ca3f8a
commit a4fec03419
3 changed files with 32 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mame/drivers/vtech2.cpp
View File

@ -170,7 +170,7 @@ static INPUT_PORTS_START( laser500 )
PORT_START("ROW7") /* KEY ROW 7 */
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Graph") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(RALT))
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('`') PORT_CHAR('~')
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') PORT_CHAR('~')
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
@ -210,10 +210,10 @@ static INPUT_PORTS_START( laser500 )
PORT_START("ROWD") /* KEY ROW D */
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\\') PORT_CHAR('|')
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|')
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\xCE\xBC \xC2\xA3") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0xa3)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\xCE\xBC \xC2\xA3") PORT_CODE(KEYCODE_END) PORT_CHAR(0xa3)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL) PORT_CHAR(UCHAR_MAMEKEY(DEL))
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
@ -273,11 +273,11 @@ INPUT_PORTS_END
static const gfx_layout charlayout_80 =
{
8,8, /* 8 x 8 characters */
256, /* 256 characters */
1024, /* characters */
1, /* 1 bits per pixel */
{ 0 }, /* no bitplanes; 1 bit per pixel */
/* x offsets */
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 7, 6, 5, 4, 3, 2, 1, 0 },
/* y offsets */
{ 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8 },
8*8 /* every char takes 8 bytes */
@ -286,11 +286,11 @@ static const gfx_layout charlayout_80 =
static const gfx_layout charlayout_40 =
{
8*2,8, /* 8*2 x 8 characters */
256, /* 256 characters */
1024, /* characters */
1, /* 1 bits per pixel */
{ 0 }, /* no bitplanes; 1 bit per pixel */
/* x offsets */
{ 0,0, 1,1, 2,2, 3,3, 4,4, 5,5, 6,6, 7,7 },
{ 7,7, 6,6, 5,5, 4,4, 3,3, 2,2, 1,1, 0,0 },
/* y offsets */
{ 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8 },
8*8 /* every char takes 8 bytes */
@ -481,8 +481,8 @@ MACHINE_CONFIG_END
ROM_START(laser350)
ROM_REGION(0x40000,"maincpu",0)
ROM_LOAD("laserv3.rom", 0x00000, 0x08000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1))
ROM_REGION(0x00800,"gfx1",0)
ROM_LOAD("laser.fnt", 0x00000, 0x00800, CRC(ed6bfb2a) SHA1(95e247021a10167b9de1d6ffc91ec4ba83b0ec87))
ROM_REGION(0x2000,"gfx1",0)
ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) )
ROM_REGION(0x00100,"gfx2",ROMREGION_ERASEFF)
/* initialized in init_laser */
ROM_END
@ -492,8 +492,8 @@ ROM_START(laser500) // based on the picture at http://www.8bit-museum.de/hardwar
// There should be two roms, one 0x2000 long for the font at u10, and one longer one for the os rom at u6.
ROM_REGION(0x40000,"maincpu",0)
ROM_LOAD("27-0401-00-00.u6", 0x00000, 0x08000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1)) // may be dumped at wrong size; label is: "VTL 27-0401-00-00 // 6133-7081 // 8611MAK"
ROM_REGION(0x00800,"gfx1",0)
ROM_LOAD("27-393-00.u10", 0x00000, 0x00800, BAD_DUMP CRC(ed6bfb2a) SHA1(95e247021a10167b9de1d6ffc91ec4ba83b0ec87)) // dumped at wrong size; correct size is 0x2000; label is "TMS 2364-25NL // D8614L // ZA234015 // 27-393-00/VT 85 // SINGAPORE"
ROM_REGION(0x2000,"gfx1",0)
ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) ) // label is "TMS 2364-25NL // D8614L // ZA234015 // 27-393-00/VT 85 // SINGAPORE"
ROM_REGION(0x00100,"gfx2",ROMREGION_ERASEFF)
/* initialized in init_laser */
ROM_END
@ -501,8 +501,8 @@ ROM_END
ROM_START(laser700)
ROM_REGION(0x40000,"maincpu",0)
ROM_LOAD("laserv3.rom", 0x00000, 0x08000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1))
ROM_REGION(0x00800,"gfx1",0)
ROM_LOAD("laser.fnt", 0x00000, 0x00800, CRC(ed6bfb2a) SHA1(95e247021a10167b9de1d6ffc91ec4ba83b0ec87))
ROM_REGION(0x2000,"gfx1",0)
ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) )
ROM_REGION(0x00100,"gfx2",ROMREGION_ERASEFF)
/* initialized in init_laser */
ROM_END

23
src/mame/includes/vtech2.h
View File

@ -22,14 +22,16 @@ class vtech2_state : public driver_device
{
public:
vtech2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker"),
m_cassette(*this, "cassette"),
m_cart(*this, "cartslot"),
m_laser_file(*this, {FLOPPY_0, FLOPPY_1}),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_speaker(*this, "speaker")
, m_cassette(*this, "cassette")
, m_cart(*this, "cartslot")
, m_laser_file(*this, {FLOPPY_0, FLOPPY_1})
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
, m_io_keyboard(*this, {"ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7", "ROWD", "ROWC", "ROWB", "ROWA"})
{ }
void laser350(machine_config &config);
void laser700(machine_config &config);
@ -79,6 +81,7 @@ private:
optional_device_array<legacy_floppy_image_device, 2> m_laser_file;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_ioport_array<12> m_io_keyboard;
uint8_t *m_videoram;
int m_laser_latch;
@ -101,10 +104,6 @@ private:
int m_laser_fdc_latch;
int m_level_old;
int m_cassette_bit;
int m_row_a;
int m_row_b;
int m_row_c;
int m_row_d;
int m_laser_bg_mode;
int m_laser_two_color;

63
src/mame/machine/vtech2.cpp
View File

@ -192,67 +192,20 @@ WRITE8_MEMBER(vtech2_state::laser_bank_select_w)
************************************************/
int vtech2_state::mra_bank(int bank, int offs)
{
uint8_t data = 0x7f;
u8 data = 0x7f;
/* Laser 500/700 only: keyboard rows A through D */
if( (offs & 0x00ff) == 0x00ff )
offs = ~offs & 0x7ff;
if (BIT(offs, 10))
{
if( (offs & 0x0300) == 0x0000 ) /* keyboard row A */
{
if( ioport("ROWA")->read() != m_row_a )
{
m_row_a = ioport("ROWA")->read();
data &= m_row_a;
}
}
if( (offs & 0x0300) == 0x0100 ) /* keyboard row B */
{
if( ioport("ROWB")->read() != m_row_b )
{
m_row_b = ioport("ROWB")->read();
data &= m_row_b;
}
}
if( (offs & 0x0300) == 0x0200 ) /* keyboard row C */
{
if( ioport("ROWC")->read() != m_row_c )
{
m_row_c = ioport("ROWC")->read();
data &= m_row_c;
}
}
if( (offs & 0x0300) == 0x0300 ) /* keyboard row D */
{
if( ioport("ROWD")->read() != m_row_d )
{
m_row_d = ioport("ROWD")->read();
data &= m_row_d;
}
}
offs = (offs >> 8) & 3;
data &= m_io_keyboard[offs + 8]->read(); // ROW A-D
}
else
{
/* All Lasers keyboard rows 0 through 7 */
if( !(offs & 0x01) )
data &= ioport("ROW0")->read();
if( !(offs & 0x02) )
data &= ioport("ROW1")->read();
if( !(offs & 0x04) )
data &= ioport("ROW2")->read();
if( !(offs & 0x08) )
data &= ioport("ROW3")->read();
if( !(offs & 0x10) )
data &= ioport("ROW4")->read();
if( !(offs & 0x20) )
data &= ioport("ROW5")->read();
if( !(offs & 0x40) )
data &= ioport("ROW6")->read();
if( !(offs & 0x80) )
data &= ioport("ROW7")->read();
}
for (u8 i = 0; i < 8; i++)
if (BIT(offs, i))
data &= m_io_keyboard[i]->read(); // ROW 0-7
/* BIT 7 - tape input */
data |= (m_cassette->input() > +0.02) ? 0x80 : 0;
return data;