patch 400K, id matrix

Author: dfgordon

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.1] - 2025-10-04
+
+### Fixes
+
+* fix handling of 400K Apple disks
+* remove interleave restriction on 3.5 inch Apple disks
+* eliminate unnecessary elements from disk identification matrix
+
 ## [4.0.0] - 2025-09-20
 
 ### Fixes
@@ -63,7 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - arguments to many functions use abstract `Track` and `Sector` in place of CHS indices
 * changes to `DiskFS` trait
     - permissions are controlled by `set_attrib`, while `lock`, `unlock`, `protect`, and `unprotect` are eliminated
-* changed interfaces: `escaped_ascii_to_bytes`, `Packing::get_load_address`, `Woz1::create`, `Woz2::create`
+* changed interfaces: `create_fs_*`, `escaped_ascii_to_bytes`, `Packing::get_load_address`, `Woz1::create`, `Woz2::create`
 * changed structures: `merlin::settings::Flag`, `img::TrackSolution`
 * changed enumerations: various error enumerations
 * public became private: `lang::linenum`

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "a2kit"
-version = "4.0.0"
+version = "4.0.1"
 edition = "2024"
 readme = "README.md"
 license = "MIT"

src/fs/cpm/mod.rs

@@ -42,6 +42,15 @@ use crate::{STDRESULT,DYNERR};
 const RCH: &str = "unreachable was reached";
 
 pub const FS_NAME: &str = "cpm";
+const IMAGE_TYPES: [img::DiskImageType;7] = [
+    img::DiskImageType::DO,
+    img::DiskImageType::NIB,
+    img::DiskImageType::WOZ1,
+    img::DiskImageType::WOZ2,
+    img::DiskImageType::DOT2MG,
+    img::DiskImageType::IMD,
+    img::DiskImageType::TD0,
+];
 
 /// Given a CP/M extended filename string, get the access and fs_type fields
 /// to be used in a file image.  These are tied together because of the way
@@ -162,6 +171,10 @@ impl Disk
     /// Usually called before user parameters are applied.
     /// Will not accept images with directory structures corresponding to CP/M versions higher than `cpm_vers`.
     pub fn test_img(img: &mut Box<dyn img::DiskImage>,dpb: &DiskParameterBlock,cpm_vers: [u8;3]) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying CP/M");
         img.change_method(img::tracks::Method::Auto);
         // test the volume directory header
         if let Some(directory) = get_directory(img,dpb) {

src/fs/dos3x/mod.rs

@@ -27,6 +27,14 @@ use crate::DiskFormat;
 use crate::{STDRESULT,DYNERR};
 
 pub const FS_NAME: &str = "a2 dos";
+const IMAGE_TYPES: [img::DiskImageType;6] = [
+    img::DiskImageType::D13,
+    img::DiskImageType::DO,
+    img::DiskImageType::NIB,
+    img::DiskImageType::WOZ1,
+    img::DiskImageType::WOZ2,
+    img::DiskImageType::DOT2MG
+];
 
 pub fn new_fimg(chunk_len: usize,name: &str) -> Result<super::FileImage,DYNERR> {
     if !pack::is_name_valid(name) {
@@ -130,6 +138,10 @@ impl Disk
     /// Test an image for DOS 3.x.  Changes method to Auto.
     /// Usually called before user parameters are applied.
     pub fn test_img(img: &mut Box<dyn img::DiskImage>, maybe_fmt: Option<&DiskFormat>) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying DOS 3.x");
         img.change_method(img::tracks::Method::Auto);
         let tlen = img.end_track();
         if (tlen < 35 || tlen > 40) && maybe_fmt.is_none() {

src/fs/fat/mod.rs

@@ -26,6 +26,12 @@ use crate::bios::{bpb,fat};
 use crate::{DYNERR,STDRESULT};
 
 pub const FS_NAME: &str = "fat";
+const IMAGE_TYPES: [img::DiskImageType;4] = [
+    img::DiskImageType::IMG,
+    img::DiskImageType::IMD,
+    img::DiskImageType::TD0,
+    img::DiskImageType::DOT86F
+];
 
 pub fn new_fimg(chunk_len: usize,set_time: bool,path: &str) -> Result<super::FileImage,DYNERR> {
     if !pack::is_path_valid(path) {
@@ -121,6 +127,10 @@ impl Disk {
     }
     /// Test an image for the FAT file system.
     pub fn test_img(img: &mut Box<dyn img::DiskImage>) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying FAT");
         // test the boot sector to see if this is FAT
         if let Ok(boot) = img.read_sector(Track::Num(0),Sector::Num(1)) {
             return bpb::BootSector::verify(&boot);
@@ -130,6 +140,10 @@ impl Disk {
     }
     /// Test an image for DOS 1.x (no signature, no BPB)
     pub fn test_img_dos1x(img: &mut Box<dyn img::DiskImage>) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying DOS 1.x");
         // We are going to look in the first FAT.
         // We look in the boot sector only for logging purposes.
         // By this time layout or size has already been used to create the `DiskImage`.

src/fs/fimg.rs

@@ -6,8 +6,8 @@
 //! 
 //! The native file image used by `a2kit` is the `FileImage` trait object.
 //! It handles sparse and sequential files on an equal footing.
-//! All data must be packed as a `FileImage` before being written to a disk image.
-//! All data read from a disk image will be initially in the form of a `FileImage`.
+//! All file data must be packed as a `FileImage` before being written to a disk image.
+//! All file data read from a disk image will be initially in the form of a `FileImage`.
 //! `FileImage` data can be unpacked into a form suitable for ordinary consumers.
 //! If the data is not unpacked, the user will receive the `FileImage` as a JSON string.
 //! 

src/fs/pascal/mod.rs

@@ -21,6 +21,13 @@ use crate::img;
 use crate::{STDRESULT,DYNERR};
 
 pub const FS_NAME: &str = "a2 pascal";
+const IMAGE_TYPES: [img::DiskImageType;5] = [
+    img::DiskImageType::DO,
+    img::DiskImageType::NIB,
+    img::DiskImageType::WOZ1,
+    img::DiskImageType::WOZ2,
+    img::DiskImageType::DOT2MG
+];
 
 /// Load directory structure from a borrowed disk image.
 /// This is used to test images, as well as being called during FS operations.
@@ -99,6 +106,10 @@ impl Disk
     /// Test an image for the Pascal file system.  Changes method to Auto.
     /// Usually called before user parameters are applied.
     pub fn test_img(img: &mut Box<dyn img::DiskImage>) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying Pascal");
         img.change_method(img::tracks::Method::Auto);
         // test the volume directory header
          match get_directory(img) {

src/fs/prodos/mod.rs

@@ -23,6 +23,14 @@ use crate::img;
 use crate::{DYNERR,STDRESULT};
 
 pub const FS_NAME: &str = "prodos";
+const IMAGE_TYPES: [img::DiskImageType;6] = [
+    img::DiskImageType::DO,
+    img::DiskImageType::PO,
+    img::DiskImageType::NIB,
+    img::DiskImageType::WOZ1,
+    img::DiskImageType::WOZ2,
+    img::DiskImageType::DOT2MG
+];
 
 /// The primary interface for disk operations.
 pub struct Disk {
@@ -91,6 +99,10 @@ impl Disk {
     /// Test an image for the ProDOS file system. May try multiple track methods.
     /// Usually called before user parameters are applied.
     pub fn test_img(img: &mut Box<dyn img::DiskImage>) -> bool {
+        if !IMAGE_TYPES.contains(&img.what_am_i()) {
+            return false;
+        }
+        log::info!("trying ProDOS");
         let mut maybe_buf: Result<Vec<u8>,DYNERR> = Err(Box::new(Error::IOError));
         for test_method in [img::tracks::Method::Auto,img::tracks::Method::Emulate] {
             img.change_method(test_method);

src/img/tracks/formats.rs

@@ -96,7 +96,7 @@ impl ZoneFormat {
                 _ => panic!("sides should be 1 or 2")
             },
             addr_fmt_expr: expr_vec(&["cyl%64","sec","head*32+cyl//64",&format,&chk]),
-            addr_seek_expr: expr_vec(&["cyl%64","sec","head*32+cyl//64",&format,"(a0^a1^a2^a3)&63"]),
+            addr_seek_expr: expr_vec(&["cyl%64","sec","head*32+cyl//64","a3","(a0^a1^a2^a3)&63"]),
             data_expr: expr_vec(&["sec","dat"]),
             markers: [
                 SectorMarker {key: vec![0xd5,0xaa,0x96], mask: vec![0xff,0xff,0xff]},

src/img/tracks/gcr.rs

@@ -1,12 +1,14 @@
 //! ## module for GCR tracks
 //! 
-//! This handles bit-level processing of a GCR encoded disk track.
+//! This handles bit-level or flux-level processing of a GCR encoded disk track.
 //! Image types handled include WOZ, G64, and NIB.
 //! Special handling can be triggered by elements of the `ZoneFormat` struct.
 //! 
-//! There is an assumed tick normalization for each kind of disk:
+//! The `FluxCells` that are passed in for Apple disks must use tick normalizations as follows:
 //! * Apple 5.25 inch - 125000 ps
 //! * Apple 3.5 inch - 62500 ps
+//! This differs from WOZ image normalization which is always 125000 ps.
+//! Callers external to the library should not have to worry about this.
 
 use crate::img::{Error,FieldCode,SectorHood,Sector};
 use super::{ZoneFormat,Method,FluxCells};