VirtualBox

Changeset 29522 in vbox for trunk


Ignore:
Timestamp:
May 17, 2010 10:15:48 AM (15 years ago)
Author:
vboxsync
Message:

Devices: move to the right place.

Location:
trunk/src/VBox/Devices
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Builtins.cpp

    r29326 r29522  
    8383        return rc;
    8484#endif
    85 #ifdef VBOX_WITH_SMC
    86     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
    87     if (RT_FAILURE(rc))
    88         return rc;
    89 #endif
    90 #ifdef VBOX_WITH_LPC
    91     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
    92     if (RT_FAILURE(rc))
    93         return rc;
    94 #endif
    9585#ifdef VBOX_WITH_EFI
    9686    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEFI);

  • trunk/src/VBox/Devices/Builtins.h

    r29326 r29522  
    8080extern const PDMDEVREG g_DeviceLsiLogicSAS;
    8181#endif
    82 #ifdef VBOX_WITH_SMC
    83 extern const PDMDEVREG g_DeviceSMC;
    84 #endif
    85 #ifdef VBOX_WITH_LPC
    86 extern const PDMDEVREG g_DeviceLPC;
    87 #endif
    8882#ifdef VBOX_WITH_EFI
    8983extern const PDMDEVREG g_DeviceEFI;

  • trunk/src/VBox/Devices/Builtins2.cpp

    r29332 r29522  
    11/* $Id $ */
    22/** @file
    3  * Built-in drivers & devices (part 2).
     3 * Built-in drivers & devices part 2.
    44 */
    55
    66/*
    7  * Copyright (C) 2006-2007 Oracle Corporation
     7 * Copyright (C) 2006-2010 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6161    if (RT_FAILURE(rc))
    6262        return rc;
     63#ifdef VBOX_WITH_SMC
     64    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
     65    if (RT_FAILURE(rc))
     66        return rc;
     67#endif
     68#ifdef VBOX_WITH_LPC
     69    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
     70    if (RT_FAILURE(rc))
     71        return rc;
     72#endif
    6373
    6474    return VINF_SUCCESS;

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

    r29332 r29522  
    180180 VBoxDD_DEFS           += VBOX_WITH_SMC
    181181endif
    182 ifdef VBOX_WITH_LPC
    183  VBoxDD_DEFS           += VBOX_WITH_LPC
    184 endif
    185182ifdef VBOX_WITH_EFI
    186183 VBoxDD_DEFS           += VBOX_WITH_EFI
    … …  
    250247VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
    251248
     249
    252250#
    253251# VBoxDD2 (shared object)
    … …  
    260258        Builtins2.cpp \
    261259        PC/DevAPIC.cpp
     260ifdef VBOX_WITH_SMC
     261 VBoxDD2_DEFS          += VBOX_WITH_SMC
     262 VBoxDD2_SOURCES       += PC/DevSMC.cpp
     263endif
     264ifdef VBOX_WITH_LPC
     265 VBoxDD2_DEFS          += VBOX_WITH_LPC
     266 VBoxDD2_SOURCES       += PC/DevLPC.cpp
     267endif
    262268VBoxDD2_LIBS            = \
    263269        $(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
    … …  
    425431endif
    426432
    427 ifdef VBOX_WITH_SMC
    428  DevicesR3_DEFS        += VBOX_WITH_SMC
    429  DevicesR3_SOURCES     += PC/DevSMC.cpp
    430 endif
    431 
    432 ifdef VBOX_WITH_LPC
    433  DevicesR3_DEFS        += VBOX_WITH_LPC
    434  DevicesR3_SOURCES     += PC/DevLPC.cpp
    435 endif
    436 
    437433ifdef VBOX_WITH_EFI
    438434 DevicesR3_DEFS        += VBOX_WITH_EFI
    … …  
    796792VBoxDD2R0_SOURCES        = \
    797793        PC/DevAPIC.cpp
     794
     795ifdef VBOX_WITH_SMC
     796 VBoxDD2R0_DEFS         += VBOX_WITH_SMC
     797 VBoxDD2R0_SOURCES      += PC/DevSMC.cpp
     798endif
     799
    798800if1of ($(VBOX_LDR_FMT), pe lx)
    799801VBoxDD2R0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)

  • trunk/src/VBox/Devices/PC/DevLPC.cpp

    r29085 r29522  
    33 * DevLPC - LPC device emulation
    44 */
     5
    56/*
    67 * Copyright (C) 2006-2010 Oracle Corporation
    … …  
    5354#include <iprt/string.h>
    5455
    55 #include "../Builtins.h"
     56#include "../Builtins2.h"
    5657
    5758#define RCBA_BASE                0xFED1C000
    … …  
    314315    "lpc",
    315316    /* szRCMod */
    316     "VBoxDDGC.gc",
     317    "VBoxDD2GC.gc",
    317318    /* szR0Mod */
    318     "VBoxDDR0.r0",
     319    "VBoxDD2R0.r0",
    319320    /* pszDescription */
    320     " Low Pin Count (LPC) Bus",
     321    "Low Pin Count (LPC) Bus",
    321322    /* fFlags */
    322323    PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_32_64 | PDM_DEVREG_FLAGS_PAE36,

  • trunk/src/VBox/Devices/PC/DevSMC.cpp

    r29085 r29522  
    11/* $Id$ */
    2 /**
    3  * @file
     2/** @file
    43 * DevSMC - SMC device emulation.
    54 */
     5
    66/*
    77 * Copyright (C) 2006-2010 Oracle Corporation
    … …  
    5757#include <iprt/string.h>
    5858
    59 #include "../Builtins.h"
     59#include "../Builtins2.h"
    6060
    6161/* data port used by Apple SMC */
    … …  
    438438    "smc",
    439439    /* szRCMod */
    440     "VBoxDDGC.gc",
     440    "VBoxDD2GC.gc",
    441441    /* szR0Mod */
    442     "VBoxDDR0.r0",
     442    "VBoxDD2R0.r0",
    443443    /* pszDescription */
    444     " System Management Controller (SMC) Device",
     444    "System Management Controller (SMC) Device",
    445445    /* fFlags */
    446446    PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_32_64 | PDM_DEVREG_FLAGS_PAE36,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette