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

Corrects accidental use of sector contents as addresses in multi-sector reads and writes.

Browse Source 
As a secondary defect, this was also causing erroneous CRC error reports.
This commit is contained in:
Thomas Harte 2019-12-22 19:58:02 -05:00
parent d25b48878c
commit b035b92f33
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Components/1770/1770.cpp
View File

@ -324,7 +324,9 @@ void WD1770::posit_event(int new_event_type) {
goto wait_for_command; goto wait_for_command;
} }
if(distance_into_section_ == 7) { if(distance_into_section_ == 7) {
distance_into_section_ = 0;
set_data_mode(DataMode::Scanning); set_data_mode(DataMode::Scanning);
if(get_crc_generator().get_value()) { if(get_crc_generator().get_value()) {
update_status([] (Status &status) { update_status([] (Status &status) {
status.crc_error = true; status.crc_error = true;
@ -339,8 +341,6 @@ void WD1770::posit_event(int new_event_type) {
}); });
goto wait_for_command; goto wait_for_command;
} }
distance_into_section_ = 0;
} }
goto verify_read_data; goto verify_read_data;
@ -397,6 +397,9 @@ void WD1770::posit_event(int new_event_type) {
goto wait_for_command; goto wait_for_command;
} }
distance_into_section_ = 0;
set_data_mode(DataMode::Scanning);
type2_get_header: type2_get_header:
WAIT_FOR_EVENT(static_cast<int>(Event::IndexHole) | static_cast<int>(Event::Token)); WAIT_FOR_EVENT(static_cast<int>(Event::IndexHole) | static_cast<int>(Event::Token));
READ_ID(); READ_ID();
@ -409,8 +412,10 @@ void WD1770::posit_event(int new_event_type) {
goto wait_for_command; goto wait_for_command;
} }
if(distance_into_section_ == 7) { if(distance_into_section_ == 7) {
LOG("Considering " << std::dec << int(header_[0]) << "/" << int(header_[2])); distance_into_section_ = 0;
set_data_mode(DataMode::Scanning); set_data_mode(DataMode::Scanning);
LOG("Considering " << std::dec << int(header_[0]) << "/" << int(header_[2]));
if( header_[0] == track_ && header_[2] == sector_ && if( header_[0] == track_ && header_[2] == sector_ &&
(has_motor_on_line() || !(command_&0x02) || ((command_&0x08) >> 3) == header_[1])) { (has_motor_on_line() || !(command_&0x02) || ((command_&0x08) >> 3) == header_[1])) {
LOG("Found " << std::dec << int(header_[0]) << "/" << int(header_[2])); LOG("Found " << std::dec << int(header_[0]) << "/" << int(header_[2]));
@ -427,7 +432,6 @@ void WD1770::posit_event(int new_event_type) {
}); });
goto type2_read_or_write_data; goto type2_read_or_write_data;
} }
distance_into_section_ = 0;
} }
goto type2_get_header; goto type2_get_header;
@ -470,6 +474,9 @@ void WD1770::posit_event(int new_event_type) {
header_[distance_into_section_] = get_latest_token().byte_value; header_[distance_into_section_] = get_latest_token().byte_value;
distance_into_section_++; distance_into_section_++;
if(distance_into_section_ == 2) { if(distance_into_section_ == 2) {
distance_into_section_ = 0;
set_data_mode(DataMode::Scanning);
if(get_crc_generator().get_value()) { if(get_crc_generator().get_value()) {
LOG("CRC error; terminating"); LOG("CRC error; terminating");
update_status([this] (Status &status) { update_status([this] (Status &status) {
@ -478,11 +485,13 @@ void WD1770::posit_event(int new_event_type) {
goto wait_for_command; goto wait_for_command;
} }
LOG("Finished reading sector " << std::dec << int(sector_));
if(command_ & 0x10) { if(command_ & 0x10) {
sector_++; sector_++;
LOG("Advancing to search for sector " << std::dec << int(sector_));
goto test_type2_write_protection; goto test_type2_write_protection;
} }
LOG("Finished reading sector " << std::dec << int(sector_));
goto wait_for_command; goto wait_for_command;
} }
goto type2_check_crc; goto type2_check_crc;
@ -630,9 +639,11 @@ void WD1770::posit_event(int new_event_type) {
update_status([] (Status &status) { update_status([] (Status &status) {
status.data_request = true; status.data_request = true;
}); });
distance_into_section_++; ++distance_into_section_;
if(distance_into_section_ == 7) { if(distance_into_section_ == 7) {
distance_into_section_ = 0;
if(get_crc_generator().get_value()) { if(get_crc_generator().get_value()) {
update_status([] (Status &status) { update_status([] (Status &status) {
status.crc_error = true; status.crc_error = true;