From 7fc7f5850e6a1082664efac72470919dcc0311b1 Mon Sep 17 00:00:00 2001 From: 68bit Date: Mon, 20 Jan 2020 13:32:17 +1100 Subject: apply2 floppy format: bake in the track count The APPLE2_TRACK_COUNT macro was not being expanded here, at least on gcc8. This resulted in the string "APPLE2_TRACK_COUNT" being within the specification and that in turn broke option_resolution::lookup_in_specification leading to an assertion fail with the debug checks enabled. So bake in the numeric constant to at least get things working again. --- src/lib/formats/ap2_dsk.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/formats/ap2_dsk.cpp') diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index a2fa0ee188a..f469edf6a73 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -496,19 +496,19 @@ static uint32_t apple2_get_track_size(floppy_image_legacy *floppy, int head, int LEGACY_FLOPPY_OPTIONS_START( apple2 ) LEGACY_FLOPPY_OPTION( apple2_do, "do,dsk,bin", "Apple ][ DOS order disk image", apple2_dsk_identify, apple2_do_construct, nullptr, HEADS([1]) - TRACKS([APPLE2_TRACK_COUNT]) + TRACKS([40]) // APPLE2_TRACK_COUNT SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([0])) LEGACY_FLOPPY_OPTION( apple2_po, "po,dsk,bin", "Apple ][ ProDOS order disk image", apple2_dsk_identify, apple2_po_construct, nullptr, HEADS([1]) - TRACKS([APPLE2_TRACK_COUNT]) + TRACKS([40]) // APPLE2_TRACK_COUNT SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([0])) LEGACY_FLOPPY_OPTION( apple2_nib, "dsk,nib", "Apple ][ Nibble order disk image", apple2_nib_identify, apple2_nib_construct, nullptr, HEADS([1]) - TRACKS([APPLE2_TRACK_COUNT]) + TRACKS([40]) // APPLE2_TRACK_COUNT SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([0])) -- cgit v1.2.3-70-g09d2