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

Consolidated interrupt request setting.

Browse Source
This commit is contained in:
Thomas Harte 2016-11-26 09:41:53 +08:00
parent e9d6566e9c
commit b9677c9927
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Components/1770/1770.cpp
View File

@ -260,8 +260,10 @@ void WD1770::posit_event(Event new_event_type)
is_reading_data_ = false; is_reading_data_ = false;
status_ &= ~Flag::Busy; status_ &= ~Flag::Busy;
index_hole_count_ = 0; index_hole_count_ = 0;
set_interrupt_request(true);
WAIT_FOR_EVENT(Event::Command); WAIT_FOR_EVENT(Event::Command);
WAIT_FOR_TIME(1); // TODO: what should the time cost here really be? set_interrupt_request(false);
// WAIT_FOR_TIME(1); // TODO: what should the time cost here really be?
printf("Starting %02x\n", command_); printf("Starting %02x\n", command_);
status_ |= Flag::Busy; status_ |= Flag::Busy;
if(!(command_ & 0x80)) goto begin_type_1; if(!(command_ & 0x80)) goto begin_type_1;
@ -275,7 +277,6 @@ void WD1770::posit_event(Event new_event_type)
begin_type_1: begin_type_1:
// Set initial flags, skip spin-up if possible. // Set initial flags, skip spin-up if possible.
status_ &= ~Flag::SeekError; status_ &= ~Flag::SeekError;
set_interrupt_request(false);
set_data_request(false); set_data_request(false);
if((command_&0x08) || (status_ & Flag::MotorOn)) goto test_type1_type; if((command_&0x08) || (status_ & Flag::MotorOn)) goto test_type1_type;
@ -330,7 +331,6 @@ void WD1770::posit_event(Event new_event_type)
verify: verify:
if(!(command_ & 0x04)) if(!(command_ & 0x04))
{ {
set_interrupt_request(true);
goto wait_for_command; goto wait_for_command;
} }
@ -343,7 +343,6 @@ void WD1770::posit_event(Event new_event_type)
if(index_hole_count_ == 6) if(index_hole_count_ == 6)
{ {
set_interrupt_request(true);
status_ |= Flag::SeekError; status_ |= Flag::SeekError;
goto wait_for_command; goto wait_for_command;
} }
@ -355,7 +354,6 @@ void WD1770::posit_event(Event new_event_type)
{ {
printf("Reached track %d\n", track_); printf("Reached track %d\n", track_);
status_ &= ~Flag::CRCError; status_ &= ~Flag::CRCError;
set_interrupt_request(true);
goto wait_for_command; goto wait_for_command;
} }
@ -369,7 +367,6 @@ void WD1770::posit_event(Event new_event_type)
*/ */
begin_type_2: begin_type_2:
status_ &= ~(Flag::LostData | Flag::RecordNotFound | Flag::WriteProtect | Flag::RecordType); status_ &= ~(Flag::LostData | Flag::RecordNotFound | Flag::WriteProtect | Flag::RecordType);
set_interrupt_request(false);
set_data_request(false); set_data_request(false);
distance_into_section_ = 0; distance_into_section_ = 0;
if((command_&0x08) || (status_ & Flag::MotorOn)) goto test_type2_delay; if((command_&0x08) || (status_ & Flag::MotorOn)) goto test_type2_delay;
@ -385,7 +382,6 @@ void WD1770::posit_event(Event new_event_type)
test_type2_write_protection: test_type2_write_protection:
if(command_&0x20) // TODO:: && is_write_protected if(command_&0x20) // TODO:: && is_write_protected
{ {
set_interrupt_request(true);
status_ |= Flag::WriteProtect; status_ |= Flag::WriteProtect;
goto wait_for_command; goto wait_for_command;
} }
@ -396,7 +392,6 @@ void WD1770::posit_event(Event new_event_type)
if(index_hole_count_ == 5) if(index_hole_count_ == 5)
{ {
set_interrupt_request(true);
status_ |= Flag::RecordNotFound; status_ |= Flag::RecordNotFound;
goto wait_for_command; goto wait_for_command;
} }
@ -456,7 +451,6 @@ void WD1770::posit_event(Event new_event_type)
sector_++; sector_++;
goto test_type2_write_protection; goto test_type2_write_protection;
} }
set_interrupt_request(true);
printf("Read sector %d\n", sector_); printf("Read sector %d\n", sector_);
goto wait_for_command; goto wait_for_command;
} }