Index: uspace/lib/ieee80211/include/ieee80211.h
===================================================================
--- uspace/lib/ieee80211/include/ieee80211.h	(revision a931b7b2faca447e0708fd5fae0f85116e4c788d)
+++ uspace/lib/ieee80211/include/ieee80211.h	(revision 86cf96db61d51787a47d6d8c6ac8e3d1961b743d)
@@ -27,5 +27,5 @@
  */
 
-/** 
+/**
  * @addtogroup libieee80211
  * @{
@@ -43,5 +43,5 @@
 #include <ops/ieee80211.h>
 
-#define DEVICE_CATEGORY_IEEE80211 "ieee80211"
+#define DEVICE_CATEGORY_IEEE80211  "ieee80211"
 
 struct ieee80211_dev;
@@ -49,17 +49,17 @@
 
 /** Initial channel frequency. */
-#define IEEE80211_FIRST_FREQ 2412
+#define IEEE80211_FIRST_FREQ  2412
 
 /** Max supported channel frequency. */
-#define IEEE80211_MAX_FREQ 2472
-
-/* Gap between IEEE80211 channels in MHz. */
-#define IEEE80211_CHANNEL_GAP 5
-
-/* Max AMPDU factor. */
-#define IEEE80211_MAX_AMPDU_FACTOR 13
-
-/* Max authentication password length. */
-#define IEEE80211_MAX_PASSW_LEN 64
+#define IEEE80211_MAX_FREQ  2472
+
+/** Gap between IEEE80211 channels in MHz. */
+#define IEEE80211_CHANNEL_GAP  5
+
+/** Max AMPDU factor. */
+#define IEEE80211_MAX_AMPDU_FACTOR  13
+
+/** Max authentication password length. */
+#define IEEE80211_MAX_PASSW_LEN  64
 
 /** IEEE 802.11 b/g supported data rates in units of 500 kb/s. */
@@ -97,113 +97,111 @@
 /** IEEE 802.11 callback functions. */
 typedef struct {
-	/**
-	 * Function that is called at device initalization. This should
-	 * get device into running state.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
+	/** unction that is called at device initalization.
+	 *
+	 * This should get device into running state.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
 	 */
 	int (*start)(struct ieee80211_dev *);
 	
-	/**
-	 * Scan neighborhood for networks. There should be implemented
-	 * scanning of whole bandwidth. Incoming results are processed by
-	 * IEEE 802.11 framework itself.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
+	/** Scan neighborhood for networks.
+	 *
+	 * There should be implemented scanning of whole bandwidth.
+	 * Incoming results are processed by IEEE 802.11 framework itself.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
 	 */
 	int (*scan)(struct ieee80211_dev *);
 	
-	/**
-	 * Handler for TX frames to be send from device. This should be
-	 * called for every frame that has to be send from IEEE 802.11 device.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * @param buffer Buffer with data to be send.
-	 * @param buffer_size Size of buffer.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
+	/** Handler for TX frames to be send from device.
+	 *
+	 * This should be called for every frame that has to be send
+	 * from IEEE 802.11 device.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 * @param buffer        Buffer with data to be send.
+	 * @param buffer_size   Size of buffer.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
 	 */
 	int (*tx_handler)(struct ieee80211_dev *, void *, size_t);
 	
-	/**
-	 * Set device operating frequency to given value.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * @param freq New device operating frequency.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
+	/** Set device operating frequency to given value.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 * @param freq          New device operating frequency.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
 	 */
 	int (*set_freq)(struct ieee80211_dev *, uint16_t);
 	
-	/**
-	 * Callback to inform device about BSSID change.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * @param connected True if connected to new BSSID, otherwise false.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
+	/** Callback to inform device about BSSID change.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 * @param connected     True if connected to new BSSID, otherwise false.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
 	 */
 	int (*bssid_change)(struct ieee80211_dev *, bool);
 	
-	/**
-	 * Callback to setup encryption key in IEEE 802.11 device.
-	 * 
-	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-	 * @param key_conf Key config structure.
-	 * @param insert True to insert this key to device, false to remove it.
-	 * 
-	 * @return EOK if succeed, negative error code otherwise.
-	 */
-	int (*key_config)(struct ieee80211_dev *, 
-		ieee80211_key_config_t *key_conf, bool);
+	/** Callback to setup encryption key in IEEE 802.11 device.
+	 *
+	 * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
+	 * @param key_conf      Key config structure.
+	 * @param insert        True to insert this key to device,
+	 *                      false to remove it.
+	 *
+	 * @return EOK if succeed, negative error code otherwise.
+	 *
+	 */
+	int (*key_config)(struct ieee80211_dev *,
+	    ieee80211_key_config_t *key_conf, bool);
 } ieee80211_ops_t;
 
 /* Initialization functions. */
 extern ieee80211_dev_t *ieee80211_device_create(void);
-extern int ieee80211_device_init(ieee80211_dev_t *ieee80211_dev, 
-	ddf_dev_t *ddf_dev);
-extern int ieee80211_init(ieee80211_dev_t *ieee80211_dev, 
-	ieee80211_ops_t *ieee80211_ops, ieee80211_iface_t *ieee80211_iface,
-	nic_iface_t *ieee80211_nic_iface, ddf_dev_ops_t *ieee80211_dev_ops);
+extern int ieee80211_device_init(ieee80211_dev_t *, ddf_dev_t *);
+extern int ieee80211_init(ieee80211_dev_t *, ieee80211_ops_t *,
+    ieee80211_iface_t *, nic_iface_t *, ddf_dev_ops_t *);
 
 /* Getters & setters, queries & reports. */
-extern void *ieee80211_get_specific(ieee80211_dev_t *ieee80211_dev);
-extern void ieee80211_set_specific(ieee80211_dev_t *ieee80211_dev, 
-	void *specific);
-extern ddf_dev_t *ieee80211_get_ddf_dev(ieee80211_dev_t* ieee80211_dev);
-extern ieee80211_operating_mode_t 
-	ieee80211_query_current_op_mode(ieee80211_dev_t *ieee80211_dev);
-extern uint16_t ieee80211_query_current_freq(ieee80211_dev_t *ieee80211_dev);
-extern void ieee80211_query_bssid(ieee80211_dev_t* ieee80211_dev, 
-	nic_address_t *bssid);
-extern bool ieee80211_is_connected(ieee80211_dev_t* ieee80211_dev);
-extern void ieee80211_report_current_op_mode(ieee80211_dev_t *ieee80211_dev,
-	ieee80211_operating_mode_t op_mode);
-extern void ieee80211_report_current_freq(ieee80211_dev_t *ieee80211_dev,
-	uint16_t freq);
-extern uint16_t ieee80211_get_aid(ieee80211_dev_t* ieee80211_dev);
-extern int ieee80211_get_pairwise_security(ieee80211_dev_t* ieee80211_dev);
-extern bool ieee80211_is_ready(ieee80211_dev_t* ieee80211_dev);
-extern void ieee80211_set_ready(ieee80211_dev_t* ieee80211_dev, bool ready);
-extern bool ieee80211_query_using_key(ieee80211_dev_t* ieee80211_dev);
-extern void ieee80211_setup_key_confirm(ieee80211_dev_t* ieee80211_dev, 
-	bool using_key);
-
-extern bool ieee80211_is_data_frame(uint16_t frame_ctrl);
-extern bool ieee80211_is_mgmt_frame(uint16_t frame_ctrl);
-extern bool ieee80211_is_beacon_frame(uint16_t frame_ctrl);
-extern bool ieee80211_is_probe_response_frame(uint16_t frame_ctrl);
-extern bool ieee80211_is_auth_frame(uint16_t frame_ctrl);
-extern bool ieee80211_is_assoc_response_frame(uint16_t frame_ctrl);
+extern void *ieee80211_get_specific(ieee80211_dev_t *);
+extern void ieee80211_set_specific(ieee80211_dev_t *, void *);
+extern ddf_dev_t *ieee80211_get_ddf_dev(ieee80211_dev_t *);
+extern ieee80211_operating_mode_t
+    ieee80211_query_current_op_mode(ieee80211_dev_t *);
+extern uint16_t ieee80211_query_current_freq(ieee80211_dev_t *);
+extern void ieee80211_query_bssid(ieee80211_dev_t *, nic_address_t *);
+extern bool ieee80211_is_connected(ieee80211_dev_t *);
+extern void ieee80211_report_current_op_mode(ieee80211_dev_t *,
+    ieee80211_operating_mode_t);
+extern void ieee80211_report_current_freq(ieee80211_dev_t *, uint16_t);
+extern uint16_t ieee80211_get_aid(ieee80211_dev_t *);
+extern int ieee80211_get_pairwise_security(ieee80211_dev_t *);
+extern bool ieee80211_is_ready(ieee80211_dev_t *);
+extern void ieee80211_set_ready(ieee80211_dev_t *, bool);
+extern bool ieee80211_query_using_key(ieee80211_dev_t *);
+extern void ieee80211_setup_key_confirm(ieee80211_dev_t *, bool);
+
+extern bool ieee80211_is_data_frame(uint16_t);
+extern bool ieee80211_is_mgmt_frame(uint16_t);
+extern bool ieee80211_is_beacon_frame(uint16_t);
+extern bool ieee80211_is_probe_response_frame(uint16_t);
+extern bool ieee80211_is_auth_frame(uint16_t);
+extern bool ieee80211_is_assoc_response_frame(uint16_t);
 
 /* Worker functions. */
-extern int ieee80211_rx_handler(ieee80211_dev_t *ieee80211_dev, void *buffer,
-	size_t buffer_size);
-
-#endif // LIB_IEEE80211_H
+extern int ieee80211_rx_handler(ieee80211_dev_t *, void *, size_t);
+
+#endif
 
 /** @}
