Changeset 35824 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp

Timestamp:

Feb 2, 2011 1:32:03 PM (14 years ago)

Author:

vboxsync

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

69816

Message:

netadp: coding style

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdp.c (modified) (12 diffs)
• VBoxNetAdpInternal.h (modified) (2 diffs)
• darwin/VBoxNetAdp-darwin.cpp (modified) (3 diffs)
• freebsd/VBoxNetAdp-freebsd.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c

@@ -588 +588 @@
 
 
-int vboxNetAdpCreate (PINTNETTRUNKFACTORY pIfFactory, PVBOXNETADP *ppNew)
+int vboxNetAdpCreate(PINTNETTRUNKFACTORY pIfFactory, PVBOXNETADP *ppNew)
 {
     int rc;
@@ -618 +618 @@
 }
 
-int vboxNetAdpDestroy (PVBOXNETADP pThis)
+int vboxNetAdpDestroy(PVBOXNETADP pThis)
 {
     int rc = VINF_SUCCESS;
@@ -1061 +1061 @@
 DECLINLINE(int) vboxNetAdpGetUnitByName(const char *pcszName)
 {
-    uint32_t nUnit = RTStrToUInt32(pcszName + sizeof(VBOXNETADP_NAME) - 1);
+    uint32_t iUnit = RTStrToUInt32(pcszName + sizeof(VBOXNETADP_NAME) - 1);
     bool fOld;
 
-    if (nUnit >= VBOXNETADP_MAX_UNITS)
+    if (iUnit >= VBOXNETADP_MAX_UNITS)
         return -1;
 
-    fOld = ASMAtomicBitTestAndSet(g_aUnits, nUnit);
-    return fOld ? -1 : (int)nUnit;
+    fOld = ASMAtomicBitTestAndSet(g_aUnits, iUnit);
+    return fOld ? -1 : (int)iUnit;
 }
 
@@ -1074 +1074 @@
 {
     bool fOld;
-    int nUnit;
+    int iUnit;
     /* There is absolutely no chance that all units are taken */
     do {
-        nUnit = ASMBitFirstClear(g_aUnits, VBOXNETADP_MAX_UNITS);
-        if (nUnit < 0)
+        iUnit = ASMBitFirstClear(g_aUnits, VBOXNETADP_MAX_UNITS);
+        if (iUnit < 0)
             break;
-        fOld = ASMAtomicBitTestAndSet(g_aUnits, nUnit);
+        fOld = ASMAtomicBitTestAndSet(g_aUnits, iUnit);
     } while (fOld);
 
-    return nUnit;
-}
-
-DECLINLINE(void) vboxNetAdpReleaseUnit(int nUnit)
-{
-    Assert(ASMAtomicBitTestAndClear(g_aUnits, nUnit));
+    return iUnit;
+}
+
+DECLINLINE(void) vboxNetAdpReleaseUnit(int iUnit)
+{
+    Assert(ASMAtomicBitTestAndClear(g_aUnits, iUnit));
 }
 
@@ -1104 +1104 @@
     pMac->au8[2] = 0x27;
 
-    pMac->au8[3] = 0; /* pThis->nUnit >> 16; */
-    pMac->au8[4] = 0; /* pThis->nUnit >> 8; */
-    pMac->au8[5] = pThis->nUnit;
-}
-
-int vboxNetAdpCreate (PVBOXNETADP *ppNew, const char *pcszName)
+    pMac->au8[3] = 0; /* pThis->iUnit >> 16; */
+    pMac->au8[4] = 0; /* pThis->iUnit >> 8; */
+    pMac->au8[5] = pThis->iUnit;
+}
+
+int vboxNetAdpCreate(PVBOXNETADP *ppNew, const char *pcszName)
 {
     int rc;
@@ -1125 +1125 @@
             {
                 Log(("vboxNetAdpCreate: using name: %s\n", pcszName));
-                pThis->nUnit = vboxNetAdpGetUnitByName(pcszName);
+                pThis->iUnit = vboxNetAdpGetUnitByName(pcszName);
                 strncpy(pThis->szName, pcszName, sizeof(pThis->szName));
                 pThis->szName[sizeof(pThis->szName) - 1] = '\0';
@@ -1131 +1131 @@
             else
             {
-                pThis->nUnit = vboxNetAdpGetNextAvailableUnit();
+                pThis->iUnit = vboxNetAdpGetNextAvailableUnit();
                 pThis->szName[0] = '\0';
             }
-            if (pThis->nUnit < 0)
+            if (pThis->iUnit < 0)
                 rc = VERR_INVALID_PARAMETER;
             else
@@ -1140 +1140 @@
                 vboxNetAdpComposeMACAddress(pThis, &Mac);
                 rc = vboxNetAdpOsCreate(pThis, &Mac);
-                Log(("vboxNetAdpCreate: pThis=%p pThis->nUnit=%d, pThis->szName=%s\n",
-                     pThis, pThis->nUnit, pThis->szName));
+                Log(("vboxNetAdpCreate: pThis=%p pThis->iUnit=%d, pThis->szName=%s\n",
+                     pThis, pThis->iUnit, pThis->szName));
             }
             if (RT_SUCCESS(rc))
@@ -1156 +1156 @@
             for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
                 Log2(("VBoxNetAdpCreate: Scanning entry: state=%d unit=%d name=%s\n",
-                      g_aAdapters[i].enmState, g_aAdapters[i].nUnit, g_aAdapters[i].szName));
+                      g_aAdapters[i].enmState, g_aAdapters[i].iUnit, g_aAdapters[i].szName));
             return rc;
         }
@@ -1166 +1166 @@
 }
 
-int vboxNetAdpDestroy (PVBOXNETADP pThis)
+int vboxNetAdpDestroy(PVBOXNETADP pThis)
 {
     int rc = VINF_SUCCESS;
@@ -1173 +1173 @@
         return VERR_INTNET_FLT_IF_BUSY;
 
-    Assert(pThis->nUnit >= 0 && pThis->nUnit < VBOXNETADP_MAX_UNITS);
+    Assert(pThis->iUnit >= 0 && pThis->iUnit < VBOXNETADP_MAX_UNITS);
     vboxNetAdpOsDestroy(pThis);
-    vboxNetAdpReleaseUnit(pThis->nUnit);
-    pThis->nUnit = -1;
+    vboxNetAdpReleaseUnit(pThis->iUnit);
+    pThis->iUnit = -1;
     pThis->szName[0] = '\0';
 
@@ -1195 +1195 @@
     {
         g_aAdapters[i].enmState = kVBoxNetAdpState_Invalid;
-        g_aAdapters[i].nUnit    = -1;
+        g_aAdapters[i].iUnit    = -1;
         vboxNetAdpOsInit(&g_aAdapters[i]);
     }

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -86 +86 @@
     VBOXNETADPSTATE   enmState;
     /** Corresponds to the digit at the end of device name. */
-    int               nUnit;
+    int               iUnit;
 
     union
@@ -142 +142 @@
 DECLHIDDEN(int) vboxNetAdpInit(void);
 DECLHIDDEN(void) vboxNetAdpShutdown(void);
-DECLHIDDEN(int) vboxNetAdpCreate (PVBOXNETADP *ppNew, const char *pcszName);
+DECLHIDDEN(int) vboxNetAdpCreate(PVBOXNETADP *ppNew, const char *pcszName);
 DECLHIDDEN(int) vboxNetAdpDestroy(PVBOXNETADP pThis);
 DECLHIDDEN(PVBOXNETADP) vboxNetAdpFindByName(const char *pszName);

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -136 +136 @@
     pUuid->Gen.u8ClockSeqHiAndReserved = (pUuid->Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
     pUuid->Gen.u16TimeHiAndVersion = (pUuid->Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
-    pUuid->Gen.u8ClockSeqLow = pThis->nUnit;
+    pUuid->Gen.u8ClockSeqLow = pThis->iUnit;
     vboxNetAdpComposeMACAddress(pThis, (PRTMAC)pUuid->Gen.au8Node);
 }
@@ -216 +216 @@
     memcpy(LLADDR(&mac), pMACAddress->au8, mac.sdl_alen);
 
-    RTStrPrintf(pThis->szName, VBOXNETADP_MAX_NAME_LEN, "%s%d", VBOXNETADP_NAME, pThis->nUnit);
+    RTStrPrintf(pThis->szName, VBOXNETADP_MAX_NAME_LEN, "%s%d", VBOXNETADP_NAME, pThis->iUnit);
     vboxNetAdpDarwinComposeUUID(pThis, &uuid);
     Params.uniqueid = uuid.au8;
     Params.uniqueid_len = sizeof(uuid);
     Params.name = VBOXNETADP_NAME;
-    Params.unit = pThis->nUnit;
+    Params.unit = pThis->iUnit;
     Params.family = IFNET_FAMILY_ETHERNET;
     Params.type = IFT_ETHER;
@@ -294 +294 @@
     if (rc == VERR_TIMEOUT)
         LogRel(("VBoxAdpDrv: Failed to detach interface %s%d\n.",
-                VBOXNETADP_NAME, pThis->nUnit));
+                VBOXNETADP_NAME, pThis->iUnit));
     err = ifnet_release(pThis->u.s.pIface);
     if (err)

trunk/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c

@@ -264 +264 @@
         return VERR_NO_MEMORY;
 
-    if_initname(ifp, VBOXNETADP_NAME, pThis->nUnit);
+    if_initname(ifp, VBOXNETADP_NAME, pThis->iUnit);
     ifp->if_softc = pThis;
     ifp->if_mtu = ETHERMTU;