Changeset 7715994 in mainline for uspace/srv/net/netif/netif.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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 mainline changes.

File:

• uspace/srv/net/netif/netif.h (modified) (8 diffs)

uspace/srv/net/netif/netif.h

@@ -69 +69 @@
  *  @see device.h
  */
-DEVICE_MAP_DECLARE( device_map, device_t );
+DEVICE_MAP_DECLARE(device_map, device_t);
 
 /** Network interface device specific data.
@@ -76 +76 @@
         /** Device identifier.
          */
-        device_id_t     device_id;
+        device_id_t device_id;
         /** Receiving network interface layer phone.
          */
-        int             nil_phone;
+        int nil_phone;
         /** Actual device state.
          */
-        device_state_t  state;
+        device_state_t state;
         /** Driver specific data.
          */
-        void *          specific;
+        void * specific;
 };
 
@@ -93 +93 @@
         /** Networking module phone.
          */
-        int             net_phone;
+        int net_phone;
         /**     Device map.
          */
-        device_map_t    device_map;
+        device_map_t device_map;
         /** Safety lock.
          */
-        fibril_rwlock_t lock;
+        fibril_rwlock_t lock;
 };
 
@@ -109 +109 @@
  *  @returns EPERM if the device is not initialized.
  */
-int     find_device( device_id_t device_id, device_ref * device );
+int find_device(device_id_t device_id, device_ref * device);
 
 /** Clears the usage statistics.
  *  @param[in] stats The usage statistics.
  */
-void    null_device_stats( device_stats_ref stats );
+void null_device_stats(device_stats_ref stats);
 
 // prepared for future optimalizations
@@ -120 +120 @@
  *  @param[in] packet_id The packet identifier.
  */
-void    netif_pq_release( packet_id_t packet_id );
+void netif_pq_release(packet_id_t packet_id);
 
 /** Allocates new packet to handle the given content size.
@@ -127 +127 @@
  *  @returns NULL if there is an error.
  */
-packet_t netif_packet_get_1( size_t content );
+packet_t netif_packet_get_1(size_t content);
 
 /** Processes the netif module messages.
@@ -140 +140 @@
  *  @see IS_NET_NETIF_MESSAGE()
  */
-int     netif_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+int netif_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 /** Initializes the netif module.
@@ -148 +148 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int     netif_init_module( async_client_conn_t client_connection );
+int netif_init_module(async_client_conn_t client_connection);
 
 /** Starts and maintains the netif module until terminated.
  *  @returns EOK after the module is terminated.
  */
-int netif_run_module( void );
+int netif_run_module(void);
 
 #endif