Macintosh-HW/greenscsi
1
0
Fork 0
mirror of https://github.com/dkgrizzly/GreenSCSI.git synced 2024-11-25 09:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from androda/main

Browse Source 
Update BlueSCSI.cpp
This commit is contained in:
Eric Helgeson 2021-04-10 13:58:05 -05:00 committed by GitHub
commit 21a3708a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BlueSCSI.cpp
View File

@ -189,7 +189,7 @@ byte m_msg; // Message bytes
HDDIMG *m_img; // HDD image for current SCSI-ID, LUN HDDIMG *m_img; // HDD image for current SCSI-ID, LUN
byte m_buf[MAX_BLOCKSIZE+1]; // General purpose buffer + overrun fetch byte m_buf[MAX_BLOCKSIZE+1]; // General purpose buffer + overrun fetch
int m_msc; int m_msc;
bool m_msb[256]; byte m_msb[256]; // Command storage bytes
/* /*
* Data byte to BSRR register setting value and parity table * Data byte to BSRR register setting value and parity table
@ -595,7 +595,7 @@ inline byte readHandshake(void)
{ {
SCSI_OUT(vREQ,active) SCSI_OUT(vREQ,active)
//SCSI_DB_INPUT() //SCSI_DB_INPUT()
while(!SCSI_IN(vACK)) { if(m_isBusReset) return 0; } while( ! SCSI_IN(vACK)) { if(m_isBusReset) return 0; }
byte r = readIO(); byte r = readIO();
SCSI_OUT(vREQ,inactive) SCSI_OUT(vREQ,inactive)
while( SCSI_IN(vACK)) { if(m_isBusReset) return 0; } while( SCSI_IN(vACK)) { if(m_isBusReset) return 0; }
@ -1166,7 +1166,7 @@ void loop()
#endif #endif
// Wait until SEL becomes inactive // Wait until SEL becomes inactive
while(isHigh(gpio_read(SEL))) { while(isHigh(gpio_read(SEL)) && isLow(gpio_read(BSY))) {
if(m_isBusReset) { if(m_isBusReset) {
goto BusFree; goto BusFree;
} }
@ -1177,10 +1177,12 @@ void loop()
bool syncenable = false; bool syncenable = false;
int syncperiod = 50; int syncperiod = 50;
int syncoffset = 0; int syncoffset = 0;
int loopWait = 0;
m_msc = 0; m_msc = 0;
memset(m_msb, 0x00, sizeof(m_msb)); memset(m_msb, 0x00, sizeof(m_msb));
while(isHigh(gpio_read(ATN))) { while(isHigh(gpio_read(ATN)) && loopWait < 255) {
MsgOut2(); MsgOut2();
loopWait++;
} }
for(int i = 0; i < m_msc; i++) { for(int i = 0; i < m_msc; i++) {
// ABORT // ABORT