Changes in uspace/srv/net/il/arp/arp.h [ffa2c8ef:e9caf47] in mainline

File:

• uspace/srv/net/il/arp/arp.h (modified) (8 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>
@@ -52 +55 @@
 typedef struct arp_device arp_device_t;
 
+/** Type definition of the ARP device specific data pointer.
+ * @see arp_device
+ */
+typedef arp_device_t *arp_device_ref;
+
 /** Type definition of the ARP global data.
  * @see arp_globals
@@ -62 +70 @@
 typedef struct arp_proto arp_proto_t;
 
-/** Type definition of the ARP address translation record.
- * @see arp_trans
+/** Type definition of the ARP protocol specific data pointer.
+ * @see arp_proto
  */
-typedef struct arp_trans arp_trans_t;
+typedef arp_proto_t *arp_proto_ref;
 
 /** ARP address map.
@@ -72 +80 @@
  * @see generic_char_map.h
  */
-GENERIC_CHAR_MAP_DECLARE(arp_addr, arp_trans_t);
+GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
 
 /** ARP address cache.
@@ -91 +99 @@
 struct arp_device {
         /** Actual device hardware address. */
-        measured_string_t *addr;
+        measured_string_ref addr;
         /** Actual device hardware address data. */
-        uint8_t *addr_data;
+        char *addr_data;
         /** Broadcast device hardware address. */
-        measured_string_t *broadcast_addr;
+        measured_string_ref broadcast_addr;
         /** Broadcast device hardware address data. */
-        uint8_t *broadcast_data;
+        char *broadcast_data;
         /** Device identifier. */
         device_id_t device_id;
@@ -122 +130 @@
         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_mutex_t lock;
+        fibril_rwlock_t lock;
 };
 
@@ -131 +145 @@
 struct arp_proto {
         /** Actual device protocol address. */
-        measured_string_t *addr;
+        measured_string_ref addr;
         /** Actual device protocol address data. */
-        uint8_t *addr_data;
+        char *addr_data;
         /** Address map. */
         arp_addr_t addresses;
@@ -140 +154 @@
 };
 
-/** 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
 
 /** @}
  */
-