儲存庫 vbox 的更動 62617

時間撮記:

2016-7-28 上午11:09:43 (8 年 以前)

作者:

vboxsync

訊息:

Devices: unused parameter warnings.

檔案:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (修改) (25 筆差異)

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

@@ -2273 +2273 @@
 #else
     pStatus->fIXSM = true;
+    RT_NOREF_PV(pThis); RT_NOREF_PV(pFrame); RT_NOREF_PV(cb);
 #endif
     return VINF_SUCCESS;
@@ -2372 +2373 @@
     E1K_INC_ISTAT_CNT(pThis->uStatRxFrm);
 
-#ifdef E1K_WITH_RXD_CACHE
+# ifdef E1K_WITH_RXD_CACHE
     while (cb > 0)
     {
@@ -2384 +2385 @@
             break;
         }
-#else /* !E1K_WITH_RXD_CACHE */
+# else /* !E1K_WITH_RXD_CACHE */
     if (RDH == RDT)
     {
@@ -2397 +2398 @@
         PDMDevHlpPhysRead(pThis->CTX_SUFF(pDevIns), e1kDescAddr(RDBAH, RDBAL, RDH),
                           &desc, sizeof(desc));
-#endif /* !E1K_WITH_RXD_CACHE */
+# endif /* !E1K_WITH_RXD_CACHE */
         if (pDesc->u64BufAddr)
         {
@@ -2429 +2430 @@
                 e1kCsRxLeave(pThis);
                 e1kStoreRxFragment(pThis, pDesc, ptr, cb);
-#ifdef E1K_WITH_RXD_CACHE
+# ifdef E1K_WITH_RXD_CACHE
                 rc = e1kCsRxEnter(pThis, VERR_SEM_BUSY);
                 if (RT_UNLIKELY(rc != VINF_SUCCESS))
                     return rc;
                 cb = 0;
-#else /* !E1K_WITH_RXD_CACHE */
+# else /* !E1K_WITH_RXD_CACHE */
                 pThis->led.Actual.s.fReading = 0;
                 return VINF_SUCCESS;
-#endif /* !E1K_WITH_RXD_CACHE */
+# endif /* !E1K_WITH_RXD_CACHE */
             }
             /*
@@ -2444 +2445 @@
              */
         }
-#ifdef E1K_WITH_RXD_CACHE
+# ifdef E1K_WITH_RXD_CACHE
         /* Write back the descriptor. */
         pDesc->status.fDD = true;
         e1kRxDPut(pThis, pDesc);
-#else /* !E1K_WITH_RXD_CACHE */
+# else /* !E1K_WITH_RXD_CACHE */
         else
         {
@@ -2458 +2459 @@
             e1kAdvanceRDH(pThis);
         }
-#endif /* !E1K_WITH_RXD_CACHE */
+# endif /* !E1K_WITH_RXD_CACHE */
     }
 
@@ -2467 +2468 @@
 
     e1kCsRxLeave(pThis);
-#ifdef E1K_WITH_RXD_CACHE
+# ifdef E1K_WITH_RXD_CACHE
     /* Complete packet has been stored -- it is time to let the guest know. */
-# ifdef E1K_USE_RX_TIMERS
+#  ifdef E1K_USE_RX_TIMERS
     if (RDTR)
     {
@@ -2480 +2481 @@
     else
     {
-# endif /* E1K_USE_RX_TIMERS */
+#  endif /* E1K_USE_RX_TIMERS */
         /* 0 delay means immediate interrupt */
         E1K_INC_ISTAT_CNT(pThis->uStatIntRx);
         e1kRaiseInterrupt(pThis, VERR_SEM_BUSY, ICR_RXT0);
-# ifdef E1K_USE_RX_TIMERS
-    }
-# endif /* E1K_USE_RX_TIMERS */
-#endif /* E1K_WITH_RXD_CACHE */
+#  ifdef E1K_USE_RX_TIMERS
+    }
+#  endif /* E1K_USE_RX_TIMERS */
+# endif /* E1K_WITH_RXD_CACHE */
 
     return VINF_SUCCESS;
-#else
+#else  /* !IN_RING3 */
+    RT_NOREF_PV(pThis); RT_NOREF_PV(pvBuf); RT_NOREF_PV(cb); RT_NOREF_PV(status);
     return VERR_INTERNAL_ERROR_2;
-#endif
+#endif /* !IN_RING3 */
 }
 
@@ -2702 +2704 @@
     return VINF_SUCCESS;
 #else /* !IN_RING3 */
+    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index); RT_NOREF_PV(value);
     return VINF_IOM_R3_MMIO_WRITE;
 #endif /* !IN_RING3 */
@@ -2739 +2742 @@
     return rc;
 #else /* !IN_RING3 */
+    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index); RT_NOREF_PV(pu32Value);
     return VINF_IOM_R3_MMIO_READ;
 #endif /* !IN_RING3 */
@@ -2774 +2778 @@
     return VINF_SUCCESS;
 #else /* !IN_RING3 */
+    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index); RT_NOREF_PV(value);
     return VINF_IOM_R3_MMIO_WRITE;
 #endif /* !IN_RING3 */
@@ -2847 +2852 @@
     ICR &= ~value;
 
+    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index);
     return VINF_SUCCESS;
 }
@@ -2930 +2936 @@
 static int e1kRegWriteICS(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF_PV(offset); RT_NOREF_PV(index);
     E1K_INC_ISTAT_CNT(pThis->uStatIntICS);
     return e1kRaiseInterrupt(pThis, VINF_IOM_R3_MMIO_WRITE, value & g_aE1kRegMap[ICS_IDX].writable);
@@ -2948 +2955 @@
 static int e1kRegWriteIMS(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF_PV(offset); RT_NOREF_PV(index);
+
     IMS |= value;
     E1kLogRel(("E1000: irq enabled, RDH=%x RDT=%x TDH=%x TDT=%x\n", RDH, RDT, TDH, TDT));
@@ -2970 +2979 @@
 static int e1kRegWriteIMC(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF_PV(offset); RT_NOREF_PV(index);
+
     int rc = e1kCsEnter(pThis, VINF_IOM_R3_MMIO_WRITE);
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
@@ -5548 +5559 @@
 static int e1kRegReadDefault(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
 {
+    RT_NOREF_PV(offset);
+
     AssertReturn(index < E1K_NUM_OF_32BIT_REGS, VERR_DEV_IO_ERROR);
     *pu32Value = pThis->auRegs[index] & g_aE1kRegMap[index].readable;
@@ -5568 +5581 @@
  static int e1kRegWriteUnimplemented(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index); RT_NOREF_PV(value);
+
     E1kLog(("%s At %08X write attempt (%08X) to  unimplemented register %s (%s)\n",
             pThis->szPrf, offset, value, g_aE1kRegMap[index].abbrev, g_aE1kRegMap[index].name));
@@ -5592 +5607 @@
 static int e1kRegWriteDefault(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF_PV(offset);
+
     AssertReturn(index < E1K_NUM_OF_32BIT_REGS, VERR_DEV_IO_ERROR);
     pThis->auRegs[index] = (value & g_aE1kRegMap[index].writable)
@@ -5604 +5621 @@
  * @returns Index in the register table or -1 if not found.
  *
- * @param   pThis       The device state structure.
  * @param   offReg      Register offset in memory-mapped region.
  * @thread  EMT
  */
-static int e1kRegLookup(PE1KSTATE pThis, uint32_t offReg)
-{
+static int e1kRegLookup(uint32_t offReg)
+{
+
 #if 0
     int index;
@@ -5679 +5696 @@
     uint32_t    shift;
     int         rc     = VINF_SUCCESS;
-    int         index  = e1kRegLookup(pThis, offReg);
+    int         index  = e1kRegLookup(offReg);
 #ifdef LOG_ENABLED
     char        buf[9];
@@ -5768 +5785 @@
      */
     int rc     = VINF_SUCCESS;
-    int idxReg = e1kRegLookup(pThis, offReg);
+    int idxReg = e1kRegLookup(offReg);
     if (RT_LIKELY(idxReg != -1))
     {
@@ -5814 +5831 @@
 {
     int         rc    = VINF_SUCCESS;
-    int         index = e1kRegLookup(pThis, offReg);
+    int         index = e1kRegLookup(offReg);
     if (RT_LIKELY(index != -1))
     {
@@ -5897 +5914 @@
     int         rc;
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIORead), a);
+    RT_NOREF_PV(pvUser);
 
     uPort -= pThis->IOPortBase;
@@ -5941 +5959 @@
     int         rc;
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIOWrite), a);
+    RT_NOREF_PV(pvUser);
 
     E1kLog2(("%s e1kIOPortOut: uPort=%RTiop value=%08x\n", pThis->szPrf, uPort, u32));