Changeset b0f00a9 in mainline for uspace/srv/net/il/arp/arp.h

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/il/arp/arp.h (modified) (3 diffs)

uspace/srv/net/il/arp/arp.h

@@ -38 +38 @@
 #define NET_ARP_H_
 
+#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
@@ -91 +92 @@
 struct arp_device {
         /** Actual device hardware address. */
-        measured_string_t *addr;
-        /** Actual device hardware address data. */
-        uint8_t *addr_data;
+        uint8_t addr[NIC_MAX_ADDRESS_LENGTH];
+        /** Actual device hardware address length. */
+        size_t addr_len;
         /** Broadcast device hardware address. */
-        measured_string_t *broadcast_addr;
-        /** Broadcast device hardware address data. */
-        uint8_t *broadcast_data;
+        uint8_t broadcast_addr[NIC_MAX_ADDRESS_LENGTH];
+        /** Broadcast device hardware address length. */
+        size_t broadcast_addr_len;
         /** Device identifier. */
-        device_id_t device_id;
+        nic_device_id_t device_id;
         /** Hardware type. */
         hw_type_t hardware;
         /** Packet dimension. */
         packet_dimension_t packet_dimension;
-        /** Device module phone. */
-        int phone;
+        /** Device module session. */
+        async_sess_t *sess;
         
         /**
@@ -122 +123 @@
         arp_cache_t cache;
         
-        /** Networking module phone. */
-        int net_phone;
+        /** Networking module session. */
+        async_sess_t *net_sess;
+        
         /** Safety lock. */
         fibril_mutex_t lock;