Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-30 18:29:49 +00:00
Code Issues Projects Releases Wiki Activity

Comment and logging updates

Browse Source
This commit is contained in:
Uwe Seimet 2021-09-11 19:26:54 +02:00
parent de1a324374
commit eabd041b9f
4 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/raspberrypi/controllers/sasidev_ctrl.cpp
View File

@ -123,18 +123,18 @@ void SASIDEV::SetUnit(int no, Disk *dev)
//---------------------------------------------------------------------------
//
// Check to see if this has a valid logical unit
// Check to see if this has a valid LUN
//
//---------------------------------------------------------------------------
bool SASIDEV::HasUnit()
{
for (int i = 0; i < UnitMax; i++) {
if (ctrl.unit[i]) {
return TRUE;
return true;
}
}
return FALSE;
return false;
}
//---------------------------------------------------------------------------
@ -220,7 +220,7 @@ void SASIDEV::BusFree()
{
// Phase change
if (ctrl.phase != BUS::busfree) {
LOGINFO("Bus free phase");
LOGTRACE("%s Bus free phase", __PRETTY_FUNCTION__);
// Phase Setting
ctrl.phase = BUS::busfree;
@ -259,7 +259,7 @@ void SASIDEV::Selection()
return;
}
// Return if there is no unit
// Return if there is no valid LUN
if (!HasUnit()) {
return;
}
@ -282,7 +282,7 @@ void SASIDEV::Selection()
//---------------------------------------------------------------------------
//
// Command phase
// Command phase (used by SASI and SCSI)
//
//---------------------------------------------------------------------------
void SASIDEV::Command()
@ -485,7 +485,7 @@ void SASIDEV::Status()
//---------------------------------------------------------------------------
//
// Message in phase
// Message in phase (used by SASI and SCSI)
//
//---------------------------------------------------------------------------
void SASIDEV::MsgIn()
@ -516,7 +516,7 @@ void SASIDEV::MsgIn()
//---------------------------------------------------------------------------
//
// Data-in Phase
// Data-in Phase (used by SASI and SCSI)
//
//---------------------------------------------------------------------------
void SASIDEV::DataIn()
@ -564,7 +564,7 @@ void SASIDEV::DataIn()
//---------------------------------------------------------------------------
//
// Data out phase
// Data out phase (used by SASI and SCSI)
//
//---------------------------------------------------------------------------
void SASIDEV::DataOut()

2
src/raspberrypi/controllers/sasidev_ctrl.h
View File

@ -101,7 +101,7 @@ public:
typedef struct {
// General
BUS::phase_t phase; // Transition phase
int m_scsi_id; // Controller ID (0-7)
int m_scsi_id; // Controller ID (0-7)
BUS *bus; // Bus
// commands

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

@ -95,7 +95,7 @@ BUS::phase_t SCSIDEV::Process()
BusFree();
break;
// Selection phase
// Selection
case BUS::selection:
Selection();
break;
@ -139,12 +139,6 @@ BUS::phase_t SCSIDEV::Process()
return ctrl.phase;
}
//---------------------------------------------------------------------------
//
// Phases
//
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//
// Bus free phase
@ -154,12 +148,12 @@ void SCSIDEV::BusFree()
{
// Phase change
if (ctrl.phase != BUS::busfree) {
LOGTRACE( "%s Bus free phase", __PRETTY_FUNCTION__);
LOGTRACE("%s Bus free phase", __PRETTY_FUNCTION__);
// Phase setting
ctrl.phase = BUS::busfree;
// Signal line
// Set Signal lines
ctrl.bus->SetREQ(FALSE);
ctrl.bus->SetMSG(FALSE);
ctrl.bus->SetCD(FALSE);
@ -196,7 +190,7 @@ void SCSIDEV::Selection()
return;
}
// End if there is no valid unit
// Return if there is no valid LUN
if (!HasUnit()) {
return;
}
@ -357,16 +351,9 @@ void SCSIDEV::Error(ERROR_CODES::sense_key sense_key, ERROR_CODES::asc asc)
LOGTRACE("%s Error (to status phase)", __PRETTY_FUNCTION__);
// status phase
Status();
}
//===========================================================================
//
// Data Transfer
//
//===========================================================================
//---------------------------------------------------------------------------
//
// Send data
@ -374,8 +361,6 @@ void SCSIDEV::Error(ERROR_CODES::sense_key sense_key, ERROR_CODES::asc asc)
//---------------------------------------------------------------------------
void SCSIDEV::Send()
{
int len;
ASSERT(!ctrl.bus->GetREQ());
ASSERT(ctrl.bus->GetIO());
@ -385,18 +370,18 @@ void SCSIDEV::Send()
s << __PRETTY_FUNCTION__ << " sending handhake with offset " << ctrl.offset << ", length " << ctrl.length;
LOGTRACE("%s", s.str().c_str());
// TODO Get rid of Daynaport specific code
// TODO Get rid of Daynaport specific code in this class
// The Daynaport needs to have a delay after the size/flags field
// of the read response. In the MacOS driver, it looks like the
// driver is doing two "READ" system calls.
int len;
if (ctrl.unit[0] && ctrl.unit[0]->IsDaynaPort()) {
len = ((GPIOBUS*)ctrl.bus)->SendHandShake(
&ctrl.buffer[ctrl.offset], ctrl.length, SCSIDaynaPort::DAYNAPORT_READ_HEADER_SZ);
&ctrl.buffer[ctrl.offset], ctrl.length, SCSIDaynaPort::DAYNAPORT_READ_HEADER_SZ);
}
else
{
len = ctrl.bus->SendHandShake(
&ctrl.buffer[ctrl.offset], ctrl.length, BUS::SEND_NO_DELAY);
len = ctrl.bus->SendHandShake(&ctrl.buffer[ctrl.offset], ctrl.length, BUS::SEND_NO_DELAY);
}
// If you cannot send all, move to status phase
@ -421,7 +406,7 @@ void SCSIDEV::Send()
// set next buffer (set offset, length)
result = XferIn(ctrl.buffer);
ostringstream s;
s << __PRETTY_FUNCTION__ << " processing after data collection. Blocks: " << ctrl.blocks;
s << __PRETTY_FUNCTION__ << " Processing after data collection. Blocks: " << ctrl.blocks;
LOGTRACE("%s", s.str().c_str());
}
}
@ -435,7 +420,7 @@ void SCSIDEV::Send()
// Continue sending if block !=0
if (ctrl.blocks != 0){
ostringstream s;
s << __PRETTY_FUNCTION__ << " Continuing to send. blocks = " << ctrl.blocks;
s << __PRETTY_FUNCTION__ << " Continuing to send. Blocks: " << ctrl.blocks;
LOGTRACE("%s", s.str().c_str());
ASSERT(ctrl.length > 0);
ASSERT(ctrl.offset == 0);

2
src/raspberrypi/rascsi.cpp
View File

@ -1619,7 +1619,7 @@ int main(int argc, char* argv[])
}
}
// Stop because it the bus is busy or another device responded
// Stop because the bus is busy or another device responded
if (bus->GetBSY() || !bus->GetSEL()) {
continue;
}