6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-17 17:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Ensures head and track counts are reported accurately.

Browse Source
This commit is contained in:
Thomas Harte 2020-01-12 22:23:34 -05:00
parent 2d233b6358
commit b3b2e18c4b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Storage/Disk/DiskImage/Formats/STX.cpp
View File

@ -280,8 +280,8 @@ STX::STX(const std::string &file_name) : file_(file_name) {
// Skip: tool used, 2 reserved bytes. // Skip: tool used, 2 reserved bytes.
file_.seek(4, SEEK_CUR); file_.seek(4, SEEK_CUR);
// Grab the track count and test for a new-style encoding, and skip a reserved area. // Skip the track count, test for a new-style encoding, skip a reserved area.
track_count_ = file_.get8(); file_.seek(1, SEEK_CUR);
is_new_format_ = file_.get8() == 2; is_new_format_ = file_.get8() == 2;
file_.seek(4, SEEK_CUR); file_.seek(4, SEEK_CUR);
@ -301,6 +301,8 @@ STX::STX(const std::string &file_name) : file_(file_name) {
// 12 2 Total number of bytes on track. // 12 2 Total number of bytes on track.
// 14 1 Track number (b7 = side, b0-b6 = track). // 14 1 Track number (b7 = side, b0-b6 = track).
// 15 1 Track type. // 15 1 Track type.
track_count_ = 0;
head_count_ = 1;
while(true) { while(true) {
const long offset = file_.tell(); const long offset = file_.tell();
const uint32_t size = file_.get32le(); const uint32_t size = file_.get32le();
@ -312,17 +314,21 @@ STX::STX(const std::string &file_name) : file_(file_name) {
const uint8_t track_position = file_.get8(); const uint8_t track_position = file_.get8();
offset_by_track_[track_position] = offset; offset_by_track_[track_position] = offset;
// Update the maximum surface dimensions.
track_count_ = std::max(track_count_, track_position & 0x7f);
head_count_ = std::max(head_count_, ((track_position & 0x80) >> 6));
// Seek next track start. // Seek next track start.
file_.seek(offset + size, SEEK_SET); file_.seek(offset + size, SEEK_SET);
} }
} }
HeadPosition STX::get_maximum_head_position() { HeadPosition STX::get_maximum_head_position() {
return HeadPosition(80); return HeadPosition(track_count_ + 1); // Same issue as MSA; must fix!
} }
int STX::get_head_count() { int STX::get_head_count() {
return 2; return head_count_;
} }
std::shared_ptr<::Storage::Disk::Track> STX::get_track_at_position(::Storage::Disk::Track::Address address) { std::shared_ptr<::Storage::Disk::Track> STX::get_track_at_position(::Storage::Disk::Track::Address address) {

2
Storage/Disk/DiskImage/Formats/STX.hpp
View File

@ -38,6 +38,8 @@ class STX: public DiskImage {
FileHolder file_; FileHolder file_;
int track_count_; int track_count_;
int head_count_;
bool is_new_format_; bool is_new_format_;
long offset_by_track_[256]; long offset_by_track_[256];
}; };