6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Simplified slightly, and updated TODO as to still-missing functionality.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-11 14:33:34 -04:00
parent 80ebc63101
commit edb088526f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Storage/Disk/Formats/CPCDSK.cpp
View File

@ -123,33 +123,33 @@ std::shared_ptr<Track> CPCDSK::get_uncached_track_at_position(unsigned int head,
new_sector.data.resize(data_size); new_sector.data.resize(data_size);
fread(new_sector.data.data(), sizeof(uint8_t), data_size, file_); fread(new_sector.data.data(), sizeof(uint8_t), data_size, file_);
// TODO: obey the status bytes, somehow (?) if(sector_info.status1 & 0x08) {
if(sector_info.status1 || sector_info.status2) { // The CRC failed in the ID field.
if(sector_info.status1 & 0x08) { new_sector.has_header_crc_error = true;
// The CRC failed in the ID field. }
new_sector.has_header_crc_error = true;
}
if(sector_info.status2 & 0x20) { if(sector_info.status2 & 0x20) {
// The CRC failed in the data field. // The CRC failed in the data field.
new_sector.has_data_crc_error = true; new_sector.has_data_crc_error = true;
} }
if(sector_info.status2 & 0x40) { if(sector_info.status2 & 0x40) {
// This sector is marked as deleted. // This sector is marked as deleted.
new_sector.is_deleted = true; new_sector.is_deleted = true;
} }
if(sector_info.status2 & 0x01) { if(sector_info.status2 & 0x01) {
// Data field wasn't found. // Data field wasn't found.
new_sector.data.clear(); new_sector.data.clear();
}
} }
sectors.push_back(std::move(new_sector)); sectors.push_back(std::move(new_sector));
} }
// TODO: supply gay 3 length and filler byte // TODO: extensions to the extended format; John Elliot's addition of single-density support,
// and Simon Owen's weak/random sectors, subject to adding some logic to pick a potential
// FM/MFM encoding that can produce specified weak values.
if(sectors.size()) return Storage::Encodings::MFM::GetMFMTrackWithSectors(sectors, gap3_length, filler_byte); if(sectors.size()) return Storage::Encodings::MFM::GetMFMTrackWithSectors(sectors, gap3_length, filler_byte);
return nullptr; return nullptr;