6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 16:30:29 +00:00
Code Issues Projects Releases Wiki Activity

Enssures STX interprets sector sizes correctly.

Browse Source
This commit is contained in:
Thomas Harte 2020-01-14 21:35:37 -05:00
parent 942986aadc
commit ecb5807ec0
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/STX.cpp
View File

@ -45,7 +45,7 @@ class TrackConstructor {
/// @returns The byte size of this sector, according to its address mark. /// @returns The byte size of this sector, according to its address mark.
uint32_t data_size() const { uint32_t data_size() const {
return uint32_t(128 << address[3]); return uint32_t(128 << (address[3]&3));
} }
/// @returns The byte stream this sector address would produce if a WD read track command were to observe it. /// @returns The byte stream this sector address would produce if a WD read track command were to observe it.
@ -156,7 +156,7 @@ class TrackConstructor {
locations.emplace_back(Location::Address, address_position, sector); locations.emplace_back(Location::Address, address_position, sector);
// Advance the track position. // Advance the track position.
track_position = address_position; track_position = address_position + 6;
} }
} }
@ -174,7 +174,7 @@ class TrackConstructor {
} }
locations.emplace_back(Location::Data, data_position, sector); locations.emplace_back(Location::Data, data_position, sector);
track_position = data_position; track_position = data_position + sector.data_size();
} }
} }
@ -188,7 +188,7 @@ class TrackConstructor {
auto location = locations.begin(); auto location = locations.begin();
track_position = track_data_.begin(); track_position = track_data_.begin();
while(location != locations.end()) { while(location != locations.end()) {
assert(location->position < track_data_.end()); // assert(location->position >= track_position && location->position < track_data_.end());
// Advance to location.position. // Advance to location.position.
while(track_position < location->position) { while(track_position < location->position) {