儲存庫 vbox 的更動 12565

時間撮記:

2008-9-18 下午12:31:04 (16 年 以前)

作者:

vboxsync

訊息:

Enable the BusLogic adapter by default and introduce VBOX_WITH_SCSI to compile DrvSCSI, DrvSCSIHost and the BIOS

位置:

trunk

檔案:

• Config.kmk (修改) (3 筆差異)
• src/VBox/Devices/Builtins.cpp (修改) (1 筆差異)
• src/VBox/Devices/Builtins.h (修改) (1 筆差異)
• src/VBox/Devices/Makefile.kmk (修改) (1 筆差異)

trunk/Config.kmk

@@ -355 +355 @@
 # Enables all the doxgen bits.
 VBOX_WITH_ALL_DOXYGEN_TARGETS = 1
+# Enable BusLogic SCSI host adapter
+VBOX_WITH_BUSLOGIC = 1
+# Enable SCSI drivers
+VBOX_WITH_SCSI = 1
 # Enables the Python<->XPCOM and later Python<->COM bindings.
 # (Current not enabled by default because all the build servers has
@@ -608 +612 @@
  VBOX_WITH_AHCI=
  VBOX_WITH_PDM_ASYNC_COMPLETION=
+ VBOX_WITH_BUSLOGIC=
+ VBOX_WITH_SCSI=
  # branding
  VBOX_BRAND_BIOS_LOGO          := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/ose_logo.bmp
@@ -1021 +1027 @@
 ifdef VBOX_PATH_APP_DOCS
  DEFS += RTPATH_APP_DOCS=\"$(VBOX_PATH_APP_DOCS)\"
+endif
+ifdef VBOX_WITH_SCSI # Needed to compile the BIOS if SCSI is enabled
+ DEFS += VBOX_WITH_SCSI
 endif
 ## @todo eliminate these guys.

trunk/src/VBox/Devices/Builtins.cpp

@@ -262 +262 @@
         return rc;
 #endif
-#ifdef VBOX_WITH_BUSLOGIC
+#ifdef VBOX_WITH_SCSI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSI);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Builtins.h

@@ -100 +100 @@
 #endif
 
-#ifdef VBOX_WITH_BUSLOGIC
+#ifdef VBOX_WITH_SCSI
 extern const PDMDRVREG g_DrvSCSI;
 extern const PDMDRVREG g_DrvSCSIHost;

trunk/src/VBox/Devices/Makefile.kmk

@@ -838 +838 @@
 endif #VBOX_WITH_PDM_ASYNC_COMPLETION
 
-ifdef VBOX_WITH_BUSLOGIC
- Drivers_DEFS += VBOX_WITH_BUSLOGIC
+ifdef VBOX_WITH_SCSI
+ Drivers_DEFS += VBOX_WITH_SCSI
  Drivers_SOURCES += \
         Storage/DrvSCSI.cpp
  Drivers_SOURCES.linux += \
         Storage/DrvSCSIHost.cpp
-endif # VBOX_WITH_BUSLOGIC
+endif # VBOX_WITH_SCSI
 
 #