From c1e0a6344aff140e9929e4eb1a62c4d587dfc7b6 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Thu, 16 Feb 2017 14:46:45 +0100 Subject: [PATCH] Revert "wd177x_dsk, upd765_dsk: Fixed sector interleaving. [Curt Coder]" This reverts commit 16f79382aa892eb478813e3fc4b812e9e875fbaf. --- src/lib/formats/abc800_dsk.cpp | 4 ++-- src/lib/formats/tiki100_dsk.cpp | 12 +++++------- src/lib/formats/upd765_dsk.cpp | 2 +- src/lib/formats/wd177x_dsk.cpp | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/formats/abc800_dsk.cpp b/src/lib/formats/abc800_dsk.cpp index 8d6ced9c0fd..033ff309dcd 100644 --- a/src/lib/formats/abc800_dsk.cpp +++ b/src/lib/formats/abc800_dsk.cpp @@ -53,7 +53,7 @@ const abc800_format::format abc800_format::formats[] = { { // 80K 5 1/4 inch single density single sided floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM, - 4000, 16, 40, 1, 128, {}, -1, { 1,2,11,12,5,6,15,16,9,10,3,4,13,14,7,8 }, 28, 11, 27 + 4000, 16, 40, 1, 128, {}, 1, {}, 28, 11, 27 }, // track description @@ -77,7 +77,7 @@ const abc800_format::format abc800_format::formats[] = { { // 160K 5 1/4 inch double density single sided floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM, - 2000, 16, 40, 1, 256, {}, -1, { 1,8,15,6,13,4,11,2,9,16,7,14,5,12,3,10 }, 55, 22, 54 + 2000, 16, 40, 1, 256, {}, 1, {}, 55, 22, 54 }, // track description diff --git a/src/lib/formats/tiki100_dsk.cpp b/src/lib/formats/tiki100_dsk.cpp index adb94859b36..2258f29c47a 100644 --- a/src/lib/formats/tiki100_dsk.cpp +++ b/src/lib/formats/tiki100_dsk.cpp @@ -6,8 +6,6 @@ TIKI 100 disk image format - NOTE: existing sector dump images are interleaved - *********************************************************************/ #include @@ -56,7 +54,7 @@ const tiki100_format::format tiki100_format::formats[] = { // 89xff { // 90K 5 1/4 inch single density single sided floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM, - 4000, 18, 40, 1, 128, {}, 1, { 1,10,6,15,11,2,16,7,3,12,8,17,13,4,12,9,5,14 }, 20, 11, 7 + 4000, 18, 40, 1, 128, {}, -1, { 1,10,6,15,11,2,16,7,3,12,8,17,13,4,12,9,5,14 }, 20, 11, 7 }, // track description @@ -73,12 +71,12 @@ const tiki100_format::format tiki100_format::formats[] = { // 275x4e { // 200K 5 1/4 inch double density single sided floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM, - 2000, 10, 40, 1, 512, {}, 1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 + 2000, 10, 40, 1, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 }, { // 360K 5 1/4 inch double density floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, - 2000, 9, 40, 2, 512, {}, 1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 + 2000, 9, 40, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 }, // track description @@ -95,7 +93,7 @@ const tiki100_format::format tiki100_format::formats[] = { // 275x4e { // 400K 5 1/4 inch double density floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, - 2000, 10, 40, 2, 512, {}, 1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 + 2000, 10, 40, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 }, // track description @@ -112,7 +110,7 @@ const tiki100_format::format tiki100_format::formats[] = { // 275x4e { // 800K 5 1/4 inch quad density floppy_image::FF_525, floppy_image::DSQD, floppy_image::MFM, - 2000, 10, 80, 2, 512, {}, 1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 + 2000, 10, 80, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24 }, {} diff --git a/src/lib/formats/upd765_dsk.cpp b/src/lib/formats/upd765_dsk.cpp index 1be4b1e0275..67c7ce8b653 100644 --- a/src/lib/formats/upd765_dsk.cpp +++ b/src/lib/formats/upd765_dsk.cpp @@ -62,7 +62,7 @@ void upd765_format::build_sector_description(const format &f, uint8_t *sectdata, cur_offset += f.sector_base_size ? f.sector_base_size : f.per_sector_size[j]; sectors[i].data = sectdata + cur_offset; sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i]; - sectors[i].sector_id = i + f.per_sector_id[0]; + sectors[i].sector_id = f.per_sector_id[i]; } } else { int cur_offset = 0; diff --git a/src/lib/formats/wd177x_dsk.cpp b/src/lib/formats/wd177x_dsk.cpp index 04e17ce66d2..fe6c9db2535 100644 --- a/src/lib/formats/wd177x_dsk.cpp +++ b/src/lib/formats/wd177x_dsk.cpp @@ -65,7 +65,7 @@ void wd177x_format::build_sector_description(const format &f, uint8_t *sectdata, cur_offset += f.sector_base_size ? f.sector_base_size : f.per_sector_size[j]; sectors[i].data = sectdata + cur_offset; sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i]; - sectors[i].sector_id = i + f.per_sector_id[0]; + sectors[i].sector_id = f.per_sector_id[i]; } } else { int cur_offset = 0;