Changeset 11556 in vbox

Timestamp:

Aug 21, 2008 9:36:45 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35141

Message:

BusLogic: updates, Linux guests are working and R0/GC components are implemented

Location:

trunk

Files:

• include/VBox/pdmifs.h (modified) (3 diffs)
• include/VBox/scsi.h (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/testcase/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp (modified) (2 diffs)

trunk/include/VBox/pdmifs.h

@@ -2498 +2498 @@
     uint32_t    cbCDB;
     /** Pointer to the SCSI CDB. */
-    uint8_t    *pCDB;
+    uint8_t    *paCDB;
     /** Overall size of all scatter gather list elements
      *  for data transfer if any. */
@@ -2506 +2506 @@
     /** Pointer to the head of the scatter gather list. */
     PPDMDATASEG paScatterGatherHead;
+    /** Size of the sense buffer. */
+    uint32_t    cbSenseBuffer;
+    /** Pointer to the sense buffer. *
+     * Current assumption that the sense buffer is not scattered. */
+    uint8_t    *pu8SenseBuffer;
     /** Opaque user data for use by the device. Left untouched by everything else! */
     void       *pvUser;
@@ -2549 +2554 @@
      * @param   pInterface    Pointer to this interface.
      * @param   pSCSIRequest  Pointer to the SCSI request to execute.
+     * @remark  pfnSetSimultaneousRequestsMax must be called before this function can be used.
      */
      DECLR3CALLBACKMEMBER(int, pfnSCSIRequestSend, (PPDMISCSICONNECTOR pInterface, PPDMSCSIREQUEST pSCSIRequest));
+
+    /**
+     * Sets the maximum number of requests the driver implementing this interface has to expect.
+     *
+     * @return VBox status code.
+     * @param  pInterface    Pointer to this interface.
+     * @param  cRequestsMax  Maximum number of simultaneous requests.
+     * @remark Before calling pfnSCSIRequestSend this function must be called.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetSimultaneousRequestsMax, (PPDMISCSICONNECTOR pInterface, uint32_t cRequestsMax));
 
 } PDMISCSICONNECTOR;

trunk/include/VBox/scsi.h

@@ -105 +105 @@
     SCSI_REPORT_LUNS                    = 0xa0,
     /** Rezero Unit command. Obsolete for ages now, but used by cdrecord. */
-    SCSI_REZERO_UNIT                    = 0x01
+    SCSI_REZERO_UNIT                    = 0x01,
+    SCSI_SERVICE_ACTION_IN_16           = 0x9e,
+    SCSI_READ_16                        = 0x88,
+    SCSI_WRITE_16                       = 0x8a
 } SCSICMD;
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -401 +401 @@
 endif
 
+ifdef VBOX_WITH_BUSLOGIC
+VBoxDDGC_DEFS          += VBOX_WITH_BUSLOGIC
+VBoxDDGC_SOURCES       += \
+        Storage/DevBusLogic.cpp
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -456 +462 @@
         Storage/DevAHCI.cpp \
         Storage/ATAController.cpp
+endif
+
+ifdef VBOX_WITH_BUSLOGIC
+VBoxDDR0_DEFS          += VBOX_WITH_BUSLOGIC
+VBoxDDR0_SOURCES       += \
+        Storage/DevBusLogic.cpp
 endif
 

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -64 +64 @@
 tstDeviceStructSizeGC_DEFS     += VBOX_WITH_E1000
 endif
+ifdef VBOX_WITH_BUSLOGIC
+tstDeviceStructSizeGC_DEFS     += VBOX_WITH_BUSLOGIC
+endif
 tstDeviceStructSizeGC_SOURCES   = tstDeviceStructSizeGC.cpp
 tstDeviceStructSizeGC_INCS      = \
@@ -84 +87 @@
 ifdef VBOX_WITH_E1000
 tstDeviceStructSize_DEFS     += VBOX_WITH_E1000
+endif
+ifdef VBOX_WITH_BUSLOGIC
+tstDeviceStructSize_DEFS     += VBOX_WITH_BUSLOGIC
 endif
 tstDeviceStructSize_INCS     = \

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -67 +67 @@
 # undef LOG_GROUP
 # include "../Network/DevE1000.cpp"
+#endif
+#ifdef VBOX_WITH_BUSLOGIC
+# undef LOG_GROUP
+# include "../Storage/DevBusLogic.cpp"
 #endif
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -77 +77 @@
 # undef LOG_GROUP
 # include "../Network/DevE1000.cpp"
+#endif
+#ifdef VBOX_WITH_BUSLOGIC
+# undef LOG_GROUP
+# include "../Storage/DevBusLogic.cpp"
 #endif
 
@@ -1106 +1110 @@
 #endif /* VBOX_WITH_E1000 */
 
+#ifdef VBOX_WITH_BUSLOGIC
+    GEN_CHECK_SIZE(BUSLOGICDEVICE);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, pBusLogicR3);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, pBusLogicR0);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, pBusLogicRC);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, fPresent);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, iLUN);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, IBase);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, ISCSIPort);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, pDrvBase);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, pDrvSCSIConnector);
+
+    GEN_CHECK_SIZE(BUSLOGIC);
+    GEN_CHECK_OFF(BUSLOGIC, dev);
+    GEN_CHECK_OFF(BUSLOGIC, pDevInsR3);
+    GEN_CHECK_OFF(BUSLOGIC, pDevInsR0);
+    GEN_CHECK_OFF(BUSLOGIC, pDevInsRC);
+    GEN_CHECK_OFF(BUSLOGIC, IOPortBase);
+    GEN_CHECK_OFF(BUSLOGIC, MMIOBase);
+    GEN_CHECK_OFF(BUSLOGIC, regStatus);
+    GEN_CHECK_OFF(BUSLOGIC, regInterrupt);
+    GEN_CHECK_OFF(BUSLOGIC, regGeometry);
+    GEN_CHECK_OFF(BUSLOGIC, LocalRam);
+    GEN_CHECK_OFF(BUSLOGIC, uOperationCode);
+    GEN_CHECK_OFF(BUSLOGIC, aCommandBuffer);
+    GEN_CHECK_OFF(BUSLOGIC, aCommandBuffer[BUSLOGIC_COMMAND_SIZE_MAX]);
+    GEN_CHECK_OFF(BUSLOGIC, iParameter);
+    GEN_CHECK_OFF(BUSLOGIC, cbCommandParametersLeft);
+    GEN_CHECK_OFF(BUSLOGIC, fUseLocalRam);
+    GEN_CHECK_OFF(BUSLOGIC, aReplyBuffer);
+    GEN_CHECK_OFF(BUSLOGIC, aReplyBuffer[BUSLOGIC_REPLY_SIZE_MAX]);
+    GEN_CHECK_OFF(BUSLOGIC, iReply);
+    GEN_CHECK_OFF(BUSLOGIC, cbReplyParametersLeft);
+    GEN_CHECK_OFF(BUSLOGIC, fIRQEnabled);
+    GEN_CHECK_OFF(BUSLOGIC, cMailbox);
+    GEN_CHECK_OFF(BUSLOGIC, GCPhysAddrMailboxOutgoingBase);
+    GEN_CHECK_OFF(BUSLOGIC, uMailboxOutgoingPositionCurrent);
+    GEN_CHECK_OFF(BUSLOGIC, cMailboxesReady);
+    GEN_CHECK_OFF(BUSLOGIC, fNotificationSend);
+    GEN_CHECK_OFF(BUSLOGIC, GCPhysAddrMailboxIncomingBase);
+    GEN_CHECK_OFF(BUSLOGIC, uMailboxIncomingPositionCurrent);
+    GEN_CHECK_OFF(BUSLOGIC, fStrictRoundRobinMode);
+    GEN_CHECK_OFF(BUSLOGIC, fExtendedLunCCBFormat);
+    GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueR3);
+    GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueR0);
+    GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueRC);
+    GEN_CHECK_OFF(BUSLOGIC, pTaskCache);
+    GEN_CHECK_OFF(BUSLOGIC, aDeviceStates);
+    GEN_CHECK_OFF(BUSLOGIC, aDeviceStates[BUSLOGIC_MAX_DEVICES]);
+#endif /* VBOX_WITH_BUSLOGIC */
+
     return (0);
 }