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

Timestamp:

Apr 1, 2011 1:45:14 PM (14 years ago)

Author:

vboxsync

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

70914

Message:

DevE1000: Two incorrect PDMBOTHCBDECL uses.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (10 diffs)

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

@@ -1415 +1415 @@
 
 #ifdef E1K_GLOBAL_MUTEX
+
 DECLINLINE(int) e1kCsEnter(E1KSTATE *pState, int iBusyRc)
 {
@@ -1424 +1425 @@
 }
 
-#define e1kCsRxEnter(ps, rc) VINF_SUCCESS
-#define e1kCsRxLeave(ps) do { } while (0)
-
-#define e1kCsTxEnter(ps, rc) VINF_SUCCESS
-#define e1kCsTxLeave(ps) do { } while (0)
+# define e1kCsRxEnter(ps, rc) VINF_SUCCESS
+# define e1kCsRxLeave(ps) do { } while (0)
+
+# define e1kCsTxEnter(ps, rc) VINF_SUCCESS
+# define e1kCsTxLeave(ps) do { } while (0)
 
 
@@ -1456 +1457 @@
 
 #else /* !E1K_GLOBAL_MUTEX */
-#define e1kCsEnter(ps, rc) PDMCritSectEnter(&ps->cs, rc)
-#define e1kCsLeave(ps) PDMCritSectLeave(&ps->cs)
-
-#define e1kCsRxEnter(ps, rc) PDMCritSectEnter(&ps->csRx, rc)
-#define e1kCsRxLeave(ps) PDMCritSectLeave(&ps->csRx)
-
-#define e1kCsTxEnter(ps, rc) VINF_SUCCESS
-#define e1kCsTxLeave(ps) do { } while (0)
-//#define e1kCsTxEnter(ps, rc) PDMCritSectEnter(&ps->csTx, rc)
-//#define e1kCsTxLeave(ps) PDMCritSectLeave(&ps->csTx)
-
-#if 0
+# define e1kCsEnter(ps, rc) PDMCritSectEnter(&ps->cs, rc)
+# define e1kCsLeave(ps) PDMCritSectLeave(&ps->cs)
+
+# define e1kCsRxEnter(ps, rc) PDMCritSectEnter(&ps->csRx, rc)
+# define e1kCsRxLeave(ps) PDMCritSectLeave(&ps->csRx)
+
+# define e1kCsTxEnter(ps, rc) VINF_SUCCESS
+# define e1kCsTxLeave(ps) do { } while (0)
+//# define e1kCsTxEnter(ps, rc) PDMCritSectEnter(&ps->csTx, rc)
+//# define e1kCsTxLeave(ps) PDMCritSectLeave(&ps->csTx)
+
+# if 0
 DECLINLINE(int) e1kCsEnter(E1KSTATE *pState, PPDMCRITSECT pCs, int iBusyRc, RT_SRC_POS_DECL)
 {
@@ -1491 +1492 @@
     PDMCritSectLeave(&pState->cs);
 }
-#endif
+# endif
 DECLINLINE(int) e1kMutexAcquire(E1KSTATE *pState, int iBusyRc, RT_SRC_POS_DECL)
 {
@@ -1500 +1501 @@
 {
 }
+
 #endif /* !E1K_GLOBAL_MUTEX */
-
 #ifdef IN_RING3
+
 /**
  * Wakeup the RX thread.
@@ -1523 +1525 @@
  * @param   pState      The device state structure.
  */
-PDMBOTHCBDECL(void) e1kHardReset(E1KSTATE *pState)
+static void e1kHardReset(E1KSTATE *pState)
 {
     E1kLog(("%s Hard reset triggered\n", INSTANCE(pState)));
@@ -1544 +1546 @@
         pState->pDrvR3->pfnSetPromiscuousMode(pState->pDrvR3, false);
 }
-#endif
+
+#endif /* IN_RING3 */
 
 /**
@@ -1734 +1737 @@
  * @param   pState      The device state structure.
  */
-PDMBOTHCBDECL(int) e1kRaiseInterrupt(E1KSTATE *pState, int rcBusy, uint32_t u32IntCause = 0)
+static int e1kRaiseInterrupt(E1KSTATE *pState, int rcBusy, uint32_t u32IntCause = 0)
 {
     int rc = e1kCsEnter(pState, rcBusy);
@@ -4432 +4435 @@
  */
 PDMBOTHCBDECL(int) e1kIOPortIn(PPDMDEVINS pDevIns, void *pvUser,
-              RTIOPORT port, uint32_t *pu32, unsigned cb)
+                               RTIOPORT port, uint32_t *pu32, unsigned cb)
 {
     E1KSTATE   *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
@@ -4483 +4486 @@
  */
 PDMBOTHCBDECL(int) e1kIOPortOut(PPDMDEVINS pDevIns, void *pvUser,
-              RTIOPORT port, uint32_t u32, unsigned cb)
+                                RTIOPORT port, uint32_t u32, unsigned cb)
 {
     E1KSTATE   *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);