From dc3a8776d8844f480e925e34317d60551e312256 Mon Sep 17 00:00:00 2001 From: Lord-Nightmare Date: Wed, 28 Mar 2018 22:00:07 -0400 Subject: minor s3670 wip, remove an erroneous comment in swyft and some redundant comments in superqix (nw) --- src/mame/drivers/superqix.cpp | 4 ++-- src/mame/drivers/swyft.cpp | 9 --------- src/mame/drivers/symbolics.cpp | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index be745232e3b..30befa7c7aa 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -1771,7 +1771,7 @@ GAME( 1987, sqix, 0, sqix, superqix, superqix_state, sqix, GAME( 1987, sqixr1, sqix, sqix, superqix, superqix_state, sqix, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.1)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, sqixr0, sqix, sqix, superqix, superqix_state, sqixr0, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.0)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, sqixu, sqix, sqix, superqix, superqix_state, sqix, ROT90, "Kaneko / Taito (Romstar License)", "Super Qix (US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, sqixb1, sqix, sqix_8031, superqix, superqix_state, sqixr0, ROT90, "bootleg", "Super Qix (bootleg of V1.0, 8031 MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1 -GAME( 1987, sqixb2, sqix, sqix_nomcu, superqix, superqix_state, sqix, ROT90, "bootleg", "Super Qix (bootleg, No MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1 +GAME( 1987, sqixb1, sqix, sqix_8031, superqix, superqix_state, sqixr0, ROT90, "bootleg", "Super Qix (bootleg of V1.0, 8031 MCU)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, sqixb2, sqix, sqix_nomcu, superqix, superqix_state, sqix, ROT90, "bootleg", "Super Qix (bootleg, No MCU)", MACHINE_SUPPORTS_SAVE ) GAME( 1994, perestro, 0, sqix_nomcu, superqix, superqix_state, perestro, ROT90, "Promat", "Perestroika Girls", MACHINE_SUPPORTS_SAVE ) GAME( 1993, perestrof,perestro, sqix_nomcu, superqix, superqix_state, perestro, ROT90, "Promat (Fuuki license)", "Perestroika Girls (Fuuki license)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index be50c5138bc..8b083ff6b13 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -367,15 +367,6 @@ public: DECLARE_WRITE_LINE_MEMBER(write_acia_clock); - /* gate array 2 has a 16-bit counter inside which counts at 10mhz and - rolls over at FFFF->0000; on roll-over (or likely at FFFF terminal count) - it triggers the KTOBF output. It does this every 6.5535ms, which causes - a 74LS74 d-latch at IC100 to invert the state of the DUART IP2 line; - this causes the DUART to fire an interrupt, which makes the 68000 read - the keyboard. - The watchdog counter and the 6ms counter are both incremented - every time the KTOBF pulses. - */ uint8_t m_keyboard_line; uint8_t m_floppy_control; diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp index f1109759638..bcfe13ebbde 100644 --- a/src/mame/drivers/symbolics.cpp +++ b/src/mame/drivers/symbolics.cpp @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Jonathan Gevaryahu -// thanks-to:Ian F./trinitr0n +// thanks-to:Ian F. & trinitr0n /****************************************************************************** Symbolics 36x0 (really in this case, 3670; the original 3600 is considerably rarer, 3670 is backwards compatible for the most part) TODO: add credits, backstory, history, etc here @@ -261,7 +261,8 @@ void symbolics_state::m68k_mem(address_map &map) //AM_RANGE(0x040000, 0xffffff) AM_READ(buserror_r); //AM_RANGE(0x800000, 0xffffff) AM_RAM /* paged access to lispm ram? */ //FF00B0 is readable, may be to read the MC/SQ/DP/AU continuity lines? - map(0xff00b0, 0xff00b1).r(this, FUNC(symbolics_state::fep_paddle_id_prom_r)); + map(0xff00a0, 0xff00bf).rom().region("fep_paddle_prom",0); + map(0xff00c0, 0xff00df).rom().region("fep_prom",0); //FF00E1 is writable, may control the LBUS_POWER_RESET line, see http://bitsavers.trailing-edge.com/pdf/symbolics/3600_series/Lisp_Machine_Hardware_Memos.pdf page 90 // or may be writing to FEP-LBUS-CONTROL bit 0x02 DOORBELL INT ENABLE ? // or may actually be setting LBUS_ID_REQ as the patent map shows @@ -352,7 +353,12 @@ ROM_START( s3670 ) ROMX_LOAD("10l.127.27c128.d10", 0x08001, 0x2000, CRC(b8ddb3c8) SHA1(e6c3b96340c5c767ef18abf48b73fa8e5d7353b9), ROM_SKIP(1) | ROM_BIOS(1)) // Label: "10L.127" @D10 ROM_CONTINUE( 0x18001, 0x2000 ) // D17, D11 are empty sockets; these would map to 0x0c000-0ffff and 0x1c000-0x1ffff + ROM_REGION16_BE( 0x20,"fep_paddle_prom", 0) + ROM_LOAD("fpa-458.bin", 0x0000, 0x0020, CRC(5e034b33) SHA1(fea84183825013b2adc290f71d97e5cffd0cf7fd)) // nFEP Paddle S/N 458 + ROM_REGION16_BE( 0x20,"fep_prom", 0) + ROM_LOAD("fep-3973.d5", 0x0000, 0x0020, CRC(29910aa0) SHA1(433ea99b8e21055abb80bebc1d7dfc9e3aacd097)) // nFEP S/N 3973 // note: load all the PLAs, PALs and PROMs here + // picture is at https://4310b1a9-a-11c96037-s-sites.googlegroups.com/a/ricomputermuseum.org/home/Home/equipment/symbolics-3645/Symbolics_3645_FEP.jpg /* LBBUFA.4 mb7124 @A6 <- 4887235 page 630 has LBBUFC.UCODE rev27 \ @@ -368,11 +374,11 @@ ROM_START( s3670 ) DV2ACK pal16L8A @C23 <- 4887235 page 629 has DEVACK rev?, pal16l8 <- controls fep mem map; this is DIFFERENT between FEP v24 (DEVACK) and NFEP v127 (DV2ACK) PROC.4 pal? @C25 <- 4887235 page 622 has PROC rev4, pal16l8 UDMAHA.4 pal? @D3 <- 4887235 page 619 has UDMAHA rev2, pal16l8 - FEP 4642 16pprom? @D5 <- this is the serial number of the FEP board stored in a prom, readable at one of the local-io addresses + FEP 3973 16pprom? @D5 <- the number after FEP is the serial number of the FEP board (and is also supposedly stored in the prom), prom is readable at one of the local-io addresses HSRQ.4 pal @D6 <- 4887235 page 626 has HSRQ rev?, pal16l8 - d7, d8, d10 are eproms, see above + d7, d8, d10 are EPROMs, see above d11 is empty socket marked 2764 - d13, d14, d16 are eproms, see above + d13, d14, d16 are EPROMs, see above d17 is empty socket marked 2764 DV2NUM @E21 <- 4887235 page 629 has DEVNUM rev8, pal16l8 <- controls fep mem map; this is DIFFERENT between FEP v24 (DEVNUM) and NFEP v127 (DV2NUM) LBBD.4 pal16L8A @G18 <- 4887235 page 624 has LBBD rev6, pal16l8 @@ -383,7 +389,8 @@ ROM_START( s3670 ) LBARB.4 @I18 <- 4887235 page 625 has LBARB rev1, pal16l8 SERCTL.4 @K6 <- 4887235 page 620 has SERCTL rev4, pal16l8 */ - ROM_REGION16_BE( 0x20000, "fepdram", ROMREGION_ERASEFF ) + ROM_REGION16_BE( 0x20000, "fepdram", ROMREGION_ERASE00 ) + ROM_END /****************************************************************************** -- cgit v1.2.3