Changeset 39059 in vbox

Timestamp:

Oct 20, 2011 2:48:56 PM (13 years ago)

Author:

vboxsync

Message:

unused variable warnings.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (14 diffs)
• Network/DrvDedicatedNic.cpp (modified) (1 diff)
• PC/DevIoApic.cpp (modified) (2 diffs)

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

@@ -1170 +1170 @@
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
+#ifndef IN_RC
     RTGCPHYS GCPhys = addr; /* save original address */
+#endif
 
     addr &= 0x1ffff;
@@ -1249 +1251 @@
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
+#ifndef IN_RC
     RTGCPHYS GCPhys = addr; /* save original address */
+#endif
 
     addr &= 0x1ffff;
@@ -4114 +4118 @@
 
 /**
- * Prints a separator line. 
- *  
+ * Prints a separator line.
+ *
  * @param   pHlp                Callback functions for doing output.
  * @param   cCols               The number of columns.
@@ -4122 +4126 @@
 static void vgaInfoTextPrintSeparatorLine(PCDBGFINFOHLP pHlp, uint32_t cCols, const char *pszTitle)
 {
-    if (pszTitle) 
+    if (pszTitle)
     {
         size_t cchTitle = strlen(pszTitle);
-        if (cchTitle + 6 >= cCols) 
+        if (cchTitle + 6 >= cCols)
         {
             pHlp->pfnPrintf(pHlp, "-- %s --", pszTitle);
@@ -4134 +4138 @@
             uint32_t cchLeft = (cCols - cchTitle - 2) / 2;
             cCols -= cchLeft + cchTitle + 2;
-            while (cchLeft-- > 0) 
+            while (cchLeft-- > 0)
                 pHlp->pfnPrintf(pHlp, "-");
             pHlp->pfnPrintf(pHlp, " %s ", pszTitle);
@@ -4140 +4144 @@
     }
 
-    while (cCols-- > 0) 
+    while (cCols-- > 0)
         pHlp->pfnPrintf(pHlp, "-");
     pHlp->pfnPrintf(pHlp, "\n");
@@ -4150 +4154 @@
  *
  * @param   pThis       The vga state.
- * @param   pHlp        Callback functions for doing output. 
- * @param   offStart    Where to start dumping (relative to the VRAM). 
- * @param   cbLine      The source line length (aka line_offset). 
- * @param   cCols       The number of columns on the screen. 
+ * @param   pHlp        Callback functions for doing output.
+ * @param   offStart    Where to start dumping (relative to the VRAM).
+ * @param   cbLine      The source line length (aka line_offset).
+ * @param   cCols       The number of columns on the screen.
  * @param   cRows       The number of rows to dump.
- * @param   iScrBegin   The row at which the current screen output starts. 
- * @param   iScrEnd     The row at which the current screen output end 
+ * @param   iScrBegin   The row at which the current screen output starts.
+ * @param   iScrEnd     The row at which the current screen output end
  *                      (exclusive).
  */
-static void vgaInfoTextWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, 
+static void vgaInfoTextWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp,
                               uint32_t offStart, uint32_t cbLine,
-                              uint32_t cCols, uint32_t cRows, 
+                              uint32_t cCols, uint32_t cRows,
                               uint32_t iScrBegin, uint32_t iScrEnd)
 {
     /* Title, */
     char szTitle[32];
-    if (iScrBegin || iScrEnd < cRows) 
-        RTStrPrintf(szTitle, sizeof(szTitle), "%ux%u (+%u before, +%u after)", 
+    if (iScrBegin || iScrEnd < cRows)
+        RTStrPrintf(szTitle, sizeof(szTitle), "%ux%u (+%u before, +%u after)",
                     cCols, iScrEnd - iScrBegin, iScrBegin, cRows - iScrEnd);
     else
@@ -4218 +4222 @@
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
 
-    /* 
+    /*
      * Parse args.
      */
@@ -4224 +4228 @@
     if (pszArgs && *pszArgs)
     {
-        if (!strcmp(pszArgs, "all")) 
+        if (!strcmp(pszArgs, "all"))
             fAll = true;
-        else if (!strcmp(pszArgs, "scr") || !strcmp(pszArgs, "screen")) 
+        else if (!strcmp(pszArgs, "scr") || !strcmp(pszArgs, "screen"))
             fAll = false;
         else
@@ -4270 +4274 @@
 
             if (fAll) {
-                vgaInfoTextWorker(pThis, pHlp, offStart - iScrBegin * cbLine, cbLine, 
+                vgaInfoTextWorker(pThis, pHlp, offStart - iScrBegin * cbLine, cbLine,
                                   cCols, cRows, iScrBegin, iScrBegin + cScrRows);
             } else {
@@ -4560 +4564 @@
 
 
-/** 
- * Internal vgaPortUpdateDisplayAll worker called under pThis->lock. 
- */ 
+/**
+ * Internal vgaPortUpdateDisplayAll worker called under pThis->lock.
+ */
 static int updateDisplayAll(PVGASTATE pThis)
 {
@@ -4592 +4596 @@
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
     PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
-    PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
 
     /* This is called both in VBVA mode and normal modes. */
@@ -4673 +4676 @@
 
     /*
-     * Allocate the buffer for 32 bits per pixel bitmap                       
-     *                                                                        
+     * Allocate the buffer for 32 bits per pixel bitmap
+     *
      * Note! The size can't be zero or greater than the size of the VRAM.
      *       Inconsistent VGA device state can cause the incorrect size values.
@@ -4709 +4712 @@
             pThis->fRenderVRAM = 1;             /* force the guest VRAM rendering to the given buffer. */
 
-            /* 
+            /*
              * Make the screenshot.
              *

trunk/src/VBox/Devices/Network/DrvDedicatedNic.cpp

@@ -326 +326 @@
     PDRVDEDICATEDNIC pThis = RT_FROM_MEMBER(pInterface, DRVDEDICATEDNIC, CTX_SUFF(INetworkUp));
     /** @todo enable/disable promiscuous mode (should be easy) */
+    NOREF(pThis);
 }
 

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -435 +435 @@
     uint8_t  trigger_mode = (uValue >> VBOX_MSI_DATA_TRIGGER_SHIFT) & 0x1;
     uint8_t  delivery_mode = (uValue >> VBOX_MSI_DATA_DELIVERY_MODE_SHIFT) & 0x7;
-    /**
+#if 0
+    /*
      * This bit indicates whether the message should be directed to the
      * processor with the lowest interrupt priority among
@@ -441 +442 @@
      */
     uint8_t  redir_hint = (GCAddr >> VBOX_MSI_ADDR_REDIRECTION_SHIFT) & 0x1;
-
+#endif
     int rc = pThis->CTX_SUFF(pIoApicHlp)->pfnApicBusDeliver(pDevIns,
                                                             dest,