From 4b7c504d223fa68310df223087d21666ff5159af Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 11 Aug 2017 15:55:33 -0400 Subject: [PATCH] =?UTF-8?q?Corrects=20analysis=20of=20system=20disks=20?= =?UTF-8?q?=E2=80=94=20they=20have=20a=20catalogue=20that=20is=20correct?= =?UTF-8?q?=20read,=20but=20can=20be=20launched=20without=20reference=20to?= =?UTF-8?q?=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StaticAnalyser/AmstradCPC/StaticAnalyser.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp b/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp index d166887d2..354f7f54d 100644 --- a/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp +++ b/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp @@ -50,6 +50,8 @@ static void InspectDataCatalogue( static void InspectSystemCatalogue( const std::unique_ptr &data_catalogue, StaticAnalyser::Target &target) { + // If this is a system disk, then launch it as though it were CP/M. + target.loadingCommand = "|cpm\n"; } void StaticAnalyser::AmstradCPC::AddTargets( @@ -87,12 +89,12 @@ void StaticAnalyser::AmstradCPC::AddTargets( InspectDataCatalogue(data_catalogue, target); } else { Storage::Disk::CPM::ParameterBlock system_format; - data_format.sectors_per_track = 9; - data_format.tracks = 40; - data_format.block_size = 1024; - data_format.first_sector = 0x41; - data_format.catalogue_allocation_bitmap = 0xc000; - data_format.reserved_tracks = 2; + system_format.sectors_per_track = 9; + system_format.tracks = 40; + system_format.block_size = 1024; + system_format.first_sector = 0x41; + system_format.catalogue_allocation_bitmap = 0xc000; + system_format.reserved_tracks = 2; std::unique_ptr system_catalogue = Storage::Disk::CPM::GetCatalogue(target.disks.front(), system_format); if(system_catalogue) {