Changeset 94987 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

May 12, 2022 9:05:55 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151412

Message:

DevBusMouse: Un-broke the code after PDM interface changes. Also avoided possible trouble when Mouse.pDrv is not set in case device is misconfigured and has no driver attached.

File:

• trunk/src/VBox/ExtPacks/BusMouseSample/DevBusMouse.cpp (modified) (4 diffs)

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

@@ -217 +217 @@
     PPDMIMOUSECONNECTOR pDrv = pThisCC->Mouse.pDrv;
     bool fEnabled = !!pThis->mouse_enabled;
-    pDrv->pfnReportModes(pDrv, fEnabled, false, false);
+    if (pDrv)   /* pDrv may be NULL if no mouse interface attached. */
+        pDrv->pfnReportModes(pDrv, fEnabled, false, false);
 }
 
@@ -240 +241 @@
 {
     PBMSSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PBMSSTATE);
-    PBMSSTATER3 pThisCC = PDMDEVINS_2_DATA(pDevIns, PBMSSTATER3);
+    PBMSSTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PBMSSTATER3);
     uint8_t     irq_bit;
-    RT_NOREF(pvUser, hTimer);
+    RT_NOREF(pvUser);
     Assert(hTimer == pThis->hMouseTimer);
 
@@ -520 +521 @@
 {
     PBMSSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PBMSSTATE);
-    PBMSSTATER3 pThisCC = PDMDEVINS_2_DATA(pDevIns, PBMSSTATER3);
+    PBMSSTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PBMSSTATER3);
 
     /* Reinitialize the timer. */
@@ -633 +634 @@
             else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
             {
-                Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pReg->szName, pDevIns->iInstance));
+                LogRel(("%s/%d: Warning: no driver attached to LUN #0!\n", pDevIns->pReg->szName, pDevIns->iInstance));
                 rc = VINF_SUCCESS;
             }