Changeset 14438
- Timestamp:
- 11/20/08 22:39:01 (2 months ago)
- Files:
-
- trunk/include/VBox/log.h (modified) (4 diffs)
- trunk/src/VBox/Devices/Builtins.cpp (modified) (1 diff)
- trunk/src/VBox/Devices/Builtins.h (modified) (1 diff)
- trunk/src/VBox/Devices/Makefile.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/VBox/log.h
r12449 r14438 102 102 /** KeyBoard Controller Device group. */ 103 103 LOG_GROUP_DEV_KBD, 104 /** LsiLogic SCSI controller Device group. */ 105 LOG_GROUP_DEV_LSILOGICSCSI, 104 106 /** NE2000 Device group. */ 105 107 LOG_GROUP_DEV_NE2000, … … 178 180 /** SCSI driver group. */ 179 181 LOG_GROUP_DRV_SCSI, 182 /** Host SCSI driver group. */ 183 LOG_GROUP_DRV_SCSIHOST, 180 184 /** Async transport driver group */ 181 185 LOG_GROUP_DRV_TRANSPORT_ASYNC, … … 350 354 "DEV_INIP", \ 351 355 "DEV_KBD", \ 356 "DEV_LSILOGICSCSI", \ 352 357 "DEV_NE2000", \ 353 358 "DEV_PARALLEL", \ … … 388 393 "DRV_RAW_IMAGE", \ 389 394 "DRV_SCSI", \ 395 "DRV_SCSIHOST", \ 390 396 "DRV_TRANSPORT_ASYNC", \ 391 397 "DRV_TUN", \ trunk/src/VBox/Devices/Builtins.cpp
r13835 r14438 150 150 if (RT_FAILURE(rc)) 151 151 return rc; 152 152 #ifdef VBOX_WITH_LSILOGIC 153 rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLsiLogicSCSI); 154 if (VBOX_FAILURE(rc)) 155 return rc; 156 #endif 153 157 154 158 return VINF_SUCCESS; trunk/src/VBox/Devices/Builtins.h
r13189 r14438 67 67 #endif 68 68 extern const PDMDEVREG g_DevicePCIBridge; 69 #ifdef VBOX_WITH_LSILOGIC 70 extern const PDMDEVREG g_DeviceLsiLogicSCSI; 71 #endif 69 72 70 73 extern const PDMDRVREG g_DrvMouseQueue; trunk/src/VBox/Devices/Makefile.kmk
r14408 r14438 151 151 ifdef VBOX_WITH_SCSI 152 152 VBoxDD_DEFS += VBOX_WITH_SCSI 153 endif 154 ifdef VBOX_WITH_LSILOGIC 155 VBoxDD_DEFS += VBOX_WITH_LSILOGIC 153 156 endif 154 157 VBoxDD_LIBS = \ … … 315 318 endif 316 319 320 ifdef VBOX_WITH_LSILOGIC 321 DevicesR3_DEFS += VBOX_WITH_LSILOGIC 322 DevicesR3_SOURCES += \ 323 Storage/DevLsiLogicSCSI.cpp 324 endif 325 317 326 ifdef VBOX_WITH_USB 318 327 DevicesR3_DEFS += VBOX_WITH_USB IN_USB_R3 … … 405 414 endif 406 415 416 ifdef VBOX_WITH_LSILOGIC 417 VBoxDDGC_DEFS += VBOX_WITH_LSILOGIC 418 VBoxDDGC_SOURCES += \ 419 Storage/DevLsiLogicSCSI.cpp 420 endif 421 407 422 ifeq ($(VBOX_LDR_FMT32),pe) 408 423 VBoxDDGC_LDFLAGS = -Entry:vgaMMIOWrite … … 466 481 VBoxDDR0_SOURCES += \ 467 482 Storage/DevBusLogic.cpp 483 endif 484 485 ifdef VBOX_WITH_LSILOGIC 486 VBoxDDR0_DEFS += VBOX_WITH_LSILOGIC 487 VBoxDDR0_SOURCES += \ 488 Storage/DevLsiLogicSCSI.cpp 468 489 endif 469 490
