Changeset 89c57b6 in mainline for uspace/srv/net/net/net.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (4 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>
-
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/char_map.h>
 #include <adt/generic_char_map.h>
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 
 /** @name Modules definitions
@@ -52 +50 @@
  */
 
-#define DP8390_FILENAME  "/srv/dp8390"
-#define DP8390_NAME      "dp8390"
+#define NE2000_FILENAME  "/srv/ne2000"
+#define NE2000_NAME      "ne2000"
 
 #define ETHERNET_FILENAME  "/srv/eth"
@@ -103 +101 @@
         
         /** 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. */
+        module_t *il;    /**< Serving internet layer module index. */
+        uint8_t *name;   /**< System-unique network interface name. */
+        module_t *nil;   /**< Serving link layer module index. */
 } netif_t;
 
@@ -133 +131 @@
 } net_globals_t;
 
-extern int add_configuration(measured_strings_ref, const char *, const char *);
-extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
+extern int add_configuration(measured_strings_t *, const uint8_t *,
+    const uint8_t *);
+extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
 extern int net_initialize_build(async_client_conn_t);
-extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
+extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
 
 #endif