diff --git a/.gitattributes b/.gitattributes index 3c509381324..b54dd4cb564 100644 --- a/.gitattributes +++ b/.gitattributes @@ -65,6 +65,7 @@ hash/c64_flop.xml svneol=native#text/xml hash/casloopy.xml svneol=native#text/xml hash/cbm2_cart.xml svneol=native#text/xml hash/cbm2_flop.xml svneol=native#text/xml +hash/cbm8296_flop.xml svneol=native#text/xml hash/cd32.xml svneol=native#text/xml hash/cdi.xml svneol=native#text/xml hash/cdtv.xml svneol=native#text/xml @@ -181,6 +182,7 @@ hash/pcw.xml svneol=native#text/xml hash/pcw16.xml svneol=native#text/xml hash/pecom_cass.xml svneol=native#text/xml hash/pentagon_cass.xml svneol=native#text/xml +hash/pet_flop.xml svneol=native#text/xml hash/pet_rom.xml svneol=native#text/xml hash/pico.xml svneol=native#text/xml hash/pippin.xml svneol=native#text/xml @@ -229,6 +231,7 @@ hash/st_flop.xml svneol=native#text/xml hash/studio2.xml svneol=native#text/xml hash/stv.xml svneol=native#text/xml hash/super6.xml svneol=native#text/xml +hash/superpet_flop.xml svneol=native#text/xml hash/supracan.xml svneol=native#text/xml hash/svi318_cart.xml svneol=native#text/xml hash/svi318_cass.xml svneol=native#text/xml diff --git a/hash/c128_flop.xml b/hash/c128_flop.xml index 9855d5398c6..94e03dd5de1 100644 --- a/hash/c128_flop.xml +++ b/hash/c128_flop.xml @@ -398,4 +398,201 @@ + + Commodore 1581 3.5" Disk Drive Demo/Utilities + 198? + Commodore + + + + + + + + + + + Commodore 128 Diagnostic Menu + 198? + Commodore + + + + + + + + + + Commodore 1700/1750 RAM Expansion Test/Demo Disk (v1.0) + 1985 + Commodore + + + + + + + + + + CP/M Version 3.0 + 1985 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (Alt) + 1985 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (Alt 2) + 1985 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (Alt 3) + 1985 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (1 May 1986, Ger) + 1986 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (28 May 1987) + 1987 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (28 May 1987, Alt) + 1987 + Commodore + + + + + + + + + + + + + + + + + + + CP/M Version 3.0 (1581) + 198? + Commodore + + + + + + + + + diff --git a/hash/c64_cart.xml b/hash/c64_cart.xml index 4b23bc36f29..937c31683ee 100644 --- a/hash/c64_cart.xml +++ b/hash/c64_cart.xml @@ -6574,4 +6574,26 @@ + + + + CP/M + 1982 + Commodore + + + + + + + + SFX Sound Expander + 1985 + Commodore + + + + + + diff --git a/hash/c64_flop.xml b/hash/c64_flop.xml index c3178531e02..c06abd31696 100644 --- a/hash/c64_flop.xml +++ b/hash/c64_flop.xml @@ -404,19 +404,6 @@ - - SFX Sound Expander Test/Demo Disk - 1985 - Commodore - - - - - - - - - SuperBase 64 (Fin) 1983 @@ -602,15 +589,238 @@ - - Commodore 1581 3.5" Disk Drive Demo/Utilities + + Commodore 1541 Floppy Disk Drive Test/Demo Disk 198? Commodore - + - - - + + + + + + + + + Commodore VIC-1541 Test/Demo + 198? + Commodore + + + + + + + + + + Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt) + 1984 + Commodore + + + + + + + + + + Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt 2) + 1985 + Commodore + + + + + + + + + + Commodore Model 1541 Test/Demo-Diskette + 198? + Commodore + + + + + + + + + + Commodore 1764 RAM Expansion Utility Disk + 1987 + Commodore + + + + + + + + + + + + + + + + + + Commodore 1351 Mouse Utility Disk + 1986 + Commodore + + + + + + + + + + + + + + + + + + SFX Sound Expander Test/Demo Disk + 1985 + Commodore + + + + + + + + + + + + Commodore Modem 300 Test/Demo Diskette + 198? + Commodore + + + + + + + + + + + + + + + + Commodore Modem 1200 Test/Demo Diskette + 198? + Commodore + + + + + + + + + + + + + + + + C-64 Demodiskette + 198? + Commodore + + + + + + + + + + + Commodore C-64 Disk Bonus Pack + 198? + Commodore + + + + + + + + + + Commodore SX-64 Test/Demo Disk + 198? + Commodore + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk + 1982 + Commodore + + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk (Alt) + 1982 + Commodore + + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk (Alt 2) + 1982 + Commodore + + + + + + diff --git a/hash/cbm2_flop.xml b/hash/cbm2_flop.xml index 987b8047f16..fb863c58bb5 100644 --- a/hash/cbm2_flop.xml +++ b/hash/cbm2_flop.xml @@ -2,6 +2,18 @@ + + Commodore 2031 LP Floppy Diskette Drive Test/Demo Diskette + 198? + Commodore + + + + + + + + Commodore 8250LP Floppy Disk Drive Test/Demo Diskette 198? diff --git a/hash/cbm8296_flop.xml b/hash/cbm8296_flop.xml new file mode 100644 index 00000000000..d2ef38b47bc --- /dev/null +++ b/hash/cbm8296_flop.xml @@ -0,0 +1,35 @@ + + + + + + Commodore 8296 System Disk + 1984 + Commodore + + + + + + + + + + ExecuDesk + 1984 + Commodore + + + + + + + + + + + + + + + diff --git a/hash/pet_flop.xml b/hash/pet_flop.xml new file mode 100644 index 00000000000..62dea8c4a83 --- /dev/null +++ b/hash/pet_flop.xml @@ -0,0 +1,120 @@ + + + + + + Commodore 2040 Floppy Disk Drive Test/Demo Disk + 197? + Commodore + + + + + + + + + + VisiCalc + 1981 + Software Arts + + + + + + + + + + + + PET Assembler + 197? + <unknown> + + + + + + + + + + Petspeed + 1982 + Small Systems Engineering + + + + + + + + + + PET-BOOK 8000 + 1982 + Datatronic + + + + + + + + + + + PET-ENT 8000 + 1982 + Datatronic + + + + + + + + + + + PET-GEN 8000 + 1982 + Datatronic + + + + + + + + + + + PET-LEV 8000 + 1983 + Datatronic + + + + + + + + + + diff --git a/hash/pet_rom.xml b/hash/pet_rom.xml index 7380c7dbaee..4708c5303ae 100644 --- a/hash/pet_rom.xml +++ b/hash/pet_rom.xml @@ -2,12 +2,28 @@ + + BATPRO (v4.8) + 198? + <unknown> + + + + + + + + + + + Basic Expand 198? <unknown> + - + @@ -17,8 +33,9 @@ OrgaBASIC 101 (v1.4.015) 198? <unknown> + - + @@ -28,8 +45,9 @@ Spellmaster 198? <unknown> + - + @@ -39,8 +57,9 @@ Wordpro 198? <unknown> + - + @@ -50,19 +69,33 @@ Arrow 198? <unknown> + - + + + Command-O + 198? + <unknown> + + + + + + + + msvweigh 198? <unknown> + - + @@ -83,8 +116,9 @@ NEWTIM S (v3.1) 198? <unknown> + - + @@ -94,8 +128,9 @@ UD11 198? <unknown> + - + @@ -105,8 +140,9 @@ Basic Erweiterung 1 (Ger) 198? <unknown> + - + @@ -116,8 +152,9 @@ SUO 001024 198? <unknown> + - + @@ -127,8 +164,9 @@ PetMaster Superchip 198? <unknown> + - + @@ -138,8 +176,9 @@ The BASIC Programmer's Toolkit 198? <unknown> + - + @@ -149,8 +188,9 @@ VisiCalc 198? <unknown> + - + @@ -160,8 +200,9 @@ Wordcraft 198? <unknown> + - + diff --git a/hash/plus4_flop.xml b/hash/plus4_flop.xml index e3c0b948014..797522847aa 100644 --- a/hash/plus4_flop.xml +++ b/hash/plus4_flop.xml @@ -2,6 +2,18 @@ + + Commodore 1551 Test Demo + 198? + Commodore + + + + + + + + ACE: Air Combat Emulator 1985 diff --git a/hash/superpet_flop.xml b/hash/superpet_flop.xml new file mode 100644 index 00000000000..53b5f30832a --- /dev/null +++ b/hash/superpet_flop.xml @@ -0,0 +1,71 @@ + + + + + + Waterloo Language (v1.0) + 1981 + University of Waterloo + + + + + + + + + + + + + + + + + + + + + + + + + Waterloo Language (v1.1) + 1981 + University of Waterloo + + + + + + + + + + + + + + + + + + + + + + + + + Development Package Examples + 1981 + University of Waterloo + + + + + + + + + diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c index 1d6261e69a8..9637c610524 100644 --- a/src/mess/drivers/pet.c +++ b/src/mess/drivers/pet.c @@ -709,6 +709,7 @@ static MACHINE_CONFIG_START( pet_general, pet_state ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("rom_list", "pet_rom") + MCFG_SOFTWARE_LIST_ADD("flop_list", "pet_flop") MACHINE_CONFIG_END @@ -816,6 +817,13 @@ static MACHINE_CONFIG_DERIVED( superpet, pet80 ) MCFG_GFXDECODE( superpet ) MCFG_PIA6821_MODIFY( "pia_0", petb_pia0 ) + + MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") +MACHINE_CONFIG_END + + +static MACHINE_CONFIG_DERIVED( cbm8296, pet80pal ) + MCFG_SOFTWARE_LIST_ADD("flop_list2", "cbm8296_flop") MACHINE_CONFIG_END @@ -1154,34 +1162,34 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ -COMP(1977, pet2001, 0, 0, pet2001, pet, pet_state, pet2001, "Commodore Business Machines", "PET 2001", GAME_NO_SOUND) -COMP(1979, pet2001n, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "PET 2001-N", GAME_NO_SOUND) -COMP(1979, pet2001b, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "PET 2001-B", GAME_NO_SOUND) -COMP(1979, cbm30, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "CBM 30xx", GAME_NO_SOUND) -COMP(1979, cbm30b, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 30xx (Business keyboard)", GAME_NO_SOUND) -COMP(1979, cbm30nor, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 30xx (Norway, Business keyboard)", GAME_NO_SOUND) +COMP(1977, pet2001, 0, 0, pet2001, pet, pet_state, pet2001, "Commodore Business Machines", "PET 2001", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1979, pet2001n, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "PET 2001-N", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1979, pet2001b, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "PET 2001-B", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1979, cbm30, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "CBM 30xx", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1979, cbm30b, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 30xx (Business keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1979, cbm30nor, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 30xx (Norway, Business keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) /* So called, THIN-40 */ -COMP(1980, pet40on, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, no CRTC, Normal keyboard)", GAME_NO_SOUND) -COMP(1980, pet40ob, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, no CRTC, Business keyboard)", GAME_NO_SOUND) -COMP(1980, cbm40o, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, no CRTC, Normal keyboard)", GAME_NO_SOUND) -COMP(1980, cbm40ob, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, no CRTC, Business keyboard)", GAME_NO_SOUND) +COMP(1980, pet40on, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, no CRTC, Normal keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1980, pet40ob, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, no CRTC, Business keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1980, cbm40o, pet2001, 0, pet, pet, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, no CRTC, Normal keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1980, cbm40ob, pet2001, 0, petb, petb, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, no CRTC, Business keyboard)", GAME_NOT_WORKING | GAME_NO_SOUND) -COMP(1981, pet80, 0, 0, pet80, cbm8096, pet_state, pet80, "Commodore Business Machines", "PET 80xx (Basic 4, CRTC 60Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, cbm80, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, cbm80ger, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Germany, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, cbm80hun, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Hungary, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, cbm80swe, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Sweden, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) +COMP(1981, pet80, 0, 0, pet80, cbm8096, pet_state, pet80, "Commodore Business Machines", "PET 80xx (Basic 4, CRTC 60Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm80, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm80ger, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Germany, Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm80hun, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Hungary, Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm80swe, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 80xx (Sweden, Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) /* So called, FAT-40 */ -COMP(1981, pet40b, pet80, 0, pet80, cbm8096, pet_state, pet80, "Commodore Business Machines", "PET 40xx (Basic 4, CRTC 60Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, pet40n, pet2001, 0, pet40, pet, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, CRTC 60Hz, 40 columns)", GAME_NO_SOUND) -COMP(1981, cbm40b, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 40xx (Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) -COMP(1981, cbm40n, pet2001, 0, pet40pal, pet, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, CRTC 50Hz, 40 columns)", GAME_NO_SOUND) +COMP(1981, pet40b, pet80, 0, pet80, cbm8096, pet_state, pet80, "Commodore Business Machines", "PET 40xx (Basic 4, CRTC 60Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, pet40n, pet2001, 0, pet40, pet, pet_state, pet, "Commodore Business Machines", "PET 40xx (Basic 4, CRTC 60Hz, 40 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm40b, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 40xx (Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1981, cbm40n, pet2001, 0, pet40pal, pet, pet_state, pet, "Commodore Business Machines", "CBM 40xx (Basic 4, CRTC 50Hz, 40 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) -COMP(1981, superpet, 0, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "SuperPET (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING) -COMP(1981, sp9000, superpet, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "CBM SP9000 / MicroMainFrame 9000 (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING) -COMP(198?, mmf9000s, superpet, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "MicroMainFrame 9000 (Sweden, CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING) +COMP(1981, superpet, 0, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "SuperPET (CRTC 50Hz)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_NOT_WORKING) +COMP(1981, sp9000, superpet, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "CBM SP9000 / MicroMainFrame 9000 (CRTC 50Hz)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_NOT_WORKING) +COMP(198?, mmf9000s, superpet, 0, superpet, superpet, pet_state, superpet,"Commodore Business Machines", "MicroMainFrame 9000 (Sweden, CRTC 50Hz)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_NOT_WORKING) -COMP(1984, cbm8296, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 8296 (Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND) -COMP(1984, cbm8296d, pet80, 0, pet80pal, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 8296D", GAME_NO_SOUND) +COMP(1984, cbm8296, pet80, 0, cbm8296, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 8296 (Basic 4, CRTC 50Hz, 80 columns)", GAME_NOT_WORKING | GAME_NO_SOUND) +COMP(1984, cbm8296d, pet80, 0, cbm8296, cbm8096, pet_state, pet80, "Commodore Business Machines", "CBM 8296D", GAME_NOT_WORKING | GAME_NO_SOUND) diff --git a/src/mess/machine/c64exp.c b/src/mess/machine/c64exp.c index 1fadfb8abcf..897a7b12285 100644 --- a/src/mess/machine/c64exp.c +++ b/src/mess/machine/c64exp.c @@ -313,8 +313,8 @@ bool c64_expansion_slot_device::call_load() size = get_software_region_length("nvram"); if (size) memset(m_cart->c64_nvram_pointer(machine(), size), 0, size); - m_cart->m_exrom = atol(get_feature("exrom")); - m_cart->m_game = atol(get_feature("game")); + if (get_feature("exrom") != NULL) m_cart->m_exrom = atol(get_feature("exrom")); + if (get_feature("game") != NULL) m_cart->m_game = atol(get_feature("game")); } } }