Supremacy disk formats are actually ZZKJ's. And used on other titles …

…of his.

Refs #73

disk-analyse/formats

@@ -10,7 +10,7 @@ probe_amiga
       archipelagos sensible rnc_pdos_old \
       bat special_fx menace elite_a elite_b elite_c elite_d turrican \
       federation_of_free_traders \
-      phantom_fighter supremacy_a supremacy_b \
+      phantom_fighter zzkj_boot \
       protec_longtrack protoscan_longtrack
 
 ####################
@@ -1578,16 +1578,16 @@ probe_amiga
 "Super Hang-On" 
     0 amigados 
     1 super_hang_on_scores
-    2 supremacy_a 
+    2 zzkj_boot 
     * super_hang_on  
 
 "Super Monaco GP"
     0 amigados
-    1 supremacy_b
-    2 supremacy_a
-    3-47 supremacy_b
+    1 zzkj_11sec
+    2 zzkj_boot
+    3-47 zzkj_11sec
     48-154/2 ignore
-    49-155 supremacy_b
+    49-155 zzkj_11sec
     158 tiertex_longtrack
     159 protoscan_longtrack
     * ignore
@@ -1600,7 +1600,7 @@ probe_amiga
 "Superfrog" = rnc_pdos
 
 "Supremacy" # Disk 1 Tracks 138,140,142,144+, Disk 2 Tracks 130+, may be empty
-    * amigados supremacy_a supremacy_b
+    * amigados zzkj_boot zzkj_11sec
 
 "Suspicious Cargo" = amigados
 

libdisk/format/amiga/supremacy.c → libdisk/format/amiga/zzkj.c

@@ -1,15 +1,15 @@
 /*
- * disk/supremacy.c
+ * disk/zzkj.c
  * 
- * Custom format as used on Supremacy by Melbourne House / Virgin Mastertronic.
+ * Custom formats as used on ZZKJ titles.
  * 
  * Written in 2012 by Keir Fraser
  */
 
 #include <libdisk/util.h>
 #include <private/disk.h>
 
-/* TRKTYP_supremacy_a: Used on Disk 1, Track 2 only.
+/* TRKTYP_zzkj_boot: Used on Disk 1, Track 2 only.
  *  u16 0x4489,0x4489,0x2aaa
  *  u32 data_odd[0x402]
  *  u32 data_even[0x402]
@@ -19,7 +19,7 @@
  * TRKTYP_supremacy data layout:
  *  u8 sector_data[4*1024] */
 
-static void *supremacy_a_write_raw(
+static void *zzkj_boot_write_raw(
     struct disk *d, unsigned int tracknr, struct stream *s)
 {
     struct track_info *ti = &d->di->track[tracknr];
@@ -61,7 +61,7 @@ static void *supremacy_a_write_raw(
     return NULL;
 }
 
-static void supremacy_a_read_raw(
+static void zzkj_boot_read_raw(
     struct disk *d, unsigned int tracknr, struct tbuf *tbuf)
 {
     struct track_info *ti = &d->di->track[tracknr];
@@ -80,14 +80,14 @@ static void supremacy_a_read_raw(
     tbuf_bytes(tbuf, SPEED_AVG, bc_mfm_odd_even, 0x402*4, dat);
 }
 
-struct track_handler supremacy_a_handler = {
+struct track_handler zzkj_boot_handler = {
     .bytes_per_sector = 4*1024,
     .nr_sectors = 1,
-    .write_raw = supremacy_a_write_raw,
-    .read_raw = supremacy_a_read_raw
+    .write_raw = zzkj_boot_write_raw,
+    .read_raw = zzkj_boot_read_raw
 };
 
-/* TRKTYP_supremacy_b:
+/* TRKTYP_zzkj_11sec:
  * 11 sectors:
  *  u16 0x4489,0x4489,0x2aaa :: Sync header
  *  u32 data_odd[0x82]
@@ -100,7 +100,7 @@ struct track_handler supremacy_a_handler = {
  * TRKTYP_supremacy data layout:
  *  u8 sector_data[11*512] */
 
-static void *supremacy_b_write_raw(
+static void *zzkj_11sec_write_raw(
     struct disk *d, unsigned int tracknr, struct stream *s)
 {
     struct track_info *ti = &d->di->track[tracknr];
@@ -162,7 +162,7 @@ static void *supremacy_b_write_raw(
     return block;
 }
 
-static void supremacy_b_read_raw(
+static void zzkj_11sec_read_raw(
     struct disk *d, unsigned int tracknr, struct tbuf *tbuf)
 {
     struct track_info *ti = &d->di->track[tracknr];
@@ -190,11 +190,11 @@ static void supremacy_b_read_raw(
     }
 }
 
-struct track_handler supremacy_b_handler = {
+struct track_handler zzkj_11sec_handler = {
     .bytes_per_sector = 512,
     .nr_sectors = 11,
-    .write_raw = supremacy_b_write_raw,
-    .read_raw = supremacy_b_read_raw
+    .write_raw = zzkj_11sec_write_raw,
+    .read_raw = zzkj_11sec_read_raw
 };
 
 /*

libdisk/include/libdisk/track_types.h

@@ -56,8 +56,8 @@ X(turrican, "Turrican")
 X(factor5_hiscore, "Factor 5 High Score")
 X(federation_of_free_traders, "Federation Of Free Traders")
 X(phantom_fighter, "Phantom Fighter")
-X(supremacy_a, "Supremacy A")
-X(supremacy_b, "Supremacy B")
+X(zzkj_boot, "ZZKJ Bootloader")
+X(zzkj_11sec, "ZZKJ 11-Sector")
 X(bombuzal, "AmigaDOS (Bombuzal Long Track)")
 X(speedlock, "Speedlock")
 X(ratt_dos_1800, "RattDOS")