Changeset 10963 in vbox for trunk/include/iprt

Timestamp:

Jul 29, 2008 10:26:39 PM (16 years ago)

Author:

vboxsync

Message:

types: Merged PDMMAC and RTNETMAC into RTMAC.

File:

• trunk/include/iprt/net.h (modified) (7 diffs)

trunk/include/iprt/net.h

@@ -28 +28 @@
  */
 
-#ifndef ___iprt_netprotfmt_h
-#define ___iprt_netprotfmt_h
+#ifndef ___iprt_net_h
+#define ___iprt_net_h
 
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
-#include <VBox/types.h> /** @todo switch around PDMMAC and NETMAC. */
 #include <iprt/assert.h>
 
@@ -43 +42 @@
  * @{
  */
-
-/** A Ethernet MAC address. */
-typedef PDMMAC RTNETMAC;
-/** Pointer to an ethernet MAC address. */
-typedef RTNETMAC *PRTNETMAC;
-/** Pointer to a const ethernet MAC address. */
-typedef RTNETMAC const *PCRTNETMAC;
 
 /**
@@ -80 +72 @@
     uint32_t Network;
     /** The node ID. (Defaults to the MAC address apparently.) */
-    RTNETMAC Node;
+    RTMAC Node;
 } RTNETADDRIPX;
 #pragma pack(0)
@@ -109 +101 @@
     RTNETADDRIPX Ipx;
     /** MAC address view. */
-    RTNETMAC Mac;
+    RTMAC Mac;
 } RTNETADDRU;
 AssertCompileSize(RTNETADDRU, 16);
@@ -124 +116 @@
 typedef struct RTNETETHERHDR
 {
-    RTNETMAC    MacDst;
-    RTNETMAC    MacSrc;
+    RTMAC       MacDst;
+    RTMAC       MacSrc;
     /** Ethernet frame type or frame size, depending on the kind of ethernet.
      * This is big endian on the wire. */
@@ -324 +316 @@
     RTNETARPHDR     Hdr;
     /** The sender hardware address. */
-    RTNETMAC        ar_sha;
+    RTMAC           ar_sha;
     /** The sender protocol address. */
     RTNETADDRIPV4   ar_spa;
     /** The target hardware address. */
-    RTNETMAC        ar_tha;
+    RTMAC           ar_tha;
     /** The arget protocol address. */
     RTNETADDRIPV4   ar_tpa;
@@ -349 +341 @@
 #endif
 
-
-