Changeset 069015f2 in mainline for uspace/srv/net/il/arp/arp_module.c

Timestamp:

2010-10-30T19:40:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5c088975

Parents:

f2d2c604 (diff), fd8e8e1 (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 from lp:~jakub/helenos/net.

File:

• uspace/srv/net/il/arp/arp_module.c (modified) (3 diffs)

uspace/srv/net/il/arp/arp_module.c

@@ -32 +32 @@
 
 /** @file
- *  ARP standalone module implementation.
- *  Contains skeleton module functions mapping.
- *  The functions are used by the module skeleton as module specific entry points.
- *  @see module.c
+ * ARP standalone module implementation.
+ * Contains skeleton module functions mapping.
+ * The functions are used by the module skeleton as module specific entry
+ * points.
+ * @see module.c
  */
 
@@ -53 +54 @@
 #include "arp_module.h"
 
-/** ARP module global data.
- */
-extern arp_globals_t    arp_globals;
+/** ARP module global data. */
+extern arp_globals_t arp_globals;
 
-int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int
+il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         return arp_message_standalone(callid, call, answer, answer_count);
 }
 
-int il_module_start_standalone(async_client_conn_t client_connection){
+int il_module_start_standalone(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;
         
@@ -69 +73 @@
         
         ipcarg_t phonehash;
-        if (ERROR_OCCURRED(arp_initialize(client_connection))
-            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) {
+        if (ERROR_OCCURRED(arp_initialize(client_connection)) ||
+            ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;