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

Adds SCSI interrupt support.

Browse Source
This commit is contained in:
Thomas Harte 2021-02-01 17:40:11 -05:00
parent 1a40cc048e
commit 9f202d4238
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Machines/Electron/Electron.cpp
View File

@ -356,7 +356,9 @@ template <bool has_scsi_bus> class ConcreteMachine:
break; break;
case 0xfc03: case 0xfc03:
if(has_scsi_bus && (address&0x00f0) == 0x0040) { if(has_scsi_bus && (address&0x00f0) == 0x0040) {
// TODO: SCSI IRQ. Once I'm clear on the use. scsi_interrupt_state_ = false;
scsi_interrupt_mask_ = *value & 1;
evaluate_interrupts();
} }
break; break;
case 0xfc01: case 0xfc01:
@ -376,9 +378,9 @@ template <bool has_scsi_bus> class ConcreteMachine:
(state & SCSI::Line::Control ? 0x80 : 0x00) | (state & SCSI::Line::Control ? 0x80 : 0x00) |
(state & SCSI::Line::Input ? 0x40 : 0x00) | (state & SCSI::Line::Input ? 0x40 : 0x00) |
(state & SCSI::Line::Request ? 0x20 : 0x00) | (state & SCSI::Line::Request ? 0x20 : 0x00) |
((scsi_interrupt_state_ && scsi_interrupt_mask_) ? 0x10 : 0x00) |
(state & SCSI::Line::Busy ? 0x02 : 0x00) | (state & SCSI::Line::Busy ? 0x02 : 0x00) |
(state & SCSI::Line::Message ? 0x01 : 0x00); (state & SCSI::Line::Message ? 0x01 : 0x00);
// TODO: interrupt flag.
// Empirical guess: this is also the trigger to affect busy/request/acknowledge // Empirical guess: this is also the trigger to affect busy/request/acknowledge
// signalling. Maybe? // signalling. Maybe?
@ -550,6 +552,10 @@ template <bool has_scsi_bus> class ConcreteMachine:
scsi_acknowledge_ = false; scsi_acknowledge_ = false;
push_scsi_output(); push_scsi_output();
} }
scsi_interrupt_state_ |= (new_state^previous_bus_state_)&new_state & SCSI::Line::Request;
previous_bus_state_ = new_state;
evaluate_interrupts();
} }
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference preference) final { void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference preference) final {
@ -713,7 +719,12 @@ template <bool has_scsi_bus> class ConcreteMachine:
} else { } else {
interrupt_status_ &= ~1; interrupt_status_ &= ~1;
} }
m6502_.set_irq_line(interrupt_status_ & 1);
if constexpr (has_scsi_bus) {
m6502_.set_irq_line((scsi_interrupt_state_ && scsi_interrupt_mask_) | (interrupt_status_ & 1));
} else {
m6502_.set_irq_line(interrupt_status_ & 1);
}
} }
CPU::MOS6502::Processor<CPU::MOS6502::Personality::P6502, ConcreteMachine, false> m6502_; CPU::MOS6502::Processor<CPU::MOS6502::Personality::P6502, ConcreteMachine, false> m6502_;
@ -760,11 +771,14 @@ template <bool has_scsi_bus> class ConcreteMachine:
// Hard drive. // Hard drive.
SCSI::Bus scsi_bus_; SCSI::Bus scsi_bus_;
SCSI::Target::Target<SCSI::DirectAccessDevice> hard_drive_; SCSI::Target::Target<SCSI::DirectAccessDevice> hard_drive_;
SCSI::BusState previous_bus_state_ = SCSI::DefaultBusState;
const size_t scsi_device_ = 0; const size_t scsi_device_ = 0;
uint8_t scsi_data_ = 0; uint8_t scsi_data_ = 0;
bool scsi_select_ = false; bool scsi_select_ = false;
bool scsi_acknowledge_ = false; bool scsi_acknowledge_ = false;
bool scsi_is_clocked_ = false; bool scsi_is_clocked_ = false;
bool scsi_interrupt_state_ = false;
bool scsi_interrupt_mask_ = false;
void push_scsi_output() { void push_scsi_output() {
scsi_bus_.set_device_output(scsi_device_, scsi_bus_.set_device_output(scsi_device_,
scsi_data_ | scsi_data_ |