Changeset a676574 in mainline for uspace/lib/net/include

Timestamp:

2011-01-09T12:18:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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.

Location:

uspace/lib/net/include

Files:

• adt/module_map.h (modified) (1 diff)
• arp_interface.h (modified) (1 diff)
• generic.h (modified) (2 diffs)
• net_interface.h (modified) (1 diff)
• netif_local.h (modified) (1 diff)
• netif_remote.h (modified) (1 diff)
• socket_core.h (modified) (2 diffs)

uspace/lib/net/include/adt/module_map.h

@@ -65 +65 @@
         int usage;
         /** Module name. */
-        const char *name;
+        const uint8_t *name;
         /** Module full path filename. */
-        const char *filename;
+        const uint8_t *filename;
         /** Connecting function. */
         connect_module_t *connect_module;
 };
 
-extern int add_module(module_t **, modules_t *, const char *, const char *,
-    services_t, task_id_t, connect_module_t *);
-extern module_t *get_running_module(modules_t *, char *);
-extern task_id_t spawn(const char *);
+extern int add_module(module_t **, modules_t *, const uint8_t *,
+    const uint8_t *, services_t, task_id_t, connect_module_t *);
+extern module_t *get_running_module(modules_t *, uint8_t *);
+extern task_id_t net_spawn(const uint8_t *);
 
 #endif

uspace/lib/net/include/arp_interface.h

@@ -50 +50 @@
     measured_string_t *);
 extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *,
-    measured_string_t **, char **);
+    measured_string_t **, uint8_t **);
 extern int arp_clear_device_req(int, device_id_t);
 extern int arp_clear_address_req(int, device_id_t, services_t,

uspace/lib/net/include/generic.h

@@ -50 +50 @@
 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
 extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
     packet_dimension_t *);
@@ -58 +58 @@
     services_t, services_t);
 extern int generic_translate_req(int, int, device_id_t, services_t,
-    measured_string_t *, size_t, measured_string_t **, char **);
+    measured_string_t *, size_t, measured_string_t **, uint8_t **);
 
 #endif

uspace/lib/net/include/net_interface.h

@@ -45 +45 @@
 
 extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
-    size_t, char **);
-extern int net_get_conf_req(int, measured_string_t **, size_t, char **);
-extern void net_free_settings(measured_string_t *, char *);
+    size_t, uint8_t **);
+extern int net_get_conf_req(int, measured_string_t **, size_t, uint8_t **);
+extern void net_free_settings(measured_string_t *, uint8_t *);
 extern int net_connect_module(void);
 

uspace/lib/net/include/netif_local.h

@@ -196 +196 @@
 
 extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_local(int, device_id_t, int, int);
 extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t);

uspace/lib/net/include/netif_remote.h

@@ -42 +42 @@
 
 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_remote(int, device_id_t, int, int);
 extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t);

uspace/lib/net/include/socket_core.h

@@ -86 +86 @@
         void *specific_data;
         /** Socket ports map key. */
-        const char *key;
+        const uint8_t *key;
         /** Length of the Socket ports map key. */
         size_t key_length;
@@ -118 +118 @@
     void (*)(socket_core_t *));
 extern int socket_reply_packets(packet_t *, size_t *);
-extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
+extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *,
     size_t);
 extern void socket_port_release(socket_ports_t *, socket_core_t *);
 extern int socket_port_add(socket_ports_t *, int, socket_core_t *,
-    const char *, size_t);
+    const uint8_t *, size_t);
 
 #endif