Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-01 19:41:48 +00:00
Code Issues Projects Releases Wiki Activity

fix scsimon and bus (#66)

Browse Source
This commit is contained in:
sonique6784 2020-12-14 02:27:09 +11:00 committed by GitHub
parent abee51d4b8
commit a3e770ddf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/raspberrypi/Makefile
View File

@ -50,6 +50,7 @@ RASCSI = rascsi
RASCTL = rasctl
RASDUMP = rasdump
SASIDUMP = sasidump
SCSIMON = scsimon
SCSISHARK = scsishark
SYSTEMD_CONF = /etc/systemd/system/rascsi.service

4
src/raspberrypi/controllers/scsidev_ctrl.cpp
View File

@ -209,7 +209,7 @@ void FASTCALL SCSIDEV::Arbitration()
// If we arent' in the bus-free phase, we can't progress....
// just return.
ctrl.bus->Aquire();
((GPIOBUS*)ctrl.bus)->Aquire();
if(ctrl.bus->GetBSY() || ctrl.bus->GetSEL())
{
LOGWARN("Unable to start arbitration. BSY:%d SEL:%d",(int)ctrl.bus->GetBSY(), (int)ctrl.bus->GetSEL());
@ -229,7 +229,7 @@ void FASTCALL SCSIDEV::Arbitration()
SysTimer::SleepNsec(SCSI_DELAY_ARBITRATION_DELAY_NS);
// Check if a higher SCSI ID is asserted. If so, we lost arbitration
ctrl.bus->Aquire();
((GPIOBUS*)ctrl.bus)->Aquire();
data_lines = ctrl.bus->GetDAT();
LOGDEBUG("After Arbitration, data lines are %04X", (int)data_lines);
data_lines >>= (ctrl.id + 1);