diff --git a/src/raspberrypi/controllers/scsidev_ctrl.cpp b/src/raspberrypi/controllers/scsidev_ctrl.cpp index db5b6da..dba09b0 100644 --- a/src/raspberrypi/controllers/scsidev_ctrl.cpp +++ b/src/raspberrypi/controllers/scsidev_ctrl.cpp @@ -275,6 +275,11 @@ void FASTCALL SCSIDEV::Execute() CmdRezero(); return; +// // Nuvolink reset statistics +// case eCmdResetStatistics: +// CmdResetStatistics(); +// return; + // REQUEST SENSE case eCmdRequestSense: CmdRequestSense(); @@ -285,6 +290,16 @@ void FASTCALL SCSIDEV::Execute() CmdFormat(); return; + // Nuvolink Send Packet command + case eCmdSendPacket: + CmdSendPacket(); + return; + + // Nuvolink Change MAC address command + case eCmdChangeMacAddr: + CmdChangeMacAddr(); + return; + // REASSIGN BLOCKS case eCmdReassign: CmdReassign(); @@ -295,6 +310,10 @@ void FASTCALL SCSIDEV::Execute() CmdRead6(); return; + case eCmdSetMcastReg: + CmdSetMcastReg(); + return; + // WRITE(6) case eCmdWrite6: CmdWrite6(); @@ -305,9 +324,9 @@ void FASTCALL SCSIDEV::Execute() CmdSeek6(); return; - // Unknown Nuvolink command - case 0x0C: - CmdNuvolink0C(); + // Nuvolink Media Sense Command + case eCmdMediaSense: + CmdMediaSense(); return; // INQUIRY @@ -1129,32 +1148,35 @@ void FASTCALL SCSIDEV::CmdReadToc() // Unknown Vendor-specific command (probably cmmd_mdsens - Medium Sense) // //--------------------------------------------------------------------------- -void FASTCALL SCSIDEV::CmdNuvolink0C(){ - DWORD lun; - BOOL status; +void FASTCALL SCSIDEV::CmdMediaSense(){ + ASSERT(this); + + Status(); +} + +void FASTCALL SCSIDEV::CmdSendPacket(){ ASSERT(this); - LOGTRACE("Received Medium Sense command for Nuvolink"); - - // Logical Unit - lun = (ctrl.cmd[1] >> 5) & 0x07; - if (!ctrl.unit[lun]) { - Error(); - return; - } - - // // Command processing on drive - // status = ctrl.unit[lun]->PlayAudio(ctrl.cmd); - // if (!status) { - // // Failure (Error) - // Error(); - // return; - // } - - // status phase Status(); } +void FASTCALL SCSIDEV::CmdChangeMacAddr(){ + + ASSERT(this); + + Status(); +} + +void SCSIDEV::FASTCALL CmdSetMcastReg(){ + DWORD lun; + + ASSERT(this); + + Status(); +} + + + //--------------------------------------------------------------------------- // diff --git a/src/raspberrypi/controllers/scsidev_ctrl.h b/src/raspberrypi/controllers/scsidev_ctrl.h index 8c97e57..7275b13 100644 --- a/src/raspberrypi/controllers/scsidev_ctrl.h +++ b/src/raspberrypi/controllers/scsidev_ctrl.h @@ -157,8 +157,16 @@ private: // GET MESSAGE(10) command void FASTCALL CmdSendMessage10(); // SEND MESSAGE(10) command - void FASTCALL CmdNuvolink0C(); - // SEND MESSAGE(10) command + void FASTCALL CmdMediaSense(); + // Nuvolink-specific command + void FASTCALL CmdResetStatistics(); + // Nuvolink-specific command + void FASTCALL CmdSendPacket(); + // Nuvolink-specific command + void FASTCALL CmdChangeMacAddr(); + // Nuvolink-specific command + void FASTCALL CmdSetMcastReg(); + // Nuvolink-specific command // データ転送 void FASTCALL Send();