Changeset 14438 in vbox for trunk

Timestamp:

Nov 20, 2008 9:39:01 PM (16 years ago)

Author:

vboxsync

Message:

LsiLogic: Update

Location:

trunk

Files:

• include/VBox/log.h (modified) (4 diffs)
• src/VBox/Devices/Builtins.cpp (modified) (1 diff)
• src/VBox/Devices/Builtins.h (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (4 diffs)

trunk/include/VBox/log.h

@@ -102 +102 @@
     /** KeyBoard Controller Device group. */
     LOG_GROUP_DEV_KBD,
+    /** LsiLogic SCSI controller Device group. */
+    LOG_GROUP_DEV_LSILOGICSCSI,
     /** NE2000 Device group. */
     LOG_GROUP_DEV_NE2000,
@@ -178 +180 @@
     /** SCSI driver group. */
     LOG_GROUP_DRV_SCSI,
+    /** Host SCSI driver group. */
+    LOG_GROUP_DRV_SCSIHOST,
     /** Async transport driver group */
     LOG_GROUP_DRV_TRANSPORT_ASYNC,
@@ -350 +354 @@
     "DEV_INIP",     \
     "DEV_KBD",      \
+    "DEV_LSILOGICSCSI", \
     "DEV_NE2000",   \
     "DEV_PARALLEL", \
@@ -388 +393 @@
     "DRV_RAW_IMAGE", \
     "DRV_SCSI", \
+    "DRV_SCSIHOST", \
     "DRV_TRANSPORT_ASYNC", \
     "DRV_TUN",      \

trunk/src/VBox/Devices/Builtins.cpp

@@ -150 +150 @@
     if (RT_FAILURE(rc))
         return rc;
-
+#ifdef VBOX_WITH_LSILOGIC
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLsiLogicSCSI);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Builtins.h

@@ -67 +67 @@
 #endif
 extern const PDMDEVREG g_DevicePCIBridge;
+#ifdef VBOX_WITH_LSILOGIC
+extern const PDMDEVREG g_DeviceLsiLogicSCSI;
+#endif
 
 extern const PDMDRVREG g_DrvMouseQueue;

trunk/src/VBox/Devices/Makefile.kmk

@@ -151 +151 @@
 ifdef VBOX_WITH_SCSI
  VBoxDD_DEFS           += VBOX_WITH_SCSI
+endif
+ifdef VBOX_WITH_LSILOGIC
+ VBoxDD_DEFS           += VBOX_WITH_LSILOGIC
 endif
 VBoxDD_LIBS             = \
@@ -315 +318 @@
 endif
 
+ifdef VBOX_WITH_LSILOGIC
+DevicesR3_DEFS         += VBOX_WITH_LSILOGIC
+DevicesR3_SOURCES      += \
+        Storage/DevLsiLogicSCSI.cpp
+endif
+
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
@@ -405 +414 @@
 endif
 
+ifdef VBOX_WITH_LSILOGIC
+VBoxDDGC_DEFS          += VBOX_WITH_LSILOGIC
+VBoxDDGC_SOURCES       += \
+        Storage/DevLsiLogicSCSI.cpp
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -466 +481 @@
 VBoxDDR0_SOURCES       += \
         Storage/DevBusLogic.cpp
+endif
+
+ifdef VBOX_WITH_LSILOGIC
+VBoxDDR0_DEFS          += VBOX_WITH_LSILOGIC
+VBoxDDR0_SOURCES       += \
+        Storage/DevLsiLogicSCSI.cpp
 endif