Changes in uspace/srv/net/nil/eth/eth.h [609243f4:fe8dfa6] in mainline

File:

• uspace/srv/net/nil/eth/eth.h (modified) (6 diffs)

uspace/srv/net/nil/eth/eth.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Lukas Mejdrech
- * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -39 +38 @@
 #define NET_ETH_H_
 
-#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
+
 #include <net/device.h>
 #include <adt/measured_strings.h>
-#include <devman.h>
 
 /** Ethernet address length. */
@@ -222 +220 @@
 struct eth_device {
         /** Device identifier. */
-        nic_device_id_t device_id;
-        /** Device handle */
-        devman_handle_t handle;
-        /** Driver session. */
-        async_sess_t *sess;
+        device_id_t device_id;
+        /** Device driver service. */
+        services_t service;
+        /** Driver phone. */
+        int phone;
         /** Maximal transmission unit. */
         size_t mtu;
@@ -238 +236 @@
         
         /** Actual device hardware address. */
-        nic_address_t addr;
+        measured_string_t *addr;
+        
+        /** Actual device hardware address data. */
+        uint8_t *addr_data;
 };
 
@@ -247 +248 @@
         /** Protocol identifier. */
         int protocol;
-        /** Protocol module session. */
-        async_sess_t *sess;
+        /** Protocol module phone. */
+        int phone;
 };
 
 /** Ethernet global data. */
 struct eth_globals {
-        /** Networking module session. */
-        async_sess_t *net_sess;
+        /** Networking module phone. */
+        int net_phone;
         /** Safety lock for devices. */
         fibril_rwlock_t devices_lock;
@@ -264 +265 @@
         /**
          * Protocol map.
-         * Service map for each protocol.
+         * Service phone map for each protocol.
          */
         eth_protos_t protos;
         
         /** Broadcast device hardware address. */
-        uint8_t broadcast_addr[ETH_ADDR];
+        measured_string_t *broadcast_addr;
 };