Changeset 11157 in vbox

Timestamp:

Aug 5, 2008 11:08:37 PM (16 years ago)

Author:

vboxsync

Message:

Replaced PDMMAC by RTMAC.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (4 diffs)
• include/VBox/pdmifs.h (modified) (1 diff)
• include/VBox/types.h (modified) (1 diff)
• src/VBox/Devices/Network/DevPCNet.cpp (modified) (3 diffs)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvNetSniffer.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvTAP.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/DrvTAPOs2.cpp (modified) (9 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (1 diff)
• src/VBox/Devices/Network/testcase/tstIntNet-1.cpp (modified) (6 diffs)
• src/VBox/Devices/Network/testcase/tstIntNetR0.cpp (modified) (5 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/Main/darwin/iokit.cpp (modified) (1 diff)
• src/VBox/Main/darwin/iokit.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstAnimate.cpp (modified) (3 diffs)

trunk/include/VBox/intnet.h

@@ -492 +492 @@
      * @remarks Called while owning the network and the out-bound trunk port semaphores.
      */
-    DECLR0CALLBACKMEMBER(void, pfnGetMacAddress,(PINTNETTRUNKIFPORT pIfPort, PPDMMAC pMac));
+    DECLR0CALLBACKMEMBER(void, pfnGetMacAddress,(PINTNETTRUNKIFPORT pIfPort, PRTMAC pMac));
 
     /**
@@ -511 +511 @@
      *          with pfnGetHostMac?
      */
-    DECLR0CALLBACKMEMBER(bool, pfnIsHostMac,(PINTNETTRUNKIFPORT pIfPort, PCPDMMAC pMac));
+    DECLR0CALLBACKMEMBER(bool, pfnIsHostMac,(PINTNETTRUNKIFPORT pIfPort, PCRTMAC pMac));
 
     /**
@@ -780 +780 @@
     INTNETIFHANDLE  hIf;
     /** The new MAC address. */
-    PDMMAC          Mac;
+    RTMAC           Mac;
 } INTNETIFSETMACADDRESSREQ;
 /** Pointer to an INTNETR0IfSetMacAddressReq / VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS request buffer. */
@@ -933 +933 @@
  */
 INTNETR0DECL(int) INTNETR0IfSetPromiscuousMode( PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fPromiscuous);
-INTNETR0DECL(int) INTNETR0IfSetMacAddress(      PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCPDMMAC pMac);
+INTNETR0DECL(int) INTNETR0IfSetMacAddress(      PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCRTMAC pMac);
 INTNETR0DECL(int) INTNETR0IfSetActive(          PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fActive);
 

trunk/include/VBox/pdmifs.h

@@ -2192 +2192 @@
      * @thread  EMT
      */
-    DECLR3CALLBACKMEMBER(int, pfnGetMac,(PPDMINETWORKCONFIG pInterface, PPDMMAC pMac));
+    DECLR3CALLBACKMEMBER(int, pfnGetMac,(PPDMINETWORKCONFIG pInterface, PRTMAC pMac));
 
     /**

trunk/include/VBox/types.h

@@ -496 +496 @@
 
 
-/** PDM MAC address.
- * @obsolete Use RTMAC. */
-typedef RTMAC PDMMAC;
-/** Pointer to a MAC address. */
-typedef PDMMAC *PPDMMAC;
-/** Pointer to a const MAC address. */
-typedef const PDMMAC *PCPDMMAC;
-
 /**
  * Data transport buffer (scatter/gather)

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

@@ -201 +201 @@
     RTUINT                              cLinkDownReported;
     /** The configured MAC address. */
-    PDMMAC                              MacConfigured;
+    RTMAC                               MacConfigured;
     /** Alignment padding. */
     uint8_t                             Alignment4[HC_ARCH_BITS == 64 ? 6 : 2];
@@ -4179 +4179 @@
 {
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
-    PDMMAC      Mac;
+    RTMAC       Mac;
     if (   SSM_VERSION_MAJOR_CHANGED(u32Version, PCNET_SAVEDSTATE_VERSION)
         || SSM_VERSION_MINOR(u32Version) < 7)
@@ -4399 +4399 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) pcnetGetMac(PPDMINETWORKCONFIG pInterface, PPDMMAC pMac)
+static DECLCALLBACK(int) pcnetGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
     PCNetState *pData = INETWORKCONFIG_2_DATA(pInterface);

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

@@ -189 +189 @@
     Assert(pRingBuf);
     Assert(pvFrame);
-    Assert(cbFrame >= sizeof(PDMMAC) * 2);
+    Assert(cbFrame >= sizeof(RTMAC) * 2);
     uint32_t offWrite = pRingBuf->offWrite;
     Assert(offWrite == RT_ALIGN_32(offWrite, sizeof(INTNETHDR)));

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

@@ -372 +372 @@
     if (pData->pConfig)
     {
-        PDMMAC Mac;
+        RTMAC Mac;
         pData->pConfig->pfnGetMac(pData->pConfig, &Mac);
         slirp_set_ethaddr(pData->pNATState, Mac.au8);

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

@@ -213 +213 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) drvNetSnifferGetMac(PPDMINETWORKCONFIG pInterface, PPDMMAC pMac)
+static DECLCALLBACK(int) drvNetSnifferGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
     PDRVNETSNIFFER pThis = PDMINETWORKCONFIG_2_DRVNETSNIFFER(pInterface);

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

@@ -97 +97 @@
 # ifdef VBOX_WITH_CROSSBOW
     /** Crossbow: MAC address of the device. */
-    PDMMAC                  MacAddress;
+    RTMAC                   MacAddress;
     /** Crossbow: Handle of the NIC. */
     dlpi_handle_t           pDeviceHandle;
@@ -403 +403 @@
     char *pszHex = "0123456789abcdef";
     uint8_t *pMacAddr8 = pData->MacAddress.au8;
-    char szMacAddress[3 * sizeof(PDMMAC)];
-    for (unsigned int i = 0; i < sizeof(PDMMAC); i++)
+    char szMacAddress[3 * sizeof(RTMAC)];
+    for (unsigned int i = 0; i < sizeof(RTMAC); i++)
     {
         szMacAddress[3 * i] = pszHex[((*pMacAddr8 >> 4) & 0x0f)];

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

@@ -118 +118 @@
     STAM_PROFILE_START(&pThis->StatTransmit, a);
 
-    /* 
-     * If the pvBuf is a high address, we'll have to copy it onto a 
+    /*
+     * If the pvBuf is a high address, we'll have to copy it onto a
      * stack buffer of the tap driver will trap.
      */
@@ -149 +149 @@
         static unsigned cComplaints = 0;
         if (cComplaints++ < 256)
-            LogRel(("%s: send failed. rc=%d Parm={%ld,%ld} cb=%d\n", 
+            LogRel(("%s: send failed. rc=%d Parm={%ld,%ld} cb=%d\n",
                     pThis->szName, rc, Parm[0], Parm[1], cb));
         if (rc)
@@ -230 +230 @@
 
     /*
-     * Loop while the thread is running, quit immediately when 
+     * Loop while the thread is running, quit immediately when
      * we're supposed to suspend or terminate.
      */
@@ -284 +284 @@
         else if (rc)
         {
-            LogFlow(("%s: ReceiveThread: DoDevIOCtl -> %s Parm={%ld, %ld}\n", 
+            LogFlow(("%s: ReceiveThread: DoDevIOCtl -> %s Parm={%ld, %ld}\n",
                      pThis->szName, rc, Parm[0], Parm[1]));
             rc = RTErrConvertFromOS2(rc);
@@ -378 +378 @@
         if (    orc
             ||  Parm[0])
-            LogRel(("%s: Failed to disconnect %d from %d! orc=%d Parm={%ld,%ld}\n", 
+            LogRel(("%s: Failed to disconnect %d from %d! orc=%d Parm={%ld,%ld}\n",
                     pThis->szName, pThis->iLan, pThis->iConnectedTo, orc, Parm[0], Parm[1]));
         pThis->iConnectedTo = -1;
@@ -484 +484 @@
     if (VBOX_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Failed to query LanNumber! orc=%d Parm={%ld,%ld}"), 
+                                   N_("Failed to query LanNumber! orc=%d Parm={%ld,%ld}"),
                                    orc, Parm[0], Parm[1]);
     pThis->iLan = (int32_t)Data;
     Log(("%s: iLan=%d Parm[1]=%ld\n", pThis->szName, pThis->iLan, Parm[1]));
 
-    /* 
+    /*
      * Connect it requested.
      */
@@ -511 +511 @@
         if (VBOX_FAILURE(rc))
             return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                       N_("Failed to connect %d to %d! orc=%d Parm={%ld,%ld}"), 
+                                       N_("Failed to connect %d to %d! orc=%d Parm={%ld,%ld}"),
                                        pThis->iLan, iConnectTo, orc, Parm[0], Parm[1]);
         Log(("%s: Connected to %d\n", pThis->szName, iConnectTo));
@@ -517 +517 @@
     }
 
-    /* 
+    /*
      * Log the config.
      */
     Parm[0] = Parm[1] = ~0UL; /* mysterious output */
-    PDMMAC Mac;
+    RTMAC Mac;
     cbParm = sizeof(Parm);
     cbData = sizeof(Mac);
@@ -527 +527 @@
                       &Parm[0], cbParm, &cbParm,
                       &Mac, cbData, &cbData);
-    if (    !orc 
+    if (    !orc
         &&  !Parm[0]
       /*&&  !Parm[1]?*/)
-        LogRel(("%s: iLan=%d iConnectedTo=%d Mac=%02x:%02x:%02x:%02x:%02x:%02x\n", 
-                pThis->szName, pThis->iLan, pThis->iConnectedTo, 
+        LogRel(("%s: iLan=%d iConnectedTo=%d Mac=%02x:%02x:%02x:%02x:%02x:%02x\n",
+                pThis->szName, pThis->iLan, pThis->iConnectedTo,
                 Mac.au8[0], Mac.au8[1], Mac.au8[2], Mac.au8[3], Mac.au8[4], Mac.au8[5]));
     else
-        LogRel(("%s: iLan=%d iConnectedTo Mac=failed - orc=%d Parm={%ld,%ld}\n", 
+        LogRel(("%s: iLan=%d iConnectedTo Mac=failed - orc=%d Parm={%ld,%ld}\n",
                 pThis->szName, pThis->iLan, pThis->iConnectedTo, Parm[0], Parm[1]));
 

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

@@ -2674 +2674 @@
  * @param   pMAC            The new MAC address.
  */
-INTNETR0DECL(int) INTNETR0IfSetMacAddress(PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCPDMMAC pMac)
+INTNETR0DECL(int) INTNETR0IfSetMacAddress(PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCRTMAC pMac)
 {
     LogFlow(("INTNETR0IfSetMacAddress: pIntNet=%p hIf=%RX32 pMac=%p:{%.6Rhxs}\n", pIntNet, hIf, pMac, pMac));

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -183 +183 @@
     Assert(pRingBuf);
     Assert(pvFrame);
-    Assert(cbFrame >= sizeof(PDMMAC) * 2);
+    Assert(cbFrame >= sizeof(RTMAC) * 2);
     uint32_t offWrite = pRingBuf->offWrite;
     Assert(offWrite == RT_ALIGN_32(offWrite, sizeof(INTNETHDR)));
@@ -331 +331 @@
  * @param   pFileText       The file to write a textual packet summary to (optional).
  */
-static void doXmitTest(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, PCPDMMAC pSrcMac, PRTSTREAM pFileRaw, PRTSTREAM pFileText)
+static void doXmitTest(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, PCRTMAC pSrcMac, PRTSTREAM pFileRaw, PRTSTREAM pFileText)
 {
     uint8_t abFrame[4096];
@@ -346 +346 @@
     pDhcpMsg->Op = 1; /* request */
     pDhcpMsg->HType = 1; /* ethernet */
-    pDhcpMsg->HLen = sizeof(PDMMAC);
+    pDhcpMsg->HLen = sizeof(RTMAC);
     pDhcpMsg->Hops = 0;
     pDhcpMsg->XID = g_DhcpXID = RTRandU32();
@@ -432 +432 @@
  */
 static void doPacketSniffing(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, uint32_t cMillies,
-                             PRTSTREAM pFileRaw, PRTSTREAM pFileText, PCPDMMAC pSrcMac)
+                             PRTSTREAM pFileRaw, PRTSTREAM pFileText, PCRTMAC pSrcMac)
 {
     /*
@@ -498 +498 @@
                         if (    pDhcpMsg->Op == 2 /* boot reply */
                             &&  pDhcpMsg->HType == 1 /* ethernet */
-                            &&  pDhcpMsg->HLen == sizeof(PDMMAC)
+                            &&  pDhcpMsg->HLen == sizeof(RTMAC)
                             &&  (pDhcpMsg->XID == g_DhcpXID || !g_DhcpXID)
                             &&  !memcmp(&pDhcpMsg->CHAddr[0], pSrcMac, sizeof(*pSrcMac)))
@@ -581 +581 @@
     PRTSTREAM   pFileText = g_pStdOut;
     bool        fXmitTest = false;
-    PDMMAC      SrcMac;
+    RTMAC       SrcMac;
     SrcMac.au8[0] = 0x08;
     SrcMac.au8[1] = 0x03;

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -211 +211 @@
     PINTNETBUF pBuf;
     INTNETIFHANDLE hIf;
-    PDMMAC Mac;
+    RTMAC Mac;
     uint64_t u64Start;
     uint64_t u64End;
@@ -231 +231 @@
      */
     uint8_t abBuf[4096] = {0};
-    PPDMMAC pMacSrc = (PPDMMAC)&abBuf[0];
-    PPDMMAC pMacDst = pMacSrc + 1;
+    PRTMAC pMacSrc = (PRTMAC)&abBuf[0];
+    PRTMAC pMacDst = pMacSrc + 1;
     *pMacSrc = pArgs->Mac;
     *pMacDst = pArgs->Mac;
@@ -270 +270 @@
     for (unsigned c = 0; c < 20; c++)
     {
-        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4);
+        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, sizeof(RTMAC) * 2 + sizeof(unsigned) * 4);
         if (VBOX_FAILURE(rc))
         {
@@ -327 +327 @@
             uint8_t abBuf[16384];
             unsigned cb = intnetR0RingReadFrame(pArgs->pBuf, &pArgs->pBuf->Recv, abBuf);
-            unsigned *puFrame = (unsigned *)&abBuf[sizeof(PDMMAC) * 2];
+            unsigned *puFrame = (unsigned *)&abBuf[sizeof(RTMAC) * 2];
 
             /* check for termination frame. */
-            if (    cb == sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4
+            if (    cb == sizeof(RTMAC) * 2 + sizeof(unsigned) * 4
                 &&  puFrame[0] == 0xffffdead
                 &&  puFrame[1] == 0xffffdead
@@ -343 +343 @@
 
             /* validate frame header */
-            PPDMMAC pMacSrc = (PPDMMAC)&abBuf[0];
-            PPDMMAC pMacDst = pMacSrc + 1;
+            PRTMAC pMacSrc = (PRTMAC)&abBuf[0];
+            PRTMAC pMacDst = pMacSrc + 1;
             if (    pMacDst->au16[0] != 0x8086
                 ||  pMacDst->au16[1] != 0

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1034 +1034 @@
         char *macStr = (char*)macAddrUtf8.raw();
         Assert(strlen(macStr) == 12);
-        PDMMAC Mac;
+        RTMAC Mac;
         memset(&Mac, 0, sizeof(Mac));
         char *pMac = (char*)&Mac;

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1480 +1480 @@
 
                         /* Get the MAC address. */
-                        PDMMAC Mac;
+                        RTMAC Mac;
                         AssertBreak(darwinDictGetData(PropsRef, CFSTR("IOMACAddress"), &Mac, sizeof(Mac)));
 

trunk/src/VBox/Main/darwin/iokit.h

@@ -55 +55 @@
     RTUUID Uuid;
     /** The MAC address. */
-    PDMMAC Mac;
+    RTMAC Mac;
     /** Internal category number (0..7). */
     int iCat;

trunk/src/VBox/VMM/testcase/tstAnimate.cpp

@@ -578 +578 @@
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               UPDATERC();
     rc = CFGMR3InsertInteger(pCfg,  "Am79C973",             1);                     UPDATERC();
-    PDMMAC Mac;
+    RTMAC Mac;
     Mac.au16[0] = 0x0080;
     Mac.au16[2] = Mac.au16[1] = 0x8086;
@@ -817 +817 @@
     static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
     PRTLOGGER pRelLogger;
-    rc = RTLogCreate(&pRelLogger, RTLOGFLAGS_PREFIX_TIME_PROG, "all", "VBOX_RELEASE_LOG", 
+    rc = RTLogCreate(&pRelLogger, RTLOGFLAGS_PREFIX_TIME_PROG, "all", "VBOX_RELEASE_LOG",
                      RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_FILE, "./tstAnimate.log");
     if (VBOX_SUCCESS(rc))
@@ -857 +857 @@
             {
                 if (fPowerOn)
-                {   
+                {
                     /*
                      * Adjust warpspeed?