From 6abdd9c401a1d3e3080a724f3e166cac0f6b3af0 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 27 Dec 2024 22:31:57 +0100 Subject: [PATCH 1/5] Treat 1600 kB image as 20 512-byte sectors per track instead of 10 1024-byte sectors per track, per OpenStep 4.0. --- src/floppy/fdd_img.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c index 62b05a944..ea2d544f8 100644 --- a/src/floppy/fdd_img.c +++ b/src/floppy/fdd_img.c @@ -1075,9 +1075,14 @@ jump_if_fdf: dev->sectors = 19; dev->tracks = 80; } else if (size <= 1638400) { /*HD 1024 sector*/ +#ifdef SYNTH_FORMAT dev->sectors = 10; - dev->tracks = 80; dev->sector_size = 3; +#else + /* Prefer 20 512-byte sectors per track, used by the OpenStep 4.0 boot disk. */ + dev->sectors = 20; +#endif + dev->tracks = 80; } else if (size <= 1720320) { /*DMF (Windows 95) */ dev->sectors = 21; dev->tracks = 80; From b0d964140a3440267b1753afa4f445d2c3b93ac6 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 27 Dec 2024 22:37:26 +0100 Subject: [PATCH 2/5] Fixed the comment. --- src/floppy/fdd_img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c index ea2d544f8..bde4ae141 100644 --- a/src/floppy/fdd_img.c +++ b/src/floppy/fdd_img.c @@ -1079,7 +1079,7 @@ jump_if_fdf: dev->sectors = 10; dev->sector_size = 3; #else - /* Prefer 20 512-byte sectors per track, used by the OpenStep 4.0 boot disk. */ + /* Prefer 20 512-byte sectors per track, used by the OpenStep 4.0 Pre-Release 1 boot disk. */ dev->sectors = 20; #endif dev->tracks = 80; From 1a026d58df89c1b7d0953e1471448bcfcf376bbd Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 27 Dec 2024 22:44:21 +0100 Subject: [PATCH 3/5] And another fix. --- src/floppy/fdd_img.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c index bde4ae141..7734e3746 100644 --- a/src/floppy/fdd_img.c +++ b/src/floppy/fdd_img.c @@ -1093,9 +1093,14 @@ jump_if_fdf: dev->sectors = 21; dev->tracks = 82; } else if (size <= 1802240) { /*HD 1024 sector*/ - dev->sectors = 22; - dev->tracks = 80; +#ifdef SYNTH_FORMAT + dev->sectors = 11; dev->sector_size = 3; +#else + /* Prefer 22 512-byte sectors per track. */ + dev->sectors = 22; +#endif + dev->tracks = 80; } else if (size == 1884160) { /*XDF (OS/2 Warp)*/ dev->sectors = 23; dev->tracks = 80; From bf163bbfebc380bd4a02188f914629d7d144aea7 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 27 Dec 2024 22:45:35 +0100 Subject: [PATCH 4/5] Fixed another commit. --- src/floppy/fdd_img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c index 7734e3746..1ed73787a 100644 --- a/src/floppy/fdd_img.c +++ b/src/floppy/fdd_img.c @@ -1120,7 +1120,7 @@ jump_if_fdf: dev->sectors = 42; dev->tracks = 80; #if 0 - } else if (size <= 3440640) { /*HD 1024 sector*/ + } else if (size <= 3440640) { /*ED 1024 sector*/ dev->sectors = 21; dev->tracks = 80; dev->sector_size = 3; From 3bb62f59b817f61754f22b44f6238011639ff4c3 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 27 Dec 2024 22:47:40 +0100 Subject: [PATCH 5/5] And another comment. --- src/floppy/fdd_img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c index 1ed73787a..69a753ef5 100644 --- a/src/floppy/fdd_img.c +++ b/src/floppy/fdd_img.c @@ -1125,7 +1125,7 @@ jump_if_fdf: dev->tracks = 80; dev->sector_size = 3; #endif - } else if (size <= 3604480) { /*HD 1024 sector*/ + } else if (size <= 3604480) { /*ED 1024 sector*/ dev->sectors = 22; dev->tracks = 80; dev->sector_size = 3;