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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

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

@@ -39 +39 @@
 
 #include <fibril_synch.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <net/packet.h>
@@ -65 +62 @@
 typedef struct arp_proto arp_proto_t;
 
+/** Type definition of the ARP address translation record.
+ * @see arp_trans
+ */
+typedef struct arp_trans arp_trans_t;
+
 /** ARP address map.
  *
@@ -70 +72 @@
  * @see generic_char_map.h
  */
-GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
+GENERIC_CHAR_MAP_DECLARE(arp_addr, arp_trans_t);
 
 /** ARP address cache.
@@ -89 +91 @@
 struct arp_device {
         /** Actual device hardware address. */
-        measured_string_t * addr;
+        measured_string_t *addr;
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Broadcast device hardware address. */
-        measured_string_t * broadcast_addr;
+        measured_string_t *broadcast_addr;
         /** Broadcast device hardware address data. */
-        char *broadcast_data;
+        uint8_t *broadcast_data;
         /** Device identifier. */
         device_id_t device_id;
@@ -120 +122 @@
         arp_cache_t cache;
         
-        /**
-         * The client connection processing function.
-         * The module skeleton propagates its own one.
-         */
-        async_client_conn_t client_connection;
-        
         /** Networking module phone. */
         int net_phone;
         /** Safety lock. */
-        fibril_rwlock_t lock;
+        fibril_mutex_t lock;
 };
 
@@ -137 +133 @@
         measured_string_t *addr;
         /** Actual device protocol address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Address map. */
         arp_addr_t addresses;
@@ -144 +140 @@
 };
 
+/** ARP address translation record. */
+struct arp_trans {
+        /**
+         * Hardware address for the translation. NULL denotes an incomplete
+         * record with possible waiters.
+         */
+        measured_string_t *hw_addr;
+        /** Condition variable used for waiting for completion of the record. */
+        fibril_condvar_t cv;
+};
+
 #endif
 
 /** @}
  */
+