Changeset 63478 in vbox for trunk

Timestamp:

Aug 15, 2016 2:04:10 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings (clang)

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchHda.cpp (modified) (29 diffs)
• Audio/DevSB16.cpp (modified) (1 diff)
• Bus/DevPciIch9.cpp (modified) (2 diffs)
• Bus/MsiCommon.cpp (modified) (2 diffs)
• EFI/DevEFI.cpp (modified) (3 diffs)
• Graphics/DevVGA-SVGA.cpp (modified) (1 diff)
• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)
• Graphics/DevVGA.cpp (modified) (2 diffs)
• Graphics/DevVGA_VDMA.cpp (modified) (1 diff)
• Graphics/shaderlib/directx.c (modified) (3 diffs)
• Input/PS2K.cpp (modified) (2 diffs)
• Input/UsbKbd.cpp (modified) (2 diffs)
• Input/UsbMouse.cpp (modified) (2 diffs)
• Network/DevE1000.cpp (modified) (18 diffs)
• Network/DevVirtioNet.cpp (modified) (4 diffs)
• Network/DrvIntNet.cpp (modified) (6 diffs)
• Network/DrvNAT.cpp (modified) (1 diff)
• Network/SrvIntNetR0.cpp (modified) (4 diffs)
• Network/slirp/ip_icmp.c (modified) (1 diff)
• Network/slirp/tftp.c (modified) (2 diffs)
• PC/DevRTC.cpp (modified) (2 diffs)
• Storage/DevAHCI.cpp (modified) (1 diff)
• Storage/DevATA.cpp (modified) (5 diffs)
• Storage/DevBusLogic.cpp (modified) (1 diff)
• Storage/DrvHostBase.cpp (modified) (6 diffs)
• USB/DevOHCI.cpp (modified) (72 diffs)
• VirtIO/Virtio.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevIchHda.cpp

@@ -1163 +1163 @@
 
 #ifdef IN_RING3
+
 DECLINLINE(uint32_t) hdaStreamUpdateLPIB(PHDASTATE pThis, PHDASTREAM pStream, uint32_t u32LPIB)
 {
@@ -1187 +1188 @@
     return u32LPIB;
 }
-#endif
+
 
 /**
@@ -1220 +1221 @@
 }
 
+
 /**
  * Retrieves the number of bytes of a FIFOW register.
@@ -1236 +1238 @@
     }
 
-#ifdef RT_STRICT
     Assert(RT_IS_POWER_OF_TWO(cb));
-#endif
     return cb;
 }
 
-#ifdef IN_RING3
+
 /**
  * Fetches the next BDLE to use for a stream.
@@ -1259 +1259 @@
     LogFlowFuncEnter();
 
-#ifdef DEBUG
-    uint32_t uOldBDLE = pStream->State.uCurBDLE;
-#endif
+# ifdef LOG_ENABLED
+    uint32_t const uOldBDLE = pStream->State.uCurBDLE;
+# endif
 
     PHDABDLE pBDLE = &pStream->State.BDLE;
@@ -1282 +1282 @@
     int rc = hdaBDLEFetch(pThis, pBDLE, pStream->u64BDLBase, pStream->State.uCurBDLE);
 
-#ifdef DEBUG
     LogFlowFunc(("[SD%RU8]: uOldBDLE=%RU16, uCurBDLE=%RU16, LVI=%RU32, rc=%Rrc, %R[bdle]\n",
                  pStream->u8SD, uOldBDLE, pStream->State.uCurBDLE, pStream->u16LVI, rc, pBDLE));
-#endif
-
     return rc;
 }
-#endif /* IN_RING3 */
+
 
 /**
@@ -1313 +1310 @@
 }
 
+
 /**
  * Returns the HDA stream of specified stream descriptor number.
@@ -1328 +1326 @@
     return &pThis->aStreams[uSD];
 }
+
 
 /**
@@ -1356 +1355 @@
     AssertPtrReturn(pStream, 0);
 
-#ifdef VBOX_HDA_WITH_FIFO
+# ifdef VBOX_HDA_WITH_FIFO
     return hdaSDFIFOWToBytes(HDA_STREAM_REG(pThis, FIFOW, pStream->u8SD));
-#else
+# else
     return 0;
-#endif
-}
+# endif
+}
+
+#endif /* IN_RING3 */
 
 static int hdaProcessInterrupt(PHDASTATE pThis)
@@ -1511 +1512 @@
 
 #ifdef IN_RING3
+
 static int hdaCmdSync(PHDASTATE pThis, bool fLocal)
 {
@@ -1524 +1526 @@
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
-#ifdef DEBUG_CMD_BUFFER
+# ifdef DEBUG_CMD_BUFFER
         uint8_t i = 0;
         do
@@ -1545 +1547 @@
             i += 8;
         } while(i != 0);
-#endif
+# endif
     }
     else
@@ -1553 +1555 @@
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
-#ifdef DEBUG_CMD_BUFFER
+# ifdef DEBUG_CMD_BUFFER
         uint8_t i = 0;
         do {
@@ -1569 +1571 @@
             i += 8;
         } while (i != 0);
-#endif
+# endif
     }
     return rc;
@@ -1700 +1702 @@
                  pStream->u8SD, pStream->u64BDLBase, pStream->u32CBL, pStream->u16LVI, pStream->u16FIFOS));
 
-#ifdef DEBUG
+# ifdef DEBUG
     uint64_t u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, pStream->u8SD),
                                       HDA_STREAM_REG(pThis, BDPU, pStream->u8SD));
@@ -1709 +1711 @@
 
     hdaBDLEDumpAll(pThis, u64BaseDMA, u16LVI + 1);
-#endif
+# endif
 
     return VINF_SUCCESS;
@@ -1721 +1723 @@
     const uint8_t uSD = pStream->u8SD;
 
-#ifdef VBOX_STRICT
+# ifdef VBOX_STRICT
     AssertReleaseMsg(!RT_BOOL(HDA_STREAM_REG(pThis, CTL, uSD) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN)),
                      ("[SD%RU8] Cannot reset stream while in running state\n", uSD));
-#endif
+# endif
 
     LogFunc(("[SD%RU8]: Reset\n", uSD));
@@ -1770 +1772 @@
 }
 
-#if 0 /* unused */
+# if 0 /* unused */
 static bool hdaStreamIsActive(PHDASTATE pThis, PHDASTREAM pStream)
 {
@@ -1781 +1783 @@
     return fActive;
 }
-#endif
+# endif
 
 static int hdaStreamSetActive(PHDASTATE pThis, PHDASTREAM pStream, bool fActive)
@@ -1824 +1826 @@
             pThis->cStreamsActive--;
 
-#ifndef VBOX_WITH_AUDIO_CALLBACKS
+# ifndef VBOX_WITH_AUDIO_CALLBACKS
         hdaTimerMaybeStop(pThis);
-#endif
+# endif
     }
     else
     {
         pThis->cStreamsActive++;
-#ifndef VBOX_WITH_AUDIO_CALLBACKS
+# ifndef VBOX_WITH_AUDIO_CALLBACKS
         hdaTimerMaybeStart(pThis);
-#endif
+# endif
     }
 
@@ -1854 +1856 @@
 }
 
-#if 0 /** @todo hdaStreamStart is unused */
+# if 0 /** @todo hdaStreamStart is unused */
 static int hdaStreamStart(PHDASTREAM pStream)
 {
@@ -1865 +1867 @@
     return VINF_SUCCESS;
 }
-#endif /* unused */
+# endif /* unused */
 
 static int hdaStreamStop(PHDASTREAM pStream)
@@ -1876 +1878 @@
         return VINF_SUCCESS;
 
-#if 0 /** @todo Does not work (yet), as EMT deadlocks then. */
+# if 0 /** @todo Does not work (yet), as EMT deadlocks then. */
     /*
      * Wait for the stream to stop.
@@ -1893 +1895 @@
                 pStream->u8Strm, fActive ? "active" : "stopped", rc));
     }
-#else
+# else
     int rc = VINF_SUCCESS;
-#endif
+# endif
 
     LogFlowFuncLeaveRC(rc);
@@ -1901 +1903 @@
 }
 
-#if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
+# if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
 static int hdaStreamChannelExtract(PPDMAUDIOSTREAMCHANNEL pChan, const void *pvBuf, size_t cbBuf)
 {
@@ -1949 +1951 @@
     return VINF_SUCCESS;
 }
-#endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
-
-#if 0 /** @todo hdaStreamChannelAdvance is unused */
+# endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
+
+# if 0 /** @todo hdaStreamChannelAdvance is unused */
 static int hdaStreamChannelAdvance(PPDMAUDIOSTREAMCHANNEL pChan, size_t cbAdv)
 {
@@ -1961 +1963 @@
     return VINF_SUCCESS;
 }
-#endif
+# endif
 
 static int hdaStreamChannelDataInit(PPDMAUDIOSTREAMCHANNELDATA pChanData, uint32_t fFlags)
@@ -1993 +1995 @@
 }
 
-#if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
+# if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
 
 static int hdaStreamChannelAcquireData(PPDMAUDIOSTREAMCHANNELDATA pChanData, void *pvData, size_t *pcbData)
@@ -2015 +2017 @@
 }
 
-#endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
+# endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
 
 # if 0 /* currently unused */

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -416 +416 @@
 }
 
-#ifdef DEBUG
-static inline void log_dsp(PSB16STATE pThis)
+#if 0 // unused // def DEBUG
+DECLINLINE(void) log_dsp(PSB16STATE pThis)
 {
     LogFlowFunc(("%s:%s:%d:%s:dmasize=%d:freq=%d:const=%d:speaker=%d\n",

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -541 +541 @@
 }
 
+#ifdef IN_RING3
+
 /* return the global irq number corresponding to a given device irq
    pin. We could also use the bus number to have a more precise
@@ -553 +555 @@
 /* irqs corresponding to PCI irqs A-D, must match pci_irq_list in rombios.c */
 static const uint8_t aPciIrqs[4] = { 11, 10, 9, 5 };
+
+#endif /* IN_RING3 */
 
 /* Add one more level up request on APIC input line */

trunk/src/VBox/Devices/Bus/MsiCommon.cpp

@@ -99 +99 @@
 }
 
+#ifdef IN_RING3
+
 DECLINLINE(bool) msiBitJustCleared(uint32_t uOldValue,
                                    uint32_t uNewValue,
@@ -113 +115 @@
 }
 
-#ifdef IN_RING3
 void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev,
                            uint32_t u32Address, uint32_t val, unsigned len)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -1909 +1909 @@
 }
 
+
+#if 0 /* unused */
 /**
  * Helper that searches for a FFS file of a given type.
@@ -1922 +1924 @@
 efiFwVolFindFileByType(EFI_FFS_FILE_HEADER const *pFfsFile, uint8_t const *pbEnd, EFI_FV_FILETYPE FileType, uint32_t *pcbFile)
 {
-#define FFS_SIZE(hdr)   RT_MAKE_U32_FROM_U8((hdr)->Size[0], (hdr)->Size[1], (hdr)->Size[2], 0)
+# define FFS_SIZE(hdr)   RT_MAKE_U32_FROM_U8((hdr)->Size[0], (hdr)->Size[1], (hdr)->Size[2], 0)
     while ((uintptr_t)pFfsFile < (uintptr_t)pbEnd)
     {
@@ -1933 +1935 @@
         pFfsFile = (EFI_FFS_FILE_HEADER *)((uintptr_t)pFfsFile + RT_ALIGN(FFS_SIZE(pFfsFile), 8));
     }
-#undef FFS_SIZE
+# undef FFS_SIZE
     return NULL;
 }
+#endif /* unused */
 
 

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

@@ -3106 +3106 @@
             default:
 # ifdef VBOX_WITH_VMSVGA3D
-                if (    enmCmdId >= SVGA_3D_CMD_BASE
-                    &&  enmCmdId <  SVGA_3D_CMD_MAX)
+                if (    (int)enmCmdId >= SVGA_3D_CMD_BASE
+                    &&  (int)enmCmdId <  SVGA_3D_CMD_MAX)
                 {
                     /* All 3d commands start with a common header, which defines the size of the command. */

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -1090 +1090 @@
 
 #ifdef RT_OS_DARWIN
+    RT_NOREF(pOldViewport);
     PVMSVGA3DSTATE pState = pThis->svga.p3dState;
     if (   pState
@@ -3601 +3602 @@
 
 #elif defined(RT_OS_DARWIN)
+    RT_NOREF(pState);
     vmsvga3dCocoaViewSetSize(pContext->cocoaView, pThis->svga.uWidth, pThis->svga.uHeight);
 

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

@@ -269 +269 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#ifdef IN_RING3
 /* "Press F12 to select boot device." bitmap. */
 static const uint8_t g_abLogoF12BootText[] =
@@ -306 +307 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+#endif /* IN_RING3 */
 
 

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

@@ -1039 +1039 @@
 }
 
-DECLINLINE(void) vboxVDMACrCtlRetain (PVBOXVDMACMD_CHROMIUM_CTL pCmd)
+#if 0 /* unused */
+DECLINLINE(void) vboxVDMACrCtlRetain(PVBOXVDMACMD_CHROMIUM_CTL pCmd)
 {
     PVBOXVDMACMD_CHROMIUM_CTL_PRIVATE pHdr = VBOXVDMACMD_CHROMIUM_CTL_PRIVATE_FROM_CTL(pCmd);
     ASMAtomicIncU32(&pHdr->cRefs);
 }
+#endif /* unused */
 
 DECLINLINE(int) vboxVDMACrCtlGetRc (PVBOXVDMACMD_CHROMIUM_CTL pCmd)

trunk/src/VBox/Devices/Graphics/shaderlib/directx.c

@@ -56 +56 @@
 
 /* The d3d device ID */
+#if 0 /* VBox: unused */
 static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } };
+#endif
 
 
@@ -904 +906 @@
 };
 
+#if 0 /* VBox: unused */
 static const struct driver_version_information driver_version_table[] =
 {
@@ -960 +963 @@
     /* TODO: Add information about legacy ATI hardware, Intel and other cards. */
 };
+#endif /* VBox: unused */
 
 

trunk/src/VBox/Devices/Input/PS2K.cpp

@@ -267 +267 @@
 } key_def;
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+#ifdef IN_RING3
 /* USB to PS/2 conversion table for regular keys. */
 static const   key_def   aPS2Keys[] = {
@@ -461 +466 @@
 };
 
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
-
-
-/*********************************************************************************************************************************
-*   Internal Functions                                                                                                           *
-*********************************************************************************************************************************/
+#endif /* IN_RING3 */
+
 
 

trunk/src/VBox/Devices/Input/UsbKbd.cpp

@@ -463 +463 @@
 
 
+#if 0 /* unused */
 /**
  * Checks if the queue is empty or not.
@@ -473 +474 @@
     return pQueue->pHead == NULL;
 }
+#endif /* unused */
 
 

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -1071 +1071 @@
 
 
+#if 0 /* unused */
 /**
  * Checks if the queue is empty or not.
@@ -1081 +1082 @@
     return pQueue->pHead == NULL;
 }
+#endif /* unused */
 
 

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

@@ -218 +218 @@
 #define E1K_CHIP_82545EM 2
 
+#ifdef IN_RING3
 /** Different E1000 chips. */
 static const struct E1kChips
@@ -226 +227 @@
     uint16_t uPCISubsystemId;
     const char *pcszName;
-} g_Chips[] =
+} g_aChips[] =
 {
     /* Vendor Device SSVendor SubSys  Name */
     { 0x8086,
       /* Temporary code, as MSI-aware driver dislike 0x100E. How to do that right? */
-#ifdef E1K_WITH_MSI
+# ifdef E1K_WITH_MSI
       0x105E,
-#else
+# else
       0x100E,
-#endif
+# endif
                       0x8086, 0x001E, "82540EM" }, /* Intel 82540EM-A in Intel PRO/1000 MT Desktop */
     { 0x8086, 0x1004, 0x8086, 0x1004, "82543GC" }, /* Intel 82543GC   in Intel PRO/1000 T  Server */
     { 0x8086, 0x100F, 0x15AD, 0x0750, "82545EM" }  /* Intel 82545EM-A in VMWare Network Adapter */
 };
+#endif /* IN_RING3 */
 
 
@@ -1552 +1554 @@
 }
 
+#ifdef IN_RING3
 /**
  * Cancel a timer.
@@ -1568 +1571 @@
     RT_NOREF1(pThis);
 }
+#endif /* IN_RING3 */
 
 #define e1kCsEnter(ps, rc) PDMCritSectEnter(&ps->cs, rc)
@@ -1748 +1752 @@
 }
 
+
+#if defined(E1K_WITH_RXD_CACHE) && defined(IN_RING3) /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Dump receive descriptor to debug log.
@@ -1777 +1783 @@
              E1K_SPEC_PRI(pDesc->status.u16Special)));
 }
+#endif /* E1K_WITH_RXD_CACHE && IN_RING3 */
 
 /**
@@ -1954 +1961 @@
 }
 
+#ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Advance the head pointer of the receive descriptor queue.
@@ -1992 +2000 @@
     //e1kCsLeave(pThis);
 }
+#endif /* IN_RING3 */
 
 #ifdef E1K_WITH_RXD_CACHE
+
 /**
  * Return the number of RX descriptor that belong to the hardware.
@@ -2087 +2097 @@
 }
 
+# ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
+
 /**
  * Obtain the next RX descriptor from RXD cache, fetching descriptors from the
@@ -2111 +2123 @@
     return NULL;
 }
+
 
 /**
@@ -2136 +2149 @@
 }
 
-# ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Store a fragment of received packet at the specifed address.
@@ -2154 +2166 @@
     STAM_PROFILE_ADV_STOP(&pThis->StatReceiveStore, a);
 }
+
 # endif
 
@@ -2206 +2219 @@
     STAM_PROFILE_ADV_STOP(&pThis->StatReceiveStore, a);
 }
+
 #endif /* !E1K_WITH_RXD_CACHE */
 
@@ -3244 +3258 @@
 #  ifndef E1K_NO_TAD
     e1kCancelTimer(pThis, pThis->CTX_SUFF(pTADTimer));
-#  endif /* E1K_NO_TAD */
+#  endif
     e1kRaiseInterrupt(pThis, ICR_TXDW);
 }
@@ -4451 +4465 @@
                 /* Cancel both timers if armed and fire immediately. */
                 e1kCancelTimer(pThis, pThis->CTX_SUFF(pTADTimer));
-# endif /* E1K_NO_TAD */
+# endif
 #endif /* E1K_USE_TX_TIMERS */
                 E1K_INC_ISTAT_CNT(pThis->uStatIntTx);
@@ -7018 +7032 @@
     pHlp->pfnPrintf(pHlp, "E1000 #%d: port=%RTiop mmio=%RGp mac-cfg=%RTmac %s%s%s\n",
                     pDevIns->iInstance, pThis->IOPortBase, pThis->addrMMReg,
-                    &pThis->macConfigured, g_Chips[pThis->eChip].pcszName,
+                    &pThis->macConfigured, g_aChips[pThis->eChip].pcszName,
                     pThis->fRCEnabled ? " GC" : "", pThis->fR0Enabled ? " R0" : "");
 
@@ -7375 +7389 @@
 static DECLCALLBACK(void) e1kConfigurePciDev(PPCIDEVICE pPciDev, E1KCHIP eChip)
 {
-    Assert(eChip < RT_ELEMENTS(g_Chips));
+    Assert(eChip < RT_ELEMENTS(g_aChips));
     /* Configure PCI Device, assume 32-bit mode ******************************/
-    PCIDevSetVendorId(pPciDev, g_Chips[eChip].uPCIVendorId);
-    PCIDevSetDeviceId(pPciDev, g_Chips[eChip].uPCIDeviceId);
-    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_VENDOR_ID, g_Chips[eChip].uPCISubsystemVendorId);
-    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_ID, g_Chips[eChip].uPCISubsystemId);
+    PCIDevSetVendorId(pPciDev, g_aChips[eChip].uPCIVendorId);
+    PCIDevSetDeviceId(pPciDev, g_aChips[eChip].uPCIDeviceId);
+    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_VENDOR_ID, g_aChips[eChip].uPCISubsystemVendorId);
+    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_ID, g_aChips[eChip].uPCISubsystemId);
 
     PCIDevSetWord( pPciDev, VBOX_PCI_COMMAND,            0x0000);
@@ -7568 +7582 @@
 
     LogRel(("%s Chip=%s LinkUpDelay=%ums EthernetCRC=%s GSO=%s Itr=%s ItrRx=%s R0=%s GC=%s\n", pThis->szPrf,
-            g_Chips[pThis->eChip].pcszName, pThis->cMsLinkUpDelay,
+            g_aChips[pThis->eChip].pcszName, pThis->cMsLinkUpDelay,
             pThis->fEthernetCRC ? "on" : "off",
             pThis->fGSOEnabled ? "enabled" : "disabled",

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

@@ -274 +274 @@
 AssertCompileSize(VNETCTLHDR, 2);
 
+#ifdef IN_RING3
+
 /** Returns true if large packets are written into several RX buffers. */
 DECLINLINE(bool) vnetMergeableRxBuffers(PVNETSTATE pThis)
@@ -289 +291 @@
     vpciCsLeave(&pThis->VPCI);
 }
+
+#endif /* IN_RING3 */
 
 DECLINLINE(int) vnetCsRxEnter(PVNETSTATE pThis, int rcBusy)
@@ -307 +311 @@
 }
 
+#ifdef IN_RING3
 /**
  * Dump a packet to debug log.
@@ -317 +322 @@
 DECLINLINE(void) vnetPacketDump(PVNETSTATE pThis, const uint8_t *pbPacket, size_t cb, const char *pszText)
 {
-#ifdef DEBUG
+# ifdef DEBUG
     Log(("%s %s packet #%d (%d bytes):\n",
          INSTANCE(pThis), pszText, ++pThis->u32PktNo, cb));
     Log3(("%.*Rhxd\n", cb, pbPacket));
-#else
+# else
     RT_NOREF4(pThis, pbPacket, cb, pszText);
-#endif
-}
+# endif
+}
+#endif /* IN_RING3 */
 
 /**

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

@@ -269 +269 @@
  * @param   pThis               The instance data..
  */
-DECLINLINE(int) drvIntNetSignalXmit(PDRVINTNET pThis)
+DECLINLINE(int) drvR0IntNetSignalXmit(PDRVINTNET pThis)
 {
     /// @todo if (!ASMAtomicXchgBool(&pThis->fXmitSignalled, true)) - needs careful optimizing.
@@ -279 +279 @@
     return VERR_TRY_AGAIN;
 }
-#endif
+#endif /* !IN_RING3 */
 
 
@@ -306 +306 @@
     {
         ASMAtomicUoWriteBool(&pThis->fXmitProcessRing, true);
-        drvIntNetSignalXmit(pThis);
+        drvR0IntNetSignalXmit(pThis);
         rc = VINF_SUCCESS;
     }
@@ -351 +351 @@
         rc = VERR_TRY_AGAIN;
 #else  /* IN_RING0 */
-        rc = drvIntNetSignalXmit(pThis);
+        rc = drvR0IntNetSignalXmit(pThis);
 #endif /* IN_RING0 */
     }
@@ -381 +381 @@
     PPDMSCATTERGATHER pSgBuf = &pThis->u.Sg;
     if (RT_UNLIKELY(pSgBuf->fFlags != 0))
-        return drvIntNetSignalXmit(pThis);
+        return drvR0IntNetSignalXmit(pThis);
 #endif
 
@@ -444 +444 @@
     {
         pThis->fXmitProcessRing = true;
-        rc = drvIntNetSignalXmit(pThis);
+        rc = drvR0IntNetSignalXmit(pThis);
     }
     else

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

@@ -1145 +1145 @@
             else
                 LogRel(("NAT: DNS server list is empty (2)\n"));
+#else
+            RT_NOREF(hDynStor);
 #endif
             drvNATUpdateDNS(pThis, /* fFlapLink */ true);

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

@@ -897 +897 @@
     return Addr.u == UINT32_MAX;
 }
-#endif
+#endif /* unused */
 
 
@@ -1032 +1032 @@
     return intnetR0IfAddrCacheLookup(pCache, pAddr, cbAddr);
 }
-
 
 #if 0 /* unused */
@@ -1220 +1219 @@
 
 #if 0 /* unused */
-
 /**
  * Deletes the address from all the interface caches except the specified one.
@@ -1252 +1250 @@
     RTSpinlockRelease(pNetwork->hAddrSpinlock);
 }
-
-#endif
+#endif /* unused */
 
 

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -64 +64 @@
 /* The message sent when emulating PING */
 /* Be nice and tell them it's just a psuedo-ping packet */
-#if 0
+#if 0 /* unused */
 static const char icmp_ping_msg[] = "This is a psuedo-PING packet used by Slirp to emulate ICMP ECHO-REQUEST packets.\n";
 #endif

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -196 +196 @@
 
 
+#if 0 /* unused */
 DECLINLINE(bool) tftpIsAcceptableOption(const char *pszOptionName)
 {
@@ -214 +215 @@
     return false;
 }
+#endif /* unused */
 
 

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

@@ -264 +264 @@
 
 
+#ifdef IN_RING3
 DECLINLINE(int) to_bcd(PRTCSTATE pThis, int a)
 {
@@ -270 +271 @@
     return ((a / 10) << 4) | (a % 10);
 }
+#endif
 
 

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -5476 +5476 @@
 }
 
+#if 0 /* unused */
 DECLINLINE(uint8_t) ahciGetTagQueued(uint8_t *pCmdFis)
 {
     return pCmdFis[AHCI_CMDFIS_SECTC] >> 3;
 }
+#endif /* unused */
 
 /**

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -548 +548 @@
 
 
+#ifdef IN_RING3
 DECLINLINE(void) ataSetStatusValue(ATADevState *s, uint8_t stat)
 {
@@ -559 +560 @@
     }
 }
+#endif /* IN_RING3 */
 
 
@@ -722 +724 @@
 static const ATARequest g_ataDMARequest    = { ATA_AIO_DMA,            { { 0, 0, 0, 0, 0 } } };
 static const ATARequest g_ataPIORequest    = { ATA_AIO_PIO,            { { 0, 0, 0, 0, 0 } } };
+# ifdef IN_RING3
 static const ATARequest g_ataResetARequest = { ATA_AIO_RESET_ASSERTED, { { 0, 0, 0, 0, 0 } } };
 static const ATARequest g_ataResetCRequest = { ATA_AIO_RESET_CLEARED,  { { 0, 0, 0, 0, 0 } } };
+# endif
 
 # ifdef IN_RING3
@@ -1166 +1170 @@
 }
 
+
+#if 0 /* unused */
 /**
  * Compares two MSF values.
@@ -1193 +1199 @@
     return iRes;
 }
+#endif /* unused */
 
 static void ataR3CmdOK(ATADevState *s, uint8_t status)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -304 +304 @@
 #define ISA_BASE_DISABLED   6
 
+#ifdef IN_RING3
 static uint16_t const g_aISABases[NUM_ISA_BASES] =
 {
     0x330, 0x334, 0x230, 0x234, 0x130, 0x134, 0, 0
 };
+#endif
 /** @}  */
 

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -664 +664 @@
 static void drvHostBaseDADoneCallback(DADiskRef DiskRef, DADissenterRef DissenterRef, void *pvContext)
 {
+    RT_NOREF(DiskRef);
     int *prc = (int *)pvContext;
     if (!DissenterRef)
@@ -792 +793 @@
 {
 # ifdef RT_OS_DARWIN
+    RT_NOREF(fReadOnly);
+
     /* Darwin is kind of special... */
     Assert(!pFileDevice); NOREF(pFileDevice);
     Assert(!pThis->cbBlock);
-    Assert(!pThis->MasterPort);
+    Assert(pThis->MasterPort == IO_OBJECT_NULL);
     Assert(!pThis->ppMMCDI);
     Assert(!pThis->ppScsiTaskDI);
@@ -818 +821 @@
      * do the search and get a collection of keyboards.
      */
-    io_iterator_t DVDServices = NULL;
+    io_iterator_t DVDServices = IO_OBJECT_NULL;
     IOReturn irc = IOServiceGetMatchingServices(pThis->MasterPort, RefMatchingDict, &DVDServices);
     AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), VERR_NOT_FOUND);
@@ -1138 +1141 @@
         RTFileClose(pThis->hFileDevice);
     pThis->hFileDevice = hFileDevice;
-#endif /* !RT_OS_DARWIN */
+#else  /* RT_OS_DARWIN */
+    RT_NOREF(pThis);
+#endif /* RT_OS_DARWIN */
     return VINF_SUCCESS;
 }
@@ -1792 +1797 @@
         pThis->ppMMCDI = NULL;
     }
-    if (pThis->MasterPort)
+    if (pThis->MasterPort != IO_OBJECT_NULL)
     {
         mach_port_deallocate(mach_task_self(), pThis->MasterPort);
-        pThis->MasterPort = 0;
+        pThis->MasterPort = IO_OBJECT_NULL;
     }
     if (pThis->pDASession)
@@ -1875 +1880 @@
     pThis->ThreadPoller                     = NIL_RTTHREAD;
 #ifdef RT_OS_DARWIN
-    pThis->MasterPort                       = NULL;
+    pThis->MasterPort                       = IO_OBJECT_NULL;
     pThis->ppMMCDI                          = NULL;
     pThis->ppScsiTaskDI                     = NULL;

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -772 +772 @@
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
+#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+/*
+ * Explain
+ */
+typedef struct OHCIDESCREADSTATS
+{
+    uint32_t cReads;
+    uint32_t cPageChange;
+    uint32_t cMinReadsPerPage;
+    uint32_t cMaxReadsPerPage;
+
+    uint32_t cReadsLastPage;
+    uint32_t u32LastPageAddr;
+} OHCIDESCREADSTATS;
+typedef OHCIDESCREADSTATS *POHCIDESCREADSTATS;
+
+typedef struct OHCIPHYSREADSTATS
+{
+    OHCIDESCREADSTATS ed;
+    OHCIDESCREADSTATS td;
+    OHCIDESCREADSTATS all;
+
+    uint32_t cCrossReads;
+    uint32_t cCacheReads;
+    uint32_t cPageReads;
+} OHCIPHYSREADSTATS;
+typedef OHCIPHYSREADSTATS *POHCIPHYSREADSTATS;
+typedef OHCIPHYSREADSTATS const *PCOHCIPHYSREADSTATS;
+#endif /* VBOX_WITH_OHCI_PHYS_READ_STATS */
+
 
 /*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#if defined(VBOX_WITH_OHCI_PHYS_READ_STATS) && defined(IN_RING3)
+static OHCIPHYSREADSTATS g_PhysReadState;
+#endif
+
 #if defined(LOG_ENABLED) && defined(IN_RING3)
 static bool g_fLogBulkEPs = false;
@@ -873 +907 @@
 }
 
+#ifdef IN_RING3
+
 /**
  * Set an interrupt, use the wrapper ohciSetInterrupt.
@@ -895 +931 @@
  * Set an interrupt wrapper macro for logging purposes.
  */
-#define ohciSetInterrupt(ohci, a_rcBusy, intr) ohciSetInterruptInt(ohci, a_rcBusy, intr, #intr)
-#define ohciR3SetInterrupt(ohci, intr) ohciSetInterruptInt(ohci, VERR_IGNORED, intr, #intr)
-
-#ifdef IN_RING3
+# define ohciR3SetInterrupt(ohci, intr) ohciSetInterruptInt(ohci, VERR_IGNORED, intr, #intr)
+
 
 /* Carry out a hardware remote wakeup */
@@ -1217 +1251 @@
         VUSBIDevReset(pThis->RootHub.pIDev, fResetOnLinux, NULL, NULL, NULL);
 }
-#endif /* IN_RING3 */
 
 /**
@@ -1243 +1276 @@
 {
     ohciPhysRead(pThis, Addr, pau32s, c32s * sizeof(uint32_t));
-#ifndef RT_LITTLE_ENDIAN
+# ifndef RT_LITTLE_ENDIAN
     for(int i = 0; i < c32s; i++)
         pau32s[i] = RT_H2LE_U32(pau32s[i]);
-#endif
+# endif
 }
 
@@ -1254 +1287 @@
 DECLINLINE(void) ohciPutDWords(POHCI pThis, uint32_t Addr, const uint32_t *pau32s, int cu32s)
 {
-#ifdef RT_LITTLE_ENDIAN
+# ifdef RT_LITTLE_ENDIAN
     ohciPhysWrite(pThis, Addr, pau32s, cu32s << 2);
-#else
+# else
     for (int i = 0; i < c32s; i++, pau32s++, Addr += sizeof(*pau32s))
     {
@@ -1262 +1295 @@
         ohciPhysWrite(pThis, Addr, (uint8_t *)&u32Tmp, sizeof(u32Tmp));
     }
-#endif
-}
-
-
-#ifdef IN_RING3
-
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-struct DescReadStats
-{
-    uint32_t cReads;
-    uint32_t cPageChange;
-    uint32_t cMinReadsPerPage;
-    uint32_t cMaxReadsPerPage;
-
-    uint32_t cReadsLastPage;
-    uint32_t u32LastPageAddr;
-};
-
-struct PhysReadStats
-{
-    struct DescReadStats ed;
-    struct DescReadStats td;
-    struct DescReadStats all;
-
-    uint32_t cCrossReads;
-    uint32_t cCacheReads;
-    uint32_t cPageReads;
-};
-
-static struct PhysReadStats physReadStats;
-
-static void descReadStatsReset(struct DescReadStats *p)
+# endif
+}
+
+
+
+# ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+
+static void descReadStatsReset(POHCIDESCREADSTATS p)
 {
     p->cReads = 0;
@@ -1304 +1313 @@
 }
 
-static void physReadStatsReset(struct PhysReadStats *p)
+static void physReadStatsReset(POHCIPHYSREADSTATS p)
 {
     descReadStatsReset(&p->ed);
@@ -1315 +1324 @@
 }
 
-static void physReadStatsUpdateDesc(struct DescReadStats *p, uint32_t u32Addr)
+static void physReadStatsUpdateDesc(POHCIDESCREADSTATS p, uint32_t u32Addr)
 {
     const uint32_t u32PageAddr = u32Addr & ~UINT32_C(0xFFF);
@@ -1345 +1354 @@
 }
 
-static void physReadStatsPrint(struct PhysReadStats *p)
+static void physReadStatsPrint(PCOHCIPHYSREADSTATS p)
 {
     p->ed.cMinReadsPerPage = RT_MIN(p->ed.cMinReadsPerPage, p->ed.cReadsLastPage);
@@ -1370 +1379 @@
     physReadStatsReset(p);
 }
-#endif /* VBOX_WITH_OHCI_PHYS_READ_STATS */
-
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+
+# endif /* VBOX_WITH_OHCI_PHYS_READ_STATS */
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+
 static POHCIPAGECACHE ohciPhysReadCacheAlloc(void)
 {
@@ -1399 +1409 @@
                               pPageCache->au8PhysReadCache, sizeof(pPageCache->au8PhysReadCache));
             pPageCache->GCPhysReadCacheAddr = PageAddr;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-            ++physReadStats.cPageReads;
-#endif
+#  ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+            ++g_PhysReadState.cPageReads;
+#  endif
         }
 
         memcpy(pvBuf, &pPageCache->au8PhysReadCache[GCPhys & PAGE_OFFSET_MASK], cbBuf);
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-        ++physReadStats.cCacheReads;
-#endif
+#  ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+        ++g_PhysReadState.cCacheReads;
+#  endif
     }
     else
     {
         PDMDevHlpPhysRead(pThis->pDevInsR3, GCPhys, pvBuf, cbBuf);
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-        ++physReadStats.cCrossReads;
-#endif
+#  ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+        ++g_PhysReadState.cCrossReads;
+#  endif
     }
 }
@@ -1427 +1437 @@
     ohciPhysReadCacheRead(pThis, pThis->pCacheTD, TdAddr, pTd, sizeof(*pTd));
 }
-#endif /* VBOX_WITH_OHCI_PHYS_READ_CACHE */
+
+# endif /* VBOX_WITH_OHCI_PHYS_READ_CACHE */
 
 /**
@@ -1434 +1445 @@
 DECLINLINE(void) ohciReadEd(POHCI pThis, uint32_t EdAddr, POHCIED pEd)
 {
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-    physReadStatsUpdateDesc(&physReadStats.ed, EdAddr);
-    physReadStatsUpdateDesc(&physReadStats.all, EdAddr);
-#endif
+# ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+    physReadStatsUpdateDesc(&g_PhysReadState.ed, EdAddr);
+    physReadStatsUpdateDesc(&g_PhysReadState.all, EdAddr);
+# endif
     ohciGetDWords(pThis, EdAddr, (uint32_t *)pEd, sizeof(*pEd) >> 2);
 }
@@ -1446 +1457 @@
 DECLINLINE(void) ohciReadTd(POHCI pThis, uint32_t TdAddr, POHCITD pTd)
 {
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-    physReadStatsUpdateDesc(&physReadStats.td, TdAddr);
-    physReadStatsUpdateDesc(&physReadStats.all, TdAddr);
-#endif
+# ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+    physReadStatsUpdateDesc(&g_PhysReadState.td, TdAddr);
+    physReadStatsUpdateDesc(&g_PhysReadState.all, TdAddr);
+# endif
     ohciGetDWords(pThis, TdAddr, (uint32_t *)pTd, sizeof(*pTd) >> 2);
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (LogIs3Enabled())
     {
@@ -1468 +1479 @@
               pTd->be,
               pTd->hwinfo & TD_HWINFO_UNKNOWN_MASK));
-#if 0
+#  if 0
         if (LogIs3Enabled())
         {
@@ -1493 +1504 @@
                   sizeof(abXpTd), &abXpTd[0]));
         }
-#endif
-    }
-#endif
+#  endif
+    }
+# endif
 }
 
@@ -1504 +1515 @@
 {
     ohciGetDWords(pThis, ITdAddr, (uint32_t *)pITd, sizeof(*pITd) / sizeof(uint32_t));
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (LogIs3Enabled())
     {
@@ -1526 +1537 @@
               pITd->aPSW[7] >> 12, pITd->aPSW[7] & 0xfff));
     }
-#endif
+# endif
 }
 
@@ -1535 +1546 @@
 DECLINLINE(void) ohciWriteEd(POHCI pThis, uint32_t EdAddr, PCOHCIED pEd)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (LogIs3Enabled())
     {
@@ -1558 +1569 @@
               EdOld.NextED != pEd->NextED ? "*" : "", pEd->NextED));
     }
-#endif
+# endif
 
     ohciPutDWords(pThis, EdAddr, (uint32_t *)pEd, sizeof(*pEd) >> 2);
@@ -1569 +1580 @@
 DECLINLINE(void) ohciWriteTd(POHCI pThis, uint32_t TdAddr, PCOHCITD pTd, const char *pszLogMsg)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (LogIs3Enabled())
     {
@@ -1588 +1599 @@
               pszLogMsg));
     }
-#else
+# else
     RT_NOREF(pszLogMsg);
-#endif
+# endif
     ohciPutDWords(pThis, TdAddr, (uint32_t *)pTd, sizeof(*pTd) >> 2);
 }
@@ -1599 +1610 @@
 DECLINLINE(void) ohciWriteITd(POHCI pThis, uint32_t ITdAddr, PCOHCIITD pITd, const char *pszLogMsg)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (LogIs3Enabled())
     {
@@ -1625 +1636 @@
               (ITdOld.aPSW[7] >> 12) != (pITd->aPSW[7] >> 12) ? "*" : "", pITd->aPSW[7] >> 12,  (ITdOld.aPSW[7] & 0xfff) != (pITd->aPSW[7] & 0xfff) ? "*" : "", pITd->aPSW[7] & 0xfff));
     }
-#else
+# else
     RT_NOREF(pszLogMsg);
-#endif
+# endif
     ohciPutDWords(pThis, ITdAddr, (uint32_t *)pITd, sizeof(*pITd) / sizeof(uint32_t));
 }
 
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
 
 /**
@@ -1770 +1781 @@
 }
 
-#endif /* LOG_ENABLED */
+# endif /* LOG_ENABLED */
 
 
@@ -1804 +1815 @@
     if (i >= 0)
     {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
         pUrb->pHci->u32FrameNo = pThis->HcFmNumber;
-#endif
+# endif
         pThis->aInFlight[i].GCPhysTD = GCPhysTD;
         pThis->aInFlight[i].pUrb = pUrb;
@@ -1908 +1919 @@
     if (i >= 0)
     {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
         const int cFramesInFlight = pThis->HcFmNumber - pThis->aInFlight[i].pUrb->pHci->u32FrameNo;
-#else
+# else
         const int cFramesInFlight = 0;
-#endif
+# endif
         Log2(("ohci_in_flight_remove: reaping TD=%#010x %d frames (%#010x-%#010x)\n",
               GCPhysTD, cFramesInFlight, pThis->aInFlight[i].pUrb->pHci->u32FrameNo, pThis->HcFmNumber));
@@ -1946 +1957 @@
 
 
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
 
 /**
@@ -1981 +1992 @@
 {
     int i = ohci_in_done_queue_find(pThis, GCPhysTD);
-#if 0
+#  if 0
     /* This condition has been observed with the USB tablet emulation or with
      * a real USB mouse and an SMP XP guest.  I am also not sure if this is
@@ -1993 +2004 @@
      */
     AssertMsg(i < 0, ("TD %#010x (i=%d)\n", GCPhysTD, i));
-#endif
+#  endif
     return i < 0;
 }
 
 
-# ifdef VBOX_STRICT
+#  ifdef VBOX_STRICT
 /**
  * Adds a TD to the in-done-queue tracking, checking that it's not there already.
@@ -2010 +2021 @@
         pThis->aInDoneQueue[pThis->cInDoneQueue++].GCPhysTD = GCPhysTD;
 }
-# endif /* VBOX_STRICT */
-#endif /* defined(VBOX_STRICT) || defined(LOG_ENABLED) */
+#  endif /* VBOX_STRICT */
+# endif /* defined(VBOX_STRICT) || defined(LOG_ENABLED) */
 
 
@@ -2524 +2535 @@
          * Move on to the done list and write back the modified TD.
          */
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
         if (!pThis->done)
             pThis->u32FmDoneQueueTail = pThis->HcFmNumber;
-# ifdef VBOX_STRICT
+#  ifdef VBOX_STRICT
         ohci_in_done_queue_add(pThis, ITdAddr);
+#  endif
 # endif
-#endif
         pITd->NextTD = pThis->done;
         pThis->done = ITdAddr;
@@ -2663 +2674 @@
          * Move on to the done list and write back the modified TD.
          */
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
         if (!pThis->done)
             pThis->u32FmDoneQueueTail = pThis->HcFmNumber;
-# ifdef VBOX_STRICT
+#  ifdef VBOX_STRICT
         ohci_in_done_queue_add(pThis, TdAddr);
+#  endif
 # endif
-#endif
         pTd->NextTD = pThis->done;
         pThis->done = TdAddr;
@@ -2943 +2954 @@
     if (ohciIsTdInFlight(pThis, TdAddr))
         return false;
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
     ohci_in_done_queue_check(pThis, TdAddr);
-#endif
+# endif
     return ohciServiceTd(pThis, enmType, pEd, EdAddr, TdAddr, &TdAddr, pszListName);
 }
@@ -2973 +2984 @@
     }   Head;
 
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     ohciPhysReadCacheClear(pThis->pCacheTD);
-#endif
+# endif
 
     /* read the head */
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     ohciReadTdCached(pThis, TdAddr, &Head.Td);
-#else
+# else
     ohciReadTd(pThis, TdAddr, &Head.Td);
-#endif
+# endif
     ohciBufInit(&Head.Buf, Head.Td.cbp, Head.Td.be);
     Head.TdAddr = TdAddr;
@@ -3000 +3011 @@
         pCur->pNext = NULL;
         pCur->TdAddr = pTail->Td.NextTD & ED_PTR_MASK;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
         ohciReadTdCached(pThis, pCur->TdAddr, &pCur->Td);
-#else
+# else
         ohciReadTd(pThis, pCur->TdAddr, &pCur->Td);
-#endif
+# endif
         ohciBufInit(&pCur->Buf, pCur->Td.cbp, pCur->Td.be);
 
@@ -3121 +3132 @@
     if (ohciIsTdInFlight(pThis, TdAddr))
         return false;
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
     ohci_in_done_queue_check(pThis, TdAddr);
-#endif
+# endif
     return ohciServiceTdMultiple(pThis, enmType, pEd, EdAddr, TdAddr, &TdAddr, pszListName);
 }
@@ -3274 +3285 @@
     AssertCompile(sizeof(pUrb->paTds[0].TdCopy) >= sizeof(*pITd));
     memcpy(pUrb->paTds[0].TdCopy, pITd, sizeof(*pITd));
-#if 0 /* color the data */
+# if 0 /* color the data */
     memset(pUrb->abData, 0xfe, cbTotal);
-#endif
+# endif
 
     /* copy the data */
@@ -3399 +3410 @@
         else
         {
-#if 1
+# if 1
             /*
              * Ok, the launch window for this TD has passed.
@@ -3422 +3433 @@
                 break;
             }
-#else /* BAD IDEA: */
+# else /* BAD IDEA: */
             /*
              * Ok, the launch window for this TD has passed.
@@ -3439 +3450 @@
                 break;
             }
-#endif
+# endif
         }
 
@@ -3484 +3495 @@
 static void ohciServiceBulkList(POHCI pThis)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
         ohciDumpEdList(pThis, pThis->bulk_head, "Bulk before", true);
     if (pThis->bulk_cur)
         Log(("ohciServiceBulkList: bulk_cur=%#010x before listprocessing!!! HCD have positioned us!!!\n", pThis->bulk_cur));
-#endif
+# endif
 
     /*
@@ -3504 +3515 @@
     {
         OHCIED Ed;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
         ohciReadEdCached(pThis, EdAddr, &Ed);
-#else
+# else
         ohciReadEd(pThis, EdAddr, &Ed);
-#endif
+# endif
         Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
         if (ohciIsEdReady(&Ed))
@@ -3515 +3526 @@
             pThis->fBulkNeedsCleaning = true;
 
-#if 1
+# if 1
             /*
 
@@ -3525 +3536 @@
              */
             ohciServiceHeadTdMultiple(pThis, VUSBXFERTYPE_BULK, &Ed, EdAddr, "Bulk");
-#else
+# else
             /*
              * This alternative code was used before we started reassembling URBs from
@@ -3550 +3561 @@
                 } while (ohciIsEdReady(&Ed));
             }
-#endif
+# endif
         }
         else
@@ -3572 +3583 @@
     }
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
         ohciDumpEdList(pThis, pThis->bulk_head, "Bulk after ", true);
-#endif
+# endif
 }
 
@@ -3588 +3599 @@
 static void ohciUndoBulkList(POHCI pThis)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
         ohciDumpEdList(pThis, pThis->bulk_head, "Bulk before", true);
     if (pThis->bulk_cur)
         Log(("ohciUndoBulkList: bulk_cur=%#010x before list processing!!! HCD has positioned us!!!\n", pThis->bulk_cur));
-#endif
+# endif
 
     /* This flag follows OHCI_STATUS_BLF, but BLF doesn't change when list processing is disabled. */
@@ -3602 +3613 @@
     {
         OHCIED Ed;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
         ohciReadEdCached(pThis, EdAddr, &Ed);
-#else
+# else
         ohciReadEd(pThis, EdAddr, &Ed);
-#endif
+# endif
         Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
         if (ohciIsEdPresent(&Ed))
@@ -3633 +3644 @@
 static void ohciServiceCtrlList(POHCI pThis)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogControlEPs)
         ohciDumpEdList(pThis, pThis->ctrl_head, "Ctrl before", true);
     if (pThis->ctrl_cur)
         Log(("ohciServiceCtrlList: ctrl_cur=%010x before list processing!!! HCD have positioned us!!!\n", pThis->ctrl_cur));
-#endif
+# endif
 
     /*
@@ -3656 +3667 @@
         if (ohciIsEdReady(&Ed))
         {
-#if 1
+# if 1
             /*
              * Control TDs depends on order and stage. Only one can be in-flight
@@ -3673 +3684 @@
                 ohciReadEd(pThis, EdAddr, &Ed); /* It might have been updated on URB completion. */
             } while (ohciIsEdReady(&Ed));
-#else
+# else
             /* Simplistic, for debugging. */
             ohciServiceHeadTd(pThis, VUSBXFERTYPE_CTRL, &Ed, EdAddr, "Control");
             pThis->status |= OHCI_STATUS_CLF;
-#endif
+# endif
         }
 
@@ -3684 +3695 @@
     }
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogControlEPs)
         ohciDumpEdList(pThis, pThis->ctrl_head, "Ctrl after ", true);
-#endif
+# endif
 }
 
@@ -3707 +3718 @@
     ohciGetDWords(pThis, pThis->hcca + iList * sizeof(EdAddr), &EdAddr, 1);
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     const uint32_t EdAddrHead = EdAddr;
     if (g_fLogInterruptEPs)
@@ -3715 +3726 @@
         ohciDumpEdList(pThis, EdAddrHead, sz, true);
     }
-#endif
+# endif
 
     /*
@@ -3723 +3734 @@
     {
         OHCIED Ed;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
         ohciReadEdCached(pThis, EdAddr, &Ed);
-#else
+# else
         ohciReadEd(pThis, EdAddr, &Ed);
-#endif
+# endif
 
         if (ohciIsEdReady(&Ed))
@@ -3771 +3782 @@
     }
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     if (g_fLogInterruptEPs)
     {
@@ -3778 +3789 @@
         ohciDumpEdList(pThis, EdAddrHead, sz, true);
     }
-#endif
+# endif
 }
 
@@ -3811 +3822 @@
         Log(("ohci: Writeback Done (%#010x) on frame %#x (age %#x)\n", hcca.done,
              pThis->HcFmNumber, pThis->HcFmNumber - pThis->u32FmDoneQueueTail));
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
         ohciDumpTdQueue(pThis, hcca.done & ED_PTR_MASK, "DoneQueue");
-#endif
+# endif
         Assert(RT_OFFSETOF(struct ohci_hcca, done) == 4);
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
         ohci_in_done_queue_zap(pThis);
-#endif
+# endif
         fWriteDoneHeadInterrupt = true;
     }
@@ -3859 +3870 @@
     Assert(cLeft == 0);
 
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     /* Get hcca data to minimize calls to ohciGetDWords/PDMDevHlpPhysRead. */
     uint32_t au32HCCA[OHCI_HCCA_NUM_INTR];
     ohciGetDWords(pThis, pThis->hcca, au32HCCA, OHCI_HCCA_NUM_INTR);
-#endif
+# endif
 
     /* Go over all bulk/control/interrupt endpoint lists; any URB found in these lists
@@ -3879 +3890 @@
             break;
         default:
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
             EdAddr = au32HCCA[i];
-#else
+# else
             ohciGetDWords(pThis, pThis->hcca + i * sizeof(EdAddr), &EdAddr, 1);
-#endif
+# endif
             break;
         }
@@ -3890 +3901 @@
             OHCIED Ed;
             OHCITD Td;
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
             ohciReadEdCached(pThis, EdAddr, &Ed);
-#else
+# else
             ohciReadEd(pThis, EdAddr, &Ed);
-#endif
+# endif
             uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
             uint32_t TailP  = Ed.TailP & ED_PTR_MASK;
@@ -3901 +3912 @@
                 && (TdAddr != TailP))
             {
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
                 ohciPhysReadCacheClear(pThis->pCacheTD);
-#endif
+# endif
                 do
                 {
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
                     ohciReadTdCached(pThis, TdAddr, &Td);
-#else
+# else
                     ohciReadTd(pThis, TdAddr, &Td);
-#endif
+# endif
                     j = ohci_in_flight_find(pThis, TdAddr);
                     if (j > -1)
@@ -3956 +3967 @@
 static void ohciStartOfFrame(POHCI pThis)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     const uint32_t status_old = pThis->status;
-#endif
+# endif
 
     /*
@@ -3973 +3984 @@
                         ||  pThis->hcca < ~OHCI_HCCA_MASK);
 
-#if 1
+# if 1
     /*
      * Update the HCCA.
@@ -3980 +3991 @@
     if (fValidHCCA)
         ohciUpdateHCCA(pThis);
-#endif
+# endif
 
     /* "After writing to HCCA, HC will set SF in HcInterruptStatus" - guest isn't executing, so ignore the order! */
@@ -4022 +4033 @@
         ohciUndoBulkList(pThis);    /* If list disabled but not empty, abort endpoints. */
 
-#if 0
+# if 0
     /*
      * Update the HCCA after processing the lists and everything. A bit experimental.
@@ -4037 +4048 @@
      */
     ohciUpdateHCCA(pThis);
-#endif
-
-#ifdef LOG_ENABLED
+# endif
+
+# ifdef LOG_ENABLED
     if (pThis->status ^ status_old)
     {
@@ -4052 +4063 @@
               chg & (3<<16)? "*" : "", (val >> 16) & 3));
     }
-#endif
+# endif
 }
 
@@ -4078 +4089 @@
     pThis->fIdle = true;
 
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-    physReadStatsReset(&physReadStats);
-#endif
-
-#ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
+# ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+    physReadStatsReset(&g_PhysReadState);
+# endif
+
+# ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     ohciPhysReadCacheClear(pThis->pCacheED);
     ohciPhysReadCacheClear(pThis->pCacheTD);
-#endif
+# endif
 
     /* Frame boundary, so do EOF stuff here. */
@@ -4098 +4109 @@
     ohciStartOfFrame(pThis);
 
-#ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
-    physReadStatsPrint(&physReadStats);
-#endif
+# ifdef VBOX_WITH_OHCI_PHYS_READ_STATS
+    physReadStatsPrint(&g_PhysReadState);
+# endif
 
     RTCritSectLeave(&pThis->CritSect);

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -623 +623 @@
 }
 
+#if 0 /* unused */
 /**
  * Sets 32-bit register in PCI configuration space.
@@ -635 +636 @@
     *(uint32_t*)&refPciDev.config[uOffset] = u32Value;
 }
+#endif /* unused */