Changeset 96b02eb9 in mainline for uspace/lib/net

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

uspace/lib/net

Files:

• generic/generic.c (modified) (9 diffs)
• generic/packet_remote.c (modified) (4 diffs)
• il/arp_remote.c (modified) (3 diffs)
• il/ip_remote.c (modified) (5 diffs)
• netif/netif_remote.c (modified) (1 diff)
• tl/icmp_remote.c (modified) (4 diffs)

uspace/lib/net/generic/generic.c

@@ -59 +59 @@
     int state, services_t target)
 {
-        async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-            (ipcarg_t) state, target);
+        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+            (sysarg_t) state, target);
         
         return EOK;
@@ -81 +81 @@
     int arg2, services_t service)
 {
-        return (int) async_req_3_0(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, (ipcarg_t) arg2, (ipcarg_t) service);
+        return (int) async_req_3_0(phone, (sysarg_t) message,
+            (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
 }
 
@@ -103 +103 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         int string;
 
@@ -110 +110 @@
 
         // request the address
-        message_id = async_send_1(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, NULL);
+        message_id = async_send_1(phone, (sysarg_t) message,
+            (sysarg_t) device_id, NULL);
         string = measured_strings_return(phone, address, data, 1);
         async_wait_for(message_id, &result);
@@ -143 +143 @@
                 return EBADMEM;
         
-        ipcarg_t addr_len;
-        ipcarg_t prefix;
-        ipcarg_t content;
-        ipcarg_t suffix;
-        
-        ipcarg_t result = async_req_1_4(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, &addr_len, &prefix, &content, &suffix);
+        sysarg_t addr_len;
+        sysarg_t prefix;
+        sysarg_t content;
+        sysarg_t suffix;
+        
+        sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
+            (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
         
         packet_dimension->prefix = (size_t) prefix;
@@ -175 +175 @@
 {
         if (error) {
-                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) target, (ipcarg_t) error);
+                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) target);
+                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) target);
         }
         
@@ -201 +201 @@
 {
         if (error) {
-                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) sender, (ipcarg_t) error);
+                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) sender);
+                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) sender);
         }
         
@@ -237 +237 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         int string;
 
@@ -246 +246 @@
 
         // request the translation
-        message_id = async_send_3(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, (ipcarg_t) count, (ipcarg_t) service, NULL);
+        message_id = async_send_3(phone, (sysarg_t) message,
+            (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
         measured_strings_send(phone, configuration, count);
         string = measured_strings_return(phone, translation, data, count);

uspace/lib/net/generic/packet_remote.c

@@ -86 +86 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message, &result);
         
@@ -116 +116 @@
         *packet = pm_find(packet_id);
         if (!*packet) {
-                ipcarg_t size;
+                sysarg_t size;
                 
                 rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
@@ -151 +151 @@
     size_t max_prefix, size_t max_suffix)
 {
-        ipcarg_t packet_id;
-        ipcarg_t size;
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         
@@ -182 +182 @@
 packet_t *packet_get_1_remote(int phone, size_t content)
 {
-        ipcarg_t packet_id;
-        ipcarg_t size;
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         

uspace/lib/net/il/arp_remote.c

@@ -86 +86 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
-            (ipcarg_t) device_id, protocol, NULL);
+            (sysarg_t) device_id, protocol, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
@@ -106 +106 @@
 {
         return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
-            (ipcarg_t) device_id);
+            (sysarg_t) device_id);
 }
 
@@ -136 +136 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
-            (ipcarg_t) device_id, protocol, netif, NULL);
+            (sysarg_t) device_id, protocol, netif, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);

uspace/lib/net/il/ip_remote.c

@@ -67 +67 @@
 {
         return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE,
-            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr,
-            (ipcarg_t) address.s_addr, (ipcarg_t) netmask.s_addr);
+            (sysarg_t) device_id, (sysarg_t) gateway.s_addr,
+            (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr);
 }
 
@@ -86 +86 @@
     async_client_conn_t receiver)
 {
-        return (int) bind_service(service, (ipcarg_t) protocol, me, service,
+        return (int) bind_service(service, (sysarg_t) protocol, me, service,
             receiver);
 }
@@ -151 +151 @@
         ipc_call_t answer;
         aid_t message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE,
-            (ipcarg_t) protocol, &answer);
+            (sysarg_t) protocol, &answer);
         
         if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&
@@ -164 +164 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message_id, &result);
         
@@ -244 +244 @@
 {
         return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY,
-            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr);
+            (sysarg_t) device_id, (sysarg_t) gateway.s_addr);
 }
 

uspace/lib/net/netif/netif_remote.c

@@ -144 +144 @@
         
         aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS,
-            (ipcarg_t) device_id, NULL);
+            (sysarg_t) device_id, NULL);
         async_data_read_start(netif_phone, stats, sizeof(*stats));
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message_id, &result);
         

uspace/lib/net/tl/icmp_remote.c

@@ -65 +65 @@
     icmp_param_t mtu, packet_t *packet)
 {
-        async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (ipcarg_t) code,
-            (ipcarg_t) packet_get_id(packet), (ipcarg_t) mtu);
+        async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code,
+            (sysarg_t) packet_get_id(packet), (sysarg_t) mtu);
         return EOK;
 }
@@ -85 +85 @@
 {
         async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0,
-            (ipcarg_t) packet_get_id(packet));
+            (sysarg_t) packet_get_id(packet));
         return EOK;
 }
@@ -104 +104 @@
 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet)
 {
-        async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (ipcarg_t) code,
-            (ipcarg_t) packet_get_id(packet));
+        async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code,
+            (sysarg_t) packet_get_id(packet));
         return EOK;
 }
@@ -126 +126 @@
     icmp_param_t pointer, packet_t *packet)
 {
-        async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (ipcarg_t) code,
-            (ipcarg_t) packet_get_id(packet), (ipcarg_t) pointer);
+        async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code,
+            (sysarg_t) packet_get_id(packet), (sysarg_t) pointer);
         return EOK;
 }