Changeset 24ab58b3 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-04-06T11:41:48Z (14 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/net/nil/eth/eth.c (modified) (9 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -60 +60 @@
 #include <adt/measured_strings.h>
 #include <packet/packet_client.h>
+#include <nil_module.h>
 
 #include "eth.h"
@@ -66 +67 @@
 /** The module name.
  */
-#define NAME    "Ethernet protocol"
+#define NAME  "eth"
 
 /** Reserved packet prefix length.
@@ -401 +402 @@
                         return index;
                 }
-                printf("New device registered:\n\tid\t= %d\n\tservice\t= %d\n\tMTU\t= %d\n\taddress\t= %X:%X:%X:%X:%X:%X\n\tflags\t= 0x%x\n", device->device_id, device->service, device->mtu, device->addr_data[0], device->addr_data[1], device->addr_data[2], device->addr_data[3], device->addr_data[4], device->addr_data[5], device->flags);
+                printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
+                    "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
+                    NAME, device->device_id, device->service, device->mtu,
+                    device->addr_data[0], device->addr_data[1],
+                    device->addr_data[2], device->addr_data[3],
+                    device->addr_data[4], device->addr_data[5], device->flags);
         }
         fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -571 +577 @@
                 }
         }
-        printf("New protocol registered:\n\tprotocol\t= 0x%x\n\tservice\t= %d\n\tphone\t= %d\n", proto->protocol, proto->service, proto->phone);
+        
+        printf("%s: Protocol registered (protocol: %d, service: %d, phone: %d)\n",
+            NAME, proto->protocol, proto->service, proto->phone);
+        
         fibril_rwlock_write_unlock(&eth_globals.protos_lock);
         return EOK;
@@ -704 +713 @@
 }
 
-int nil_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int nil_message(const char *name, ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         ERROR_DECLARE;
-
+        
         measured_string_ref address;
         packet_t packet;
@@ -713 +724 @@
         size_t suffix;
         size_t content;
-
-//      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NIL_FIRST);
+        
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
+        switch (IPC_GET_METHOD(*call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return EOK;
                 case NET_NIL_DEVICE:
-                        return eth_device_message(IPC_GET_DEVICE(call), IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                        return eth_device_message(IPC_GET_DEVICE(call),
+                            IPC_GET_SERVICE(call), IPC_GET_MTU(call));
                 case NET_NIL_SEND:
-                        ERROR_PROPAGATE(packet_translate(eth_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                        return eth_send_message(IPC_GET_DEVICE(call), packet, IPC_GET_SERVICE(call));
+                        ERROR_PROPAGATE(packet_translate(eth_globals.net_phone, &packet,
+                            IPC_GET_PACKET(call)));
+                        return eth_send_message(IPC_GET_DEVICE(call), packet,
+                            IPC_GET_SERVICE(call));
                 case NET_NIL_PACKET_SPACE:
-                        ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call),
+                            &addrlen, &prefix, &content, &suffix));
                         IPC_SET_ADDR(answer, addrlen);
                         IPC_SET_PREFIX(answer, prefix);
@@ -733 +747 @@
                         return EOK;
                 case NET_NIL_ADDR:
-                        ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call), ETH_LOCAL_ADDR, &address));
+                        ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
+                            ETH_LOCAL_ADDR, &address));
                         return measured_strings_reply(address, 1);
                 case NET_NIL_BROADCAST_ADDR:
-                        ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call), ETH_BROADCAST_ADDR, &address));
+                        ERROR_PROPAGATE(eth_addr_message(IPC_GET_DEVICE(call),
+                            ETH_BROADCAST_ADDR, &address));
                         return measured_strings_reply(address, 1);
                 case IPC_M_CONNECT_TO_ME:
-                        return eth_register_message(NIL_GET_PROTO(call), IPC_GET_PHONE(call));
-        }
+                        return eth_register_message(NIL_GET_PROTO(call),
+                            IPC_GET_PHONE(call));
+        }
+        
         return ENOTSUP;
 }
@@ -799 +817 @@
                 
                 /* Process the message */
-                int res = nil_module_message(callid, &call, &answer, &answer_count);
+                int res = nil_module_message(NAME, callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -823 +842 @@
         ERROR_DECLARE;
         
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
-        
         /* Start the module */
-        if (ERROR_OCCURRED(nil_module_start(nil_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
+        if (ERROR_OCCURRED(nil_module_start(nil_client_connection)))
                 return ERROR_CODE;
-        }
         
         return EOK;