6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-26 11:29:09 +00:00
Code Issues Projects Releases Wiki Activity

Switches interleaving logic around: having inspected some NIBs sectors are numbered in order, but scatter read from the image.

Browse Source
This commit is contained in:
Thomas Harte 2018-05-02 21:28:18 -04:00
parent 3787d094ec
commit fcc750784a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Storage/Disk/DiskImage/Formats/AppleDSK.cpp
View File

@ -53,12 +53,12 @@ std::shared_ptr<Track> AppleDSK::get_track_at_position(Track::Address address) {
// In either case below, the code aims for exactly 50,000 bits per track. // In either case below, the code aims for exactly 50,000 bits per track.
if(sectors_per_track_ == 16) { if(sectors_per_track_ == 16) {
// Write the sectors. // Write the sectors.
uint8_t sector_number_ = 0; std::size_t sector_number_ = 0;
for(std::size_t c = 0; c < 16; ++c) { for(uint8_t c = 0; c < 16; ++c) {
segment += Encodings::AppleGCR::six_and_two_sync(10); segment += Encodings::AppleGCR::six_and_two_sync(10);
segment += Encodings::AppleGCR::header(0, track, sector_number_); segment += Encodings::AppleGCR::header(0, track, c);
segment += Encodings::AppleGCR::six_and_two_sync(10); segment += Encodings::AppleGCR::six_and_two_sync(10);
segment += Encodings::AppleGCR::six_and_two_data(&track_data[c * 256]); segment += Encodings::AppleGCR::six_and_two_data(&track_data[sector_number_ * 256]);
// DOS and Pro DOS interleave sectors on disk, and they're represented in a disk // DOS and Pro DOS interleave sectors on disk, and they're represented in a disk
// image in physical order rather than logical. So that skew needs to be applied here. // image in physical order rather than logical. So that skew needs to be applied here.