6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-15 14:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Started working CRC checking into the 1770. Discovered immediately that my generated CRC does not match that built into the Oric disk images. So mine is pretty-much certainly wrong. An opportunity for learning!

Browse Source
This commit is contained in:
Thomas Harte
2016-12-26 16:46:26 -05:00
parent 0490a47058
commit 9c0f622a2e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Components/1770/1770.cpp
View File

@@ -29,6 +29,7 @@ WD1770::Status::Status() :
WD1770::WD1770(Personality p) : WD1770::WD1770(Personality p) :
Storage::Disk::Controller(8000000, 16, 300), Storage::Disk::Controller(8000000, 16, 300),
crc_generator_(0x1021, 0xffff),
interesting_event_mask_(Event::Command), interesting_event_mask_(Event::Command),
resume_point_(0), resume_point_(0),
delay_time_(0), delay_time_(0),
@@ -563,6 +564,7 @@ void WD1770::posit_event(Event new_event_type)
}); });
distance_into_section_ = 0; distance_into_section_ = 0;
is_reading_data_ = true; is_reading_data_ = true;
crc_generator_.reset();
goto type2_read_byte; goto type2_read_byte;
} }
goto type2_read_data; goto type2_read_data;
@@ -571,6 +573,7 @@ void WD1770::posit_event(Event new_event_type)
WAIT_FOR_EVENT(Event::Token); WAIT_FOR_EVENT(Event::Token);
if(latest_token_.type != Token::Byte) goto type2_read_byte; if(latest_token_.type != Token::Byte) goto type2_read_byte;
data_ = latest_token_.byte_value; data_ = latest_token_.byte_value;
crc_generator_.add(data_);
update_status([] (Status &status) { update_status([] (Status &status) {
status.lost_data |= status.data_request; status.lost_data |= status.data_request;
status.data_request = true; status.data_request = true;
@@ -590,7 +593,12 @@ void WD1770::posit_event(Event new_event_type)
distance_into_section_++; distance_into_section_++;
if(distance_into_section_ == 2) if(distance_into_section_ == 2)
{ {
// TODO: check CRC uint16_t crc = crc_generator_.get_value();
if((crc >> 8) != header_[0] || (crc&0xff) != header_[1])
{
printf("CRC error: %04x v %02x%02x\n", crc, header_[0], header_[1]);
}
if(command_ & 0x10) if(command_ & 0x10)
{ {
sector_++; sector_++;
@@ -640,6 +648,7 @@ void WD1770::posit_event(Event new_event_type)
WAIT_FOR_EVENT(Event::DataWritten); WAIT_FOR_EVENT(Event::DataWritten);
distance_into_section_ = 0; distance_into_section_ = 0;
crc_generator_.reset();
type2_write_loop: type2_write_loop:
/* /*
@@ -650,6 +659,7 @@ void WD1770::posit_event(Event new_event_type)
natural expectations and the way that emulated machines responded, I believe that to be a natural expectations and the way that emulated machines responded, I believe that to be a
documentation error. documentation error.
*/ */
crc_generator_.add(data_);
write_byte(data_); write_byte(data_);
distance_into_section_++; distance_into_section_++;
if(distance_into_section_ < 128 << header_[3]) if(distance_into_section_ < 128 << header_[3])
@@ -675,9 +685,11 @@ void WD1770::posit_event(Event new_event_type)
goto type2_write_loop; goto type2_write_loop;
type2_write_crc: type2_write_crc:
// TODO: write CRC {
write_byte(0); uint16_t crc = crc_generator_.get_value();
write_byte(0); write_byte(crc >> 8);
write_byte((crc & 0xff));
}
write_byte(0xff); write_byte(0xff);
WAIT_FOR_EVENT(Event::DataWritten); WAIT_FOR_EVENT(Event::DataWritten);
end_writing(); end_writing();

4
Components/1770/1770.hpp
View File

@@ -10,6 +10,7 @@
#define _770_hpp #define _770_hpp
#include "../../Storage/Disk/DiskController.hpp" #include "../../Storage/Disk/DiskController.hpp"
#include "../../NumberTheory/CRC.hpp"
namespace WD { namespace WD {
@@ -129,6 +130,9 @@ class WD1770: public Storage::Disk::Controller {
// ID buffer // ID buffer
uint8_t header_[6]; uint8_t header_[6];
// CRC generator
NumberTheory::CRC16 crc_generator_;
// 1793 head-loading logic // 1793 head-loading logic
bool head_is_loaded_; bool head_is_loaded_;