Changeset 48419 in vbox for trunk/src

Timestamp:

Sep 10, 2013 10:28:34 PM (11 years ago)

Author:

vboxsync

Message:

Filled in a few blanks.

Location:

trunk/src/VBox/ExtPacks/BusMouseSample

Files:

• BusMouse.cpp (modified) (2 diffs)
• VBoxBusMouseMain.cpp (modified) (4 diffs)

trunk/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp

@@ -34 +34 @@
 #define LOG_GROUP LOG_GROUP_DEV_KBD
 #include <VBox/vmm/pdmdev.h>
+#include <VBox/version.h>
 #include <iprt/assert.h>
 #include <iprt/uuid.h>
-
 
 /** @page pg_busmouse DevBusMouse - Microsoft Bus Mouse Emulation
@@ -876 +876 @@
 };
 
+#ifdef VBOX_IN_EXTPACK_R3
+/**
+ * @callback_method_impl{FNPDMVBOXDEVICESREGISTER}
+ */
+extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t u32Version)
+{
+    AssertLogRelMsgReturn(u32Version >= VBOX_VERSION,
+                          ("u32Version=%#x VBOX_VERSION=%#x\n", u32Version, VBOX_VERSION),
+                          VERR_EXTPACK_VBOX_VERSION_MISMATCH);
+    AssertLogRelMsgReturn(pCallbacks->u32Version == PDM_DEVREG_CB_VERSION,
+                          ("pCallbacks->u32Version=%#x PDM_DEVREG_CB_VERSION=%#x\n", pCallbacks->u32Version, PDM_DEVREG_CB_VERSION),
+                          VERR_VERSION_MISMATCH);
+
+    return pCallbacks->pfnRegister(pCallbacks, &g_DeviceBusMouse);
+}
+#endif /* VBOX_IN_EXTPACK_R3 */
+
 # endif /* IN_RING3 */
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */

trunk/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp

@@ -73 +73 @@
 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
 //
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
-//  */
-// static DECLCALLBACK(int)  vboxSkeletonExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-//
+
+/**
+ * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM 
+ */
+static DECLCALLBACK(int)  vboxBusMouseExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM)
+{
+    /*
+     * Find the bus mouse module and tell PDM to load it.
+     * ASSUME /PDM/Devices exists.
+     */
+    char szPath[RTPATH_MAX];
+    int rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseR3", NULL, VBOXEXTPACKMODKIND_R3, szPath, sizeof(szPath), NULL);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    PCFGMNODE pCfgRoot = CFGMR3GetRoot(pVM);
+    AssertReturn(pCfgRoot, VERR_INTERNAL_ERROR_3);
+
+    PCFGMNODE pCfgDevices = CFGMR3GetChild(pCfgRoot, "PDM/Devices");
+    AssertReturn(pCfgDevices, VERR_INTERNAL_ERROR_3);
+
+    PCFGMNODE pCfgMine;
+    rc = CFGMR3InsertNode(pCfgDevices, "VBoxBusMouse", &pCfgMine);
+    AssertRCReturn(rc, rc);
+    rc = CFGMR3InsertString(pCfgMine, "Path", szPath);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Tell PDM where to find the R0 and RC modules for the bus mouse device.
+     */
+#ifdef VBOX_WITH_RAW_MODE
+    rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseRC", NULL, VBOXEXTPACKMODKIND_RC, szPath, sizeof(szPath), NULL);
+    AssertRCReturn(rc, rc);
+    RTPathStripFilename(szPath);
+    rc = CFGMR3InsertString(pCfgMine, "RCSearchPath", szPath);
+    AssertRCReturn(rc, rc);
+#endif
+
+    rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseR0", NULL, VBOXEXTPACKMODKIND_R0, szPath, sizeof(szPath), NULL);
+    AssertRCReturn(rc, rc);
+    RTPathStripFilename(szPath);
+    rc = CFGMR3InsertString(pCfgMine, "R0SearchPath", szPath);
+    AssertRCReturn(rc, rc);
+
+    return VINF_SUCCESS;
+}
+
 // /**
 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
@@ -92 +134 @@
 
 
-static const VBOXEXTPACKREG g_vboxSkeletonExtPackReg =
+static const VBOXEXTPACKREG g_vboxBusMouseExtPackReg =
 {
     VBOXEXTPACKREG_VERSION,
@@ -101 +143 @@
     /* .pfnUnload =         */  NULL,
     /* .pfnVMCreated =      */  NULL,
-    /* .pfnVMConfigureVMM = */  NULL,
+    /* .pfnVMConfigureVMM = */  vboxBusMouseExtPack_VMConfigureVMM,
     /* .pfnVMPowerOn =      */  NULL,
     /* .pfnVMPowerOff =     */  NULL,
@@ -131 +173 @@
      */
     g_pHlp = pHlp;
-    *ppReg = &g_vboxSkeletonExtPackReg;
+    *ppReg = &g_vboxBusMouseExtPackReg;
 
     return VINF_SUCCESS;