Changeset 858fc90 in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/nil/eth/eth_module.c (modified) (4 diffs)

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

@@ -59 +59 @@
 /** Prints the module name.
  */
-void    module_print_name( void );
+void module_print_name(void);
 
 /** Starts the Ethernet module.
@@ -69 +69 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int     module_start( async_client_conn_t client_connection );
+int module_start(async_client_conn_t client_connection);
 
 /** Passes the parameters to the module specific nil_message() function.
@@ -80 +80 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int     module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
-void module_print_name( void ){
-        printf( "%s", NAME );
+void module_print_name(void){
+        printf("%s", NAME);
 }
 
-int module_start( async_client_conn_t client_connection ){
+int module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;
 
-        ipcarg_t        phonehash;
-        int                     net_phone;
+        ipcarg_t phonehash;
+        int net_phone;
 
-        async_set_client_connection( client_connection );
-        net_phone = net_connect_module( SERVICE_NETWORKING );
-        ERROR_PROPAGATE( pm_init());
-        if( ERROR_OCCURRED( nil_initialize( net_phone ))
-        || ERROR_OCCURRED( REGISTER_ME( SERVICE_ETHERNET, & phonehash ))){
+        async_set_client_connection(client_connection);
+        net_phone = net_connect_module(SERVICE_NETWORKING);
+        ERROR_PROPAGATE(pm_init());
+        if(ERROR_OCCURRED(nil_initialize(net_phone))
+                || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))){
                 pm_destroy();
                 return ERROR_CODE;
@@ -107 +107 @@
 }
 
-int     module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
-        return nil_message( callid, call, answer, answer_count );
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return nil_message(callid, call, answer, answer_count);
 }