Changeset 80478 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 28, 2019 1:32:17 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: remove unused VBOX_VDMA_WITH_WATCHDOG code. bugref:9529

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (1 diff)
• Graphics/DevVGA_VDMA.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -3112 +3112 @@
                         HGSMIClearHostGuestFlags(pThis->pHGSMI,
                                                  HGSMIHOSTFLAGS_IRQ
-#  ifdef VBOX_VDMA_WITH_WATCHDOG
-                                                 | HGSMIHOSTFLAGS_WATCHDOG
-#  endif
                                                  | HGSMIHOSTFLAGS_VSYNC
                                                  | HGSMIHOSTFLAGS_HOTPLUG

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -194 +194 @@
     RTCRITSECT CalloutCritSect;
 //    VBOXVDMA_SOURCE aSources[VBOX_VIDEO_MAX_SCREENS];
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-    PTMTIMERR3 WatchDogTimer;
-#endif
 } VBOXVDMAHOST, *PVBOXVDMAHOST;
 
@@ -2940 +2937 @@
 # endif
 
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-
-/**
- * @callback_method_impl{TMTIMER, VDMA watchdog timer.}
- */
-static DECLCALLBACK(void) vboxVDMAWatchDogTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
-{
-    VBOXVDMAHOST *pVdma = (VBOXVDMAHOST *)pvUser;
-    PVGASTATE pVGAState = pVdma->pVGAState;
-    VBVARaiseIrq(pVGAState, HGSMIHOSTFLAGS_WATCHDOG);
-}
-
-/**
- * Handles VBOXVDMA_CTL_TYPE_WATCHDOG for vboxVDMAControl.
- */
-static int vboxVDMAWatchDogCtl(struct VBOXVDMAHOST *pVdma, uint32_t cMillis)
-{
-    PPDMDEVINS pDevIns = pVdma->pVGAState->pDevInsR3;
-    if (cMillis)
-        TMTimerSetMillies(pVdma->WatchDogTimer, cMillis);
-    else
-        TMTimerStop(pVdma->WatchDogTimer);
-    return VINF_SUCCESS;
-}
-
-#endif /* VBOX_VDMA_WITH_WATCHDOG */
-
 /**
  * Called by vgaR3Construct() to initialize the state.
@@ -2983 +2953 @@
         pVdma->pVGAState = pVGAState;
 
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-        rc = PDMDevHlpTMTimerCreate(pVGAState->pDevInsR3, TMCLOCK_REAL, vboxVDMAWatchDogTimer,
-                                    pVdma, TMTIMER_FLAGS_NO_CRIT_SECT,
-                                    "VDMA WatchDog Timer", &pVdma->WatchDogTimer);
-        AssertRC(rc);
-#else
         rc = VINF_SUCCESS;
-#endif
         if (RT_SUCCESS(rc))
         {
@@ -3097 +3060 @@
                 break;
             case VBOXVDMA_CTL_TYPE_WATCHDOG:
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-                rc = vboxVDMAWatchDogCtl(pVdma, pCmd->u32Offset);
-#else
                 rc = VERR_NOT_SUPPORTED;
-#endif
                 break;
             default:

trunk/src/VBox/Devices/Makefile.kmk

@@ -348 +348 @@
  endif
 
- ifdef VBOX_VDMA_WITH_WATCHDOG
-  VBoxDD_DEFS           += VBOX_VDMA_WITH_WATCHDOG
- endif
-
  ifdef VBOX_WITH_PXE_ROM
   VBoxDD_DEFS           += VBOX_WITH_PXE_ROM
@@ -981 +977 @@
   ifdef VBOX_WITH_VMSVGA3D
    VBoxDDRC_DEFS         += VBOX_WITH_VMSVGA3D
-  endif
-  ifdef VBOX_VDMA_WITH_WATCHDOG
-   VBoxDDRC_DEFS        += VBOX_VDMA_WITH_WATCHDOG
   endif
 
@@ -1116 +1109 @@
         $(if $(VBOX_WITH_VDMA),VBOX_WITH_VDMA,) \
         $(if $(VBOXWDDM_WITH_VBVA),VBOXWDDM_WITH_VBVA,) \
-        $(if $(VBOX_VDMA_WITH_WATCHDOG),VBOX_VDMA_WITH_WATCHDOG,) \
         $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
         $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \