pacnpal/RASCSI
1
0
Fork 0
mirror of https://github.com/thewesker/RASCSI.git synced 2025-12-20 12:21:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Un-do extraneous changes before merging back into source branch

Browse Source
This commit is contained in:
akuker
2020-07-19 15:10:17 -05:00
parent f422bd9ca9
commit 52ba5c2fa7
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/raspberrypi/disk.cpp
View File

@@ -6439,14 +6439,14 @@ void FASTCALL SASIDEV::Selection()
return; return;
} }
spdlog::trace( spdlog::trace(
"Selection Phase ID=%d (with device)", ctrl.id); "Selection Phase ID=%d (with device)", ctrl.id);
// Phase change // Phase change
ctrl.phase = BUS::selection; ctrl.phase = BUS::selection;
// Raise BSY and respond // Raise BSY and respond
ctrl.bus->SetBSY(TRUE); ctrl.bus->SetBSY(TRUE);
return; return;
} }
@@ -8133,26 +8133,25 @@ void FASTCALL SCSIDEV::Selection()
// invalid if IDs do not match // invalid if IDs do not match
id = 1 << ctrl.id; id = 1 << ctrl.id;
if ((ctrl.bus->GetDAT() & id) == 0) { if ((ctrl.bus->GetDAT() & id) == 0) {
spdlog::trace("[ID {}] ID doesn't match {}",ctrl.id,id); spdlog::trace("[ID {}] ID doesn't match {}",ctrl.id,id);
return; return;
} }
// End if there is no valid unit // End if there is no valid unit
if (!HasUnit()) { if (!HasUnit()) {
spdlog::trace("[ID {}] No unit attached",ctrl.id); spdlog::trace("[ID {}] No unit attached",ctrl.id);
return; return;
} }
spdlog::trace( spdlog::trace("Selection Phase ID={} (with device)", ctrl.id);
"Selection Phase ID={} (with device)", ctrl.id);
// Phase setting // Phase setting
ctrl.phase = BUS::selection; ctrl.phase = BUS::selection;
// Raise BSY and respond // Raise BSY and respond
ctrl.bus->SetBSY(TRUE); ctrl.bus->SetBSY(TRUE);
return; return;
} }
// Selection completed // Selection completed
if (!ctrl.bus->GetSEL() && ctrl.bus->GetBSY()) { if (!ctrl.bus->GetSEL() && ctrl.bus->GetBSY()) {

1
src/raspberrypi/rascsi.cpp
View File

@@ -998,7 +998,6 @@ int main(int argc, char* argv[])
spdlog::set_level(spdlog::level::trace); spdlog::set_level(spdlog::level::trace);
spdlog::trace("Entering the function with %d arguments", argc); spdlog::trace("Entering the function with %d arguments", argc);
// Output the Banner // Output the Banner
Banner(argc, argv); Banner(argc, argv);