Changeset 24ab58b3 in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2010-04-06T11:41:48Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

14f1db0

Parents:

4dd8529

Message:

more compact network startup messages (usually one line instead of multiple lines)
pass module name as an argument to nil_message() and friends
deeper cstyle changes (replace forward prototypes with proper extern declarations and static functions, change doxygen comments, stick more closely to the 80-column rule, no argument names in header files, spacing, comments, etc.)

File:

• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (4 diffs)

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -59 +59 @@
 /** DP8390 module name.
  */
-#define NAME    "dp8390 network interface"
+#define NAME  "dp8390"
 
 /** Returns the device from the interrupt call.
@@ -302 +302 @@
 }
 
-int change_state(device_ref device, device_state_t state){
-        device->state = state;
-        printf("State changed to %s\n", (state == NETIF_ACTIVE) ? "ACTIVE" : "STOPPED");
-        return state;
+int change_state(device_ref device, device_state_t state)
+{
+        if (device->state != state) {
+                device->state = state;
+                
+                printf("%s: State changed to %s\n", NAME,
+                    (state == NETIF_ACTIVE) ? "active" : "stopped");
+                
+                return state;
+        }
+        
+        return EOK;
 }
 
@@ -346 +354 @@
                 
                 /* 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 */
@@ -370 +379 @@
         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)))
+                return ERROR_CODE;
         
-        /* Start the module */
-        if (ERROR_OCCURRED(netif_module_start(netif_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
-                return ERROR_CODE;
-        }
-        
         return EOK;
 }