Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2025-08-15 08:27:34 +00:00
Code Issues Projects Releases Wiki Activity

Changed scsi_command enum base type so that the dispatcher can use enum again (#128)

Browse Source
This commit is contained in:
uweseimet
2021-07-09 18:37:46 +02:00
committed by GitHub
parent 6d1f661ab8
commit 910d3af525
4 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,12 +565,12 @@ void FASTCALL SASIDEV::Execute()
return; return;
// RESERVE UNIT(16) // RESERVE UNIT(16)
case 0x16: case SASIDEV::eCmdReserve6:
CmdReserveUnit(); CmdReserveUnit();
return; return;
// RELEASE UNIT(17) // RELEASE UNIT(17)
case 0x17: case eCmdRelease6:
CmdReleaseUnit(); CmdReleaseUnit();
return; return;
@@ -1560,9 +1560,9 @@ BOOL FASTCALL SASIDEV::XferIn(BYTE *buf)
// Limited to read commands // Limited to read commands
switch (ctrl.cmd[0]) { switch (ctrl.cmd[0]) {
// READ(6) // READ(6)
case 0x08: case eCmdRead6:
// READ(10) // READ(10)
case 0x28: case eCmdRead10:
// Read from disk // Read from disk
ctrl.length = ctrl.unit[lun]->Read(ctrl.cmd, buf, ctrl.next); ctrl.length = ctrl.unit[lun]->Read(ctrl.cmd, buf, ctrl.next);
ctrl.next++; ctrl.next++;

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

@@ -55,8 +55,8 @@ protected:
eMsgCodeTerminateIOProcess = 0x11, eMsgCodeTerminateIOProcess = 0x11,
}; };
private: protected:
enum scsi_command : BYTE { enum scsi_command : int {
eCmdTestUnitReady = 0x00, eCmdTestUnitReady = 0x00,
eCmdRezero = 0x01, eCmdRezero = 0x01,
eCmdRequestSense = 0x03, eCmdRequestSense = 0x03,

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

@@ -45,46 +45,46 @@ SCSIDEV::SCSIDEV(Device *dev) : SASIDEV(dev)
scsi.msc = 0; scsi.msc = 0;
memset(scsi.msb, 0x00, sizeof(scsi.msb)); memset(scsi.msb, 0x00, sizeof(scsi.msb));
SetupCommand(0x00, "CmdTestUnitReady", &SCSIDEV::CmdTestUnitReady); SetupCommand(eCmdTestUnitReady, "CmdTestUnitReady", &SCSIDEV::CmdTestUnitReady);
SetupCommand(0x01, "CmdRezero", &SCSIDEV::CmdRezero); SetupCommand(eCmdRezero, "CmdRezero", &SCSIDEV::CmdRezero);
SetupCommand(0x03, "CmdRequestSense", &SCSIDEV::CmdRequestSense); SetupCommand(eCmdRequestSense, "CmdRequestSense", &SCSIDEV::CmdRequestSense);
SetupCommand(0x04, "CmdFormat", &SCSIDEV::CmdFormat); SetupCommand(eCmdFormat, "CmdFormat", &SCSIDEV::CmdFormat);
SetupCommand(0x07, "CmdReassign", &SCSIDEV::CmdReassign); SetupCommand(eCmdReassign, "CmdReassign", &SCSIDEV::CmdReassign);
SetupCommand(0x08, "CmdRead6", &SCSIDEV::CmdRead6); SetupCommand(eCmdRead6, "CmdRead6", &SCSIDEV::CmdRead6);
SetupCommand(0x0a, "CmdWrite6", &SCSIDEV::CmdWrite6); SetupCommand(eCmdWrite6, "CmdWrite6", &SCSIDEV::CmdWrite6);
SetupCommand(0x0b, "CmdSeek6", &SCSIDEV::CmdSeek6); SetupCommand(eCmdSeek6, "CmdSeek6", &SCSIDEV::CmdSeek6);
SetupCommand(0x12, "CmdInquiry", &SCSIDEV::CmdInquiry); SetupCommand(eCmdInquiry, "CmdInquiry", &SCSIDEV::CmdInquiry);
SetupCommand(0x15, "CmdModeSelect", &SCSIDEV::CmdModeSelect); SetupCommand(eCmdModeSelect, "CmdModeSelect", &SCSIDEV::CmdModeSelect);
SetupCommand(0x16, "CmdReserve6", &SCSIDEV::CmdReserve6); SetupCommand(eCmdReserve6, "CmdReserve6", &SCSIDEV::CmdReserve6);
SetupCommand(0x17, "CmdRelease6", &SCSIDEV::CmdRelease6); SetupCommand(eCmdRelease6, "CmdRelease6", &SCSIDEV::CmdRelease6);
SetupCommand(0x1a, "CmdModeSense", &SCSIDEV::CmdModeSense); SetupCommand(eCmdModeSense, "CmdModeSense", &SCSIDEV::CmdModeSense);
SetupCommand(0x1b, "CmdStartStop", &SCSIDEV::CmdStartStop); SetupCommand(eCmdStartStop, "CmdStartStop", &SCSIDEV::CmdStartStop);
SetupCommand(0x1d, "CmdSendDiag", &SCSIDEV::CmdSendDiag); SetupCommand(eCmdSendDiag, "CmdSendDiag", &SCSIDEV::CmdSendDiag);
SetupCommand(0x1e, "CmdRemoval", &SCSIDEV::CmdRemoval); SetupCommand(eCmdRemoval, "CmdRemoval", &SCSIDEV::CmdRemoval);
SetupCommand(0x25, "CmdReadCapacity", &SCSIDEV::CmdReadCapacity); SetupCommand(eCmdReadCapacity, "CmdReadCapacity", &SCSIDEV::CmdReadCapacity);
SetupCommand(0x28, "CmdRead10", &SCSIDEV::CmdRead10); SetupCommand(eCmdRead10, "CmdRead10", &SCSIDEV::CmdRead10);
SetupCommand(0x2a, "CmdWrite10", &SCSIDEV::CmdWrite10); SetupCommand(eCmdWrite10, "CmdWrite10", &SCSIDEV::CmdWrite10);
SetupCommand(0x2e, "CmdWriteAndVerify10", &SCSIDEV::CmdWrite10); SetupCommand(eCmdWriteAndVerify10, "CmdWriteAndVerify10", &SCSIDEV::CmdWrite10);
SetupCommand(0x2b, "CmdSeek10", &SCSIDEV::CmdSeek10); SetupCommand(eCmdSeek10, "CmdSeek10", &SCSIDEV::CmdSeek10);
SetupCommand(0x2f, "CmdVerify", &SCSIDEV::CmdVerify); SetupCommand(eCmdVerify, "CmdVerify", &SCSIDEV::CmdVerify);
SetupCommand(0x35, "CmdSynchronizeCache", &SCSIDEV::CmdSynchronizeCache); SetupCommand(eCmdSynchronizeCache, "CmdSynchronizeCache", &SCSIDEV::CmdSynchronizeCache);
SetupCommand(0x37, "CmdReadDefectData10", &SCSIDEV::CmdReadDefectData10); SetupCommand(eCmdReadDefectData10, "CmdReadDefectData10", &SCSIDEV::CmdReadDefectData10);
SetupCommand(0x55, "CmdModeSelect10", &SCSIDEV::CmdModeSelect10); SetupCommand(eCmdModeSelect10, "CmdModeSelect10", &SCSIDEV::CmdModeSelect10);
SetupCommand(0x56, "CmdReserve10", &SCSIDEV::CmdReserve10); SetupCommand(eCmdReserve10, "CmdReserve10", &SCSIDEV::CmdReserve10);
SetupCommand(0x57, "CmdRelease10", &SCSIDEV::CmdRelease10); SetupCommand(eCmdRelease10, "CmdRelease10", &SCSIDEV::CmdRelease10);
SetupCommand(0x5a, "CmdModeSense10", &SCSIDEV::CmdModeSense10); SetupCommand(eCmdModeSense10, "CmdModeSense10", &SCSIDEV::CmdModeSense10);
// MMC specific. TODO Move to separate class // MMC specific. TODO Move to separate class
SetupCommand(0x43, "CmdReadToc", &SCSIDEV::CmdReadToc); SetupCommand(eCmdReadToc, "CmdReadToc", &SCSIDEV::CmdReadToc);
SetupCommand(0x45, "CmdPlayAudio10", &SCSIDEV::CmdPlayAudio10); SetupCommand(eCmdPlayAudio10, "CmdPlayAudio10", &SCSIDEV::CmdPlayAudio10);
SetupCommand(0x47, "CmdPlayAudioMSF", &SCSIDEV::CmdPlayAudioMSF); SetupCommand(eCmdPlayAudioMSF, "CmdPlayAudioMSF", &SCSIDEV::CmdPlayAudioMSF);
SetupCommand(0x48, "CmdPlayAudioTrack", &SCSIDEV::CmdPlayAudioTrack); SetupCommand(eCmdPlayAudioTrack, "CmdPlayAudioTrack", &SCSIDEV::CmdPlayAudioTrack);
// DaynaPort specific. TODO Move to separate class // DaynaPort specific. TODO Move to separate class
SetupCommand(0x09, "CmdRetrieveStats", &SCSIDEV::CmdRetrieveStats); SetupCommand(eCmdRetrieveStats, "CmdRetrieveStats", &SCSIDEV::CmdRetrieveStats);
SetupCommand(0x0c, "CmdSetIfaceMode", &SCSIDEV::CmdSetIfaceMode); SetupCommand(eCmdSetIfaceMode, "CmdSetIfaceMode", &SCSIDEV::CmdSetIfaceMode);
SetupCommand(0x0d, "CmdSetMcastAddr", &SCSIDEV::CmdSetMcastAddr); SetupCommand(eCmdSetMcastAddr, "CmdSetMcastAddr", &SCSIDEV::CmdSetMcastAddr);
SetupCommand(0x0e, "CmdEnableInterface", &SCSIDEV::CmdEnableInterface); SetupCommand(eCmdEnableInterface, "CmdEnableInterface", &SCSIDEV::CmdEnableInterface);
} }
SCSIDEV::~SCSIDEV() SCSIDEV::~SCSIDEV()
@@ -94,7 +94,7 @@ SCSIDEV::~SCSIDEV()
} }
} }
void FASTCALL SCSIDEV::SetupCommand(BYTE opcode, const char* name, void FASTCALL (SCSIDEV::*execute)(void)) void FASTCALL SCSIDEV::SetupCommand(scsi_command opcode, const char* name, void FASTCALL (SCSIDEV::*execute)(void))
{ {
scsi_commands[opcode] = new command_t(name, execute); scsi_commands[opcode] = new command_t(name, execute);
} }
@@ -297,13 +297,13 @@ void FASTCALL SCSIDEV::Execute()
#endif // RASCSI #endif // RASCSI
// If the command is valid it must be contained in the command map // If the command is valid it must be contained in the command map
if (!scsi_commands.count(ctrl.cmd[0])) { if (!scsi_commands.count(static_cast<scsi_command>(ctrl.cmd[0]))) {
LOGWARN("%s Received unsupported command: $%02X", __PRETTY_FUNCTION__, (BYTE)ctrl.cmd[0]); LOGWARN("%s Received unsupported command: $%02X", __PRETTY_FUNCTION__, (BYTE)ctrl.cmd[0]);
CmdInvalid(); CmdInvalid();
return; return;
} }
command_t* command = scsi_commands[ctrl.cmd[0]]; command_t* command = scsi_commands[static_cast<scsi_command>(ctrl.cmd[0])];
LOGDEBUG("++++ CMD ++++ %s Received %s ($%02X)", __PRETTY_FUNCTION__, command->name, (unsigned int)ctrl.cmd[0]); LOGDEBUG("++++ CMD ++++ %s Received %s ($%02X)", __PRETTY_FUNCTION__, command->name, (unsigned int)ctrl.cmd[0]);

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

@@ -48,7 +48,7 @@ public:
} command_t; } command_t;
// Mapping of SCSI opcodes to command implementations // Mapping of SCSI opcodes to command implementations
std::map<BYTE, command_t*> scsi_commands; std::map<scsi_command, command_t*> scsi_commands;
public: public:
// Basic Functions // Basic Functions
@@ -67,7 +67,7 @@ public:
BOOL FASTCALL IsSCSI() const {return TRUE;} // SCSI check BOOL FASTCALL IsSCSI() const {return TRUE;} // SCSI check
private: private:
void FASTCALL SetupCommand(BYTE, const char*, void FASTCALL (SCSIDEV::*)(void)); void FASTCALL SetupCommand(scsi_command, const char*, void FASTCALL (SCSIDEV::*)(void));
// Phase // Phase
void FASTCALL BusFree(); // Bus free phase void FASTCALL BusFree(); // Bus free phase