6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-11 08:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Cleans up READ_ID macro, inter alia.

Browse Source
This commit is contained in:
Thomas Harte 2019-12-22 17:58:33 -05:00
parent 34a3790e11
commit d25b48878c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Components/1770/1770.cpp
View File

@ -91,6 +91,7 @@ uint8_t WD1770::get_register(int address) {
if(status_.type == Status::One) if(status_.type == Status::One)
status |= (status_.spin_up ? Flag::SpinUp : 0); status |= (status_.spin_up ? Flag::SpinUp : 0);
} }
// LOG("Returned status " << PADHEX(2) << int(status) << " of type " << 1+int(status_.type));
return status; return status;
} }
case 1: return track_; case 1: return track_;
@ -124,11 +125,13 @@ void WD1770::run_for(const Cycles cycles) {
#define END_SECTION() (void)0; } #define END_SECTION() (void)0; }
#define READ_ID() \ #define READ_ID() \
if(new_event_type == static_cast<int>(Event::Token)) { \ if(new_event_type == int(Event::Token)) { \
if(!distance_into_section_ && get_latest_token().type == Token::ID) {set_data_mode(DataMode::Reading); distance_into_section_++; } \ if(!distance_into_section_ && get_latest_token().type == Token::ID) {\
else if(distance_into_section_ && distance_into_section_ < 7 && get_latest_token().type == Token::Byte) { \ set_data_mode(DataMode::Reading); \
++distance_into_section_; \
} else if(distance_into_section_ && distance_into_section_ < 7 && get_latest_token().type == Token::Byte) { \
header_[distance_into_section_ - 1] = get_latest_token().byte_value; \ header_[distance_into_section_ - 1] = get_latest_token().byte_value; \
distance_into_section_++; \ ++distance_into_section_; \
} \ } \
} }