Changeset 24ab58b3 in mainline for uspace/lib/net/netif/netif.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/lib/net/netif/netif.c (modified) (3 diffs)

uspace/lib/net/netif/netif.c

@@ -176 +176 @@
 }
 
-/** Registers the device notification receiver, the network interface layer module.
- *  @param[in] device_id The device identifier.
- *  @param[in] phone The network interface layer module phone.
- *  @returns EOK on success.
- *  @returns ENOENT if there is no such device.
- *  @returns ELIMIT if there is another module registered.
- */
-static int register_message(device_id_t device_id, int phone){
-        ERROR_DECLARE;
-
+/** Register the device notification receiver, the network interface layer module.
+ *
+ * @param[in] name      Module name.
+ * @param[in] device_id The device identifier.
+ * @param[in] phone     The network interface layer module phone.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there is no such device.
+ * @return ELIMIT if there is another module registered.
+ *
+ */
+static int register_message(const char *name, device_id_t device_id, int phone)
+{
+        ERROR_DECLARE;
+        
         device_ref device;
-
         ERROR_PROPAGATE(find_device(device_id, &device));
-        if(device->nil_phone > 0){
+        if(device->nil_phone > 0)
                 return ELIMIT;
-        }
+        
         device->nil_phone = phone;
-        printf("New receiver of the device %d registered:\n\tphone\t= %d\n", device->device_id, device->nil_phone);
-        return EOK;
-}
-
-int netif_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        ERROR_DECLARE;
-
+        printf("%s: Receiver of device %d registered (phone: %d)\n",
+            name, device->device_id, device->nil_phone);
+        return EOK;
+}
+
+int netif_message(const char *name, ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
+        ERROR_DECLARE;
+        
         size_t length;
         device_stats_t stats;
         packet_t packet;
         measured_string_t address;
-
-//      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NETIF_FIRST);
+        
         *answer_count = 0;
         switch(IPC_GET_METHOD(*call)){
@@ -211 +217 @@
                         return EOK;
                 case NET_NETIF_PROBE:
-                        return netif_probe_req(0, IPC_GET_DEVICE(call), NETIF_GET_IRQ(call), NETIF_GET_IO(call));
+                        return netif_probe_req(0, IPC_GET_DEVICE(call),
+                            NETIF_GET_IRQ(call), NETIF_GET_IO(call));
                 case IPC_M_CONNECT_TO_ME:
                         fibril_rwlock_write_lock(&netif_globals.lock);
-                        ERROR_CODE = register_message(IPC_GET_DEVICE(call), IPC_GET_PHONE(call));
+                        ERROR_CODE = register_message(name, IPC_GET_DEVICE(call),
+                            IPC_GET_PHONE(call));
                         fibril_rwlock_write_unlock(&netif_globals.lock);
                         return ERROR_CODE;
                 case NET_NETIF_SEND:
-                        ERROR_PROPAGATE(packet_translate(netif_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                        return netif_send_msg(0, IPC_GET_DEVICE(call), packet, IPC_GET_SENDER(call));
+                        ERROR_PROPAGATE(packet_translate(netif_globals.net_phone,
+                            &packet, IPC_GET_PACKET(call)));
+                        return netif_send_msg(0, IPC_GET_DEVICE(call), packet,
+                            IPC_GET_SENDER(call));
                 case NET_NETIF_START:
                         return netif_start_req(0, IPC_GET_DEVICE(call));
                 case NET_NETIF_STATS:
                         fibril_rwlock_read_lock(&netif_globals.lock);
-                        if(! ERROR_OCCURRED(async_data_read_receive(&callid, &length))){
-                                if(length < sizeof(device_stats_t)){
+                        if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) {
+                                if (length < sizeof(device_stats_t))
                                         ERROR_CODE = EOVERFLOW;
-                                }else{
-                                        if(! ERROR_OCCURRED(netif_get_device_stats(IPC_GET_DEVICE(call), &stats))){
-                                                ERROR_CODE = async_data_read_finalize(callid, &stats, sizeof(device_stats_t));
-                                        }
+                                else {
+                                        if (!ERROR_OCCURRED(netif_get_device_stats(
+                                            IPC_GET_DEVICE(call), &stats)))
+                                                ERROR_CODE = async_data_read_finalize(callid, &stats,
+                                                    sizeof(device_stats_t));
                                 }
                         }
@@ -239 +250 @@
                 case NET_NETIF_GET_ADDR:
                         fibril_rwlock_read_lock(&netif_globals.lock);
-                        if(! ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call), &address))){
+                        if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call),
+                            &address)))
                                 ERROR_CODE = measured_strings_reply(&address, 1);
-                        }
                         fibril_rwlock_read_unlock(&netif_globals.lock);
                         return ERROR_CODE;
         }
+        
         return netif_specific_message(callid, call, answer, answer_count);
 }