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

Sector size is now reported, and CRC failures are merely indicated, not cause for a sector to be thrown away.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-11 16:23:33 -04:00
parent 23c149368b
commit a12671010a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Storage/Disk/Encodings/MFM.cpp
View File

@ -432,10 +432,10 @@ std::shared_ptr<Sector> Parser::get_next_sector() {
sector->track = get_next_byte(); sector->track = get_next_byte();
sector->side = get_next_byte(); sector->side = get_next_byte();
sector->sector = get_next_byte(); sector->sector = get_next_byte();
uint8_t size = get_next_byte(); sector->size = get_next_byte();
uint16_t header_crc = crc_generator_.get_value(); uint16_t header_crc = crc_generator_.get_value();
if((header_crc >> 8) != get_next_byte()) continue; if((header_crc >> 8) != get_next_byte()) sector->has_header_crc_error = true;
if((header_crc & 0xff) != get_next_byte()) continue; if((header_crc & 0xff) != get_next_byte()) sector->has_header_crc_error = true;
// look for data mark // look for data mark
bool data_found = false; bool data_found = false;
@ -462,14 +462,14 @@ std::shared_ptr<Sector> Parser::get_next_sector() {
} }
crc_generator_.add(DataAddressByte); crc_generator_.add(DataAddressByte);
size_t data_size = (size_t)(128 << size); size_t data_size = (size_t)(128 << sector->size);
sector->data.reserve(data_size); sector->data.reserve(data_size);
for(size_t c = 0; c < data_size; c++) { for(size_t c = 0; c < data_size; c++) {
sector->data.push_back(get_next_byte()); sector->data.push_back(get_next_byte());
} }
uint16_t data_crc = crc_generator_.get_value(); uint16_t data_crc = crc_generator_.get_value();
if((data_crc >> 8) != get_next_byte()) continue; if((data_crc >> 8) != get_next_byte()) sector->has_data_crc_error = true;
if((data_crc & 0xff) != get_next_byte()) continue; if((data_crc & 0xff) != get_next_byte()) sector->has_data_crc_error = true;
// Put this sector into the cache. // Put this sector into the cache.
int index = get_index(head_, track_, sector->sector); int index = get_index(head_, track_, sector->sector);