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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/srv/net/netif/lo/lo.c (modified) (12 diffs)

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

@@ -51 +51 @@
 #include <nil_interface.h>
 #include <nil_messages.h>
-#include <netif.h>
-#include <netif_module.h>
+#include <netif_interface.h>
+#include <netif_local.h>
 
 /** Default hardware address.
@@ -64 +64 @@
 /** Loopback module name.
  */
-#define NAME    "lo - loopback interface"
+#define NAME  "lo"
 
 /** Network interface global data.
@@ -76 +76 @@
  *  @returns EOK otherwise.
  */
-int change_state_message(device_ref device, device_state_t state);
+int change_state_message(netif_device_t * device, device_state_t state);
 
 /** Creates and returns the loopback network interface structure.
@@ -85 +85 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int create(device_id_t device_id, device_ref * device);
+int create(device_id_t device_id, netif_device_t * * device);
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
@@ -103 +103 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
 
         if(! stats){
@@ -113 +113 @@
 }
 
-int change_state_message(device_ref device, device_state_t state){
-        if(device->state != state){
+int change_state_message(netif_device_t * device, device_state_t state)
+{
+        if (device->state != state) {
                 device->state = state;
-                printf("State changed to %s\n", (state == NETIF_ACTIVE) ? "ACTIVE" : "STOPPED");
+                
+                printf("%s: State changed to %s\n", NAME,
+                    (state == NETIF_ACTIVE) ? "active" : "stopped");
+                
                 return state;
         }
-        return EOK;
-}
-
-int create(device_id_t device_id, device_ref * device){
+        
+        return EOK;
+}
+
+int create(device_id_t device_id, netif_device_t * * device){
         int index;
 
-        if(device_map_count(&netif_globals.device_map) > 0){
+        if(netif_device_map_count(&netif_globals.device_map) > 0){
                 return EXDEV;
         }else{
-                *device = (device_ref) malloc(sizeof(device_t));
+                *device = (netif_device_t *) malloc(sizeof(netif_device_t));
                 if(!(*device)){
                         return ENOMEM;
@@ -141 +146 @@
                 (** device).nil_phone = -1;
                 (** device).state = NETIF_STOPPED;
-                index = device_map_add(&netif_globals.device_map, (** device).device_id, * device);
+                index = netif_device_map_add(&netif_globals.device_map, (** device).device_id, * device);
                 if(index < 0){
                         free(*device);
@@ -161 +166 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
 
         // create a new device
         ERROR_PROPAGATE(create(device_id, &device));
         // print the settings
-        printf("New device created:\n\tid\t= %d\n", device->device_id);
+        printf("%s: Device created (id: %d)\n", NAME, device->device_id);
         return EOK;
 }
@@ -173 +178 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
         size_t length;
         packet_t next;
@@ -199 +204 @@
 }
 
-int netif_start_message(device_ref device){
+int netif_start_message(netif_device_t * device){
         return change_state_message(device, NETIF_ACTIVE);
 }
 
-int netif_stop_message(device_ref device){
+int netif_stop_message(netif_device_t * device){
         return change_state_message(device, NETIF_STOPPED);
 }
 
-#ifdef CONFIG_NETWORKING_modular
-
-#include <netif_standalone.h>
-
 /** 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)
+ * @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)
 {
         /*
@@ -237 +238 @@
                 
                 /* Process the message */
-                int res = netif_module_message(callid, &call, &answer, &answer_count);
+                int res = netif_module_message(NAME, callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -248 +250 @@
 }
 
-/** Starts the module.
- *
- *  @param argc The count of the command line arguments. Ignored parameter.
- *  @param argv The command line parameters. Ignored parameter.
- *
- *  @returns EOK on success.
- *  @returns Other error codes as defined for each specific module start function.
- *
- */
 int main(int argc, char *argv[])
 {
         ERROR_DECLARE;
         
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
-        
         /* Start the module */
-        if (ERROR_OCCURRED(netif_module_start(netif_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
+        if (ERROR_OCCURRED(netif_module_start(netif_client_connection)))
                 return ERROR_CODE;
-        }
-        
-        return EOK;
-}
-
-#endif /* CONFIG_NETWORKING_modular */
+        
+        return EOK;
+}
 
 /** @}