Changeset 977fcea in mainline for uspace/srv/net/netif/lo/lo.c

Timestamp:

2011-01-14T10:11:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f9dd44d

Parents:

0bd2879 (diff), 6610565b (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:

development branch merge

File:

• uspace/srv/net/netif/lo/lo.c (modified) (5 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -49 +49 @@
 #include <net/device.h>
 #include <nil_interface.h>
-#include <netif_interface.h>
-#include <netif_local.h>
+#include <netif_skel.h>
 
 /** Default hardware address. */
-#define DEFAULT_ADDR            "\0\0\0\0\0\0"
+#define DEFAULT_ADDR  0
 
 /** Default address length. */
-#define DEFAULT_ADDR_LEN        (sizeof(DEFAULT_ADDR) / sizeof(char))
+#define DEFAULT_ADDR_LEN  6
 
 /** Loopback module name. */
@@ -62 +61 @@
 
 /** Network interface global data. */
-netif_globals_t netif_globals;
+netif_globals_t netif_globals;
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
         return ENOTSUP;
@@ -74 +73 @@
         if (!address)
                 return EBADMEM;
-
-        address->value = str_dup(DEFAULT_ADDR);
+        
+        uint8_t *addr = (uint8_t *) malloc(DEFAULT_ADDR_LEN);
+        memset(addr, DEFAULT_ADDR, DEFAULT_ADDR_LEN);
+        
+        address->value = addr;
         address->length = DEFAULT_ADDR_LEN;
-
+        
         return EOK;
 }
@@ -169 +171 @@
 }
 
-int netif_probe_message(device_id_t device_id, int irq, uintptr_t io)
+int netif_probe_message(device_id_t device_id, int irq, void *io)
 {
         netif_device_t *device;
@@ -230 +232 @@
 }
 
-/** Default thread for new connections.
- *
- * @param[in] iid       The initial message identifier.
- * @param[in] icall     The initial message call structure.
- */
-static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        /*
-         * Accept the connection
-         *  - Answer the first IPC_M_CONNECT_ME_TO call.
-         */
-        ipc_answer_0(iid, EOK);
-        
-        while (true) {
-                ipc_call_t answer;
-                int answer_count;
-                
-                /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
-                
-                /* Fetch the next message */
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                /* Process the message */
-                int res = netif_module_message(NAME, callid, &call, &answer,
-                    &answer_count);
-                
-                /*
-                 * End if told to either by the message or the processing
-                 * result.
-                 */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
 int main(int argc, char *argv[])
 {
-        int rc;
-        
         /* Start the module */
-        rc = netif_module_start(netif_client_connection);
-        return rc;
+        return netif_module_start();
 }