Changeset 59ecd4a in mainline for uspace/lib/net/include/arp_interface.h

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/lib/net/include/arp_interface.h (moved) (moved from uspace/srv/net/include/arp_interface.h ) (8 diffs)

uspace/lib/net/include/arp_interface.h

@@ -41 +41 @@
 #define __NET_ARP_INTERFACE_H__
 
-#include "../structures/measured_strings.h"
-
-#include "device.h"
+#include <adt/measured_strings.h>
+#include <net_device.h>
 
 /** @name ARP module interface
@@ -67 +66 @@
  *  @returns Other error codes as defined for the nil_get_broadcast_addr() function.
  */
-int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address);
+extern int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address);
 
 /** Translates the given protocol address to the network interface address.
@@ -83 +82 @@
  *  @returns ENOENT if the mapping is not found.
  */
-int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data);
+extern int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data);
 
 /** Clears the device cache.
@@ -91 +90 @@
  *  @returns ENOENT if the device is not found.
  */
-int arp_clear_device_req(int arp_phone, device_id_t device_id);
+extern int arp_clear_device_req(int arp_phone, device_id_t device_id);
 
 /** Clears the given protocol address from the cache.
@@ -101 +100 @@
  *  @returns ENOENT if the mapping is not found.
  */
-int arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address);
+extern int arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address);
 
 /** Cleans the cache.
@@ -107 +106 @@
  *  @returns EOK on success.
  */
-int arp_clean_cache_req(int arp_phone);
+extern int arp_clean_cache_req(int arp_phone);
 
 /** Connects to the ARP module.
@@ -114 +113 @@
  *  @returns 0 if called by the bundle module.
  */
-int arp_connect_module(services_t service);
+extern int arp_connect_module(services_t service);
 
 /** Returns the ARP task identifier.
@@ -120 +119 @@
  *  @returns 0 if called by the remote module.
  */
-task_id_t arp_task_get_id(void);
+extern task_id_t arp_task_get_id(void);
 
 /*@}*/