6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-05 10:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Ensures no state transitions while acknowledge is still asserted.

Browse Source
This commit is contained in:
Thomas Harte 2019-09-07 13:17:34 -04:00
parent 64dad35026
commit bee782234a
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Storage/MassStorage/SCSI/Target.hpp
View File

@ -83,11 +83,17 @@ struct Responder {
Terminates a SCSI command, sending the proper sequence of status and message phases.
*/
void terminate_command(Status status) {
send_message(Target::Responder::Message::CommandComplete, [status] (const Target::CommandState &state, Target::Responder &responder) {
responder.send_status(status, [] (const Target::CommandState &state, Target::Responder &responder) {
send_status(status, [] (const Target::CommandState &state, Target::Responder &responder) {
responder.send_message(Target::Responder::Message::CommandComplete, [] (const Target::CommandState &state, Target::Responder &responder) {
responder.end_command();
});
});
// send_message(Target::Responder::Message::CommandComplete, [status] (const Target::CommandState &state, Target::Responder &responder) {
// responder.send_status(status, [] (const Target::CommandState &state, Target::Responder &responder) {
// responder.end_command();
// });
// });
}
};

18
Storage/MassStorage/SCSI/TargetImplementation.hpp
View File

@ -98,12 +98,13 @@ template <typename Executor> void Target<Executor>::scsi_bus_did_change(Bus *, B
data_[data_pointer_] = uint8_t(new_state);
++data_pointer_;
if(data_pointer_ == data_.size()) {
next_function_(CommandState(command_), *this);
}
break;
case 0:
if(data_pointer_ == data_.size()) {
next_function_(CommandState(command_), *this);
}
bus_state_ |= Line::Request;
break;
}
@ -119,16 +120,17 @@ template <typename Executor> void Target<Executor>::scsi_bus_did_change(Bus *, B
++data_pointer_;
printf("DP: %zu\n", data_pointer_);
break;
case 0:
if(
phase_ == Phase::SendingMessage ||
phase_ == Phase::SendingStatus ||
(phase_ == Phase::SendingMessage && data_pointer_ == 1) ||
(phase_ == Phase::SendingStatus && data_pointer_ == 1) ||
(phase_ == Phase::SendingData && data_pointer_ == data_.size())
) {
next_function_(CommandState(command_), *this);
}
break;
case 0:
bus_state_ |= Line::Request;
bus_state_ &= ~0xff;
@ -238,6 +240,7 @@ template <typename Executor> void Target<Executor>::send_status(Status status, c
phase_ = Phase::SendingStatus;
next_function_ = next;
data_pointer_ = 0;
set_device_output(bus_state_);
}
@ -250,6 +253,7 @@ template <typename Executor> void Target<Executor>::send_message(Message message
phase_ = Phase::SendingMessage;
next_function_ = next;
data_pointer_ = 0;
set_device_output(bus_state_);
}