Changeset 30592 in vbox

Timestamp:

Jul 4, 2010 10:40:45 AM (15 years ago)

Author:

vboxsync

Message:

BusLogic: Fix NT4 and SCO OpenServer guests. For NT4 the product revision register needs to be modified and the interrupt status register is handled in a different way. Implemented a missing command for OpenServer and modify status flag handling. (Both need a bigger table to make interrupts work correctly)

File:

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

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

@@ -797 +797 @@
     LogFlowFunc(("pBusLogic=%#p\n", pBusLogic));
     pBusLogic->regInterrupt |= BUSLOGIC_REGISTER_INTERRUPT_INTERRUPT_VALID;
-    PDMDevHlpPCISetIrqNoWait(pBusLogic->CTX_SUFF(pDevIns), 0, 1);
+    if (pBusLogic->fIRQEnabled)
+        PDMDevHlpPCISetIrqNoWait(pBusLogic->CTX_SUFF(pDevIns), 0, 1);
 }
 
@@ -881 +882 @@
         pBusLogic->regInterrupt |= BUSLOGIC_REGISTER_INTERRUPT_COMMAND_COMPLETE;
 
-        if (pBusLogic->fIRQEnabled)
-            buslogicSetInterrupt(pBusLogic);
+        /*
+         * SCO OpenServer requires that this flag is set after the ECHO COMMAND
+         * DATA command. Doesn't look like it breaks other guests
+         * but we just set it if the command was actually issued just to be sure.
+         */
+        if (pBusLogic->uOperationCode == BUSLOGICCOMMAND_ECHO_COMMAND_DATA)
+            pBusLogic->regStatus |= BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
+
+        buslogicSetInterrupt(pBusLogic);
     }
 
@@ -943 +951 @@
 
     pBusLogic->regInterrupt |= BUSLOGIC_REGISTER_INTERRUPT_INCOMING_MAILBOX_LOADED;
-    if (pBusLogic->fIRQEnabled)
-        buslogicSetInterrupt(pBusLogic);
+    buslogicSetInterrupt(pBusLogic);
 
     PDMCritSectLeave(&pBusLogic->CritSectIntr);
@@ -1297 +1304 @@
         {
             pBusLogic->aReplyBuffer[0] = '0'; /* @todo figure out what to write here. */
-            pBusLogic->aReplyBuffer[1] = '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'. */
 
             /* We report version 5.07B. This reply will provide the first two digits. */
@@ -1450 +1457 @@
             else
                 pBusLogic->fIRQEnabled = true;
+            break;
+        }
+        case BUSLOGICCOMMAND_ECHO_COMMAND_DATA:
+        {
+            pBusLogic->aReplyBuffer[0] = pBusLogic->aCommandBuffer[0];
+            pBusLogic->cbReplyParametersLeft = 1;
             break;
         }
@@ -1506 +1519 @@
             pBusLogic->cbReplyParametersLeft--;
 
+            LogFlowFunc(("cbReplyParametersLeft=%u\n", pBusLogic->cbReplyParametersLeft));
             if (!pBusLogic->cbReplyParametersLeft)
             {
@@ -1557 +1571 @@
 
             if (uVal & BUSLOGIC_REGISTER_CONTROL_INTERRUPT_RESET)
+            {
                 buslogicClearInterrupt(pBusLogic);
+                /*
+                 * Clear the flag in case it is set
+                 * to avoid confusing other guests.
+                 * SCO OpenServer doesn't need it anymore to be set.
+                 */
+                pBusLogic->regStatus &= ~BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
+            }
 
             PDMCritSectLeave(&pBusLogic->CritSectIntr);
@@ -1620 +1642 @@
                     case BUSLOGICCOMMAND_INQUIRE_SYNCHRONOUS_PERIOD:
                     case BUSLOGICCOMMAND_DISABLE_HOST_ADAPTER_INTERRUPT:
+                    case BUSLOGICCOMMAND_ECHO_COMMAND_DATA:
                         pBusLogic->cbCommandParametersLeft = 1;
                         break;
@@ -1772 +1795 @@
 
     if (!pBusLogic->fISAEnabled)
-        return VERR_IOM_IOPORT_UNUSED;
+        return VINF_SUCCESS;
 
     rc = vboxscsiReadRegister(&pBusLogic->VBoxSCSI, (Port - BUSLOGIC_ISA_IO_PORT), pu32);
@@ -1856 +1879 @@
 
     if (!pBusLogic->fISAEnabled)
-        return VERR_IOM_IOPORT_UNUSED;
+        return VINF_SUCCESS;
 
     rc = vboxscsiWriteRegister(&pBusLogic->VBoxSCSI, (Port - BUSLOGIC_ISA_IO_PORT), (uint8_t)u32);