Changeset 609243f4 in mainline for uspace/srv/net/net/net.h

Timestamp:

2011-10-07T15:46:01Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2c50e1

Parents:

f51b1d3

Message:

cherrypick general networking improvements from lp:~helenos-nicf/helenos/nicf (after sanitization)
remove obsolete networking drivers
this renders the networking non-functional for the time being

File:

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

uspace/srv/net/net/net.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -45 +46 @@
 #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 ETHERNET_FILENAME  "/srv/eth"
@@ -58 +57 @@
 #define IP_FILENAME  "/srv/ip"
 #define IP_NAME      "ip"
-
-#define LO_FILENAME  "/srv/lo"
-#define LO_NAME      "lo"
 
 #define NILDUMMY_FILENAME  "/srv/nildummy"
@@ -77 +73 @@
 #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 +81 @@
 #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 +95 @@
  */
 typedef struct {
+        uint8_t *name;                          /**< System-unique network interface name. */
+        nic_device_id_t id;             /**< System-unique network interface identifier. */
         measured_strings_t configuration;  /**< 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 *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;
 
@@ -124 +122 @@
         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. */