Changeset 774e6d1a in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-01-09T23:24:53Z (13 years ago)

Author:

martin@…>

Branches:

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

Children:

4b86dac

Parents:

3c106e88

Message:

partial networking stack overhaul

• a lot of coding style changes (comments, indentation, etc.)
• convert several ints to unsigned ints or size_t values
• streamline many of the IPC-related macros (they no longer dereference the call structure by themselves)
• get rid of netif_interface.h (containing only aliases for remote functions and not serving any purpose)
• rename netif_local.{c|h} to netif_skel.{c|h} (it is really just a skeleton)
• drop the "_remote" and "_standalone" suffixes from most of the netif_ functions (they do not serve any purpose anymore)
• implement netif_client_connection() as a common framework function for all netif modules
  • update the lo module accordingly
• ip module now reports the default gateway to the user whenever it is being set

File:

• uspace/srv/net/net/net.c (modified) (6 diffs)

uspace/srv/net/net/net.c

@@ -474 +474 @@
         
         setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IO, 0);
-        int io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
-        
-        rc = netif_probe_req_remote(netif->driver->phone, netif->id, irq, io);
+        uintptr_t io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
+        
+        rc = netif_probe_req(netif->driver->phone, netif->id, irq, (void *) io);
         if (rc != EOK)
                 return rc;
@@ -511 +511 @@
         }
         
-        return netif_start_req_remote(netif->driver->phone, netif->id);
+        return netif_start_req(netif->driver->phone, netif->id);
 }
 
@@ -613 +613 @@
 /** Process the networking message.
  *
- * @param[in] callid        The message identifier.
- * @param[in] call          The message parameters.
+ * @param[in]  callid       The message identifier.
+ * @param[in]  call         The message parameters.
  * @param[out] answer       The message answer parameters.
  * @param[out] answer_count The last parameter for the actual answer
@@ -627 +627 @@
  */
 int net_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         measured_string_t *strings;
@@ -639 +639 @@
         case NET_NET_GET_DEVICE_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
-                    IPC_GET_COUNT(call), NULL);
+                net_get_device_conf_req(0, IPC_GET_DEVICE(*call), &strings,
+                    IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
         case NET_NET_GET_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
+                net_get_conf_req(0, &strings, IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
@@ -688 +688 @@
                 /* Clear the answer structure */
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 refresh_answer(&answer, &answer_count);