Changeset 103882 in vbox

Timestamp:

Mar 18, 2024 9:38:17 AM (11 months ago)

Author:

vboxsync

Message:

VSCSI: For READ(6) and WRITE(6), a request to transfer zero blocks means transferring 256 blocks.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevFdc.cpp (modified) (2 diffs)
• VSCSI/VSCSILunMmc.cpp (modified) (1 diff)
• VSCSI/VSCSILunSbc.cpp (modified) (2 diffs)
• VSCSI/VSCSILunSsc.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -791 +791 @@
         break;
     case FD_REG_DSR:
-        fdctrl_write_rate(fdctrl, value);
+        fdctrl_write_data(fdctrl, value);
+//        fdctrl_write_rate(fdctrl, value);
         break;
     case FD_REG_FIFO:
@@ -1045 +1046 @@
     if (value & FD_DSR_SWRESET) {
         fdctrl->dor &= ~FD_DOR_nRESET;
-        fdctrl_reset(fdctrl, 1);
+//        fdctrl_reset(fdctrl, 1);
         fdctrl->dor |= FD_DOR_nRESET;
     }

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -1222 +1222 @@
                                             | ((pVScsiReq->pbCDB[1] & 0x1f) << 16));
                 cSectorTransfer = pVScsiReq->pbCDB[4];
+                cSectorTransfer = cSectorTransfer ? cSectorTransfer : 256;  /* Zero blocks means 256 */
                 cbSector        = _2K;
                 break;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -358 +358 @@
                                         | ((pVScsiReq->pbCDB[1] & 0x1f) << 16));
             cSectorTransfer = pVScsiReq->pbCDB[4];
+            cSectorTransfer = cSectorTransfer ? cSectorTransfer : 256;  /* Zero blocks means 256 */
             break;
         }
@@ -388 +389 @@
                                         | ((pVScsiReq->pbCDB[1] & 0x1f) << 16));
             cSectorTransfer = pVScsiReq->pbCDB[4];
+            cSectorTransfer = cSectorTransfer ? cSectorTransfer : 256;  /* Zero blocks means 256 */
             break;
         }

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSsc.cpp

@@ -218 +218 @@
                                          | (pVScsiReq->pbCDB[2] << 16));
             cBlocksTransfer = pVScsiReq->pbCDB[4];
+            cSectorTransfer = cSectorTransfer ? cSectorTransfer : 256;  /* Zero blocks means 256 */
             uTransferStart  = pVScsiLUNSSC->uCurPos;
             pVScsiLUNSSC->uCurPos += cbTransfer;
@@ -229 +230 @@
                                          | (pVScsiReq->pbCDB[2] << 16));
             cBlocksTransfer = pVScsiReq->pbCDB[4];
+            cSectorTransfer = cSectorTransfer ? cSectorTransfer : 256;  /* Zero blocks means 256 */
             uTransferStart  = pVScsiLUNSSC->uCurPos;
             pVScsiLUNSSC->uCurPos += cbTransfer;