Changeset d7ff048 in mainline for uspace/srv/net/net/net.h

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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) (9 diffs)

uspace/srv/net/net/net.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -31 +32 @@
  */
 
-/** @file
- * Networking subsystem central module.
- *
- */
-
 #ifndef NET_NET_H_
 #define NET_NET_H_
@@ -45 +41 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
+#include <devman.h>
 
-/** @name Modules definitions
- * @{
- */
-
-#define NE2000_FILENAME  "/srv/ne2000"
-#define NE2000_NAME      "ne2000"
+#define NAME  "net"
 
 #define ETHERNET_FILENAME  "/srv/eth"
@@ -58 +50 @@
 #define IP_FILENAME  "/srv/ip"
 #define IP_NAME      "ip"
-
-#define LO_FILENAME  "/srv/lo"
-#define LO_NAME      "lo"
 
 #define NILDUMMY_FILENAME  "/srv/nildummy"
@@ -77 +66 @@
 #define CONF_MTU    "MTU"    /**< Maximum transmission unit configuration label. */
 #define CONF_NAME   "NAME"   /**< Network interface name configuration label. */
-#define CONF_NETIF  "NETIF"  /**< Network interface module name configuration label. */
+#define CONF_HWPATH "HWPATH" /**< Network interface hardware pathname label. */
 #define CONF_NIL    "NIL"    /**< Network interface layer module name configuration label. */
 
@@ -85 +74 @@
 #define CONF_DIR           "/cfg/net"  /**< Configuration directory. */
 #define CONF_GENERAL_FILE  "general"   /**< General configuration file. */
+#define CONF_EXT           ".nic"      /**< Extension for NIC's configuration files. */
 
 /** Configuration settings.
@@ -98 +88 @@
  */
 typedef struct {
-        measured_strings_t configuration;  /**< Configuration. */
+        /** System-unique network interface name. */
+        uint8_t *name;
+        /** System-unique network interface identifier. */
+        nic_device_id_t id;
+        /** Configuration. */
+        measured_strings_t configuration;
         
         /** Serving network interface driver module index. */
-        module_t *driver;
+        devman_handle_t handle;  /**< Handle for devman */
+        async_sess_t *sess;      /**< Driver session. */
         
-        device_id_t id;  /**< System-unique network interface identifier. */
-        module_t *il;    /**< Serving internet layer module index. */
-        uint8_t *name;   /**< System-unique network interface name. */
-        module_t *nil;   /**< Serving link layer module index. */
+        module_t *nil;  /**< Serving link layer module index. */
+        module_t *il;   /**< Serving internet layer module index. */
 } netif_t;
 
@@ -124 +118 @@
         modules_t modules;                 /**< Available modules. */
         
-        /** Network interface structure indices by names. */
-        char_map_t netif_names;
+        /** Network interface structure indices by hardware path. */
+        char_map_t netif_hwpaths;
         
         /** Present network interfaces. */
@@ -131 +125 @@
 } net_globals_t;
 
-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 *, size_t *);
-
 #endif