Changeset eb522e8 in mainline for uspace/srv/net/il/ip/ip.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Huuuuuge merge from development - all the work actually

File:

• uspace/srv/net/il/ip/ip.h (modified) (6 diffs)

uspace/srv/net/il/ip/ip.h

@@ -39 +39 @@
 
 #include <fibril_synch.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <net/inet.h>
@@ -59 +57 @@
 typedef struct ip_netif ip_netif_t;
 
-/** Type definition of the IP network interface specific data pointer.
- * @see ip_netif
- */
-typedef ip_netif_t *ip_netif_ref;
-
 /** Type definition of the IP protocol specific data.
  * @see ip_proto
@@ -69 +62 @@
 typedef struct ip_proto ip_proto_t;
 
-/** Type definition of the IP protocol specific data pointer.
- * @see ip_proto
- */
-typedef ip_proto_t *ip_proto_ref;
-
 /** Type definition of the IP route specific data.
  *  @see ip_route
  */
 typedef struct ip_route ip_route_t;
-
-/** Type definition of the IP route specific data pointer.
- *  @see ip_route
- */
-typedef ip_route_t *ip_route_ref;
 
 /** IP network interfaces.
@@ -104 +87 @@
 struct ip_netif {
         /** ARP module. Assigned if using ARP. */
-        module_ref arp;
+        module_t *arp;
         /** Broadcast address. */
         in_addr_t broadcast;
@@ -146 +129 @@
         in_addr_t gateway;
         /** Parent netif. */
-        ip_netif_ref netif;
+        ip_netif_t *netif;
         /** Target network mask. */
         in_addr_t netmask;
@@ -153 +136 @@
 /** IP global data. */
 struct ip_globals {
-        /** Default client connection function for support modules. */
-        async_client_conn_t client_connection;
         /** Default gateway. */
         ip_route_t gateway;