mirror of
https://github.com/TomHarte/CLK.git
synced 2024-08-16 16:28:59 +00:00
Made a further guess at the state interrupts would probably be left; slightly simplified interface.
This commit is contained in:
parent
15120d8fb6
commit
9a492ac15f
@ -302,14 +302,15 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
|
||||
_tape.clear_interrupts(Interrupt::ReceiveDataFull);
|
||||
while(1)
|
||||
{
|
||||
uint8_t tapeStatus = _tape.run_for_input_pulse();
|
||||
_tape.run_for_input_pulse();
|
||||
cycles_left_while_plausibly_in_data--;
|
||||
if(!cycles_left_while_plausibly_in_data) _fast_load_is_in_data = false;
|
||||
if( (tapeStatus & Interrupt::ReceiveDataFull) &&
|
||||
if( (_tape.get_interrupt_status() & Interrupt::ReceiveDataFull) &&
|
||||
(_fast_load_is_in_data || _tape.get_data_register() == 0x2a)
|
||||
) break;
|
||||
}
|
||||
_tape.set_delegate(this);
|
||||
_tape.clear_interrupts(Interrupt::ReceiveDataFull);
|
||||
_interrupt_status |= _tape.get_interrupt_status();
|
||||
|
||||
_fast_load_is_in_data = true;
|
||||
@ -909,7 +910,7 @@ inline uint8_t Tape::get_data_register()
|
||||
return (uint8_t)(_data_register >> 2);
|
||||
}
|
||||
|
||||
inline uint8_t Tape::run_for_input_pulse()
|
||||
inline void Tape::run_for_input_pulse()
|
||||
{
|
||||
get_next_tape_pulse();
|
||||
|
||||
@ -939,8 +940,6 @@ inline uint8_t Tape::run_for_input_pulse()
|
||||
_crossings[2] = _crossings[3] = Tape::Recognised;
|
||||
}
|
||||
}
|
||||
|
||||
return _interrupt_status;
|
||||
}
|
||||
|
||||
inline void Tape::run_for_cycles(unsigned int number_of_cycles)
|
||||
|
@ -78,7 +78,7 @@ class Tape {
|
||||
inline void set_delegate(Delegate *delegate) { _delegate = delegate; }
|
||||
|
||||
inline void run_for_cycles(unsigned int number_of_cycles);
|
||||
inline uint8_t run_for_input_pulse();
|
||||
inline void run_for_input_pulse();
|
||||
|
||||
inline void set_is_running(bool is_running) { _is_running = is_running; }
|
||||
inline void set_is_enabled(bool is_enabled) { _is_enabled = is_enabled; }
|
||||
|
Loading…
Reference in New Issue
Block a user