From 27426c0ae234c42c4d3d74c18e97ef60f6f36229 Mon Sep 17 00:00:00 2001 From: arbee Date: Fri, 20 Jul 2018 19:50:26 -0400 Subject: New machines added as WORKING ----------------------------- Milmar Laser //c [R. Belmont, Peter Ferrie, KansasFest 2018 apple2: fixed floating bus reads, syncs Talbot Fantasy Seven credits screen [R. Belmont] --- src/mame/drivers/apple2.cpp | 15 ++++++++++++++- src/mame/drivers/apple2e.cpp | 2 +- src/mame/mame.lst | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 14b94b7b3fc..6698d2590eb 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -874,7 +874,7 @@ uint8_t napple2_state::read_floatingbus() // calculate vertical scanning state // - v_line = i / kHClocks; // which vertical scanning line + v_line = (i / kHClocks) + 192; // which vertical scanning line v_state = kVLine0State + v_line; // V state bits if ((v_line >= kVPresetLine)) // check for previous vertical state preset { @@ -1705,6 +1705,18 @@ ROM_START(ivelultr) ROM_LOAD( "ultra4.bin", 0x0000, 0x0800, CRC(3dce51ac) SHA1(676b6e775d5159049cae5b6143398ec7b2bf437a) ) ROM_END +ROM_START(laser2c) + ROM_REGION(0x2000,"gfx1",0) + ROM_LOAD( "g1.bin", 0x000000, 0x001000, BAD_DUMP CRC(7ad15cc4) SHA1(88c60ec0b008eccdbece09d18fe905380ddc070f) ) + + ROM_REGION( 0x1000, "keyboard", ROMREGION_ERASE00 ) + ROM_LOAD( "g2.bin", 0x000000, 0x001000, CRC(f1d92f9c) SHA1(a54d55201f04af4c24bf94450d2cd1fa87c2c259) ) + + ROM_REGION(0x10000,"maincpu",0) + ROM_LOAD( "laser.bin", 0x001000, 0x002000, CRC(8b975094) SHA1(eea53530b4a3777afa00d2979abedf84fac62e08) ) + ROM_LOAD( "mon.bin", 0x003000, 0x001000, CRC(978c083f) SHA1(14e87cb717780b19db75c313004ba4d6ef20bc26) ) +ROM_END + #if 0 ROM_START(laba2p) /* II Plus clone with on-board Disk II controller and Videx-compatible 80-column card, supposedly from lab equipment */ ROM_REGION(0x1000,"gfx1",0) @@ -1747,3 +1759,4 @@ COMP( 1985, prav8m, apple2, 0, apple2p, apple2p, napple2_state, empty_in COMP( 1985, space84, apple2, 0, space84, apple2p, napple2_state, empty_init, "ComputerTechnik/IBS", "Space 84", MACHINE_NOT_WORKING ) COMP( 1985, am64, apple2, 0, space84, apple2p, napple2_state, empty_init, "ASEM", "AM 64", MACHINE_SUPPORTS_SAVE ) //COMP( 19??, laba2p, apple2, 0, laba2p, apple2p, napple2_state, empty_init, "", "Lab equipment Apple II Plus clone", MACHINE_SUPPORTS_SAVE ) +COMP( 1985, laser2c, apple2, 0, space84, apple2p, napple2_state, empty_init, "Milmar", "Laser //c", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index fcff1fc2918..f3eeb28be1e 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -2576,7 +2576,7 @@ uint8_t apple2e_state::read_floatingbus() // calculate vertical scanning state // - v_line = i / kHClocks; // which vertical scanning line + v_line = (i / kHClocks) + 192; // which vertical scanning line (MAME starts at blank, not the beginning of the scanning area) v_state = kVLine0State + v_line; // V state bits if ((v_line >= kVPresetLine)) // check for previous vertical state preset { diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 671aa741bf4..8fdd2018171 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -1303,6 +1303,7 @@ uniap2en // 1982 Unitron AP II (in English) uniap2pt // 1982 Unitron AP II (in Brazilian Portuguese) uniap2ti // 1982 Unitron AP II+ (Teclado Inteligente) craft2p // 1982 Craft? +laser2c // 1985? Laser //c (Brazil) @source:apple2e.cpp apple2c // Apr 1984 Apple //c -- cgit v1.2.3