Changeset 15475 in vbox for trunk/src

Timestamp:

Dec 14, 2008 11:21:50 PM (16 years ago)

Author:

vboxsync

Message:

LsiLogic: Linux works! Implemented R0/GC parts and SSM. The LsiLogic controller is now build by default

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -157 +157 @@
 ifdef VBOX_WITH_LSILOGIC
  VBoxDD_DEFS           += VBOX_WITH_LSILOGIC
+endif
+ifdef VBOX_WITH_FAULT_INJECTION
+ VBoxDD_DEFS           += VBOX_WITH_FAULT_INJECTION
 endif
 VBoxDD_LIBS             = \
@@ -556 +559 @@
 Drivers_DEFS      += VBOX_WITH_NETFLT
 endif
+ifdef VBOX_WITH_FAULT_INJECTION
+Drivers_DEFS      += VBOX_WITH_FAULT_INJECTION
+endif
 Drivers_INCS      := \
         $(PATH_SUB_CURRENT) \

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

@@ -67 +67 @@
 tstDeviceStructSizeGC_DEFS     += VBOX_WITH_SCSI
 endif
+ifdef VBOX_WITH_BUSLOGIC
+tstDeviceStructSizeGC_DEFS     += VBOX_WITH_LSILOGIC
+endif
 tstDeviceStructSizeGC_SOURCES   = tstDeviceStructSizeGC.cpp
 tstDeviceStructSizeGC_INCS      = \
@@ -90 +93 @@
 ifdef VBOX_WITH_BUSLOGIC
 tstDeviceStructSize_DEFS     += VBOX_WITH_BUSLOGIC
+endif
+ifdef VBOX_WITH_LSILOGIC
+tstDeviceStructSize_DEFS     += VBOX_WITH_LSILOGIC
 endif
 tstDeviceStructSize_INCS     = \

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

@@ -71 +71 @@
 # undef LOG_GROUP
 # include "../Storage/DevBusLogic.cpp"
+#endif
+#ifdef VBOX_WITH_LSILOGIC
+# undef LOG_GROUP
+# include "../Storage/DevLsiLogicSCSI.cpp"
 #endif
 

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

@@ -81 +81 @@
 # undef LOG_GROUP
 # include "../Storage/DevBusLogic.cpp"
+#endif
+#ifdef VBOX_WITH_LSILOGIC
+# undef LOG_GROUP
+# include "../Storage/DevLsiLogicSCSI.cpp"
 #endif
 
@@ -1328 +1332 @@
     GEN_CHECK_OFF(BUSLOGIC, VBoxSCSI);
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates);
-    GEN_CHECK_OFF(BUSLOGIC, aDeviceStates[BUSLOGIC_MAX_DEVICES]);
+    GEN_CHECK_OFF(BUSLOGIC, aDeviceStates[BUSLOGIC_MAX_DEVICES-1]);
 #endif /* VBOX_WITH_BUSLOGIC */
+
+#ifdef VBOX_WITH_LSILOGIC
+    GEN_CHECK_SIZE(LSILOGICDEVICE);
+    GEN_CHECK_OFF(LSILOGICDEVICE, pLsiLogicR3);
+    GEN_CHECK_OFF(LSILOGICDEVICE, pLsiLogicR0);
+    GEN_CHECK_OFF(LSILOGICDEVICE, pLsiLogicRC);
+    GEN_CHECK_OFF(LSILOGICDEVICE, iLUN);
+    GEN_CHECK_OFF(LSILOGICDEVICE, cOutstandingRequests);
+    GEN_CHECK_OFF(LSILOGICDEVICE, IBase);
+    GEN_CHECK_OFF(LSILOGICDEVICE, ISCSIPort);
+    GEN_CHECK_OFF(LSILOGICDEVICE, pDrvBase);
+    GEN_CHECK_OFF(LSILOGICDEVICE, pDrvSCSIConnector);
+
+    GEN_CHECK_SIZE(LSILOGICSCSI);
+    GEN_CHECK_OFF(LSILOGICSCSI, PciDev);
+    GEN_CHECK_OFF(LSILOGICSCSI, pDevInsR3);
+    GEN_CHECK_OFF(LSILOGICSCSI, pDevInsR0);
+    GEN_CHECK_OFF(LSILOGICSCSI, pDevInsRC);
+    GEN_CHECK_OFF(LSILOGICSCSI, fGCEnabled);
+    GEN_CHECK_OFF(LSILOGICSCSI, fR0Enabled);
+    GEN_CHECK_OFF(LSILOGICSCSI, enmState);
+    GEN_CHECK_OFF(LSILOGICSCSI, enmWhoInit);
+    GEN_CHECK_OFF(LSILOGICSCSI, fDoorbellInProgress);
+    GEN_CHECK_OFF(LSILOGICSCSI, fDiagnosticEnabled);
+    GEN_CHECK_OFF(LSILOGICSCSI, fNotificationSend);
+    GEN_CHECK_OFF(LSILOGICSCSI, fEventNotificationEnabled);
+    GEN_CHECK_OFF(LSILOGICSCSI, pNotificationQueueR3);
+    GEN_CHECK_OFF(LSILOGICSCSI, pNotificationQueueR0);
+    GEN_CHECK_OFF(LSILOGICSCSI, pNotificationQueueRC);
+    GEN_CHECK_OFF(LSILOGICSCSI, aDeviceStates);
+    GEN_CHECK_OFF(LSILOGICSCSI, aDeviceStates[LSILOGIC_DEVICES_MAX-1]);
+    GEN_CHECK_OFF(LSILOGICSCSI, GCPhysMMIOBase);
+    GEN_CHECK_OFF(LSILOGICSCSI, IOPortBase);
+    GEN_CHECK_OFF(LSILOGICSCSI, uInterruptMask);
+    GEN_CHECK_OFF(LSILOGICSCSI, uInterruptStatus);
+    GEN_CHECK_OFF(LSILOGICSCSI, aMessage);
+    GEN_CHECK_OFF(LSILOGICSCSI, aMessage[sizeof(MptIOCInitRequest)-1]);
+    GEN_CHECK_OFF(LSILOGICSCSI, iMessage);
+    GEN_CHECK_OFF(LSILOGICSCSI, cMessage);
+    GEN_CHECK_OFF(LSILOGICSCSI, ReplyBuffer);
+    GEN_CHECK_OFF(LSILOGICSCSI, uNextReplyEntryRead);
+    GEN_CHECK_OFF(LSILOGICSCSI, cReplySize);
+    GEN_CHECK_OFF(LSILOGICSCSI, u16IOCFaultCode);
+    GEN_CHECK_OFF(LSILOGICSCSI, u32HostMFAHighAddr);
+    GEN_CHECK_OFF(LSILOGICSCSI, u32SenseBufferHighAddr);
+    GEN_CHECK_OFF(LSILOGICSCSI, cMaxDevices);
+    GEN_CHECK_OFF(LSILOGICSCSI, cMaxBuses);
+    GEN_CHECK_OFF(LSILOGICSCSI, cbReplyFrame);
+    GEN_CHECK_OFF(LSILOGICSCSI, iDiagnosticAccess);
+    GEN_CHECK_OFF(LSILOGICSCSI, cReplyQueueEntries);
+    GEN_CHECK_OFF(LSILOGICSCSI, cRequestQueueEntries);
+    GEN_CHECK_OFF(LSILOGICSCSI, ReplyPostQueueCritSect);
+    GEN_CHECK_OFF(LSILOGICSCSI, ReplyFreeQueueCritSect);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyFreeQueueBaseR3);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyPostQueueBaseR3);
+    GEN_CHECK_OFF(LSILOGICSCSI, pRequestQueueBaseR3);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyFreeQueueBaseR0);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyPostQueueBaseR0);
+    GEN_CHECK_OFF(LSILOGICSCSI, pRequestQueueBaseR0);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyFreeQueueBaseRC);
+    GEN_CHECK_OFF(LSILOGICSCSI, pReplyPostQueueBaseRC);
+    GEN_CHECK_OFF(LSILOGICSCSI, pRequestQueueBaseRC);
+    GEN_CHECK_OFF(LSILOGICSCSI, uReplyFreeQueueNextEntryFreeWrite);
+    GEN_CHECK_OFF(LSILOGICSCSI, uReplyFreeQueueNextAddressRead);
+    GEN_CHECK_OFF(LSILOGICSCSI, uReplyPostQueueNextEntryFreeWrite);
+    GEN_CHECK_OFF(LSILOGICSCSI, uReplyPostQueueNextAddressRead);
+    GEN_CHECK_OFF(LSILOGICSCSI, uRequestQueueNextEntryFreeWrite);
+    GEN_CHECK_OFF(LSILOGICSCSI, uRequestQueueNextAddressRead);
+    GEN_CHECK_OFF(LSILOGICSCSI, ConfigurationPages);
+    GEN_CHECK_OFF(LSILOGICSCSI, VBoxSCSI);
+    GEN_CHECK_OFF(LSILOGICSCSI, pTaskCache);
+#endif /* VBOX_WITH_LSILOGIC */
 
     return (0);