xnu-792.25.20.tar.gz

[apple/xnu.git] / bsd / net / if_media.h

diff --git a/bsd/net/if_media.h b/bsd/net/if_media.h
index f17ed30fa3669a47fa5fb678e0841409ba62c62a..077fc3e69342fc6770d931b54b5f61600ef4558c 100644 (file)
--- a/bsd/net/if_media.h
+++ b/bsd/net/if_media.h
@@ -72,16 +72,14 @@
  * to implement this interface.
  */
 
-#ifdef KERNEL
-
+#ifdef KERNEL_PRIVATE
 #include <sys/queue.h>
 
-#ifdef __APPLE_API_UNSTABLE
 /*
  * Driver callbacks for media status and change requests.
  */
-typedef        int (*ifm_change_cb_t) __P((struct ifnet *ifp));
-typedef        void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req));
+typedef        int (*ifm_change_cb_t)(struct ifnet *ifp);
+typedef        void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req);
 
 /*
  * In-kernel representation of a single supported media type.
@@ -107,25 +105,24 @@ struct ifmedia {
 };
 
 /* Initialize an interface's struct if_media field. */
-void   ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask,
-           ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback));
+void   ifmedia_init(struct ifmedia *ifm, int dontcare_mask,
+           ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback);
 
 /* Add one supported medium to a struct ifmedia. */
-void   ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux));
+void   ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux);
 
 /* Add an array (of ifmedia_entry) media to a struct ifmedia. */
 void   ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
            int count);
 
 /* Set default media type on initialization. */
-void   ifmedia_set __P((struct ifmedia *ifm, int mword));
+void   ifmedia_set(struct ifmedia *ifm, int mword);
 
 /* Common ioctl function for getting/setting media, called by driver. */
-int    ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr,
-           struct ifmedia *ifm, u_long cmd));
+int    ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
+           struct ifmedia *ifm, u_long cmd);
 
-#endif /* __APPLE_API_UNSTABLE */
-#endif /* KERNEL */
+#endif /* KERNEL_PRIVATE */
 
 /*
  * if_media Options word:
@@ -156,8 +153,13 @@ int        ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr,
 #define IFM_10_FL      13              /* 10baseFL - Fiber */
 #define        IFM_1000_LX     14              /* 1000baseLX - single-mode fiber */
 #define        IFM_1000_CX     15              /* 1000baseCX - 150ohm STP */
-#define        IFM_1000_TX     16              /* 1000baseTX - 4 pair cat 5 */
+#define        IFM_1000_T      16              /* 1000baseT - 4 pair cat 5 */
+#ifdef PRIVATE
+#define        IFM_1000_TX     IFM_1000_T      /* For compatibility */
+#endif /* PRIVATE */
 #define        IFM_HPNA_1      17              /* HomePNA 1.0 (1Mb/s) */
+#define        IFM_10G_SR      18              /* 10GbaseSR - multi-mode fiber */
+#define        IFM_10G_LR      19              /* 10GbaseLR - single-mode fiber */
 
 /*
  * Token ring
@@ -283,8 +285,10 @@ struct ifmedia_description {
     { IFM_10_FL,    "10baseFL"    },                \
     { IFM_1000_LX,  "1000baseLX"  },                \
     { IFM_1000_CX,  "1000baseCX"  },                \
-    { IFM_1000_TX,  "1000baseTX"  },                \
+    { IFM_1000_T,   "1000baseT"   },                \
     { IFM_HPNA_1,   "HomePNA1"    },                \
+    { IFM_10G_SR,   "10GbaseSR"   },                \
+    { IFM_10G_LR,   "10GbaseLR"   },                \
     { 0, NULL },                                    \
 }
 
@@ -307,8 +311,10 @@ struct ifmedia_description {
     { IFM_10_FL,    "10FL"   },                     \
     { IFM_1000_LX,  "1000LX" },                     \
     { IFM_1000_CX,  "1000CX" },                     \
-    { IFM_1000_TX,  "1000TX" },                     \
+    { IFM_1000_T,   "1000T"  },                     \
     { IFM_HPNA_1,   "HPNA1"  },                     \
+    { IFM_10G_SR,   "10GSR"  },                     \
+    { IFM_10G_LR,   "10GLR"  },                     \
     { 0, NULL },                                    \
 }