summaryrefslogtreecommitdiff
path: root/src/VBox/Devices/build
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/Devices/build')
-rw-r--r--src/VBox/Devices/build/VBoxDD.cpp35
-rw-r--r--src/VBox/Devices/build/VBoxDD.d5
-rw-r--r--src/VBox/Devices/build/VBoxDD.h23
-rw-r--r--src/VBox/Devices/build/VBoxDD2.cpp2
-rw-r--r--src/VBox/Devices/build/VBoxDD2.h2
-rw-r--r--src/VBox/Devices/build/VBoxDDUDeps.cpp1
-rw-r--r--src/VBox/Devices/build/vl_vbox.h2
7 files changed, 44 insertions, 26 deletions
diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp
index 9f30b2e4..70b0ad1f 100644
--- a/src/VBox/Devices/build/VBoxDD.cpp
+++ b/src/VBox/Devices/build/VBoxDD.cpp
@@ -4,7 +4,7 @@
*/
/*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
@@ -36,9 +36,6 @@
*******************************************************************************/
const void *g_apvVBoxDDDependencies[] =
{
-#if defined(VBOX_WITH_EFI) && !defined(VBOX_WITH_OVMF)
- &g_abEfiThunkBinary[0],
-#endif
NULL,
};
@@ -83,6 +80,11 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceHPET);
if (RT_FAILURE(rc))
return rc;
+#ifdef VBOX_WITH_SMC_NEW
+ rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSmc);
+ if (RT_FAILURE(rc))
+ return rc;
+#endif
#ifdef VBOX_WITH_EFI
rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEFI);
if (RT_FAILURE(rc))
@@ -178,7 +180,6 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
if (RT_FAILURE(rc))
return rc;
#endif
-
#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciRaw);
if (RT_FAILURE(rc))
@@ -260,7 +261,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNetShaper);
if (RT_FAILURE(rc))
return rc;
-#endif /* VBOX_WITH_NETSHAPER */
+#endif
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvAUDIO);
if (RT_FAILURE(rc))
return rc;
@@ -270,13 +271,16 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvAcpiCpu);
if (RT_FAILURE(rc))
return rc;
-
#ifdef VBOX_WITH_VUSB
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVUSBRootHub);
if (RT_FAILURE(rc))
return rc;
#endif
-
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+ rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostWebcam);
+ if (RT_FAILURE(rc))
+ return rc;
+#endif
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
if (RT_FAILURE(rc))
return rc;
@@ -286,38 +290,31 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvChar);
if (RT_FAILURE(rc))
return rc;
-
#if defined(RT_OS_LINUX) || defined(VBOX_WITH_WIN_PARPORT_SUP)
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostParallel);
if (RT_FAILURE(rc))
return rc;
#endif
-
#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS) || defined(RT_OS_FREEBSD)
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSerial);
if (RT_FAILURE(rc))
return rc;
#endif
-
#ifdef VBOX_WITH_SCSI
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSI);
if (RT_FAILURE(rc))
return rc;
-
# if defined(RT_OS_LINUX)
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSIHost);
if (RT_FAILURE(rc))
return rc;
# endif
-
#endif
-
#ifdef VBOX_WITH_DRV_DISK_INTEGRITY
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvDiskIntegrity);
if (RT_FAILURE(rc))
return rc;
#endif
-
#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw);
if (RT_FAILURE(rc))
@@ -343,23 +340,25 @@ extern "C" DECLEXPORT(int) VBoxUsbRegister(PCPDMUSBREGCB pCallbacks, uint32_t u3
rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbDevProxy);
if (RT_FAILURE(rc))
return rc;
-
# ifdef VBOX_WITH_SCSI
rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbMsd);
if (RT_FAILURE(rc))
return rc;
# endif
#endif
-
#ifdef VBOX_WITH_VUSB
rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbHidKbd);
if (RT_FAILURE(rc))
return rc;
-
rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbHidMou);
if (RT_FAILURE(rc))
return rc;
#endif
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+ rc = pCallbacks->pfnRegister(pCallbacks, &g_DevWebcam);
+ if (RT_FAILURE(rc))
+ return rc;
+#endif
return rc;
}
diff --git a/src/VBox/Devices/build/VBoxDD.d b/src/VBox/Devices/build/VBoxDD.d
index 887b0522..cfd2b439 100644
--- a/src/VBox/Devices/build/VBoxDD.d
+++ b/src/VBox/Devices/build/VBoxDD.d
@@ -21,6 +21,11 @@ provider vboxdd
probe hgcmcall__completed__req(void *pvCmd, int rc);
probe hgcmcall__completed__emt(void *pvCmd, int rc);
probe hgcmcall__completed__done(void *pvCmd, unsigned int idFunction, unsigned int idClient, int rc);
+
+ probe ahci__req__submit(void *pvReq, int iTxDir, uint64_t offStart, uint32_t cbXfer);
+ probe ahci__req__submit__timestamp(void *pvReq, uint64_t tsStart);
+ probe ahci__req__completed(void *pvReq, int rcReq, int iState, uint64_t offStart, uint32_t cbXfer);
+ probe ahci__req__completed__timestamp(void *pvReq, uint64_t tsEnd);
};
#pragma D attributes Evolving/Evolving/Common provider vboxdd provider
diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h
index a7215094..d029a5ad 100644
--- a/src/VBox/Devices/build/VBoxDD.h
+++ b/src/VBox/Devices/build/VBoxDD.h
@@ -4,7 +4,7 @@
*/
/*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
@@ -26,12 +26,6 @@ RT_C_DECLS_BEGIN
extern const unsigned char g_abVgaDefBiosLogo[];
/** The size of the default BIOS logo data. */
extern const unsigned g_cbVgaDefBiosLogo;
-#ifdef VBOX_WITH_EFI
-/** The EFI thunk binary. */
-extern const unsigned char g_abEfiThunkBinary[];
-/** The size of the EFI thunk binary. */
-extern const unsigned g_cbEfiThunkBinary;
-#endif
extern const PDMDEVREG g_DevicePCI;
@@ -42,6 +36,7 @@ extern const PDMDEVREG g_DevicePS2KeyboardMouse;
extern const PDMDEVREG g_DeviceI8254;
extern const PDMDEVREG g_DeviceI8259;
extern const PDMDEVREG g_DeviceHPET;
+extern const PDMDEVREG g_DeviceSmc;
extern const PDMDEVREG g_DeviceMC146818;
extern const PDMDEVREG g_DevicePIIX3IDE;
extern const PDMDEVREG g_DeviceFloppyController;
@@ -118,6 +113,9 @@ extern const PDMDRVREG g_DrvAUDIO;
extern const PDMDRVREG g_DrvACPI;
extern const PDMDRVREG g_DrvAcpiCpu;
extern const PDMDRVREG g_DrvVUSBRootHub;
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+extern const PDMDRVREG g_DrvHostWebcam;
+#endif
extern const PDMDRVREG g_DrvChar;
extern const PDMDRVREG g_DrvNamedPipe;
extern const PDMDRVREG g_DrvRawFile;
@@ -139,6 +137,9 @@ extern const PDMUSBREG g_UsbHid;
extern const PDMUSBREG g_UsbHidKbd;
extern const PDMUSBREG g_UsbHidMou;
#endif
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+extern const PDMUSBREG g_DevWebcam;
+#endif
#ifdef VBOX_WITH_SCSI
extern const PDMDRVREG g_DrvSCSI;
@@ -147,6 +148,14 @@ extern const PDMDRVREG g_DrvSCSIHost;
# endif
#endif
+
+/* VBoxAcpi.cpp */
+int acpiPrepareDsdt(PPDMDEVINS pDevIns, void **ppvPtr, size_t *pcbDsdt);
+int acpiCleanupDsdt(PPDMDEVINS pDevIns, void *pvPtr);
+int acpiPrepareSsdt(PPDMDEVINS pDevIns, void **ppvPtr, size_t *pcbSsdt);
+int acpiCleanupSsdt(PPDMDEVINS pDevIns, void *pvPtr);
+
RT_C_DECLS_END
#endif
+
diff --git a/src/VBox/Devices/build/VBoxDD2.cpp b/src/VBox/Devices/build/VBoxDD2.cpp
index 1efd3c11..cdff3171 100644
--- a/src/VBox/Devices/build/VBoxDD2.cpp
+++ b/src/VBox/Devices/build/VBoxDD2.cpp
@@ -64,9 +64,11 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
if (RT_FAILURE(rc))
return rc;
+#ifndef VBOX_WITH_SMC_NEW
rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
if (RT_FAILURE(rc))
return rc;
+#endif
rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
if (RT_FAILURE(rc))
return rc;
diff --git a/src/VBox/Devices/build/VBoxDD2.h b/src/VBox/Devices/build/VBoxDD2.h
index 5a07b6f6..4cc62bcc 100644
--- a/src/VBox/Devices/build/VBoxDD2.h
+++ b/src/VBox/Devices/build/VBoxDD2.h
@@ -45,7 +45,9 @@ extern DECLIMPORT(const unsigned) g_cbNetBiosBinary;
#endif /* !IN_VBOXDD2 */
extern const PDMDEVREG g_DeviceAPIC;
extern const PDMDEVREG g_DeviceIOAPIC;
+#ifndef VBOX_WITH_SMC_NEW
extern const PDMDEVREG g_DeviceSMC;
+#endif
extern const PDMDEVREG g_DeviceLPC;
RT_C_DECLS_END
diff --git a/src/VBox/Devices/build/VBoxDDUDeps.cpp b/src/VBox/Devices/build/VBoxDDUDeps.cpp
index a614cef1..77bc91b2 100644
--- a/src/VBox/Devices/build/VBoxDDUDeps.cpp
+++ b/src/VBox/Devices/build/VBoxDDUDeps.cpp
@@ -35,6 +35,7 @@
PFNRT g_apfnVBoxDDUDeps[] =
{
(PFNRT)VDInit,
+ (PFNRT)VDIfCreateVfsStream,
#ifdef VBOX_WITH_USB
(PFNRT)USBFilterInit,
(PFNRT)USBLibHashSerial,
diff --git a/src/VBox/Devices/build/vl_vbox.h b/src/VBox/Devices/build/vl_vbox.h
index 2d7f8263..891cb87c 100644
--- a/src/VBox/Devices/build/vl_vbox.h
+++ b/src/VBox/Devices/build/vl_vbox.h
@@ -6,7 +6,7 @@
*/
/*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
View Lorry Controller Status