Index: uspace/lib/drv/generic/remote_ieee80211.c =================================================================== --- uspace/lib/drv/generic/remote_ieee80211.c (revision 053fc2bcb6fbea6b3e6edf10ca784c77402816d4) +++ uspace/lib/drv/generic/remote_ieee80211.c (revision 003504fcbb88dc60bc2333d51f6664f36e03d56c) @@ -40,10 +40,9 @@ #include #include - #include "ops/ieee80211.h" #include "ieee80211_iface.h" #include "nic_iface.h" -#define MAX_STRING_SIZE 32 +#define MAX_STRING_SIZE 32 /** IEEE 802.11 RPC functions IDs. */ @@ -56,12 +55,13 @@ /** Get scan results from IEEE 802.11 device * - * @param[in] dev_sess Device session. - * @param[out] results Structure where to put scan results. + * @param[in] dev_sess Device session. + * @param[out] results Structure where to put scan results. * * @return EOK If the operation was successfully completed, - * negative error code otherwise. - */ -int ieee80211_get_scan_results(async_sess_t *dev_sess, - ieee80211_scan_results_t *results, bool now) + * negative error code otherwise. + * + */ +int ieee80211_get_scan_results(async_sess_t *dev_sess, + ieee80211_scan_results_t *results, bool now) { assert(results); @@ -71,7 +71,8 @@ aid_t aid = async_send_2(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE), IEEE80211_GET_SCAN_RESULTS, now, NULL); - int rc = async_data_read_start(exch, results, sizeof(ieee80211_scan_results_t)); + int rc = async_data_read_start(exch, results, + sizeof(ieee80211_scan_results_t)); async_exchange_end(exch); - + sysarg_t res; async_wait_for(aid, &res); @@ -79,12 +80,12 @@ if(res != EOK) return (int) res; - else - return rc; + + return rc; } static bool mac_matches(uint8_t *mac1, uint8_t *mac2) { - for(size_t i = 0; i < ETH_ADDR; i++) { - if(mac1[i] != mac2[i]) + for (size_t i = 0; i < ETH_ADDR; i++) { + if (mac1[i] != mac2[i]) return false; } @@ -108,7 +109,6 @@ return -1; - if(mac_matches(mac, link_info.mac_addr)) { + if (mac_matches(mac, link_info.mac_addr)) return link_list[i]; - } } @@ -118,10 +118,11 @@ /** Connect to specified network. * - * @param[in] dev_sess Device session. + * @param[in] dev_sess Device session. * @param[in] ssid_start Network SSID prefix. - * @param[in] password Network password (pass empty string if not needed). + * @param[in] password Network password (pass empty string if not needed). * * @return EOK If the operation was successfully completed, - * negative error code otherwise. + * negative error code otherwise. + * */ int ieee80211_connect(async_sess_t *dev_sess, char *ssid_start, char *password) @@ -136,6 +137,6 @@ IEEE80211_CONNECT, NULL); - sysarg_t rc = async_data_write_start(exch, ssid_start, - str_size(ssid_start) + 1); + sysarg_t rc = async_data_write_start(exch, ssid_start, + str_size(ssid_start) + 1); if (rc != EOK) { async_exchange_end(exch); @@ -144,11 +145,11 @@ if (rc_orig == EOK) return (int) rc; - else - return (int) rc_orig; - } - - if(password == NULL) { + + return (int) rc_orig; + } + + // FIXME: Typecasting string literal + if (password == NULL) password = (char *) ""; - } rc = async_data_write_start(exch, password, str_size(password) + 1); @@ -159,10 +160,10 @@ if (rc_orig == EOK) return (int) rc; - else - return (int) rc_orig; + + return (int) rc_orig; } async_exchange_end(exch); - + async_wait_for(aid, &rc); if (rc != EOK) @@ -176,5 +177,5 @@ sysarg_t link_id = get_link_id(wifi_mac.address); - if(link_id == ((sysarg_t) -1)) + if (link_id == ((sysarg_t) -1)) return EINVAL; @@ -189,5 +190,6 @@ * * @return EOK If the operation was successfully completed, - * negative error code otherwise. + * negative error code otherwise. + * */ int ieee80211_disconnect(async_sess_t *dev_sess) @@ -198,5 +200,5 @@ async_exchange_end(exch); - if(rc != EOK) + if (rc != EOK) return rc; @@ -227,9 +229,10 @@ return rc; - if(mac_matches(wifi_mac.address, link_info.mac_addr)) { - if(str_test_prefix(addr_info.name, "dhcp")) { + if (mac_matches(wifi_mac.address, link_info.mac_addr)) { + if (str_test_prefix(addr_info.name, "dhcp")) { rc = inetcfg_addr_delete(addr_list[i]); - if(rc != EOK) + if (rc != EOK) return rc; + break; } @@ -237,5 +240,5 @@ } - /* + /* * TODO: At this moment there can be only one DHCP route, * so it must be reimplemented after this limitation will be @@ -252,8 +255,9 @@ return rc; - if(str_test_prefix(route_info.name, "dhcp")) { + if (str_test_prefix(route_info.name, "dhcp")) { rc = inetcfg_sroute_delete(route_list[i]); - if(rc != EOK) + if (rc != EOK) return rc; + break; } Index: uspace/lib/drv/include/ieee80211_iface.h =================================================================== --- uspace/lib/drv/include/ieee80211_iface.h (revision 053fc2bcb6fbea6b3e6edf10ca784c77402816d4) +++ uspace/lib/drv/include/ieee80211_iface.h (revision 003504fcbb88dc60bc2333d51f6664f36e03d56c) @@ -27,5 +27,5 @@ */ - /** @addtogroup libc +/** @addtogroup libc * @{ */ @@ -39,6 +39,6 @@ #include -extern int ieee80211_get_scan_results(async_sess_t *, - ieee80211_scan_results_t *, bool); +extern int ieee80211_get_scan_results(async_sess_t *, + ieee80211_scan_results_t *, bool); extern int ieee80211_connect(async_sess_t *, char *, char *); extern int ieee80211_disconnect(async_sess_t *); Index: uspace/lib/drv/include/ops/ieee80211.h =================================================================== --- uspace/lib/drv/include/ops/ieee80211.h (revision 053fc2bcb6fbea6b3e6edf10ca784c77402816d4) +++ uspace/lib/drv/include/ops/ieee80211.h (revision 003504fcbb88dc60bc2333d51f6664f36e03d56c) @@ -42,32 +42,32 @@ /** IEEE 802.11 interface functions definition. */ typedef struct ieee80211_iface { - /** - * Fetch scan results from IEEE 802.11 device. - * - * @param fun IEEE 802.11 function. + /** Fetch scan results from IEEE 802.11 device. + * + * @param fun IEEE 802.11 function. * @param results Structure where to put scan results. - * @param now Whether to initiate scan immediately. - * + * @param now Whether to initiate scan immediately. + * * @return EOK if succeed, negative error code otherwise. + * */ int (*get_scan_results)(ddf_fun_t *, ieee80211_scan_results_t *, bool); - /** - * Connect IEEE 802.11 device to specified network. + /** Connect IEEE 802.11 device to specified network. * - * @param fun IEEE 802.11 function. - * @param ssid Network SSID. + * @param fun IEEE 802.11 function. + * @param ssid Network SSID. * @param password Network password (empty string if not needed). - * + * * @return EOK if succeed, negative error code otherwise. + * */ int (*connect)(ddf_fun_t *, char *, char *); - /** - * Disconnect IEEE 802.11 device from network. + /** Disconnect IEEE 802.11 device from network. * * @param fun IEEE 802.11 function. - * + * * @return EOK if succeed, negative error code otherwise. + * */ int (*disconnect)(ddf_fun_t *);