From 505d84f3361229286af210607b7d2bb14e63851d Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 4 Jun 2021 22:43:26 -0400 Subject: [PATCH] Corrects Amstrad 664 and 6128 ROM collection. --- Machines/AmstradCPC/AmstradCPC.cpp | 2 ++ Machines/Utility/ROMCatalogue.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index f7a4db3e5..3b1b43bae 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -798,10 +798,12 @@ template class ConcreteMachine: case Analyser::Static::AmstradCPC::Target::Model::CPC664: firmware = ROM::Name::CPC664Firmware; basic = ROM::Name::CPC664BASIC; + has_amsdos = true; break; default: firmware = ROM::Name::CPC6128Firmware; basic = ROM::Name::CPC6128BASIC; + has_amsdos = true; break; } diff --git a/Machines/Utility/ROMCatalogue.cpp b/Machines/Utility/ROMCatalogue.cpp index aa53c984a..93607a66d 100644 --- a/Machines/Utility/ROMCatalogue.cpp +++ b/Machines/Utility/ROMCatalogue.cpp @@ -156,8 +156,8 @@ Description::Description(Name name) { case Name::CPC464BASIC: *this = Description(name, "AmstradCPC", "the CPC 464 BASIC ROM", "basic464.rom", 16*1024, 0x7d9a3bacu); break; case Name::CPC664Firmware: *this = Description(name, "AmstradCPC", "the CPC 664 firmware", "os664.rom", 16*1024, 0x3f5a6dc4u); break; case Name::CPC664BASIC: *this = Description(name, "AmstradCPC", "the CPC 664 BASIC ROM", "basic664.rom", 16*1024, 0x32fee492u); break; - case Name::CPC6128Firmware: *this = Description(name, "AmstradCPC", "the CPC 6128 firmware", "os664.rom", 16*1024, 0x0219bb74u); break; - case Name::CPC6128BASIC: *this = Description(name, "AmstradCPC", "the CPC 6128 BASIC ROM", "basic664.rom", 16*1024, 0xca6af63du); break; + case Name::CPC6128Firmware: *this = Description(name, "AmstradCPC", "the CPC 6128 firmware", "os6128.rom", 16*1024, 0x0219bb74u); break; + case Name::CPC6128BASIC: *this = Description(name, "AmstradCPC", "the CPC 6128 BASIC ROM", "basic6128.rom", 16*1024, 0xca6af63du); break; case Name::AppleIIEnhancedE: *this = Description(name, "AppleII", "the Enhanced Apple IIe ROM", "apple2e.rom", 32*1024, 0x65989942u); break; case Name::AppleIIe: *this = Description(name, "AppleII", "the Apple IIe ROM", "apple2eu.rom", 32*1024, 0xe12be18du); break;