Changeset 30687 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 7, 2010 7:21:20 AM (14 years ago)

Author:

vboxsync

Message:

BusLogic: Fix W2K guests

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (7 diffs)

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

@@ -840 +840 @@
 
     /* Reset registers to default value. */
-    pBusLogic->regStatus = BUSLOGIC_REGISTER_STATUS_HOST_ADAPTER_READY;
+    pBusLogic->regStatus = BUSLOGIC_REGISTER_STATUS_HOST_ADAPTER_READY | BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
     pBusLogic->regInterrupt = 0;
     pBusLogic->regGeometry = BUSLOGIC_REGISTER_GEOMETRY_EXTENTED_TRANSLATION_ENABLED;
@@ -1301 +1301 @@
         case BUSLOGICCOMMAND_INQUIRE_BOARD_ID:
         {
-            pBusLogic->aReplyBuffer[0] = '0'; /* @todo figure out what to write here. */
-            pBusLogic->aReplyBuffer[1] = '1'; /* @todo figure out what to write here - can't be '0' or 'B'. */
+            pBusLogic->aReplyBuffer[0] = 'A'; /* Firmware option bytes */
+            pBusLogic->aReplyBuffer[1] = 'A';
 
             /* We report version 5.07B. This reply will provide the first two digits. */
@@ -1326 +1326 @@
             /* The reply length is set by the guest and is found in the first byte of the command buffer. */
             pBusLogic->cbReplyParametersLeft = pBusLogic->aCommandBuffer[0];
-            memset(pBusLogic->aReplyBuffer, 0, pBusLogic->cbReplyParametersLeft);
+            memset(pBusLogic->aReplyBuffer, ' ', pBusLogic->cbReplyParametersLeft);
             const char aModelName[] = "958";
-            int cCharsToTransfer =   (pBusLogic->cbReplyParametersLeft <= sizeof(aModelName))
+            int cCharsToTransfer =   (pBusLogic->cbReplyParametersLeft <= (sizeof(aModelName) - 1))
                                    ? pBusLogic->cbReplyParametersLeft
-                                   : sizeof(aModelName);
+                                   : sizeof(aModelName) - 1;
 
             for (int i = 0; i < cCharsToTransfer; i++)
@@ -1398 +1398 @@
             Log(("cMailboxes=%u\n", pBusLogic->cMailbox));
 
+            pBusLogic->regStatus &= ~BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
             pBusLogic->cbReplyParametersLeft = 0;
             break;
@@ -1463 +1464 @@
             break;
         }
+        case BUSLOGICCOMMAND_SET_PREEMPT_TIME_ON_BUS:
+        {
+            pBusLogic->cbReplyParametersLeft = 0;
+            pBusLogic->LocalRam.structured.autoSCSIData.uBusOnDelay = pBusLogic->aCommandBuffer[0];
+            Log(("Bus-on time: %d\n", pBusLogic->aCommandBuffer[0]));
+            break;
+        }
+        case BUSLOGICCOMMAND_SET_TIME_OFF_BUS:
+        {
+            pBusLogic->cbReplyParametersLeft = 0;
+            pBusLogic->LocalRam.structured.autoSCSIData.uBusOffDelay = pBusLogic->aCommandBuffer[0];
+            Log(("Bus-off time: %d\n", pBusLogic->aCommandBuffer[0]));
+            break;
+        }
         case BUSLOGICCOMMAND_EXECUTE_MAILBOX_COMMAND: /* Should be handled already. */
         default:
@@ -1468 +1483 @@
     }
 
-    Log(("cbReplyParametersLeft=%d\n", pBusLogic->cbReplyParametersLeft));
+    Log(("uOperationCode=%#x, cbReplyParametersLeft=%d\n", pBusLogic->uOperationCode, pBusLogic->cbReplyParametersLeft));
 
     /* Set the data in ready bit in the status register in case the command has a reply. */
@@ -1641 +1656 @@
                     case BUSLOGICCOMMAND_DISABLE_HOST_ADAPTER_INTERRUPT:
                     case BUSLOGICCOMMAND_ECHO_COMMAND_DATA:
+                    case BUSLOGICCOMMAND_SET_PREEMPT_TIME_ON_BUS:
+                    case BUSLOGICCOMMAND_SET_TIME_OFF_BUS:
                         pBusLogic->cbCommandParametersLeft = 1;
                         break;