Changeset 8fb1bf82 in mainline for uspace/srv/net/net/net.h

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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:

Merge mainline changes.

File:

• uspace/srv/net/net/net.h (modified) (3 diffs)

uspace/srv/net/net/net.h

@@ -36 +36 @@
  */
 
-#ifndef __NET_NET_H__
-#define __NET_NET_H__
+#ifndef NET_NET_H_
+#define NET_NET_H_
 
 #include <ipc/ipc.h>
@@ -103 +103 @@
         
         /** Serving network interface driver module index. */
-        module_ref driver;
+        module_t *driver;
         
-        device_id_t id;  /**< System-unique network interface identifier. */
-        module_ref il;   /**< Serving internet layer module index. */
-        char *name;      /**< System-unique network interface name. */
-        module_ref nil;  /**< Serving link layer module index. */
+        device_id_t id; /**< System-unique network interface identifier. */
+        module_t *il;   /**< Serving internet layer module index. */
+        char *name;     /**< System-unique network interface name. */
+        module_t *nil;  /**< Serving link layer module index. */
 } netif_t;
 
@@ -133 +133 @@
 } net_globals_t;
 
-extern int add_configuration(measured_strings_ref, const char *, const char *);
+extern int add_configuration(measured_strings_t *, const char *, const char *);
 extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
 extern int net_initialize_build(async_client_conn_t);