diff --git a/hash/abc1600.xml b/hash/abc1600.xml index 68fde789865..bdc6023dd87 100644 --- a/hash/abc1600.xml +++ b/hash/abc1600.xml @@ -1,11 +1,12 @@ - + ABCenix 5.12 198? Luxor + @@ -167,4 +168,5 @@ + diff --git a/hash/abc80.xml b/hash/abc80.xml index c529b061f39..39e098046e4 100644 --- a/hash/abc80.xml +++ b/hash/abc80.xml @@ -1,6 +1,6 @@ - + Demo 19?? diff --git a/hash/abc800.xml b/hash/abc800.xml index af541f90479..7512d7546c5 100644 --- a/hash/abc800.xml +++ b/hash/abc800.xml @@ -1,10 +1,12 @@ - + + - Basope v1.0 (Finland) + Basope v1.0 (Fin) 198? <unknown> + @@ -13,10 +15,11 @@ - - Grafiikka 800 v1.6 (Finland) + Grafiikka 800 v1.6 (Fin) 198? <unknown> + + @@ -28,6 +31,7 @@ Kronstat v2.1 198? ABC-klubben + @@ -36,9 +40,10 @@ - ORD 800 v2.4 (Sweden) + ORD 800 v2.4 (Swe) 198? <unknown> + @@ -47,9 +52,10 @@ - PROMMIS v6.2 (Sweden) - 198? - ELlogik + PROMMIS v6.2 (Swe) + 1983 + ELogik + @@ -58,9 +64,10 @@ - Bokforing 800 v2.0 (Sweden) + Bokföring 800 v2.0 (Swe) 198? <unknown> + @@ -69,10 +76,11 @@ - - Sana 800 v2.3 (Finland) + Sana 800 v2.3 (Fin) 198? <unknown> + + @@ -81,21 +89,10 @@ - - TTY800 v1.5 (Sweden) (no autoboot) + TTY800 v1.5 (Swe) 1983 Front-Line - - - - - - - - TTY800 v1.5 (Sweden) - 1983 - Front-Line @@ -103,11 +100,25 @@ + + TTY800 v1.5 (Swe) (no autoboot) + 1983 + Front-Line + + + + + + + + + - CAT800L v8.6 for CATNET v1.3 198? Luxor + + @@ -116,10 +127,11 @@ - - Systeemilevy ABC800 v1.0 (Finland) + Systeemilevy ABC800 v1.0 (Fin) 198? Luxor + + @@ -128,11 +140,12 @@ - - - Systemskiva ABC800 v1.0 (Sweden) + Systemskiva ABC800 v1.0 (Swe) 198? Luxor + + + @@ -141,10 +154,11 @@ - System disk v6.19 for UFD-DOS 198? Luxor + + @@ -156,6 +170,8 @@ System disk v6.19a6 for UFD-DOS 198? Luxor + + @@ -164,10 +180,11 @@ - Demo ABC800 v1.1 198? Luxor + + @@ -176,14 +193,16 @@ - Pascal 800 v1.04 198? <unknown> + + + diff --git a/hash/abc806.xml b/hash/abc806.xml index ebe303736dd..5556474a38a 100644 --- a/hash/abc806.xml +++ b/hash/abc806.xml @@ -1,10 +1,12 @@ - + + Graf806 198? <unknown> + @@ -16,6 +18,7 @@ CP/M Plus v3.0 - MYAB BIOS v0.9 198? <unknown> + @@ -27,6 +30,7 @@ CP/M Plus v3.0 198? <unknown> + @@ -35,14 +39,17 @@ - - Systemskiva v6.31 för UFD-DOS (Sweden) + Systemskiva v6.31 för UFD-DOS (Swe) 198? Luxor + + + + diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h index c26103e1ea2..7374cd70209 100644 --- a/src/emu/bus/abcbus/abcbus.h +++ b/src/emu/bus/abcbus/abcbus.h @@ -86,7 +86,7 @@ CS* --- * 23 * --- DSTB* NMI*^ --- * 24 * --- 0 V OPS* --- * 25 * --- A4 - --- * 26 * --- A3 + R/W* --- * 26 * --- A3 TREN* --- * 27 * --- A2 TRRQ* --- * 28 * --- A1 PRAC* --- * 29 * --- A0 diff --git a/src/emu/bus/abcbus/fd2.c b/src/emu/bus/abcbus/fd2.c index 19669b3394f..b689162c307 100644 --- a/src/emu/bus/abcbus/fd2.c +++ b/src/emu/bus/abcbus/fd2.c @@ -89,6 +89,7 @@ const rom_entry *abc_fd2_device::device_rom_region() const static ADDRESS_MAP_START( abc_fd2_mem, AS_PROGRAM, 8, abc_fd2_device ) AM_RANGE(0x0000, 0x03ff) AM_ROM AM_REGION(Z80_TAG, 0) + AM_RANGE(0x0800, 0x0bff) AM_RAM ADDRESS_MAP_END @@ -97,6 +98,9 @@ ADDRESS_MAP_END //------------------------------------------------- static ADDRESS_MAP_START( abc_fd2_io, AS_IO, 8, abc_fd2_device ) + ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0xb0, 0xb3) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt) + AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE(FD1771_TAG, fd1771_t, read, write) ADDRESS_MAP_END @@ -141,13 +145,13 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( abc_fd2 ) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) // ? + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(abc_fd2_mem) MCFG_CPU_IO_MAP(abc_fd2_io) MCFG_CPU_CONFIG(daisy_chain) - MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) // ? - MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2) // ? + MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz, pio_intf) + MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2) MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats) @@ -182,7 +186,7 @@ abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, d m_fdc(*this, FD1771_TAG), m_floppy0(*this, FD1771_TAG":0"), m_floppy1(*this, FD1771_TAG":1"), - m_rom(*this, "dos") + m_rom(*this, "abc80") { } diff --git a/src/emu/bus/abcbus/lux21056.c b/src/emu/bus/abcbus/lux21056.c index 8e3326d44c2..ed193de8cc6 100644 --- a/src/emu/bus/abcbus/lux21056.c +++ b/src/emu/bus/abcbus/lux21056.c @@ -260,7 +260,7 @@ luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, cons m_dma(*this, Z80DMA_TAG), m_sasibus(*this, SASIBUS_TAG ":host"), m_s1(*this, "S1"), - m_cs(0), + m_cs(false), m_rdy(0), m_req(0), m_stat(0), @@ -292,6 +292,7 @@ void luxor_55_21056_device::device_start() void luxor_55_21056_device::device_reset() { + m_cs = false; m_stat = 0; m_sasi_data = 0; } diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c index f2e701c2df6..03de34c8f69 100644 --- a/src/mess/drivers/abc80x.c +++ b/src/mess/drivers/abc80x.c @@ -1362,10 +1362,10 @@ ROM_START( abc800c ) ROM_LOAD( "abc 7-22.2j", 0x7000, 0x1000, CRC(774511ab) SHA1(5171e43213a402c2d96dee33453c8306ac1aafc8) ) ROM_REGION( 0x20, "hru", 0 ) - ROM_LOAD( "hru i.4g", 0x0000, 0x0020, CRC(d970a972) SHA1(c47fdd61fccc68368d42f03a01c7af90ab1fe1ab) ) + ROM_LOAD( "hru i.4g", 0x00, 0x20, CRC(d970a972) SHA1(c47fdd61fccc68368d42f03a01c7af90ab1fe1ab) ) ROM_REGION( 0x200, "hru2", 0 ) - ROM_LOAD( "hru ii.3a", 0x0000, 0x0200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) + ROM_LOAD( "hru ii.3a", 0x000, 0x200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) ROM_END @@ -1375,29 +1375,30 @@ ROM_END ROM_START( abc800m ) ROM_REGION( 0x8000, Z80_TAG, 0 ) + ROM_DEFAULT_BIOS("ufd20") ROM_LOAD( "abc m-12.1m", 0x0000, 0x1000, CRC(f85b274c) SHA1(7d0f5639a528d8d8130a22fe688d3218c77839dc) ) ROM_LOAD( "abc 1-12.1l", 0x1000, 0x1000, CRC(1e99fbdc) SHA1(ec6210686dd9d03a5ed8c4a4e30e25834aeef71d) ) ROM_LOAD( "abc 2-12.1k", 0x2000, 0x1000, CRC(ac196ba2) SHA1(64fcc0f03fbc78e4c8056e1fa22aee12b3084ef5) ) ROM_LOAD( "abc 3-12.1j", 0x3000, 0x1000, CRC(3ea2b5ee) SHA1(5a51ac4a34443e14112a6bae16c92b5eb636603f) ) ROM_LOAD( "abc 4-12.2m", 0x4000, 0x1000, CRC(695cb626) SHA1(9603ce2a7b2d7b1cbeb525f5493de7e5c1e5a803) ) ROM_LOAD( "abc 5-12.2l", 0x5000, 0x1000, CRC(b4b02358) SHA1(95338efa3b64b2a602a03bffc79f9df297e9534a) ) - ROM_SYSTEM_BIOS( 0, "13", "? (1982-07-19)" ) + ROM_SYSTEM_BIOS( 0, "13", "ABC-DOS (1982-07-19)" ) ROMX_LOAD( "abc 6-13.2k", 0x6000, 0x1000, CRC(6fa71fb6) SHA1(b037dfb3de7b65d244c6357cd146376d4237dab6), ROM_BIOS(1) ) - ROM_SYSTEM_BIOS( 1, "11", "? (1983-05-31)" ) + ROM_SYSTEM_BIOS( 1, "ufd19", "UFD-DOS v.19 (1983-05-31)" ) ROMX_LOAD( "abc 6-11 ufd.2k", 0x6000, 0x1000, CRC(2a45be80) SHA1(bf08a18a74e8bdaee2656a3c8246c0122398b58f), ROM_BIOS(2) ) // is this "ABC 6-5" or "ABC 6-51" instead? - ROM_SYSTEM_BIOS( 2, "52", "? (1984-03-02)" ) + ROM_SYSTEM_BIOS( 2, "ufd20", "UFD-DOS v.20 (1984-03-02)" ) ROMX_LOAD( "abc 6-52.2k", 0x6000, 0x1000, CRC(c311b57a) SHA1(4bd2a541314e53955a0d53ef2f9822a202daa485), ROM_BIOS(3) ) ROM_LOAD_OPTIONAL( "abc 7-21.2j", 0x7000, 0x1000, CRC(fd137866) SHA1(3ac914d90db1503f61397c0ea26914eb38725044) ) ROM_LOAD( "abc 7-22.2j", 0x7000, 0x1000, CRC(774511ab) SHA1(5171e43213a402c2d96dee33453c8306ac1aafc8) ) ROM_REGION( 0x800, MC6845_TAG, 0 ) - ROM_LOAD( "vum se.7c", 0x0000, 0x0800, CRC(f9152163) SHA1(997313781ddcbbb7121dbf9eb5f2c6b4551fc799) ) + ROM_LOAD( "vum se.7c", 0x000, 0x800, CRC(f9152163) SHA1(997313781ddcbbb7121dbf9eb5f2c6b4551fc799) ) ROM_REGION( 0x20, "hru", 0 ) - ROM_LOAD( "hru i.4g", 0x0000, 0x0020, CRC(d970a972) SHA1(c47fdd61fccc68368d42f03a01c7af90ab1fe1ab) ) + ROM_LOAD( "hru i.4g", 0x00, 0x20, CRC(d970a972) SHA1(c47fdd61fccc68368d42f03a01c7af90ab1fe1ab) ) ROM_REGION( 0x200, "hru2", 0 ) - ROM_LOAD( "hru ii.3a", 0x0000, 0x0200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) + ROM_LOAD( "hru ii.3a", 0x000, 0x200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) ROM_END @@ -1407,23 +1408,24 @@ ROM_END ROM_START( abc802 ) ROM_REGION( 0x8000, Z80_TAG, 0 ) - ROM_LOAD( "abc 02-11.9f", 0x0000, 0x2000, CRC(b86537b2) SHA1(4b7731ef801f9a03de0b5acd955f1e4a1828355d) ) - ROM_LOAD( "abc 12-11.11f", 0x2000, 0x2000, CRC(3561c671) SHA1(f12a7c0fe5670ffed53c794d96eb8959c4d9f828) ) - ROM_LOAD( "abc 22-11.12f", 0x4000, 0x2000, CRC(8dcb1cc7) SHA1(535cfd66c84c0370fd022d6edf702d3d1ad1b113) ) - ROM_SYSTEM_BIOS( 0, "12", "?" ) + ROM_DEFAULT_BIOS("ufd20") + ROM_LOAD( "abc 02-11.9f", 0x0000, 0x2000, CRC(b86537b2) SHA1(4b7731ef801f9a03de0b5acd955f1e4a1828355d) ) + ROM_LOAD( "abc 12-11.11f", 0x2000, 0x2000, CRC(3561c671) SHA1(f12a7c0fe5670ffed53c794d96eb8959c4d9f828) ) + ROM_LOAD( "abc 22-11.12f", 0x4000, 0x2000, CRC(8dcb1cc7) SHA1(535cfd66c84c0370fd022d6edf702d3d1ad1b113) ) + ROM_SYSTEM_BIOS( 0, "abc", "ABC-DOS (1983-05-31)" ) ROMX_LOAD( "abc 32-12.14f", 0x6000, 0x2000, CRC(23cd0f43) SHA1(639daec4565dcdb4de408b808d0c6cd97baa35d2), ROM_BIOS(1) ) - ROM_SYSTEM_BIOS( 1, "21", "UFD-DOS v6.19" ) + ROM_SYSTEM_BIOS( 1, "ufd19", "UFD-DOS v.19 (1984-03-02)" ) ROMX_LOAD( "abc 32-21.14f", 0x6000, 0x2000, CRC(57050b98) SHA1(b977e54d1426346a97c98febd8a193c3e8259574), ROM_BIOS(2) ) - ROM_SYSTEM_BIOS( 2, "31", "UFD-DOS v6.20" ) + ROM_SYSTEM_BIOS( 2, "ufd20", "UFD-DOS v.20 (1984-04-03)" ) ROMX_LOAD( "abc 32-31.14f", 0x6000, 0x2000, CRC(fc8be7a8) SHA1(a1d4cb45cf5ae21e636dddfa70c99bfd2050ad60), ROM_BIOS(3) ) - ROM_SYSTEM_BIOS( 3, "mica", "MICA DOS v6.20" ) + ROM_SYSTEM_BIOS( 3, "mica620", "MICA DOS v.20 (1984-03-02)" ) ROMX_LOAD( "mica820.14f", 0x6000, 0x2000, CRC(edf998af) SHA1(daae7e1ff6ef3e0ddb83e932f324c56f4a98f79b), ROM_BIOS(4) ) ROM_REGION( 0x1000, MC6845_TAG, 0 ) ROM_LOAD( "abc t02-1.3g", 0x0000, 0x1000, CRC(4d54eed8) SHA1(04cb5fc5f3d7ba9b9a5ae0ec94241d1fe83647f7) ) // 64 90191-01 ROM_REGION( 0x400, "plds", 0 ) - ROM_LOAD( "abc p2-1.2g", 0x0000, 0x0400, NO_DUMP ) // PAL16R4 + ROM_LOAD( "abc p2-1.2g", 0x000, 0x400, NO_DUMP ) // PAL16R4 ROM_END @@ -1433,19 +1435,20 @@ ROM_END ROM_START( abc806 ) ROM_REGION( 0x10000, Z80_TAG, 0 ) + ROM_DEFAULT_BIOS("ufd20") ROM_LOAD( "abc 06-11.1m", 0x0000, 0x1000, CRC(27083191) SHA1(9b45592273a5673e4952c6fe7965fc9398c49827) ) // BASIC PROM ABC 06-11 "64 90231-02" ROM_LOAD( "abc 16-11.1l", 0x1000, 0x1000, CRC(eb0a08fd) SHA1(f0b82089c5c8191fbc6a3ee2c78ce730c7dd5145) ) // BASIC PROM ABC 16-11 "64 90232-02" ROM_LOAD( "abc 26-11.1k", 0x2000, 0x1000, CRC(97a95c59) SHA1(013bc0a2661f4630c39b340965872bf607c7bd45) ) // BASIC PROM ABC 26-11 "64 90233-02" ROM_LOAD( "abc 36-11.1j", 0x3000, 0x1000, CRC(b50e418e) SHA1(991a59ed7796bdcfed310012b2bec50f0b8df01c) ) // BASIC PROM ABC 36-11 "64 90234-02" ROM_LOAD( "abc 46-11.2m", 0x4000, 0x1000, CRC(17a87c7d) SHA1(49a7c33623642b49dea3d7397af5a8b9dde8185b) ) // BASIC PROM ABC 46-11 "64 90235-02" ROM_LOAD( "abc 56-11.2l", 0x5000, 0x1000, CRC(b4b02358) SHA1(95338efa3b64b2a602a03bffc79f9df297e9534a) ) // BASIC PROM ABC 56-11 "64 90236-02" - ROM_SYSTEM_BIOS( 0, "v19", "UFD-DOS v.19" ) + ROM_SYSTEM_BIOS( 0, "ufd19", "UFD-DOS v.19 (1984-03-02)" ) ROMX_LOAD( "abc 66-21.2k", 0x6000, 0x1000, CRC(c311b57a) SHA1(4bd2a541314e53955a0d53ef2f9822a202daa485), ROM_BIOS(1) ) // DOS PROM ABC 66-21 "64 90314-01" - ROM_SYSTEM_BIOS( 1, "v20", "UFD-DOS v.20" ) + ROM_SYSTEM_BIOS( 1, "ufd20", "UFD-DOS v.20 (1984-04-03)" ) ROMX_LOAD( "abc 66-31.2k", 0x6000, 0x1000, CRC(a2e38260) SHA1(0dad83088222cb076648e23f50fec2fddc968883), ROM_BIOS(2) ) - ROM_SYSTEM_BIOS( 2, "mica", "MICA DOS v.20" ) + ROM_SYSTEM_BIOS( 2, "mica20", "MICA DOS v.20 (1984-04-03)" ) ROMX_LOAD( "mica2006.2k", 0x6000, 0x1000, CRC(58bc2aa8) SHA1(0604bd2396f7d15fcf3d65888b4b673f554037c0), ROM_BIOS(3) ) - ROM_SYSTEM_BIOS( 3, "catnet", "CAT-NET" ) + ROM_SYSTEM_BIOS( 3, "catnet", "CAT-NET" ) ROMX_LOAD( "cmd8_5.2k", 0x6000, 0x1000, CRC(25430ef7) SHA1(03a36874c23c215a19b0be14ad2f6b3b5fb2c839), ROM_BIOS(4) ) ROM_LOAD_OPTIONAL( "abc 76-11.2j", 0x7000, 0x1000, CRC(3eb5f6a1) SHA1(02d4e38009c71b84952eb3b8432ad32a98a7fe16) ) // Options-PROM ABC 76-11 "64 90238-02" ROM_LOAD( "abc 76-xx.2j", 0x7000, 0x1000, CRC(b364cc49) SHA1(9a2c373778856a31902cdbd2ae3362c200a38e24) ) // Enhanced Options-PROM @@ -1454,22 +1457,22 @@ ROM_START( abc806 ) ROM_LOAD( "abc t6-11.7c", 0x0000, 0x1000, CRC(b17c51c5) SHA1(e466e80ec989fbd522c89a67d274b8f0bed1ff72) ) // 64 90243-01 ROM_REGION( 0x200, "rad", 0 ) - ROM_LOAD( "64 90241-01.9b", 0x0000, 0x0200, NO_DUMP ) // "RAD" 7621/7643 (82S131/82S137), character line address + ROM_LOAD( "64 90241-01.9b", 0x000, 0x200, NO_DUMP ) // "RAD" 7621/7643 (82S131/82S137), character line address ROM_REGION( 0x20, "hru", 0 ) - ROM_LOAD( "64 90128-01.6e", 0x0000, 0x0020, NO_DUMP ) // "HRU I" 7603 (82S123), HR horizontal timing and video memory access + ROM_LOAD( "64 90128-01.6e", 0x00, 0x20, NO_DUMP ) // "HRU I" 7603 (82S123), HR horizontal timing and video memory access ROM_REGION( 0x200, "hru2", 0 ) - ROM_LOAD( "64 90127-01.12g", 0x0000, 0x0200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) // "HRU II" 7621 (82S131), ABC800C HR compatibility mode palette + ROM_LOAD( "64 90127-01.12g", 0x000, 0x200, CRC(8e9d7cdc) SHA1(4ad16dc0992e31cdb2e644c7be81d334a56f7ad6) ) // "HRU II" 7621 (82S131), ABC800C HR compatibility mode palette ROM_REGION( 0x400, "v50", 0 ) - ROM_LOAD( "64 90242-01.7e", 0x0000, 0x0200, NO_DUMP ) // "V50" 7621 (82S131), HR vertical timing 50Hz - ROM_LOAD( "64 90319-01.7e", 0x0200, 0x0200, NO_DUMP ) // "V60" 7621 (82S131), HR vertical timing 60Hz + ROM_LOAD( "64 90242-01.7e", 0x000, 0x200, NO_DUMP ) // "V50" 7621 (82S131), HR vertical timing 50Hz + ROM_LOAD( "64 90319-01.7e", 0x200, 0x200, NO_DUMP ) // "V60" 7621 (82S131), HR vertical timing 60Hz ROM_REGION( 0x400, "plds", 0 ) - ROM_LOAD( "64 90225-01.11c", 0x0000, 0x0400, NO_DUMP ) // "VIDEO ATTRIBUTE" 40033A (?) - ROM_LOAD( "64 90239-01.1b", 0x0000, 0x0400, NO_DUMP ) // "ABC P3-11" PAL16R4, color encoder - ROM_LOAD( "64 90240-01.2d", 0x0000, 0x0400, NO_DUMP ) // "ABC P4-11" PAL16L8, memory mapper + ROM_LOAD( "64 90225-01.11c", 0x000, 0x400, NO_DUMP ) // "VIDEO ATTRIBUTE" 40033A (?) + ROM_LOAD( "64 90239-01.1b", 0x000, 0x400, NO_DUMP ) // "ABC P3-11" PAL16R4, color encoder + ROM_LOAD( "64 90240-01.2d", 0x000, 0x400, NO_DUMP ) // "ABC P4-11" PAL16L8, memory mapper ROM_END