Changeset 8a64320e in mainline

Timestamp:

2015-04-23T23:40:14Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

dcba819

Parents:

09044cb

Message:

pre-merge coding style cleanup and code review

Files:

• boot/Makefile (modified) (1 diff)
• boot/Makefile.common (modified) (3 diffs)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/wifi_supplicant/Makefile (modified) (1 diff)
• uspace/app/wifi_supplicant/wifi_supplicant.c (modified) (16 diffs)
• uspace/drv/nic/ar9271/Makefile (modified) (2 diffs)
• uspace/drv/nic/ar9271/ar9271.c (modified) (49 diffs)
• uspace/drv/nic/ar9271/ar9271.h (modified) (12 diffs)
• uspace/drv/nic/ar9271/ath.h (modified) (2 diffs)
• uspace/drv/nic/ar9271/ath_usb.c (modified) (4 diffs)
• uspace/drv/nic/ar9271/ath_usb.h (modified) (2 diffs)
• uspace/drv/nic/ar9271/htc.c (modified) (19 diffs)
• uspace/drv/nic/ar9271/htc.h (modified) (14 diffs)
• uspace/drv/nic/ar9271/hw.c (modified) (45 diffs)
• uspace/drv/nic/ar9271/hw.h (modified) (1 diff)
• uspace/drv/nic/ar9271/wmi.c (modified) (10 diffs)
• uspace/drv/nic/ar9271/wmi.h (modified) (3 diffs)
• uspace/lib/c/include/ieee80211/ieee80211.h (modified) (2 diffs)
• uspace/lib/crypto/aes.c (modified) (20 diffs)
• uspace/lib/crypto/crypto.c (modified) (12 diffs)
• uspace/lib/crypto/crypto.h (modified) (1 diff)
• uspace/lib/crypto/rc4.c (modified) (5 diffs)
• uspace/lib/drv/generic/remote_ieee80211.c (modified) (15 diffs)
• uspace/lib/drv/include/ieee80211_iface.h (modified) (2 diffs)
• uspace/lib/drv/include/ops/ieee80211.h (modified) (1 diff)
• uspace/lib/ieee80211/Makefile (modified) (1 diff)
• uspace/lib/ieee80211/include/ieee80211.h (modified) (4 diffs)
• uspace/lib/ieee80211/include/ieee80211_iface_impl.h (modified) (2 diffs)
• uspace/lib/ieee80211/include/ieee80211_impl.h (modified) (2 diffs)
• uspace/lib/ieee80211/include/ieee80211_private.h (modified) (12 diffs)
• uspace/lib/ieee80211/src/ieee80211.c (modified) (67 diffs)
• uspace/lib/ieee80211/src/ieee80211_iface_impl.c (modified) (9 diffs)
• uspace/lib/ieee80211/src/ieee80211_impl.c (modified) (19 diffs)
• uspace/srv/net/dhcp/dhcp.c (modified) (2 diffs)

boot/Makefile

@@ -115 +115 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
-        for file in $(RD_DRV_FW) ; do \
+        for file in $(RD_DRVS_FW) ; do \
                 file_dir="`dirname "$$file"`" ; \
                 file_name="`basename "$$file"`" ; \

boot/Makefile.common

@@ -139 +139 @@
         nic/rtl8139 \
         nic/rtl8169 \
-        nic/ar9271 \
+        nic/ar9271 \
         block/ahci
 
 RD_DRV_CFG =
 
-RD_DRV_FW = \
-        nic/ar9271
+RD_DRVS_FW_NON_ESSENTIAL = \
+        nic/ar9271
 
 RD_LIBS =
@@ -228 +228 @@
         $(USPACE_PATH)/app/df/df \
         $(USPACE_PATH)/app/fontviewer/fontviewer \
-        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
+        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
 
 RD_TESTS = \
@@ -252 +252 @@
 RD_APPS = $(RD_APPS_ESSENTIAL)
 RD_DRVS = $(RD_DRVS_ESSENTIAL)
+RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
 RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
+RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
 endif
 

boot/arch/amd64/Makefile.inc

@@ -61 +61 @@
 RD_DRV_CFG += \
         bus/isa
-        
+
 RD_APPS_ESSENTIAL += \
         $(USPACE_PATH)/app/edit/edit \

uspace/Makefile

@@ -252 +252 @@
         lib/mbr \
         lib/gpt \
-        lib/ieee80211 \
+        lib/ieee80211
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/app/wifi_supplicant/Makefile

@@ -35 +35 @@
         wifi_supplicant.c
 
-include $(USPACE_PREFIX)/Makefile.common 
+include $(USPACE_PREFIX)/Makefile.common

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -42 +42 @@
 #include <loc.h>
 
-#define NAME "wifi_supplicant"
-
-#define enum_name(name_arr, i) ((i < 0) ? "NA" : name_arr[i])
+#define NAME  "wifi_supplicant"
+
+#define enum_name(name_arr, i) \
+        ((i < 0) ? "NA" : name_arr[i])
 
 static const char* ieee80211_security_type_strs[] = {
@@ -65 +66 @@
         printf("\tlist - list wifi devices in <index>: <name> format\n");
         printf("\tscan <index> [-n] - output scan results (force scan "
-                "immediately)\n");
+            "immediately)\n");
         printf("\tconnect <index> <ssid_prefix> [<password>] - connect to "
-                "network\n");
+            "network\n");
         printf("\tdisconnect <index> - disconnect from network\n");
 }
 
-static char *nic_addr_format(nic_address_t *a)
-{
-        int rc;
-        char *s;
-
-        rc = asprintf(&s, "%02x:%02x:%02x:%02x:%02x:%02x",
-            a->address[0], a->address[1], a->address[2],
-            a->address[3], a->address[4], a->address[5]);
-
+static char *nic_addr_format(nic_address_t *addr)
+{
+        char *str;
+        int rc = asprintf(&str, "%02x:%02x:%02x:%02x:%02x:%02x",
+            addr->address[0], addr->address[1], addr->address[2],
+            addr->address[3], addr->address[4], addr->address[5]);
+        
         if (rc < 0)
                 return NULL;
-
-        return s;
+        
+        return str;
 }
 
@@ -89 +88 @@
 {
         category_id_t wifi_cat;
-
         int rc = loc_category_get_id("ieee80211", &wifi_cat, 0);
         if (rc != EOK) {
@@ -95 +93 @@
                 return rc;
         }
-
+        
         rc = loc_category_get_svcs(wifi_cat, wifis, count);
         if (rc != EOK) {
@@ -107 +105 @@
 static async_sess_t *get_wifi_by_index(size_t i)
 {
-        int rc;
+        service_id_t *wifis = NULL;
         size_t count;
-        service_id_t *wifis = NULL;
-
-        rc = get_wifi_list(&wifis, &count);
+        
+        int rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
                 printf("Error fetching wifi list.\n");
@@ -117 +114 @@
         }
         
-        if(i >= count) {
+        if (i >= count) {
                 printf("Invalid wifi index.\n");
                 free(wifis);
                 return NULL;
         }
-
-        async_sess_t *sess = 
-                loc_service_connect(EXCHANGE_SERIALIZE, wifis[i], 0);
+        
+        async_sess_t *sess =
+            loc_service_connect(EXCHANGE_SERIALIZE, wifis[i], 0);
         if (sess == NULL) {
                 printf("Error connecting to service.\n");
@@ -130 +127 @@
                 return NULL;
         }
-
+        
         return sess;
 }
@@ -138 +135 @@
         service_id_t *wifis = NULL;
         size_t count;
-        char *svc_name;
-        int rc;
-
-        rc = get_wifi_list(&wifis, &count);
+        
+        int rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
                 printf("Error fetching wifi list.\n");
                 return EINVAL;
         }
-
+        
         printf("[Index]: [Service Name]\n");
         for (size_t i = 0; i < count; i++) {
+                char *svc_name;
                 rc = loc_service_get_name(wifis[i], &svc_name);
                 if (rc != EOK) {
@@ -157 +153 @@
                 
                 printf("%zu: %s\n", i, svc_name);
-
+                
                 free(svc_name);
         }
-
+        
         return EOK;
 }
@@ -171 +167 @@
         if (sess == NULL) {
                 printf("Specified WIFI doesn't exist or cannot connect to "
-                        "it.\n");
+                    "it.\n");
                 return EINVAL;
         }
@@ -177 +173 @@
         int rc = ieee80211_disconnect(sess);
         if(rc != EOK) {
-                if(rc == EREFUSED) {
-                        printf("Device is not ready yet.\n");                   
-                } else {
+                if (rc == EREFUSED)
+                        printf("Device is not ready yet.\n");
+                else
                         printf("Error when disconnecting device. "
-                                "Error: %d\n", rc);
-                }
+                            "Error: %d\n", rc);
                 
                 return rc;
@@ -189 +184 @@
         rc = ieee80211_connect(sess, ssid_start, password);
         if(rc != EOK) {
-                if(rc == EREFUSED) {
-                        printf("Device is not ready yet.\n");                   
-                } else if(rc == ETIMEOUT) {
+                if (rc == EREFUSED)
+                        printf("Device is not ready yet.\n");
+                else if (rc == ETIMEOUT)
                         printf("Timeout when authenticating to network.\n");
-                } else if(rc == ENOENT) {
+                else if (rc == ENOENT)
                         printf("Given SSID not in scan results.\n");
-                } else {
+                else
                         printf("Error when connecting to network. "
-                                "Error: %d\n", rc);
-                }
-                
-                return rc;
-        }
-        
-        // TODO: Wait for DHCP address ?
+                            "Error: %d\n", rc);
+                
+                return rc;
+        }
+        
+        // TODO: Wait for DHCP address?
         
         printf("Successfully connected to network!\n");
@@ -215 +209 @@
         if (sess == NULL) {
                 printf("Specified WIFI doesn't exist or cannot connect to "
-                        "it.\n");
+                    "it.\n");
                 return EINVAL;
         }
         
         int rc = ieee80211_disconnect(sess);
-        if(rc != EOK) {
-                if(rc == EREFUSED) {
+        if (rc != EOK) {
+                if (rc == EREFUSED)
                         printf("Device is not ready yet.\n");
-                } else if(rc == EINVAL) {
+                else if (rc == EINVAL)
                         printf("Not connected to any WiFi network.\n");
-                } else {
+                else
                         printf("Error when disconnecting from network. "
-                                "Error: %d\n", rc);
-                }
+                            "Error: %d\n", rc);
+                
                 return rc;
         }
@@ -239 +233 @@
 static int wifi_scan(uint32_t index, bool now)
 {
-        ieee80211_scan_results_t scan_results;
-        
         async_sess_t *sess = get_wifi_by_index(index);
         if (sess == NULL) {
                 printf("Specified WIFI doesn't exist or cannot connect to "
-                        "it.\n");
+                    "it.\n");
                 return EINVAL;
         }
         
+        ieee80211_scan_results_t scan_results;
         int rc = ieee80211_get_scan_results(sess, &scan_results, now);
-        if(rc != EOK) {
-                if(rc == EREFUSED) {
+        if (rc != EOK) {
+                if (rc == EREFUSED)
                         printf("Device is not ready yet.\n");
-                } else {
+                else
                         printf("Failed to fetch scan results. Error: %d\n", rc);
-                }
-                
-                return rc;
-        }
-        
-        if(scan_results.length == 0)
+                
+                return rc;
+        }
+        
+        if (scan_results.length == 0)
                 return EOK;
         
-        printf("%16.16s %17s %4s %5s %5s %7s %7s\n", 
-                "SSID", "MAC", "CHAN", "TYPE", "AUTH", "UNI-ALG", "GRP-ALG");
-        
-        for(int i = 0; i < scan_results.length; i++) {
+        printf("%16.16s %17s %4s %5s %5s %7s %7s\n",
+            "SSID", "MAC", "CHAN", "TYPE", "AUTH", "UNI-ALG", "GRP-ALG");
+        
+        for (uint8_t i = 0; i < scan_results.length; i++) {
                 ieee80211_scan_result_t result = scan_results.results[i];
                 
-                printf("%16.16s %17s %4d %5s %5s %7s %7s\n", 
-                        result.ssid, 
-                        nic_addr_format(&result.bssid),
-                        result.channel,
-                        enum_name(ieee80211_security_type_strs,
-                                result.security.type),
-                        enum_name(ieee80211_security_auth_strs,
-                                result.security.auth),
-                        enum_name(ieee80211_security_alg_strs,
-                                result.security.pair_alg),
-                        enum_name(ieee80211_security_alg_strs,
-                                result.security.group_alg)
-                );
+                printf("%16.16s %17s %4d %5s %5s %7s %7s\n",
+                    result.ssid, nic_addr_format(&result.bssid),
+                    result.channel,
+                    enum_name(ieee80211_security_type_strs, result.security.type),
+                    enum_name(ieee80211_security_auth_strs, result.security.auth),
+                    enum_name(ieee80211_security_alg_strs, result.security.pair_alg),
+                    enum_name(ieee80211_security_alg_strs, result.security.group_alg));
         }
         
@@ -288 +274 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-        uint32_t index;
-        
-        rc = inetcfg_init();
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to inetcfg service (%d).\n",
-                    rc);
+        int rc = inetcfg_init();
+        if (rc != EOK) {
+                printf("%s: Failed connecting to inetcfg service (%d).\n",
+                    NAME, rc);
                 return 1;
         }
@@ -300 +283 @@
         rc = dhcp_init();
         if (rc != EOK) {
-                printf(NAME ": Failed connecting to dhcp service (%d).\n", rc);
+                printf("%s: Failed connecting to dhcp service (%d).\n",
+                    NAME, rc);
                 return 1;
         }
         
-        if(argc == 2) {
-                if(!str_cmp(argv[1], "list")) {
+        if (argc == 2) {
+                if (!str_cmp(argv[1], "list"))
                         return wifi_list();
-                }
-        } else if(argc > 2) {
+        } else if (argc > 2) {
+                uint32_t index;
                 rc = str_uint32_t(argv[2], NULL, 10, false, &index);
-                if(rc != EOK) {
-                        printf(NAME ": Invalid argument.\n");
+                if (rc != EOK) {
+                        printf("%s: Invalid argument.\n", NAME);
                         print_syntax();
                         return EINVAL;
                 }
-                if(!str_cmp(argv[1], "scan")) {
+                
+                if (!str_cmp(argv[1], "scan")) {
                         bool now = false;
-                        if(argc > 3)
-                                if(!str_cmp(argv[3], "-n"))
+                        if (argc > 3)
+                                if (!str_cmp(argv[3], "-n"))
                                         now = true;
+                        
                         return wifi_scan(index, now);
-                } else if(!str_cmp(argv[1], "connect")) {
+                } else if (!str_cmp(argv[1], "connect")) {
                         char *pass = NULL;
-                        if(argc > 3) {
-                                if(argc > 4)
+                        if (argc > 3) {
+                                if (argc > 4)
                                         pass = argv[4];
+                                
                                 return wifi_connect(index, argv[3], pass);
-                        } 
-                } else if(!str_cmp(argv[1], "disconnect")) {
+                        }
+                } else if (!str_cmp(argv[1], "disconnect"))
                         return wifi_disconnect(index);
-                }
         }
         

uspace/drv/nic/ar9271/Makefile

@@ -36 +36 @@
         $(LIBIEEE80211_PREFIX)/libieee80211.a \
         $(LIBCRYPTO_PREFIX)/libcrypto.a
-        
+
 EXTRA_CFLAGS += \
         -I. \
@@ -45 +45 @@
         -I$(LIBIEEE80211_PREFIX)/include \
         -I$(LIBCRYPTO_PREFIX)
-        
+
 BINARY = ar9271
 

uspace/drv/nic/ar9271/ar9271.c

@@ -42 +42 @@
 #include <nic.h>
 #include <macros.h>
-
 #include "ath_usb.h"
 #include "wmi.h"
@@ -48 +47 @@
 #include "ar9271.h"
 
-#define NAME "ar9271"
-#define FIRMWARE_FILENAME "/drv/ar9271/ar9271.fw"
+#define NAME  "ar9271"
+#define FIRMWARE_FILENAME  "/drv/ar9271/ar9271.fw"
 
 const usb_endpoint_description_t usb_ar9271_out_bulk_endpoint_description = {
@@ -91 +90 @@
         &usb_ar9271_out_bulk_endpoint_description,
         &usb_ar9271_in_bulk_endpoint_description,
-        &usb_ar9271_in_int_endpoint_description,
-        &usb_ar9271_out_int_endpoint_description,
+        &usb_ar9271_in_int_endpoint_description,
+        &usb_ar9271_out_int_endpoint_description,
         NULL
 };
@@ -100 +99 @@
 
 /* IEEE 802.11 callbacks */
-static int ar9271_ieee80211_start(ieee80211_dev_t *ieee80211_dev);
-static int ar9271_ieee80211_tx_handler(ieee80211_dev_t *ieee80211_dev,
-        void *buffer, size_t buffer_size);
-static int ar9271_ieee80211_set_freq(ieee80211_dev_t *ieee80211_dev,
-        uint16_t freq);
-static int ar9271_ieee80211_bssid_change(ieee80211_dev_t *ieee80211_dev,
-        bool connected);
-static int ar9271_ieee80211_key_config(ieee80211_dev_t *ieee80211_dev,
-        ieee80211_key_config_t *key_conf, bool insert);
+static int ar9271_ieee80211_start(ieee80211_dev_t *);
+static int ar9271_ieee80211_tx_handler(ieee80211_dev_t *, void *, size_t);
+static int ar9271_ieee80211_set_freq(ieee80211_dev_t *, uint16_t);
+static int ar9271_ieee80211_bssid_change(ieee80211_dev_t *, bool);
+static int ar9271_ieee80211_key_config(ieee80211_dev_t *, ieee80211_key_config_t *,
+    bool);
 
 static driver_ops_t ar9271_driver_ops = {
@@ -129 +125 @@
 static ieee80211_iface_t ar9271_ieee80211_iface;
 
-static int ar9271_get_device_info(ddf_fun_t *dev, nic_device_info_t *info);
+static int ar9271_get_device_info(ddf_fun_t *, nic_device_info_t *);
 static int ar9271_get_cable_state(ddf_fun_t *, nic_cable_state_t *);
-static int ar9271_get_operation_mode(ddf_fun_t *, int *, 
-        nic_channel_mode_t *, nic_role_t *);
+static int ar9271_get_operation_mode(ddf_fun_t *, int *, nic_channel_mode_t *,
+    nic_role_t *);
 
 static nic_iface_t ar9271_ieee80211_nic_iface = {
@@ -142 +138 @@
 static ddf_dev_ops_t ar9271_ieee80211_dev_ops;
 
-/** 
- * Get device information.
+/** Get device information.
  *
  */
@@ -153 +148 @@
         memset(info, 0, sizeof(nic_device_info_t));
         
-        info->vendor_id = 0x0CF3;
+        info->vendor_id = 0x0cf3;
         info->device_id = 0x9271;
         str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH,
@@ -163 +158 @@
 }
 
-/** 
- * Get cable state.
+/** Get cable state.
  *
  */
@@ -174 +168 @@
 }
 
-/** 
- * Get operation mode of the device.
+/** Get operation mode of the device.
  *
  */
@@ -188 +181 @@
 }
 
-/** 
- * Set multicast frames acceptance mode.
- *
- */
-static int ar9271_on_multicast_mode_change(nic_t *nic, 
-        nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt)
-{
-        /*
-        ieee80211_dev_t *ieee80211_dev = (ieee80211_dev_t *) 
-                nic_get_specific(nic);
-        ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev);
-         */
-        
+/** Set multicast frames acceptance mode.
+ *
+ */
+static int ar9271_on_multicast_mode_change(nic_t *nic,
+    nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt)
+{
         switch (mode) {
-                case NIC_MULTICAST_BLOCKED:
-                        /* TODO */
-                        break;
-                case NIC_MULTICAST_LIST:
-                        /* TODO */
-                        break;
-                case NIC_MULTICAST_PROMISC:
-                        /* TODO */
-                        break;
-                default:
-                        return ENOTSUP;
-        }
-        
-        return EOK;
-}
-
-/** 
- * Set unicast frames acceptance mode.
+        case NIC_MULTICAST_BLOCKED:
+                /* TODO */
+                break;
+        case NIC_MULTICAST_LIST:
+                /* TODO */
+                break;
+        case NIC_MULTICAST_PROMISC:
+                /* TODO */
+                break;
+        default:
+                return ENOTSUP;
+        }
+        
+        return EOK;
+}
+
+/** Set unicast frames acceptance mode.
  *
  */
@@ -225 +210 @@
     const nic_address_t *addr, size_t addr_cnt)
 {
-        /*
-        ieee80211_dev_t *ieee80211_dev = (ieee80211_dev_t *) 
-                nic_get_specific(nic);
-        ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev);
-         */
-        
         switch (mode) {
-                case NIC_UNICAST_BLOCKED:
-                        /* TODO */
-                        break;
-                case NIC_UNICAST_DEFAULT:
-                        /* TODO */
-                        break;
-                case NIC_UNICAST_LIST:
-                        /* TODO */
-                        break;
-                case NIC_UNICAST_PROMISC:
-                        /* TODO */
-                        break;
-                default:
-                        return ENOTSUP;
-        }
-        
-        return EOK;
-}
-
-/** 
- * Set broadcast frames acceptance mode.
- *
- */
-static int ar9271_on_broadcast_mode_change(nic_t *nic, 
-        nic_broadcast_mode_t mode)
-{
-        /*
-        ieee80211_dev_t *ieee80211_dev = (ieee80211_dev_t *) 
-                nic_get_specific(nic);
-        ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev);
-         */
-        
+        case NIC_UNICAST_BLOCKED:
+                /* TODO */
+                break;
+        case NIC_UNICAST_DEFAULT:
+                /* TODO */
+                break;
+        case NIC_UNICAST_LIST:
+                /* TODO */
+                break;
+        case NIC_UNICAST_PROMISC:
+                /* TODO */
+                break;
+        default:
+                return ENOTSUP;
+        }
+        
+        return EOK;
+}
+
+/** Set broadcast frames acceptance mode.
+ *
+ */
+static int ar9271_on_broadcast_mode_change(nic_t *nic,
+    nic_broadcast_mode_t mode)
+{
         switch (mode) {
-                case NIC_BROADCAST_BLOCKED:
-                        /* TODO */
-                        break;
-                case NIC_BROADCAST_ACCEPTED:
-                        /* TODO */
-                        break;
-                default:
-                        return ENOTSUP;
+        case NIC_BROADCAST_BLOCKED:
+                /* TODO */
+                break;
+        case NIC_BROADCAST_ACCEPTED:
+                /* TODO */
+                break;
+        default:
+                return ENOTSUP;
         }
         
@@ -292 +264 @@
         void *buffer = malloc(buffer_size);
         
-        while(true) {
+        while (true) {
                 size_t transferred_size;
-                if(htc_read_data_message(ar9271->htc_device, 
-                        buffer, buffer_size, &transferred_size) == EOK) {
-                        size_t strip_length = 
-                                sizeof(ath_usb_data_header_t) +
-                                sizeof(htc_frame_header_t) + 
-                                sizeof(htc_rx_status_t);
-                        
-                        if(transferred_size < strip_length)
+                if (htc_read_data_message(ar9271->htc_device,
+                    buffer, buffer_size, &transferred_size) == EOK) {
+                        size_t strip_length =
+                            sizeof(ath_usb_data_header_t) +
+                            sizeof(htc_frame_header_t) +
+                            sizeof(htc_rx_status_t);
+                        
+                        if (transferred_size < strip_length)
                                 continue;
-
-                        ath_usb_data_header_t *data_header = 
-                                (ath_usb_data_header_t *) buffer;
-
+                        
+                        ath_usb_data_header_t *data_header =
+                            (ath_usb_data_header_t *) buffer;
+                        
                         /* Invalid packet. */
-                        if(data_header->tag != uint16_t_le2host(RX_TAG))
+                        if (data_header->tag != uint16_t_le2host(RX_TAG))
                                 continue;
                         
                         htc_rx_status_t *rx_status =
-                                (htc_rx_status_t *) ((void *) buffer +
-                                sizeof(ath_usb_data_header_t) +
-                                sizeof(htc_frame_header_t));
+                            (htc_rx_status_t *) ((void *) buffer +
+                            sizeof(ath_usb_data_header_t) +
+                            sizeof(htc_frame_header_t));
                         
                         uint16_t data_length =
-                                uint16_t_be2host(rx_status->data_length);
-                        
-                        int16_t payload_length = 
-                                transferred_size - strip_length;
-                        
-                        if(payload_length - data_length < 0)
+                            uint16_t_be2host(rx_status->data_length);
+                        
+                        int16_t payload_length =
+                            transferred_size - strip_length;
+                        
+                        if (payload_length - data_length < 0)
                                 continue;
                         
-                        if(ar9271_rx_status_error(rx_status->status))
+                        if (ar9271_rx_status_error(rx_status->status))
                                 continue;
                         
                         void *strip_buffer = buffer + strip_length;
-
+                        
                         ieee80211_rx_handler(ar9271->ieee80211_dev,
-                                strip_buffer,
-                                payload_length);
+                            strip_buffer,
+                            payload_length);
                 }
         }
@@ -341 +313 @@
 }
 
-/** 
- * IEEE 802.11 handlers. 
- */
-
+/** IEEE 802.11 handlers.
+ *
+ */
 static int ar9271_ieee80211_set_freq(ieee80211_dev_t *ieee80211_dev,
-        uint16_t freq)
+    uint16_t freq)
 {
         assert(ieee80211_dev);
@@ -357 +328 @@
         
         int rc = hw_freq_switch(ar9271, freq);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW switch frequency.\n");
                 return rc;
@@ -365 +336 @@
         
         rc = hw_rx_init(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to initialize RX.\n");
                 return rc;
@@ -371 +342 @@
         
         uint16_t htc_mode = host2uint16_t_be(1);
-        wmi_send_command(ar9271->htc_device, WMI_SET_MODE, 
-                (uint8_t *) &htc_mode, sizeof(htc_mode), NULL);
+        wmi_send_command(ar9271->htc_device, WMI_SET_MODE,
+            (uint8_t *) &htc_mode, sizeof(htc_mode), NULL);
         wmi_send_command(ar9271->htc_device, WMI_ENABLE_INTR, NULL, 0, NULL);
         
@@ -379 +350 @@
 
 static int ar9271_ieee80211_bssid_change(ieee80211_dev_t *ieee80211_dev,
-        bool connected)
+    bool connected)
 {
         assert(ieee80211_dev);
         
         ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev);
-
-        if(connected) {
+        
+        if (connected) {
                 nic_address_t bssid;
                 ieee80211_query_bssid(ieee80211_dev, &bssid);
-
+                
                 htc_sta_msg_t sta_msg;
                 memset(&sta_msg, 0, sizeof(htc_sta_msg_t));
                 sta_msg.is_vif_sta = 0;
-                sta_msg.max_ampdu = 
-                        host2uint16_t_be(1 << IEEE80211_MAX_AMPDU_FACTOR);
+                sta_msg.max_ampdu =
+                    host2uint16_t_be(1 << IEEE80211_MAX_AMPDU_FACTOR);
                 sta_msg.sta_index = 1;
                 sta_msg.vif_index = 0;
                 memcpy(&sta_msg.addr, bssid.address, ETH_ADDR);
-
-                wmi_send_command(ar9271->htc_device, WMI_NODE_CREATE, 
-                        (uint8_t *) &sta_msg, sizeof(sta_msg), NULL);
-
+                
+                wmi_send_command(ar9271->htc_device, WMI_NODE_CREATE,
+                    (uint8_t *) &sta_msg, sizeof(sta_msg), NULL);
+                
                 htc_rate_msg_t rate_msg;
                 memset(&rate_msg, 0, sizeof(htc_rate_msg_t));
                 rate_msg.sta_index = 1;
                 rate_msg.is_new = 1;
-                rate_msg.legacy_rates_count = 
-                        ARRAY_SIZE(ieee80211bg_data_rates);
-                memcpy(&rate_msg.legacy_rates, 
-                        ieee80211bg_data_rates, 
-                        ARRAY_SIZE(ieee80211bg_data_rates));
-
-                wmi_send_command(ar9271->htc_device, WMI_RC_RATE_UPDATE, 
-                        (uint8_t *) &rate_msg, sizeof(rate_msg), NULL);
-
+                rate_msg.legacy_rates_count = ARRAY_SIZE(ieee80211bg_data_rates);
+                memcpy(&rate_msg.legacy_rates,
+                    ieee80211bg_data_rates, 
+                    ARRAY_SIZE(ieee80211bg_data_rates));
+                
+                wmi_send_command(ar9271->htc_device, WMI_RC_RATE_UPDATE,
+                    (uint8_t *) &rate_msg, sizeof(rate_msg), NULL);
+                
                 hw_set_rx_filter(ar9271, true);
         } else {
                 uint8_t station_id = 1;
                 wmi_send_command(ar9271->htc_device, WMI_NODE_REMOVE,
-                        &station_id, sizeof(station_id), NULL);
+                    &station_id, sizeof(station_id), NULL);
                 
                 hw_set_rx_filter(ar9271, false);
@@ -429 +399 @@
 
 static int ar9271_ieee80211_key_config(ieee80211_dev_t *ieee80211_dev,
-        ieee80211_key_config_t *key_conf, bool insert)
+    ieee80211_key_config_t *key_conf, bool insert)
 {
         assert(ieee80211_dev);
@@ -446 +416 @@
                 ieee80211_query_bssid(ieee80211_dev, &bssid);
                 
-                switch(key_conf->suite) {
-                        case IEEE80211_SECURITY_SUITE_WEP40:
-                                key_type = AR9271_KEY_TABLE_TYPE_WEP40;
-                                break;
-                        case IEEE80211_SECURITY_SUITE_WEP104:
-                                key_type = AR9271_KEY_TABLE_TYPE_WEP104;
-                                break;
-                        case IEEE80211_SECURITY_SUITE_TKIP:
-                                key_type = AR9271_KEY_TABLE_TYPE_TKIP;
-                                break;
-                        case IEEE80211_SECURITY_SUITE_CCMP:
-                                key_type = AR9271_KEY_TABLE_TYPE_CCMP;
-                                break;
-                        default:
-                                key_type = -1;
+                switch (key_conf->suite) {
+                case IEEE80211_SECURITY_SUITE_WEP40:
+                        key_type = AR9271_KEY_TABLE_TYPE_WEP40;
+                        break;
+                case IEEE80211_SECURITY_SUITE_WEP104:
+                        key_type = AR9271_KEY_TABLE_TYPE_WEP104;
+                        break;
+                case IEEE80211_SECURITY_SUITE_TKIP:
+                        key_type = AR9271_KEY_TABLE_TYPE_TKIP;
+                        break;
+                case IEEE80211_SECURITY_SUITE_CCMP:
+                        key_type = AR9271_KEY_TABLE_TYPE_CCMP;
+                        break;
+                default:
+                        key_type = -1;
                 }
                 
-                uint8_t key_id = 
-                        (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) ?
-                                AR9271_STA_KEY_INDEX : key_conf->id;
+                uint8_t key_id =
+                    (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) ?
+                    AR9271_STA_KEY_INDEX : key_conf->id;
                 
                 reg_ptr = AR9271_KEY_TABLE(key_id);
@@ -471 +441 @@
                 data_start = (void *) key_conf->data;
                 
-                key[0] = uint32_t_le2host(
-                        *((uint32_t *) data_start));
-                key[1] = uint16_t_le2host(
-                        *((uint16_t *) (data_start + 4)));
-                key[2] = uint32_t_le2host(
-                        *((uint32_t *) (data_start + 6)));
-                key[3] = uint16_t_le2host(
-                        *((uint16_t *) (data_start + 10)));
-                key[4] = uint32_t_le2host(
-                        *((uint32_t *) (data_start + 12)));
-
-                if(key_conf->suite == IEEE80211_SECURITY_SUITE_WEP40 ||
-                   key_conf->suite == IEEE80211_SECURITY_SUITE_WEP104) {
+                key[0] = uint32_t_le2host(*((uint32_t *) data_start));
+                key[1] = uint16_t_le2host(*((uint16_t *) (data_start + 4)));
+                key[2] = uint32_t_le2host(*((uint32_t *) (data_start + 6)));
+                key[3] = uint16_t_le2host(*((uint16_t *) (data_start + 10)));
+                key[4] = uint32_t_le2host(*((uint32_t *) (data_start + 12)));
+                
+                if ((key_conf->suite == IEEE80211_SECURITY_SUITE_WEP40) ||
+                    (key_conf->suite == IEEE80211_SECURITY_SUITE_WEP104))
                         key[4] &= 0xFF;
-                }
                 
                 wmi_reg_write(ar9271->htc_device, reg_ptr + 0, key[0]);
@@ -494 +458 @@
                 wmi_reg_write(ar9271->htc_device, reg_ptr + 20, key_type);
                 
-                uint32_t macL, macH;
-                if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) {
+                uint32_t macl;
+                uint32_t mach;
+                if (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) {
                         data_start = (void *) bssid.address;
-                        macL = uint32_t_le2host(*((uint32_t *) data_start));
-                        macH = uint16_t_le2host(*((uint16_t *) 
-                                (data_start + 4)));
+                        macl = uint32_t_le2host(*((uint32_t *) data_start));
+                        mach = uint16_t_le2host(*((uint16_t *) (data_start + 4)));
                 } else {
-                        macL = macH = 0;
+                        macl = 0;
+                        mach = 0;
                 }
                 
-                macL >>= 1;
-                macL |= (macH & 1) << 31;
-                macH >>= 1;
-                macH |= 0x8000;
-                
-                wmi_reg_write(ar9271->htc_device, reg_ptr + 24, macL);
-                wmi_reg_write(ar9271->htc_device, reg_ptr + 28, macH);
+                macl >>= 1;
+                macl |= (mach & 1) << 31;
+                mach >>= 1;
+                mach |= 0x8000;
+                
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 24, macl);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 28, mach);
                 
                 /* Setup MIC keys for TKIP. */
-                if(key_conf->suite == IEEE80211_SECURITY_SUITE_TKIP) {
+                if (key_conf->suite == IEEE80211_SECURITY_SUITE_TKIP) {
                         uint32_t mic[5];
-                        uint8_t *gen_mic = 
-                                data_start + IEEE80211_TKIP_RX_MIC_OFFSET;
+                        uint8_t *gen_mic = data_start + IEEE80211_TKIP_RX_MIC_OFFSET;
                         uint8_t *tx_mic;
-                        if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP) {
+                        
+                        if (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP)
                                 tx_mic = gen_mic;
-                        } else {
-                                tx_mic = data_start + 
-                                        IEEE80211_TKIP_TX_MIC_OFFSET;
-                        }
-                        
-                        mic[0] = uint32_t_le2host(
-                                *((uint32_t *) gen_mic));
-                        mic[1] = uint16_t_le2host(
-                                *((uint16_t *) (tx_mic + 2))) & 0xFFFF;
-                        mic[2] = uint32_t_le2host(
-                                *((uint32_t *) (gen_mic + 4)));
-                        mic[3] = uint16_t_le2host(
-                                *((uint16_t *) tx_mic)) & 0xFFFF;
-                        mic[4] = uint32_t_le2host(
-                                *((uint32_t *) (tx_mic + 4)));
-                        
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 0, 
-                                mic[0]);
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 4, 
-                                mic[1]);
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 8, 
-                                mic[2]);
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 12, 
-                                mic[3]);
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 16, 
-                                mic[4]);
-                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 20, 
-                                AR9271_KEY_TABLE_TYPE_CLR);
+                        else
+                                tx_mic = data_start + IEEE80211_TKIP_TX_MIC_OFFSET;
+                        
+                        mic[0] = uint32_t_le2host(*((uint32_t *) gen_mic));
+                        mic[1] = uint16_t_le2host(*((uint16_t *) (tx_mic + 2))) & 0xFFFF;
+                        mic[2] = uint32_t_le2host(*((uint32_t *) (gen_mic + 4)));
+                        mic[3] = uint16_t_le2host(*((uint16_t *) tx_mic)) & 0xFFFF;
+                        mic[4] = uint32_t_le2host(*((uint32_t *) (tx_mic + 4)));
+                        
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 0, mic[0]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 4, mic[1]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 8, mic[2]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 12, mic[3]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 16, mic[4]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 20,
+                            AR9271_KEY_TABLE_TYPE_CLR);
                         
                         wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 24, 0);
@@ -553 +506 @@
                 }
                 
-                if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP)
+                if (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP)
                         ieee80211_setup_key_confirm(ieee80211_dev, true);
         } else {
@@ -564 +517 @@
 
 static int ar9271_ieee80211_tx_handler(ieee80211_dev_t *ieee80211_dev,
-        void *buffer, size_t buffer_size)
+    void *buffer, size_t buffer_size)
 {
         assert(ieee80211_dev);
         
-        size_t complete_size, offset;
+        size_t complete_size;
+        size_t offset;
         void *complete_buffer;
         int endpoint;
@@ -575 +529 @@
         
         uint16_t frame_ctrl = *((uint16_t *) buffer);
-        if(ieee80211_is_data_frame(frame_ctrl)) {
+        if (ieee80211_is_data_frame(frame_ctrl)) {
                 offset = sizeof(htc_tx_data_header_t) +
-                        sizeof(htc_frame_header_t);
+                    sizeof(htc_frame_header_t);
                 complete_size = buffer_size + offset;
                 complete_buffer = malloc(complete_size);
                 memset(complete_buffer, 0, complete_size);
                 
-                /* 
+                /*
                  * Because we handle just station mode yet, node ID and VIF ID
                  * are fixed.
                  */
                 htc_tx_data_header_t *data_header =
-                        (htc_tx_data_header_t *) 
-                        (complete_buffer + sizeof(htc_frame_header_t));
+                    (htc_tx_data_header_t *)
+                    (complete_buffer + sizeof(htc_frame_header_t));
                 data_header->data_type = HTC_DATA_NORMAL;
                 data_header->node_idx = 1;
@@ -594 +548 @@
                 data_header->cookie = 0;
                 
-                if(ieee80211_query_using_key(ieee80211_dev)) {
+                if (ieee80211_query_using_key(ieee80211_dev)) {
                         data_header->keyix = AR9271_STA_KEY_INDEX;
-                        int sec_suite = 
-                                ieee80211_get_pairwise_security(ieee80211_dev);
-                        switch(sec_suite) {
-                                case IEEE80211_SECURITY_SUITE_WEP40:
-                                case IEEE80211_SECURITY_SUITE_WEP104:
-                                        data_header->key_type =
-                                                AR9271_KEY_TYPE_WEP;
-                                        break;
-                                case IEEE80211_SECURITY_SUITE_TKIP:
-                                        data_header->key_type =
-                                                AR9271_KEY_TYPE_TKIP;
-                                        break;
-                                case IEEE80211_SECURITY_SUITE_CCMP:
-                                        data_header->key_type =
-                                                AR9271_KEY_TYPE_AES;
-                                        break;
+                        
+                        int sec_suite =
+                            ieee80211_get_pairwise_security(ieee80211_dev);
+                        
+                        switch (sec_suite) {
+                        case IEEE80211_SECURITY_SUITE_WEP40:
+                        case IEEE80211_SECURITY_SUITE_WEP104:
+                                data_header->key_type = AR9271_KEY_TYPE_WEP;
+                                break;
+                        case IEEE80211_SECURITY_SUITE_TKIP:
+                                data_header->key_type = AR9271_KEY_TYPE_TKIP;
+                                break;
+                        case IEEE80211_SECURITY_SUITE_CCMP:
+                                data_header->key_type = AR9271_KEY_TYPE_AES;
+                                break;
                         }
                 } else {
@@ -621 +574 @@
         } else {
                 offset = sizeof(htc_tx_management_header_t) +
-                        sizeof(htc_frame_header_t);
+                    sizeof(htc_frame_header_t);
                 complete_size = buffer_size + offset;
                 complete_buffer = malloc(complete_size);
                 memset(complete_buffer, 0, complete_size);
                 
-                /* 
+                /*
                  * Because we handle just station mode yet, node ID and VIF ID
                  * are fixed.
                  */
                 htc_tx_management_header_t *mgmt_header =
-                        (htc_tx_management_header_t *) 
-                        (complete_buffer + sizeof(htc_frame_header_t));
+                    (htc_tx_management_header_t *)
+                    (complete_buffer + sizeof(htc_frame_header_t));
                 mgmt_header->node_idx = 0;
                 mgmt_header->vif_idx = 0;
@@ -645 +598 @@
         
         htc_send_data_message(ar9271->htc_device, complete_buffer,
-                complete_size, endpoint);
+            complete_size, endpoint);
         
         free(complete_buffer);
@@ -661 +614 @@
         
         int rc = hw_reset(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to do HW reset.\n");
                 return rc;
@@ -667 +620 @@
         
         uint16_t htc_mode = host2uint16_t_be(1);
-        wmi_send_command(ar9271->htc_device, WMI_SET_MODE, 
-                (uint8_t *) &htc_mode, sizeof(htc_mode), NULL);
+        wmi_send_command(ar9271->htc_device, WMI_SET_MODE,
+            (uint8_t *) &htc_mode, sizeof(htc_mode), NULL);
         wmi_send_command(ar9271->htc_device, WMI_ATH_INIT, NULL, 0, NULL);
         wmi_send_command(ar9271->htc_device, WMI_START_RECV, NULL, 0, NULL);
@@ -674 +627 @@
         
         rc = hw_rx_init(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to initialize RX.\n");
                 return rc;
@@ -681 +634 @@
         /* Send capability message to target. */
         htc_cap_msg_t cap_msg;
-        cap_msg.ampdu_limit = host2uint32_t_be(0xFFFF);
-        cap_msg.ampdu_subframes = 0xFF;
+        cap_msg.ampdu_limit = host2uint32_t_be(0xffff);
+        cap_msg.ampdu_subframes = 0xff;
         cap_msg.enable_coex = 0;
         cap_msg.tx_chainmask = 0x1;
         
         wmi_send_command(ar9271->htc_device, WMI_TARGET_IC_UPDATE,
-                (uint8_t *) &cap_msg, sizeof(cap_msg), NULL);
+            (uint8_t *) &cap_msg, sizeof(cap_msg), NULL);
         
         rc = htc_init_new_vif(ar9271->htc_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to initialize new VIF.\n");
                 return rc;
@@ -697 +650 @@
         /* Add data polling fibril. */
         fid_t fibril = fibril_create(ar9271_data_polling, ar9271);
-        if (fibril == 0) {
+        if (fibril == 0)
                 return ENOMEM;
-        }
+        
         fibril_add_ready(fibril);
         
@@ -725 +678 @@
         
         int rc = ath_usb_init(ar9271->ath_device, usb_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 free(ar9271->ath_device);
                 usb_log_error("Failed to initialize ath device.\n");
@@ -741 +694 @@
         
         rc = ieee80211_device_init(ar9271->ieee80211_dev, ar9271->ddf_dev);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 free(ar9271->ieee80211_dev);
                 free(ar9271->ath_device);
                 usb_log_error("Failed to initialize IEEE80211 device structure."
-                        "\n");
+                    "\n");
                 return rc;
         }
         
         ieee80211_set_specific(ar9271->ieee80211_dev, ar9271);
-                
+        
         /* HTC device structure initialization. */
         ar9271->htc_device = calloc(1, sizeof(htc_device_t));
-        if(!ar9271->htc_device) {
+        if (!ar9271->htc_device) {
                 free(ar9271->ieee80211_dev);
                 free(ar9271->ath_device);
@@ -761 +714 @@
         }
         
-        rc = htc_device_init(ar9271->ath_device, ar9271->ieee80211_dev, 
-                ar9271->htc_device);
-        if(rc != EOK) {
+        rc = htc_device_init(ar9271->ath_device, ar9271->ieee80211_dev,
+            ar9271->htc_device);
+        if (rc != EOK) {
                 free(ar9271->htc_device);
                 free(ar9271->ieee80211_dev);
@@ -774 +727 @@
 }
 
-/**
- * Upload firmware to WiFi device.
- * 
+/** Upload firmware to WiFi device.
+ *
  * @param ar9271 AR9271 device structure
- * 
+ *
  * @return EOK if succeed, negative error code otherwise
+ *
  */
 static int ar9271_upload_fw(ar9271_t *ar9271)
 {
-        int rc;
-        
         usb_device_t *usb_device = ar9271->usb_device;
-        
-        /* TODO: Set by maximum packet size in pipe. */
+        
+        /* TODO: Set by maximum packet size in pipe. */
         static const size_t MAX_TRANSFER_SIZE = 512;
         
@@ -802 +753 @@
         
         void *fw_data = malloc(file_size);
-        if(fw_data == NULL) {
+        if (fw_data == NULL) {
                 fclose(fw_file);
                 usb_log_error("Failed allocating memory for firmware.\n");
                 return ENOMEM;
         }
-
+        
         fread(fw_data, file_size, 1, fw_file);
         fclose(fw_file);
@@ -816 +767 @@
         uint8_t *current_data = fw_data;
         uint8_t *buffer = malloc(MAX_TRANSFER_SIZE);
-        while(remain_size > 0) {
+        
+        while (remain_size > 0) {
                 size_t chunk_size = min(remain_size, MAX_TRANSFER_SIZE);
                 memcpy(buffer, current_data, chunk_size);
-                rc = usb_control_request_set(&usb_device->ctrl_pipe,
+                int rc = usb_control_request_set(&usb_device->ctrl_pipe,
                     USB_REQUEST_TYPE_VENDOR,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -825 +777 @@
                     uint16_host2usb(current_addr >> 8),
                     0, buffer, chunk_size);
-                if(rc != EOK) {
+                if (rc != EOK) {
                         free(fw_data);
                         free(buffer);
@@ -841 +793 @@
         free(buffer);
         
-        /* Send command that firmware is successfully uploaded. 
-         * This should initiate creating confirmation message in
-         * device side buffer which we will check in htc_check_ready function.
-         */
-        rc = usb_control_request_set(&usb_device->ctrl_pipe,
+        /*
+         * Send command that firmware is successfully uploaded.
+         * This should initiate creating confirmation message in
+         * device side buffer which we will check in htc_check_ready function.
+        */
+        int rc = usb_control_request_set(&usb_device->ctrl_pipe,
             USB_REQUEST_TYPE_VENDOR,
             USB_REQUEST_RECIPIENT_DEVICE,
@@ -852 +805 @@
             0, NULL, 0);
         
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("IO error when sending fw upload confirmation "
-                        "message.\n");
+                    "message.\n");
                 return rc;
         }
@@ -867 +820 @@
 
 /** Create driver data structure.
- * 
+ *
  *  @param dev The device structure
- * 
+ *
  *  @return Intialized device data structure or NULL if error occured
  */
@@ -883 +836 @@
         const char *err_msg = NULL;
         int rc = usb_device_init(usb_device, dev, endpoints, &err_msg);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 free(usb_device);
                 usb_log_error("Failed to create USB device: %s, "
@@ -902 +855 @@
         
         rc = ar9271_init(ar9271, usb_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 free(ar9271);
                 free(usb_device);
-                usb_log_error("Failed to initialize AR9271 structure: %d\n", 
-                        rc);
+                usb_log_error("Failed to initialize AR9271 structure: %d\n",
+                    rc);
                 return NULL;
         }
@@ -948 +901 @@
         /* Initialize AR9271 HTC services. */
         int rc = htc_init(ar9271->htc_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 ar9271_delete_dev_data(ar9271);
                 usb_log_error("HTC initialization failed.\n");
@@ -956 +909 @@
         /* Initialize AR9271 HW. */
         rc = hw_init(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 ar9271_delete_dev_data(ar9271);
                 usb_log_error("HW initialization failed.\n");
@@ -964 +917 @@
         /* Initialize AR9271 IEEE 802.11 framework. */
         rc = ieee80211_init(ar9271->ieee80211_dev, &ar9271_ieee80211_ops,
-                &ar9271_ieee80211_iface, &ar9271_ieee80211_nic_iface,
-                &ar9271_ieee80211_dev_ops);
-        if(rc != EOK) {
+            &ar9271_ieee80211_iface, &ar9271_ieee80211_nic_iface,
+            &ar9271_ieee80211_dev_ops);
+        if (rc != EOK) {
                 ar9271_delete_dev_data(ar9271);
                 usb_log_error("Failed to initialize IEEE80211 framework.\n");
@@ -973 +926 @@
         
         nic_set_filtering_change_handlers(nic_get_from_ddf_dev(dev),
-                ar9271_on_unicast_mode_change, ar9271_on_multicast_mode_change,
-                ar9271_on_broadcast_mode_change, NULL, NULL);
+            ar9271_on_unicast_mode_change, ar9271_on_multicast_mode_change,
+            ar9271_on_broadcast_mode_change, NULL, NULL);
         
         usb_log_info("HelenOS AR9271 added device.\n");
@@ -989 +942 @@
         
         usb_log_info("HelenOS AR9271 driver started.\n");
-
+        
         return ddf_driver_main(&ar9271_driver);
 }

uspace/drv/nic/ar9271/ar9271.h

@@ -37 +37 @@
 
 #include <usb/dev/driver.h>
-
 #include "htc.h"
 
 /** Number of transmission queues */
-#define AR9271_QUEUES_COUNT 10
+#define AR9271_QUEUES_COUNT  10
 
 /** Number of GPIO pin used for handling led light */
-#define AR9271_LED_PIN 15
+#define AR9271_LED_PIN  15
 
 /** Nominal value for AR9271 noise floor calibration. */
-#define AR9271_CALIB_NOMINAL_VALUE_2GHZ -118
+#define AR9271_CALIB_NOMINAL_VALUE_2GHZ  -118
 
 /** RX errors values. */
-#define AR9271_RX_ERROR_CRC 0x01
-#define AR9271_RX_ERROR_PHY 0x02
+#define AR9271_RX_ERROR_CRC  0x01
+#define AR9271_RX_ERROR_PHY  0x02
 
 /** Key index used for device in station mode. */
-#define AR9271_STA_KEY_INDEX 4
+#define AR9271_STA_KEY_INDEX  4
 
 /* HW encryption key indicator. */
@@ -83 +82 @@
         AR9271_RC = 0x4000,
         AR9271_RC_AHB = 0x00000001,
-                
+        
         /* GPIO registers */
-        AR9271_GPIO_IN_OUT = 0x4048,            /**< GPIO value read/set  */
-        AR9271_GPIO_OE_OUT = 0x404C,            /**< GPIO set to output  */
-        AR9271_GPIO_OE_OUT_ALWAYS = 0x3,        /**< GPIO always drive output */
+        AR9271_GPIO_IN_OUT = 0x4048,       /**< GPIO value read/set  */
+        AR9271_GPIO_OE_OUT = 0x404C,       /**< GPIO set to output  */
+        AR9271_GPIO_OE_OUT_ALWAYS = 0x3,   /**< GPIO always drive output */
         AR9271_GPIO_OUT_MUX1 = 0x4060,
         AR9271_GPIO_OUT_MUX2 = 0x4064,
         AR9271_GPIO_OUT_MUX3 = 0x4068,
-        AR9271_GPIO_OUT_MUX_AS_OUT = 0x0,       /**< GPIO set mux as output */
-    
+        AR9271_GPIO_OUT_MUX_AS_OUT = 0x0,  /**< GPIO set mux as output */
+        
         /* RTC related registers */
         AR9271_RTC_RC = 0x7000,
@@ -109 +108 @@
         AR9271_RTC_FORCE_WAKE_ENABLE = 0x00000001,
         AR9271_RTC_FORCE_WAKE_ON_INT = 0x00000002,
-                
+        
         /* MAC Registers */
-        AR9271_STATION_ID0 = 0x8000,    /**< STA Address Lower 32 Bits */
-        AR9271_STATION_ID1 = 0x8004,    /**< STA Address Upper 16 Bits */
-        AR9271_BSSID0 = 0x8008,         /**< BSSID Lower 32 Bits */
-        AR9271_BSSID1 = 0x800C,         /**< BSSID Upper 16 Bits */
-        AR9271_BSSID_MASK0 = 0x80E0,    /**< BSSID Mask Lower 32 Bits */
-        AR9271_BSSID_MASK1 = 0x80E4,    /**< BSSID Mask Upper 16 Bits */
+        AR9271_STATION_ID0 = 0x8000,  /**< STA Address Lower 32 Bits */
+        AR9271_STATION_ID1 = 0x8004,  /**< STA Address Upper 16 Bits */
+        AR9271_BSSID0 = 0x8008,       /**< BSSID Lower 32 Bits */
+        AR9271_BSSID1 = 0x800C,       /**< BSSID Upper 16 Bits */
+        AR9271_BSSID_MASK0 = 0x80E0,  /**< BSSID Mask Lower 32 Bits */
+        AR9271_BSSID_MASK1 = 0x80E4,  /**< BSSID Mask Upper 16 Bits */
         AR9271_STATION_ID1_MASK = 0x0000FFFF,
         AR9271_STATION_ID1_POWER_SAVING = 0x00040000,
         AR9271_MULTICAST_FILTER1 = 0x8040,
-        AR9271_MULTICAST_FILTER2 = 0x8044,      
+        AR9271_MULTICAST_FILTER2 = 0x8044,
         AR9271_DIAG = 0x8048,
-                
+        
         /* RX filtering register */
         AR9271_RX_FILTER = 0x803C,
@@ -134 +133 @@
         AR9271_RX_FILTER_MYBEACON = 0x00000200,
         AR9271_RX_FILTER_MCAST_BCAST_ALL = 0x00008000,
-                
+        
         /* Key related registers */
         AR9271_KEY_TABLE_BASE = 0x8800,
@@ -142 +141 @@
         AR9271_KEY_TABLE_TYPE_CCMP = 0x6,
         AR9271_KEY_TABLE_TYPE_CLR = 0x7,
-                
+        
         /* Physical layer registers */
         AR9271_PHY_ACTIVE = 0x981C,
@@ -168 +167 @@
         AR9271_PHY_TPCRG1_PD_CALIB = 0x00400000,
         AR9271_CARRIER_LEAK_CALIB = 0x00000002,
-                
+        
         AR9271_OPMODE_STATION_AP_MASK = 0x00010000,
         AR9271_OPMODE_ADHOC_MASK = 0x00020000,
-                
+        
         AR9271_CLOCK_CONTROL = 0x50040,
         AR9271_MAX_CPU_CLOCK = 0x304,
-                
+        
         AR9271_RESET_POWER_DOWN_CONTROL = 0x50044,
         AR9271_RADIO_RF_RESET = 0x20,
         AR9271_GATE_MAC_CONTROL = 0x4000,
-    
+        
         /* FW Addresses */
         AR9271_FW_ADDRESS = 0x501000,
@@ -185 +184 @@
 
 /** Compute key table base position for key by its id. */
-#define AR9271_KEY_TABLE(id) (AR9271_KEY_TABLE_BASE + (id)*32)
+#define AR9271_KEY_TABLE(id)  (AR9271_KEY_TABLE_BASE + (id) * 32)
 
 /** AR9271 Requests */
@@ -217 +216 @@
 } ar9271_t;
 
-/**
- * AR9271 init values for 2GHz mode operation.
- * 
+/** AR9271 init values for 2GHz mode operation.
+ *
  * Including settings of noise floor limits.
- * 
- * Taken from Linux sources.
+ *
+ * Taken from the Linux driver (drivers/net/wireless/ath/ath9k/)
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Licensed under the terms of ISC
+ *
  */
 static const uint32_t ar9271_2g_mode_array[][2] = {
@@ -232 +233 @@
         {0x0000801c, 0x12e0002b},
         {0x00008318, 0x00003440},
-        {0x00009804, 0x000003c0},/*< note: overridden */
+        {0x00009804, 0x000003c0},  /*< Note: overridden */
         {0x00009820, 0x02020200},
         {0x00009824, 0x01000e0e},
-        {0x00009828, 0x0a020001},/*< note: overridden */
+        {0x00009828, 0x0a020001},  /*< Note: overridden */
         {0x00009834, 0x00000e0e},
         {0x00009838, 0x00000007},
@@ -530 +531 @@
 };
 
-/**
- * AR9271 TX init values for 2GHz mode operation.
- * 
- * Taken from Linux sources.
+/** AR9271 TX init values for 2GHz mode operation.
+ *
+ * Taken from the Linux driver (drivers/net/wireless/ath/ath9k/)
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Licensed under the terms of ISC
+ *
  */
 static const uint32_t ar9271_2g_tx_array[][2] = {
@@ -571 +574 @@
 };
 
-/**
- * AR9271 hardware init values.
- * 
- * Taken from Linux sources, some values omitted.
+/** AR9271 hardware init values.
+ *
+ * Taken from the Linux driver (drivers/net/wireless/ath/ath9k/)
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Licensed under the terms of ISC
+ *
  */
 static const uint32_t ar9271_init_array[][2] = {
@@ -766 +771 @@
         {0x0000833c, 0x00000000},
         {0x00008340, 0x00010380},
-        {0x00008344, 0x00481083},/*< note: disabled ADHOC_MCAST_KEYID feature */
+        {0x00008344, 0x00481083},  /**< Note: disabled ADHOC_MCAST_KEYID feature */
         {0x00007010, 0x00000030},
         {0x00007034, 0x00000002},

uspace/drv/nic/ar9271/ath.h

@@ -34 +34 @@
 
 #ifndef ATHEROS_ATH_H
-#define ATHEROS_ATH_H
+#define ATHEROS_ATH_H
 
 struct ath;
@@ -61 +61 @@
 } ath_t;
 
-#endif  /* ATHEROS_ATH_H */
+#endif  /* ATHEROS_ATH_H */

uspace/drv/nic/ar9271/ath_usb.c

@@ -36 +36 @@
 #include <usb/debug.h>
 #include <malloc.h>
-
 #include "ath_usb.h"
 
-static int ath_usb_send_ctrl_message(ath_t *ath, void *buffer, 
-        size_t buffer_size);
-
-static int ath_usb_read_ctrl_message(ath_t *ath, void *buffer, 
-        size_t buffer_size, size_t *transferred_size);
-
-static int ath_usb_send_data_message(ath_t *ath, void *buffer, 
-        size_t buffer_size);
-
-static int ath_usb_read_data_message(ath_t *ath, void *buffer, 
-        size_t buffer_size, size_t *transferred_size);
+static int ath_usb_send_ctrl_message(ath_t *, void *, size_t);
+static int ath_usb_read_ctrl_message(ath_t *, void *, size_t, size_t *);
+static int ath_usb_send_data_message(ath_t *, void *, size_t);
+static int ath_usb_read_data_message(ath_t *, void *, size_t, size_t *);
 
 static ath_ops_t ath_usb_ops = {
@@ -58 +50 @@
 };
 
-/**
- * Initialize Atheros WiFi USB device.
- * 
+/** Initialize Atheros WiFi USB device.
+ *
  * @param ath Generic Atheros WiFi device structure.
- * @param usb_device Connected USB device.
- * 
+ * @param usb_device  Connected USB device.
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
 int ath_usb_init(ath_t *ath, usb_device_t *usb_device)
@@ -92 +84 @@
 }
 
-/**
- * Send control message.
- * 
- * @param ath Generic Atheros WiFi device structure. 
- * @param buffer Buffer with data to send.
+/** Send control message.
+ *
+ * @param ath         Generic Atheros WiFi device structure.
+ * @param buffer      Buffer with data to send.
  * @param buffer_size Buffer size.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
-static int ath_usb_send_ctrl_message(ath_t *ath, void *buffer, 
-        size_t buffer_size)
+static int ath_usb_send_ctrl_message(ath_t *ath, void *buffer,
+    size_t buffer_size)
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = 
-                &ath_usb->usb_device->pipes[ath_usb->output_ctrl_pipe_number].
-                pipe;
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->output_ctrl_pipe_number].pipe;
         
         return usb_pipe_write(pipe, buffer, buffer_size);
 }
 
-/**
- * Read control message.
- * 
- * @param ath Generic Atheros WiFi device structure. 
- * @param buffer Buffer with data to send.
- * @param buffer_size Buffer size.
+/** Read control message.
+ *
+ * @param ath              Generic Atheros WiFi device structure.
+ * @param buffer           Buffer with data to send.
+ * @param buffer_size      Buffer size.
  * @param transferred_size Real size of read data.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
-static int ath_usb_read_ctrl_message(ath_t *ath, void *buffer, 
-        size_t buffer_size, size_t *transferred_size)
+static int ath_usb_read_ctrl_message(ath_t *ath, void *buffer,
+    size_t buffer_size, size_t *transferred_size)
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = 
-                &ath_usb->usb_device->pipes[ath_usb->input_ctrl_pipe_number].
-                pipe;
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->input_ctrl_pipe_number].pipe;
         
         return usb_pipe_read(pipe, buffer, buffer_size, transferred_size);
 }
 
-/**
- * Send data message.
- * 
- * @param ath Generic Atheros WiFi device structure. 
- * @param buffer Buffer with data to send.
+/** Send data message.
+ *
+ * @param ath         Generic Atheros WiFi device structure. 
+ * @param buffer      Buffer with data to send.
  * @param buffer_size Buffer size.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
-static int ath_usb_send_data_message(ath_t *ath, void *buffer, 
-        size_t buffer_size)
+static int ath_usb_send_data_message(ath_t *ath, void *buffer,
+    size_t buffer_size)
 {
-        size_t complete_buffer_size = buffer_size + 
-                sizeof(ath_usb_data_header_t);
+        size_t complete_buffer_size = buffer_size +
+            sizeof(ath_usb_data_header_t);
         void *complete_buffer = malloc(complete_buffer_size);
-        memcpy(complete_buffer + sizeof(ath_usb_data_header_t), 
-                buffer, buffer_size);
+        memcpy(complete_buffer + sizeof(ath_usb_data_header_t),
+            buffer, buffer_size);
         
-        ath_usb_data_header_t *data_header = 
-                (ath_usb_data_header_t *) complete_buffer;
+        ath_usb_data_header_t *data_header =
+            (ath_usb_data_header_t *) complete_buffer;
         data_header->length = host2uint16_t_le(buffer_size);
         data_header->tag = host2uint16_t_le(TX_TAG);
         
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = 
-                &ath_usb->usb_device->pipes[ath_usb->output_data_pipe_number].
-                pipe;
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->output_data_pipe_number].pipe;
         
-        int ret_val = usb_pipe_write(pipe, complete_buffer, 
-                complete_buffer_size);
+        int ret_val = usb_pipe_write(pipe, complete_buffer,
+            complete_buffer_size);
         
         free(complete_buffer);
@@ -169 +158 @@
 }
 
-/**
- * Read data message.
- * 
- * @param ath Generic Atheros WiFi device structure. 
- * @param buffer Buffer with data to send.
- * @param buffer_size Buffer size.
+/** Read data message.
+ *
+ * @param ath              Generic Atheros WiFi device structure.
+ * @param buffer           Buffer with data to send.
+ * @param buffer_size      Buffer size.
  * @param transferred_size Real size of read data.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
-static int ath_usb_read_data_message(ath_t *ath, void *buffer, 
-        size_t buffer_size, size_t *transferred_size)
+static int ath_usb_read_data_message(ath_t *ath, void *buffer,
+    size_t buffer_size, size_t *transferred_size)
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = 
-                &ath_usb->usb_device->pipes[ath_usb->input_data_pipe_number].
-                pipe;
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->input_data_pipe_number].pipe;
         
-        return usb_pipe_read(pipe, buffer, buffer_size, 
-                transferred_size);
+        return usb_pipe_read(pipe, buffer, buffer_size,
+            transferred_size);
 }

uspace/drv/nic/ar9271/ath_usb.h

@@ -34 +34 @@
 
 #ifndef ATHEROS_ATH_USB_H
-#define ATHEROS_ATH_USB_H
+#define ATHEROS_ATH_USB_H
 
 #include <usb/dev/driver.h>
-
 #include "ath.h"
 
-#define RX_TAG 0x4e00
-#define TX_TAG 0x697e
+#define RX_TAG  0x4e00
+#define TX_TAG  0x697e
 
 /** Atheros USB wifi device structure */
@@ -56 +55 @@
 
 typedef struct {
-        uint16_t length;                /**< Little Endian value! */
-        uint16_t tag;                   /**< Little Endian value! */
+        uint16_t length;  /**< Little Endian value! */
+        uint16_t tag;     /**< Little Endian value! */
 } ath_usb_data_header_t;
 
-extern int ath_usb_init(ath_t *ath, usb_device_t *usb_device);
+extern int ath_usb_init(ath_t *, usb_device_t *);
 
-#endif  /* ATHEROS_ATH_USB_H */
+#endif  /* ATHEROS_ATH_USB_H */

uspace/drv/nic/ar9271/htc.c

@@ -36 +36 @@
 #include <byteorder.h>
 #include <errno.h>
-
 #include "wmi.h"
 #include "htc.h"
@@ -42 +41 @@
 #include "ar9271.h"
 
-/**
- * HTC download pipes mapping.
- * 
+/** HTC download pipes mapping.
+ *
  * @param service_id Identification of WMI service.
- * 
+ *
  * @return Number of pipe used for this service.
+ *
  */
 static inline uint8_t wmi_service_to_download_pipe(wmi_services_t service_id)
@@ -54 +53 @@
 }
 
-/**
- * HTC upload pipes mapping.
- * 
+/** HTC upload pipes mapping.
+ *
  * @param service_id Identification of WMI service.
- * 
+ *
  * @return Number of pipe used for this service.
+ *
  */
 static inline uint8_t wmi_service_to_upload_pipe(wmi_services_t service_id)
@@ -75 +74 @@
         
         nic_address_t addr;
-        nic_t *nic = 
-                nic_get_from_ddf_dev(
-                        ieee80211_get_ddf_dev(htc_device->ieee80211_dev)
-                );
+        nic_t *nic =
+            nic_get_from_ddf_dev(ieee80211_get_ddf_dev(htc_device->ieee80211_dev));
         nic_query_address(nic, &addr);
         
@@ -84 +81 @@
         memcpy(&sta_msg.addr, &addr.address, ETH_ADDR);
         
-        ieee80211_operating_mode_t op_mode = 
-                ieee80211_query_current_op_mode(htc_device->ieee80211_dev);
-        
-        switch(op_mode) {
-                case IEEE80211_OPMODE_ADHOC:
-                        vif_msg.op_mode = HTC_OPMODE_ADHOC;
-                        break;
-                case IEEE80211_OPMODE_AP:
-                        vif_msg.op_mode = HTC_OPMODE_AP;
-                        break;
-                case IEEE80211_OPMODE_MESH:
-                        vif_msg.op_mode = HTC_OPMODE_MESH;
-                        break;
-                case IEEE80211_OPMODE_STATION:
-                        vif_msg.op_mode = HTC_OPMODE_STATION;
-                        break;
+        ieee80211_operating_mode_t op_mode =
+            ieee80211_query_current_op_mode(htc_device->ieee80211_dev);
+        
+        switch (op_mode) {
+        case IEEE80211_OPMODE_ADHOC:
+                vif_msg.op_mode = HTC_OPMODE_ADHOC;
+                break;
+        case IEEE80211_OPMODE_AP:
+                vif_msg.op_mode = HTC_OPMODE_AP;
+                break;
+        case IEEE80211_OPMODE_MESH:
+                vif_msg.op_mode = HTC_OPMODE_MESH;
+                break;
+        case IEEE80211_OPMODE_STATION:
+                vif_msg.op_mode = HTC_OPMODE_STATION;
+                break;
         }
         
@@ -105 +102 @@
         vif_msg.rts_thres = host2uint16_t_be(HTC_RTS_THRESHOLD);
         
-        wmi_send_command(htc_device, WMI_VAP_CREATE, (uint8_t *) &vif_msg, 
-                sizeof(vif_msg), NULL);
+        wmi_send_command(htc_device, WMI_VAP_CREATE, (uint8_t *) &vif_msg,
+            sizeof(vif_msg), NULL);
         
         sta_msg.is_vif_sta = 1;
@@ -113 +110 @@
         sta_msg.vif_index = 0;
         
-        wmi_send_command(htc_device, WMI_NODE_CREATE, (uint8_t *) &sta_msg, 
-                sizeof(sta_msg), NULL);
+        wmi_send_command(htc_device, WMI_NODE_CREATE, (uint8_t *) &sta_msg,
+            sizeof(sta_msg), NULL);
         
         /* Write first 4 bytes of MAC address. */
@@ -121 +118 @@
         id0 = host2uint32_t_le(id0);
         wmi_reg_write(htc_device, AR9271_STATION_ID0, id0);
-
+        
         /* Write last 2 bytes of MAC address (and preserve existing data). */
         uint32_t id1;
         wmi_reg_read(htc_device, AR9271_STATION_ID1, &id1);
-
+        
         uint16_t id1_addr;
         memcpy(&id1_addr, &addr.address[4], 2);
@@ -134 +131 @@
 }
 
-static void htc_config_frame_header(htc_frame_header_t *header, 
-        size_t buffer_size, uint8_t endpoint_id)
+static void htc_config_frame_header(htc_frame_header_t *header,
+    size_t buffer_size, uint8_t endpoint_id)
 {
         memset(header, 0, sizeof(htc_frame_header_t));
         
         header->endpoint_id = endpoint_id;
-        header->payload_length = 
-                host2uint16_t_be(buffer_size - sizeof(htc_frame_header_t));
-}
-
-/**
- * Send control HTC message to USB device.
- * 
- * @param htc_device HTC device structure.
- * @param buffer Buffer with data to be sent to USB device (without HTC frame
- *              header).
+        header->payload_length =
+            host2uint16_t_be(buffer_size - sizeof(htc_frame_header_t));
+}
+
+/** Send control HTC message to USB device.
+ *
+ * @param htc_device  HTC device structure.
+ * @param buffer      Buffer with data to be sent to USB device
+ *                    (without HTC frame header).
  * @param buffer_size Size of buffer (including HTC frame header).
  * @param endpoint_id Destination endpoint.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int htc_send_control_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, uint8_t endpoint_id)
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int htc_send_control_message(htc_device_t *htc_device, void *buffer,
+    size_t buffer_size, uint8_t endpoint_id)
 {
         htc_config_frame_header((htc_frame_header_t *) buffer, buffer_size,
-                endpoint_id);
+            endpoint_id);
         
         ath_t *ath_device = htc_device->ath_device;
         
-        return ath_device->ops->send_ctrl_message(ath_device, buffer, 
-                buffer_size);
-}
-
-/**
- * Send data HTC message to USB device.
- * 
- * @param htc_device HTC device structure.
- * @param buffer Buffer with data to be sent to USB device (without HTC frame
- *              header).
+        return ath_device->ops->send_ctrl_message(ath_device, buffer,
+            buffer_size);
+}
+
+/** Send data HTC message to USB device.
+ *
+ * @param htc_device  HTC device structure.
+ * @param buffer      Buffer with data to be sent to USB device
+ *                    (without HTC frame header).
  * @param buffer_size Size of buffer (including HTC frame header).
  * @param endpoint_id Destination endpoint.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int htc_send_data_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, uint8_t endpoint_id)
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int htc_send_data_message(htc_device_t *htc_device, void *buffer,
+    size_t buffer_size, uint8_t endpoint_id)
 {
         htc_config_frame_header((htc_frame_header_t *) buffer, buffer_size,
-                endpoint_id);
+            endpoint_id);
         
         ath_t *ath_device = htc_device->ath_device;
         
-        return ath_device->ops->send_data_message(ath_device, buffer, 
-                buffer_size);
-}
-
-/**
- * Read HTC data message from USB device.
- * 
- * @param htc_device HTC device structure.
- * @param buffer Buffer where data from USB device will be stored.
- * @param buffer_size Size of buffer.
+        return ath_device->ops->send_data_message(ath_device, buffer,
+            buffer_size);
+}
+
+/** Read HTC data message from USB device.
+ *
+ * @param htc_device       HTC device structure.
+ * @param buffer           Buffer where data from USB device
+ *                         will be stored.
+ * @param buffer_size      Size of buffer.
  * @param transferred_size Real size of read data.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int htc_read_data_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, size_t *transferred_size)
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int htc_read_data_message(htc_device_t *htc_device, void *buffer,
+    size_t buffer_size, size_t *transferred_size)
 {
         ath_t *ath_device = htc_device->ath_device;
         
-        return ath_device->ops->read_data_message(ath_device, buffer, 
-                buffer_size, transferred_size);
-}
-
-/**
- * Read HTC control message from USB device.
- * 
- * @param htc_device HTC device structure.
- * @param buffer Buffer where data from USB device will be stored.
- * @param buffer_size Size of buffer.
+        return ath_device->ops->read_data_message(ath_device, buffer,
+            buffer_size, transferred_size);
+}
+
+/** Read HTC control message from USB device.
+ *
+ * @param htc_device       HTC device structure.
+ * @param buffer           Buffer where data from USB device
+ *                         will be stored.
+ * @param buffer_size      Size of buffer.
  * @param transferred_size Real size of read data.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int htc_read_control_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, size_t *transferred_size)
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int htc_read_control_message(htc_device_t *htc_device, void *buffer,
+    size_t buffer_size, size_t *transferred_size)
 {
         ath_t *ath_device = htc_device->ath_device;
         
-        return ath_device->ops->read_ctrl_message(ath_device, buffer, 
-                buffer_size, transferred_size);
-}
-
-/**
- * Initialize HTC service.
- * 
- * @param htc_device HTC device structure.
- * @param service_id Identification of WMI service.
- * @param response_endpoint_no HTC endpoint to be used for this service.
- * 
- * @return EOK if succeed, EINVAL when failed to connect service, 
- * negative error code otherwise.
- */
-static int htc_connect_service(htc_device_t *htc_device, 
+        return ath_device->ops->read_ctrl_message(ath_device, buffer,
+            buffer_size, transferred_size);
+}
+
+/** Initialize HTC service.
+ *
+ * @param htc_device           HTC device structure.
+ * @param service_id           Identification of WMI service.
+ * @param response_endpoint_no HTC endpoint to be used for
+ *                             this service.
+ *
+ * @return EOK if succeed, EINVAL when failed to connect service,
+ *         negative error code otherwise.
+ *
+ */
+static int htc_connect_service(htc_device_t *htc_device,
     wmi_services_t service_id, int *response_endpoint_no)
 {
-        size_t buffer_size = sizeof(htc_frame_header_t) + 
-                sizeof(htc_service_msg_t);
+        size_t buffer_size = sizeof(htc_frame_header_t) +
+            sizeof(htc_service_msg_t);
         void *buffer = malloc(buffer_size);
         memset(buffer, 0, buffer_size);
@@ -248 +248 @@
         /* Fill service message structure. */
         htc_service_msg_t *service_message = (htc_service_msg_t *)
-                ((void *) buffer + sizeof(htc_frame_header_t));
-        service_message->service_id = 
-                host2uint16_t_be(service_id);
-        service_message->message_id = 
-                host2uint16_t_be(HTC_MESSAGE_CONNECT_SERVICE);
-        service_message->download_pipe_id = 
-                wmi_service_to_download_pipe(service_id);
-        service_message->upload_pipe_id = 
-                wmi_service_to_upload_pipe(service_id);
+            ((void *) buffer + sizeof(htc_frame_header_t));
+        service_message->service_id =
+            host2uint16_t_be(service_id);
+        service_message->message_id =
+            host2uint16_t_be(HTC_MESSAGE_CONNECT_SERVICE);
+        service_message->download_pipe_id =
+            wmi_service_to_download_pipe(service_id);
+        service_message->upload_pipe_id =
+            wmi_service_to_upload_pipe(service_id);
         service_message->connection_flags = 0;
         
         /* Send HTC message. */
         int rc = htc_send_control_message(htc_device, buffer, buffer_size,
-                htc_device->endpoints.ctrl_endpoint);
-        if(rc != EOK) {
+            htc_device->endpoints.ctrl_endpoint);
+        if (rc != EOK) {
                 free(buffer);
                 usb_log_error("Failed to send HTC message. Error: %d\n", rc);
@@ -275 +275 @@
         /* Read response from device. */
         rc = htc_read_control_message(htc_device, buffer, buffer_size, NULL);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 free(buffer);
                 usb_log_error("Failed to receive HTC service connect response. "
-                        "Error: %d\n", rc);
+                    "Error: %d\n", rc);
                 return rc;
         }
         
         htc_service_resp_msg_t *response_message = (htc_service_resp_msg_t *)
-                ((void *) buffer + sizeof(htc_frame_header_t));
-
-        /* If service was successfully connected, write down HTC endpoint number
-         * that will be used for communication. */
-        if(response_message->status == HTC_SERVICE_SUCCESS) {
+            ((void *) buffer + sizeof(htc_frame_header_t));
+        
+        /*
+         * If service was successfully connected,
+         * write down HTC endpoint number that will
+         * be used for communication.
+         */
+        if (response_message->status == HTC_SERVICE_SUCCESS) {
                 *response_endpoint_no = response_message->endpoint_id;
                 rc = EOK;
         } else {
                 usb_log_error("Failed to connect HTC service. "
-                        "Message status: %d\n", response_message->status);
+                    "Message status: %d\n", response_message->status);
                 rc = EINVAL;
-        }
+        }
         
         free(buffer);
@@ -301 +304 @@
 }
 
-/**
- * HTC credits initialization message.
- * 
+/** HTC credits initialization message.
+ *
  * @param htc_device HTC device structure.
- * 
- * @return EOK if succeed, negative error code otherwise.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 static int htc_config_credits(htc_device_t *htc_device)
 {
-        size_t buffer_size = sizeof(htc_frame_header_t) + 
-                sizeof(htc_config_msg_t);
+        size_t buffer_size = sizeof(htc_frame_header_t) +
+            sizeof(htc_config_msg_t);
         void *buffer = malloc(buffer_size);
         htc_config_msg_t *config_message = (htc_config_msg_t *)
-                ((void *) buffer + sizeof(htc_frame_header_t));
+            ((void *) buffer + sizeof(htc_frame_header_t));
         
         config_message->message_id = 
-                host2uint16_t_be(HTC_MESSAGE_CONFIG);
+            host2uint16_t_be(HTC_MESSAGE_CONFIG);
         /* Magic number to initialize device. */
         config_message->credits = 33;
         config_message->pipe_id = 1;
-
+        
         /* Send HTC message. */
         int rc = htc_send_control_message(htc_device, buffer, buffer_size,
-                htc_device->endpoints.ctrl_endpoint);
-        if(rc != EOK) {
+            htc_device->endpoints.ctrl_endpoint);
+        if (rc != EOK) {
                 free(buffer);
                 usb_log_error("Failed to send HTC config message. "
-                        "Error: %d\n", rc);
+                    "Error: %d\n", rc);
                 return rc;
         }
@@ -336 +339 @@
         buffer_size = htc_device->ath_device->ctrl_response_length;
         buffer = malloc(buffer_size);
-
+        
         /* Check response from device. */
         rc = htc_read_control_message(htc_device, buffer, buffer_size, NULL);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to receive HTC config response message. "
-                        "Error: %d\n", rc);
+                    "Error: %d\n", rc);
         }
         
         free(buffer);
-
+        
         return rc;
 }
 
-/**
- * HTC setup complete confirmation message.
- * 
+/** HTC setup complete confirmation message.
+ *
  * @param htc_device HTC device structure.
- * 
- * @return EOK if succeed, negative error code otherwise.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 static int htc_complete_setup(htc_device_t *htc_device)
 {
-        size_t buffer_size = sizeof(htc_frame_header_t) + 
-                sizeof(htc_setup_complete_msg_t);
+        size_t buffer_size = sizeof(htc_frame_header_t) +
+            sizeof(htc_setup_complete_msg_t);
         void *buffer = malloc(buffer_size);
-        htc_setup_complete_msg_t *complete_message = 
-                (htc_setup_complete_msg_t *)
-                ((void *) buffer + sizeof(htc_frame_header_t));
-        
-        complete_message->message_id = 
-                host2uint16_t_be(HTC_MESSAGE_SETUP_COMPLETE);
-
+        htc_setup_complete_msg_t *complete_message =
+            (htc_setup_complete_msg_t *)
+            ((void *) buffer + sizeof(htc_frame_header_t));
+        
+        complete_message->message_id =
+            host2uint16_t_be(HTC_MESSAGE_SETUP_COMPLETE);
+        
         /* Send HTC message. */
-        int rc = htc_send_control_message(htc_device, buffer, buffer_size, 
-                htc_device->endpoints.ctrl_endpoint);
-        if(rc != EOK) {
+        int rc = htc_send_control_message(htc_device, buffer, buffer_size,
+            htc_device->endpoints.ctrl_endpoint);
+        if (rc != EOK)
                 usb_log_error("Failed to send HTC setup complete message. "
-                        "Error: %d\n", rc);
-        }
+                    "Error: %d\n", rc);
         
         free(buffer);
-
+        
         return rc;
 }
 
-/**
- * Try to fetch ready message from device.
+/** Try to fetch ready message from device.
+ *
  * Checks that firmware was successfully loaded on device side.
- * 
+ *
  * @param htc_device HTC device structure.
- * 
- * @return EOK if succeed, EINVAL if response error, negative error code 
- * otherwise.
+ *
+ * @return EOK if succeed, EINVAL if response error,
+ *         negative error code otherwise.
+ *
  */
 static int htc_check_ready(htc_device_t *htc_device)
@@ -394 +397 @@
         size_t buffer_size = htc_device->ath_device->ctrl_response_length;
         void *buffer = malloc(buffer_size);
-
+        
         /* Read response from device. */
-        int rc = htc_read_control_message(htc_device, buffer, buffer_size, 
-                NULL);
-        if(rc != EOK) {
+        int rc = htc_read_control_message(htc_device, buffer, buffer_size,
+            NULL);
+        if (rc != EOK) {
                 free(buffer);
                 usb_log_error("Failed to receive HTC check ready message. "
-                        "Error: %d\n", rc);
-                return rc;
-        }
-
-        uint16_t *message_id = (uint16_t *) ((void *) buffer + 
-                sizeof(htc_frame_header_t));
-        if(uint16_t_be2host(*message_id) == HTC_MESSAGE_READY) {
+                    "Error: %d\n", rc);
+                return rc;
+        }
+        
+        uint16_t *message_id = (uint16_t *) ((void *) buffer +
+            sizeof(htc_frame_header_t));
+        if (uint16_t_be2host(*message_id) == HTC_MESSAGE_READY)
                 rc = EOK;
-        } else {
+        else
                 rc = EINVAL;
-        }
         
         free(buffer);
@@ -418 +420 @@
 }
 
-/**
- * Initialize HTC device structure.
- * 
- * @param ath_device Atheros WiFi device connected with this HTC device.
+/** Initialize HTC device structure.
+ *
+ * @param ath_device Atheros WiFi device connected
+ *                   with this HTC device.
  * @param htc_device HTC device structure to be initialized.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int htc_device_init(ath_t *ath_device, ieee80211_dev_t *ieee80211_dev, 
-        htc_device_t *htc_device)
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int htc_device_init(ath_t *ath_device, ieee80211_dev_t *ieee80211_dev,
+    htc_device_t *htc_device)
 {
         fibril_mutex_initialize(&htc_device->rx_lock);
@@ -440 +443 @@
 }
 
-/**
- * HTC communication initalization.
- * 
+/** HTC communication initalization.
+ *
  * @param htc_device HTC device structure.
- * 
- * @return EOK if succeed, negative error code otherwise.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 int htc_init(htc_device_t *htc_device)
@@ -451 +454 @@
         /* First check ready message in device. */
         int rc = htc_check_ready(htc_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Device is not in ready state after loading "
-                        "firmware.\n");
-                return rc;
-        }
-
-        /* 
+                    "firmware.\n");
+                return rc;
+        }
+        
+        /*
          * HTC services initialization start.
-         * 
          */
-        
         rc = htc_connect_service(htc_device, WMI_CONTROL_SERVICE,
             &htc_device->endpoints.wmi_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing WMI service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_BEACON_SERVICE,
             &htc_device->endpoints.beacon_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing beacon service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_CAB_SERVICE,
             &htc_device->endpoints.cab_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing CAB service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_UAPSD_SERVICE,
             &htc_device->endpoints.uapsd_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing UAPSD service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_MGMT_SERVICE,
             &htc_device->endpoints.mgmt_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing MGMT service.\n");
                 return rc;
@@ -499 +500 @@
         rc = htc_connect_service(htc_device, WMI_DATA_BE_SERVICE,
             &htc_device->endpoints.data_be_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing data best effort "
                     "service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_DATA_BK_SERVICE,
             &htc_device->endpoints.data_bk_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing data background "
                     "service.\n");
                 return rc;
         }
-
+        
         rc = htc_connect_service(htc_device, WMI_DATA_VIDEO_SERVICE,
             &htc_device->endpoints.data_video_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing data video service.\n");
                 return rc;
@@ -522 +523 @@
         rc = htc_connect_service(htc_device, WMI_DATA_VOICE_SERVICE,
             &htc_device->endpoints.data_voice_endpoint);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Error while initalizing data voice service.\n");
                 return rc;
         }
-
-        /* 
+        
+        /*
          * HTC services initialization end.
-         * 
          */
-
+        
         /* Credits initialization message. */
         rc = htc_config_credits(htc_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to send HTC config message.\n");
                 return rc;
         }
-
+        
         /* HTC setup complete confirmation message. */
         rc = htc_complete_setup(htc_device);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to send HTC complete setup message.\n");
                 return rc;
         }
-
+        
         usb_log_info("HTC services initialization finished successfully.\n");
         

uspace/drv/nic/ar9271/htc.h

@@ -29 +29 @@
 /** @file htc.h
  *
- * Definitions of the Atheros HTC (Host Target Communication) technology 
+ * Definitions of the Atheros HTC (Host Target Communication) technology
  * for communication between host (PC) and target (device firmware).
  *
@@ -35 +35 @@
 
 #ifndef ATHEROS_HTC_H
-#define ATHEROS_HTC_H
+#define ATHEROS_HTC_H
 
 #include <ieee80211.h>
@@ -41 +41 @@
 #include <sys/types.h>
 #include <nic.h>
-
 #include "ath.h"
 
-#define HTC_RTS_THRESHOLD 2304
-#define HTC_RATES_MAX_LENGTH 30
-
-/**
- * HTC message IDs.
+#define HTC_RTS_THRESHOLD     2304
+#define HTC_RATES_MAX_LENGTH  30
+
+/** HTC message IDs.
+ *
  */
 typedef enum {
         HTC_MESSAGE_READY = 1,
         HTC_MESSAGE_CONNECT_SERVICE,
-        HTC_MESSAGE_CONNECT_SERVICE_RESPONSE,
-        HTC_MESSAGE_SETUP_COMPLETE,
-        HTC_MESSAGE_CONFIG
+        HTC_MESSAGE_CONNECT_SERVICE_RESPONSE,
+        HTC_MESSAGE_SETUP_COMPLETE,
+        HTC_MESSAGE_CONFIG
 } htc_message_id_t;
 
-/**
- * HTC response message status codes.
+/** HTC response message status codes.
+ *
  */
 typedef enum {
-        HTC_SERVICE_SUCCESS = 0,
-        HTC_SERVICE_NOT_FOUND,
-        HTC_SERVICE_FAILED,
-        HTC_SERVICE_NO_RESOURCES,
-        HTC_SERVICE_NO_MORE_EP
+        HTC_SERVICE_SUCCESS = 0,
+        HTC_SERVICE_NOT_FOUND,
+        HTC_SERVICE_FAILED,
+        HTC_SERVICE_NO_RESOURCES,
+        HTC_SERVICE_NO_MORE_EP
 } htc_response_status_code_t;
 
-/**
- * HTC operating mode definition.
+/** HTC operating mode definition.
+ *
  */
 typedef enum {
@@ -79 +78 @@
 } htc_operating_mode_t;
 
-/**
- * HTC data type indicator.
+/** HTC data type indicator.
+ *
  */
 typedef enum {
@@ -89 +88 @@
 } htc_data_type_t;
 
-/**
- * HTC endpoint numbers.
- */
-typedef struct {
-        int ctrl_endpoint;
+/** HTC endpoint numbers.
+ *
+ */
+typedef struct {
+        int ctrl_endpoint;
         int wmi_endpoint;
         int beacon_endpoint;
@@ -105 +104 @@
 } htc_pipes_t;
 
-/**
- * HTC device data.
- */
-typedef struct {
-        /** WMI message sequence number */
-        uint16_t sequence_number;
-    
+/** HTC device data.
+ *
+ */
+typedef struct {
+        /** WMI message sequence number */
+        uint16_t sequence_number;
+        
         /** HTC endpoints numbers */
         htc_pipes_t endpoints;
@@ -128 +127 @@
 } htc_device_t;
 
-/** 
- * HTC frame header structure.
- */
-typedef struct {
-        uint8_t   endpoint_id;
-        uint8_t   flags;
-        uint16_t  payload_length;       /**< Big Endian value! */
-        uint8_t   control_bytes[4];
+/** HTC frame header structure.
+ *
+ */
+typedef struct {
+        uint8_t endpoint_id;
+        uint8_t flags;
+        uint16_t payload_length;   /**< Big Endian value! */
+        uint8_t control_bytes[4];
 } __attribute__((packed)) htc_frame_header_t;
 
-/** 
- * HTC management TX frame header structure.
+/** HTC management TX frame header structure.
+ *
  */
 typedef struct {
@@ -152 +151 @@
 } __attribute__((packed)) htc_tx_management_header_t;
 
-/** 
- * HTC data TX frame header structure.
+/** HTC data TX frame header structure.
+ *
  */
 typedef struct {
@@ -160 +159 @@
         uint8_t vif_idx;
         uint8_t tidno;
-        uint32_t flags;                 /**< Big Endian value! */
+        uint32_t flags;    /**< Big Endian value! */
         uint8_t key_type;
         uint8_t keyix;
@@ -167 +166 @@
 } __attribute__((packed)) htc_tx_data_header_t;
 
-/** 
- * HTC ready message structure.
- */
-typedef struct {
-        uint16_t message_id;            /**< Big Endian value! */
-        uint16_t credits;               /**< Big Endian value! */
-        uint16_t credit_size;           /**< Big Endian value! */
-        
-        uint8_t max_endpoints;
+/** HTC ready message structure.
+ *
+ */
+typedef struct {
+        uint16_t message_id;   /**< Big Endian value! */
+        uint16_t credits;      /**< Big Endian value! */
+        uint16_t credit_size;  /**< Big Endian value! */
+        
+        uint8_t max_endpoints;
         uint8_t pad;
 } __attribute__((packed)) htc_ready_msg_t;
 
-/** 
- * HTC service message structure.
- */
-typedef struct {
-        uint16_t message_id;            /**< Big Endian value! */
-        uint16_t service_id;            /**< Big Endian value! */
-        uint16_t connection_flags;      /**< Big Endian value! */
+/** HTC service message structure.
+ *
+ */
+typedef struct {
+        uint16_t message_id;        /**< Big Endian value! */
+        uint16_t service_id;        /**< Big Endian value! */
+        uint16_t connection_flags;  /**< Big Endian value! */
         
         uint8_t download_pipe_id;
@@ -193 +192 @@
 } __attribute__((packed)) htc_service_msg_t;
 
-/** 
- * HTC service response message structure.
- */
-typedef struct {
-        uint16_t message_id;            /**< Big Endian value! */
-        uint16_t service_id;            /**< Big Endian value! */
-        uint8_t status;
-        uint8_t endpoint_id;
-        uint16_t max_message_length;    /**< Big Endian value! */
-        uint8_t service_meta_length;
-        uint8_t pad;
+/** HTC service response message structure.
+ *
+ */
+typedef struct {
+        uint16_t message_id;          /**< Big Endian value! */
+        uint16_t service_id;          /**< Big Endian value! */
+        uint8_t status;
+        uint8_t endpoint_id;
+        uint16_t max_message_length;  /**< Big Endian value! */
+        uint8_t service_meta_length;
+        uint8_t pad;
 } __attribute__((packed)) htc_service_resp_msg_t;
 
-/**
- * HTC credits config message structure.
- */
-typedef struct {
-        uint16_t message_id;            /**< Big Endian value! */
-        uint8_t pipe_id;
-        uint8_t credits;
+/** HTC credits config message structure.
+ *
+ */
+typedef struct {
+        uint16_t message_id;  /**< Big Endian value! */
+        uint8_t pipe_id;
+        uint8_t credits;
 } __attribute__((packed)) htc_config_msg_t;
 
-/**
- * HTC new virtual interface message.
- */
-typedef struct {
-        uint8_t index;
+/** HTC new virtual interface message.
+ *
+ */
+typedef struct {
+        uint8_t index;
         uint8_t op_mode;
         uint8_t addr[ETH_ADDR];
         uint8_t ath_cap;
-        uint16_t rts_thres;             /**< Big Endian value! */
+        uint16_t rts_thres;      /**< Big Endian value! */
         uint8_t pad;
 } __attribute__((packed)) htc_vif_msg_t;
 
-/**
- * HTC new station message.
+/** HTC new station message.
+ *
  */
 typedef struct {
         uint8_t addr[ETH_ADDR];
         uint8_t bssid[ETH_ADDR];
-        uint8_t sta_index;
+        uint8_t sta_index;
         uint8_t vif_index;
         uint8_t is_vif_sta;
-                
-        uint16_t flags;         /**< Big Endian value! */
-        uint16_t ht_cap;        /**< Big Endian value! */
-        uint16_t max_ampdu;     /**< Big Endian value! */
+        
+        uint16_t flags;      /**< Big Endian value! */
+        uint16_t ht_cap;     /**< Big Endian value! */
+        uint16_t max_ampdu;  /**< Big Endian value! */
         
         uint8_t pad;
 } __attribute__((packed)) htc_sta_msg_t;
 
-/**
- * HTC message to inform target about available capabilities.
- */
-typedef struct {
-        uint32_t ampdu_limit;   /**< Big Endian value! */
+/** HTC message to inform target about available capabilities.
+ *
+ */
+typedef struct {
+        uint32_t ampdu_limit;     /**< Big Endian value! */
         uint8_t ampdu_subframes;
         uint8_t enable_coex;
@@ -258 +257 @@
         uint8_t sta_index;
         uint8_t is_new;
-        uint32_t cap_flags;     /**< Big Endian value! */
+        uint32_t cap_flags;  /**< Big Endian value! */
         uint8_t legacy_rates_count;
         uint8_t legacy_rates[HTC_RATES_MAX_LENGTH];
@@ -264 +263 @@
 } htc_rate_msg_t;
 
-/**
- * HTC RX status structure used in incoming HTC data messages.
- */
-typedef struct {
-        uint64_t timestamp;     /**< Big Endian value! */
-        uint16_t data_length;   /**< Big Endian value! */
+/** HTC RX status structure used in incoming HTC data messages.
+ *
+ */
+typedef struct {
+        uint64_t timestamp;    /**< Big Endian value! */
+        uint16_t data_length;  /**< Big Endian value! */
         uint8_t status;
         uint8_t phy_err;
@@ -284 +283 @@
         uint8_t flags;
         uint8_t dummy;
-        uint32_t evm0;          /**< Big Endian value! */
-        uint32_t evm1;          /**< Big Endian value! */
-        uint32_t evm2;          /**< Big Endian value! */
+        uint32_t evm0;         /**< Big Endian value! */
+        uint32_t evm1;         /**< Big Endian value! */
+        uint32_t evm2;         /**< Big Endian value! */
 } htc_rx_status_t;
 
-/**
- * HTC setup complete message structure
- */
-typedef struct {
-        uint16_t message_id;            /**< Big Endian value! */
+/** HTC setup complete message structure
+ *
+ */
+typedef struct {
+        uint16_t message_id;  /**< Big Endian value! */
 } __attribute__((packed)) htc_setup_complete_msg_t;
 
-extern int htc_device_init(ath_t *ath_device, ieee80211_dev_t *ieee80211_dev, 
-        htc_device_t *htc_device);
-extern int htc_init(htc_device_t *htc_device);
-extern int htc_init_new_vif(htc_device_t *htc_device);
-extern int htc_read_control_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, size_t *transferred_size);
-extern int htc_read_data_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, size_t *transferred_size);
-extern int htc_send_control_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, uint8_t endpoint_id);
-extern int htc_send_data_message(htc_device_t *htc_device, void *buffer, 
-        size_t buffer_size, uint8_t endpoint_id);
-
-#endif  /* ATHEROS_HTC_H */
-
+extern int htc_device_init(ath_t *, ieee80211_dev_t *, htc_device_t *);
+extern int htc_init(htc_device_t *);
+extern int htc_init_new_vif(htc_device_t *);
+extern int htc_read_control_message(htc_device_t *, void *, size_t, size_t *);
+extern int htc_read_data_message(htc_device_t *, void *, size_t, size_t *);
+extern int htc_send_control_message(htc_device_t *, void *, size_t, uint8_t);
+extern int htc_send_data_message(htc_device_t *, void *, size_t, uint8_t);
+
+#endif  /* ATHEROS_HTC_H */

uspace/drv/nic/ar9271/hw.c

@@ -38 +38 @@
 #include <nic.h>
 #include <ieee80211.h>
-
 #include "hw.h"
 #include "wmi.h"
 
-/**
- * Try to wait for register value repeatedly until timeout is reached.
- * 
+/** Try to wait for register value repeatedly until timeout is reached.
+ *
  * @param ar9271 Device structure.
  * @param offset Registry offset (address) to be read.
- * @param mask Mask to apply on read result.
- * @param value Required value we are waiting for.
- * 
- * @return EOK if succeed, ETIMEOUT on timeout, negative error code otherwise.
+ * @param mask   Mask to apply on read result.
+ * @param value  Required value we are waiting for.
+ *
+ * @return EOK if succeed, ETIMEOUT on timeout,
+ *         negative error code otherwise.
+ *
  */
 static int hw_read_wait(ar9271_t *ar9271, uint32_t offset, uint32_t mask,
-        uint32_t value)
-{
-        uint32_t result;
-        
-        for(size_t i = 0; i < HW_WAIT_LOOPS; i++) {
+    uint32_t value)
+{
+        for (size_t i = 0; i < HW_WAIT_LOOPS; i++) {
                 udelay(HW_WAIT_TIME_US);
-
+                
+                uint32_t result;
                 wmi_reg_read(ar9271->htc_device, offset, &result);
-                if((result & mask) == value) {
+                if ((result & mask) == value)
                         return EOK;
-                }
         }
         
@@ -74 +72 @@
                 {
                         .offset = AR9271_RTC_FORCE_WAKE,
-                        .value = AR9271_RTC_FORCE_WAKE_ENABLE | 
-                                AR9271_RTC_FORCE_WAKE_ON_INT
+                        .value = AR9271_RTC_FORCE_WAKE_ENABLE |
+                            AR9271_RTC_FORCE_WAKE_ON_INT
                 },
                 {
@@ -88 +86 @@
         
         wmi_reg_buffer_write(ar9271->htc_device, buffer,
-                sizeof(buffer) / sizeof(wmi_reg_t));
+            sizeof(buffer) / sizeof(wmi_reg_t));
         
         udelay(2);
@@ -95 +93 @@
         wmi_reg_write(ar9271->htc_device, AR9271_RTC_RESET, 1);
         
-        int rc = hw_read_wait(ar9271, 
-                AR9271_RTC_STATUS, 
-                AR9271_RTC_STATUS_MASK, 
-                AR9271_RTC_STATUS_ON);
-        if(rc != EOK) {
+        int rc = hw_read_wait(ar9271,
+            AR9271_RTC_STATUS,
+            AR9271_RTC_STATUS_MASK,
+            AR9271_RTC_STATUS_ON);
+        if (rc != EOK) {
                 usb_log_error("Failed to wait for RTC wake up register.\n");
                 return rc;
@@ -111 +109 @@
         uint32_t reset_value = AR9271_RTC_RC_MAC_WARM;
         
-        if(cold) {
+        if (cold)
                 reset_value |= AR9271_RTC_RC_MAC_COLD;
-        }
         
         wmi_reg_t buffer[] = {
                 {
                         .offset = AR9271_RTC_FORCE_WAKE,
-                        .value = AR9271_RTC_FORCE_WAKE_ENABLE | 
-                                AR9271_RTC_FORCE_WAKE_ON_INT
+                        .value = AR9271_RTC_FORCE_WAKE_ENABLE |
+                            AR9271_RTC_FORCE_WAKE_ON_INT
                 },
                 {
@@ -131 +128 @@
         };
         
-        wmi_reg_buffer_write(ar9271->htc_device, buffer, 
-                sizeof(buffer) / sizeof(wmi_reg_t));
+        wmi_reg_buffer_write(ar9271->htc_device, buffer,
+            sizeof(buffer) / sizeof(wmi_reg_t));
         
         udelay(100);
@@ -139 +136 @@
         
         int rc = hw_read_wait(ar9271, AR9271_RTC_RC, AR9271_RTC_RC_MASK, 0);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to wait for RTC RC register.\n");
                 return rc;
@@ -145 +142 @@
         
         wmi_reg_write(ar9271->htc_device, AR9271_RC, 0);
-        wmi_reg_clear_bit(ar9271->htc_device, AR9271_STATION_ID1, 
-                AR9271_STATION_ID1_POWER_SAVING);
+        wmi_reg_clear_bit(ar9271->htc_device, AR9271_STATION_ID1,
+            AR9271_STATION_ID1_POWER_SAVING);
         
         return EOK;
@@ -156 +153 @@
         nic_address_t ar9271_address;
         
-        for(int i = 0; i < 3; i++) {
-                wmi_reg_read(ar9271->htc_device, 
-                        AR9271_EEPROM_MAC_ADDR_START + i*4,
-                        &value);
+        for (unsigned int i = 0; i < 3; i++) {
+                wmi_reg_read(ar9271->htc_device,
+                    AR9271_EEPROM_MAC_ADDR_START + i * 4, &value);
                 
                 uint16_t two_bytes = uint16_t_be2host(value);
@@ -169 +165 @@
         
         int rc = nic_report_address(nic, &ar9271_address);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to report NIC HW address.\n");
                 return rc;
@@ -179 +175 @@
 static int hw_gpio_set_output(ar9271_t *ar9271, uint32_t gpio, uint32_t type)
 {
-        uint32_t address, gpio_shift, temp;
-        
-        if(gpio > 11) {
+        uint32_t address;
+        
+        if (gpio > 11)
                 address = AR9271_GPIO_OUT_MUX3;
-        } else if(gpio > 5) {
+        else if (gpio > 5)
                 address = AR9271_GPIO_OUT_MUX2;
-        } else {
+        else
                 address = AR9271_GPIO_OUT_MUX1;
-        }
-        
-        gpio_shift = (gpio % 6) * 5;
-        
+        
+        uint32_t gpio_shift = (gpio % 6) * 5;
+        
+        uint32_t temp;
         wmi_reg_read(ar9271->htc_device, address, &temp);
-
-        temp = ((temp & 0x1F0) << 1) | (temp & ~0x1F0);
+        
+        temp = ((temp & 0x1f0) << 1) | (temp & ~0x1f0);
         temp &= ~(0x1f << gpio_shift);
         temp |= (type << gpio_shift);
-
+        
         wmi_reg_write(ar9271->htc_device, address, temp);
         
@@ -202 +198 @@
         
         wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_GPIO_OE_OUT,
-                AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift, 
-                AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift);
+            AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift,
+            AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift);
         
         return EOK;
@@ -211 +207 @@
 {
         wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_GPIO_IN_OUT,
-                (~value & 1) << gpio, 1 << gpio);
-        return EOK;
-}
-
-/**
- * Hardware init procedure of AR9271 device.
- * 
+            (~value & 1) << gpio, 1 << gpio);
+        return EOK;
+}
+
+/**Hardware init procedure of AR9271 device.
+ *
  * @param ar9271 Device structure.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
+ *
  */
 static int hw_init_proc(ar9271_t *ar9271)
 {
         int rc = hw_reset_power_on(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW reset power on.\n");
                 return rc;
@@ -231 +227 @@
         
         rc = hw_set_reset(ar9271, false);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW warm reset.\n");
                 return rc;
@@ -237 +233 @@
         
         rc = hw_addr_init(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to init HW addr.\n");
                 return rc;
@@ -247 +243 @@
 static int hw_init_led(ar9271_t *ar9271)
 {
-        int rc = hw_gpio_set_output(ar9271, AR9271_LED_PIN, 
-                AR9271_GPIO_OUT_MUX_AS_OUT);
-        if(rc != EOK) {
+        int rc = hw_gpio_set_output(ar9271, AR9271_LED_PIN,
+            AR9271_GPIO_OUT_MUX_AS_OUT);
+        if (rc != EOK) {
                 usb_log_error("Failed to set led GPIO to output.\n");
                 return rc;
@@ -255 +251 @@
         
         rc = hw_gpio_set_value(ar9271, AR9271_LED_PIN, 0);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to init bring up GPIO led.\n");
                 return rc;
@@ -271 +267 @@
 }
 
-static int hw_set_operating_mode(ar9271_t *ar9271, 
-        ieee80211_operating_mode_t op_mode)
+static int hw_set_operating_mode(ar9271_t *ar9271,
+    ieee80211_operating_mode_t op_mode)
 {
         uint32_t set_bit = 0x10000000;
         
         switch(op_mode) {
-                case IEEE80211_OPMODE_ADHOC:
-                        set_bit |= AR9271_OPMODE_ADHOC_MASK;
-                        wmi_reg_set_bit(ar9271->htc_device, AR9271_CONFIG,
-                                AR9271_CONFIG_ADHOC);
-                        break;
-                case IEEE80211_OPMODE_MESH:
-                case IEEE80211_OPMODE_AP:
-                        set_bit |= AR9271_OPMODE_STATION_AP_MASK;
-                case IEEE80211_OPMODE_STATION:
-                        wmi_reg_clear_bit(ar9271->htc_device, AR9271_CONFIG,
-                                AR9271_CONFIG_ADHOC);
+        case IEEE80211_OPMODE_ADHOC:
+                set_bit |= AR9271_OPMODE_ADHOC_MASK;
+                wmi_reg_set_bit(ar9271->htc_device, AR9271_CONFIG,
+                    AR9271_CONFIG_ADHOC);
+                break;
+        case IEEE80211_OPMODE_MESH:
+        case IEEE80211_OPMODE_AP:
+                set_bit |= AR9271_OPMODE_STATION_AP_MASK;
+        case IEEE80211_OPMODE_STATION:
+                wmi_reg_clear_bit(ar9271->htc_device, AR9271_CONFIG,
+                    AR9271_CONFIG_ADHOC);
         }
         
         wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_STATION_ID1,
-                set_bit, 
-                AR9271_OPMODE_STATION_AP_MASK | AR9271_OPMODE_ADHOC_MASK);
+            set_bit, AR9271_OPMODE_STATION_AP_MASK | AR9271_OPMODE_ADHOC_MASK);
         
         ieee80211_report_current_op_mode(ar9271->ieee80211_dev, op_mode);
@@ -302 +297 @@
 {
         int rc = hw_set_operating_mode(ar9271, IEEE80211_OPMODE_STATION);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to set opmode to station.\n");
                 return rc;
@@ -314 +309 @@
         uint32_t value;
         wmi_reg_read(ar9271->htc_device, AR9271_PHY_CAL, &value);
-        value &= 0xFFFFFE00;
-        value |= (((uint32_t) AR9271_CALIB_NOMINAL_VALUE_2GHZ << 1) & 0x1FF);
+        
+        value &= 0xfffffe00;
+        value |= (((uint32_t) AR9271_CALIB_NOMINAL_VALUE_2GHZ << 1) & 0x1ff);
+        
         wmi_reg_write(ar9271->htc_device, AR9271_PHY_CAL, value);
         
-        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_CALIB_EN);
-        
-        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_NOT_UPDATE);
-        
-        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_CALIB);
-        
-        int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_CALIB, 0);
-        if(rc != EOK) {
+        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_CALIB_EN);
+        
+        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_NOT_UPDATE);
+        
+        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_CALIB);
+        
+        int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_CALIB, 0);
+        if (rc != EOK) {
                 usb_log_error("Failed to wait for NF calibration.\n");
                 return rc;
         }
         
-        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_CALIB_EN);
-        
-        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_NOT_UPDATE);
-        
-        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_NF_CALIB);
+        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_CALIB_EN);
+        
+        wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_NOT_UPDATE);
+        
+        wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_NF_CALIB);
         
         return EOK;
@@ -349 +346 @@
 {
         /* Not supported channel frequency. */
-        if(freq < IEEE80211_FIRST_FREQ || freq > IEEE80211_MAX_FREQ) {
+        if ((freq < IEEE80211_FIRST_FREQ) || (freq > IEEE80211_MAX_FREQ))
                 return EINVAL;
-        }
         
         /* Not supported channel frequency. */
-        if((freq - IEEE80211_FIRST_FREQ) % IEEE80211_CHANNEL_GAP != 0) {
+        if ((freq - IEEE80211_FIRST_FREQ) % IEEE80211_CHANNEL_GAP != 0)
                 return EINVAL;
-        }
         
         uint32_t tx_control;
         wmi_reg_read(ar9271->htc_device, AR9271_PHY_CCK_TX_CTRL, &tx_control);
         wmi_reg_write(ar9271->htc_device, AR9271_PHY_CCK_TX_CTRL,
-                tx_control & ~AR9271_PHY_CCK_TX_CTRL_JAPAN);
+            tx_control & ~AR9271_PHY_CCK_TX_CTRL_JAPAN);
         
         /* Some magic here. */
         uint32_t synth_ctl;
         wmi_reg_read(ar9271->htc_device, AR9271_PHY_SYNTH_CONTROL, &synth_ctl);
-        synth_ctl &= 0xC0000000;
+        synth_ctl &= 0xc0000000;
         uint32_t channel_select = (freq * 0x10000) / 15;
         synth_ctl = synth_ctl | (1 << 29) | (1 << 28) | channel_select;
@@ -382 +377 @@
         
         int rc = hw_read_wait(ar9271, AR9271_PHY_RFBUS_GRANT, 0x1, 0x1);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to kill RF bus.\n");
                 return rc;
@@ -388 +383 @@
         
         rc = hw_set_freq(ar9271, freq);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW set frequency.\n");
                 return rc;
@@ -394 +389 @@
         
         rc = hw_activate_phy(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to activate physical layer.\n");
                 return rc;
@@ -403 +398 @@
         
         rc = hw_noise_floor_calibration(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to do NF calibration.\n");
                 return rc;
@@ -413 +408 @@
 int hw_set_rx_filter(ar9271_t *ar9271, bool assoc)
 {
-        uint32_t filter_bits;
-        
         uint32_t additional_bits = 0;
         
-        if(assoc) {
+        if (assoc)
                 additional_bits |= AR9271_RX_FILTER_MYBEACON;
-        } else {
+        else
                 additional_bits |= AR9271_RX_FILTER_BEACON;
-        }
-        
-        filter_bits = AR9271_RX_FILTER_UNI | AR9271_RX_FILTER_MULTI | 
-                AR9271_RX_FILTER_BROAD | additional_bits;
+        
+        uint32_t filter_bits = AR9271_RX_FILTER_UNI |
+            AR9271_RX_FILTER_MULTI | AR9271_RX_FILTER_BROAD |
+            additional_bits;
         
         wmi_reg_write(ar9271->htc_device, AR9271_RX_FILTER, filter_bits);
@@ -441 +434 @@
         uint16_t *last_2bytes = (uint16_t *) &bssid.address[4];
         
-        wmi_reg_write(ar9271->htc_device, AR9271_BSSID0, 
-                uint32_t_le2host(*first_4bytes));
-        
-        wmi_reg_write(ar9271->htc_device, AR9271_BSSID1, 
-                uint16_t_le2host(*last_2bytes) | 
-                ((ieee80211_get_aid(ieee80211_dev) & 0x3FFF) << 16));
+        wmi_reg_write(ar9271->htc_device, AR9271_BSSID0,
+            uint32_t_le2host(*first_4bytes));
+        
+        wmi_reg_write(ar9271->htc_device, AR9271_BSSID1,
+            uint16_t_le2host(*last_2bytes) |
+            ((ieee80211_get_aid(ieee80211_dev) & 0x3fff) << 16));
         
         return EOK;
@@ -453 +446 @@
 int hw_rx_init(ar9271_t *ar9271)
 {
-        wmi_reg_write(ar9271->htc_device, AR9271_COMMAND, 
-                AR9271_COMMAND_RX_ENABLE);
+        wmi_reg_write(ar9271->htc_device, AR9271_COMMAND,
+            AR9271_COMMAND_RX_ENABLE);
         
         int rc = hw_set_rx_filter(ar9271, false);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to set RX filtering.\n");
                 return rc;
@@ -473 +466 @@
 static int hw_init_pll(ar9271_t *ar9271)
 {
-        uint32_t pll;
-        
         /* Some magic here (set for 2GHz channels). But VERY important :-) */
-        pll = (0x5 << 10) | 0x2C;
+        uint32_t pll = (0x5 << 10) | 0x2c;
         
         wmi_reg_write(ar9271->htc_device, AR9271_RTC_PLL_CONTROL, pll);
         
         wmi_reg_write(ar9271->htc_device, AR9271_RTC_SLEEP_CLOCK,
-                AR9271_RTC_SLEEP_CLOCK_FORCE_DERIVED);
+            AR9271_RTC_SLEEP_CLOCK_FORCE_DERIVED);
         wmi_reg_set_bit(ar9271->htc_device, AR9271_RTC_FORCE_WAKE,
-                AR9271_RTC_FORCE_WAKE_ENABLE);
+            AR9271_RTC_FORCE_WAKE_ENABLE);
         
         return EOK;
@@ -490 +481 @@
 static void hw_set_init_values(ar9271_t *ar9271)
 {
-        uint32_t reg_offset, reg_value;
-        
-        int size = ARRAY_SIZE(ar9271_2g_mode_array);
-        
-        for(int i = 0; i < size; i++) {
+        uint32_t reg_offset;
+        uint32_t reg_value;
+        
+        size_t size = ARRAY_SIZE(ar9271_2g_mode_array);
+        
+        for (size_t i = 0; i < size; i++) {
                 reg_offset = ar9271_2g_mode_array[i][0];
                 reg_value = ar9271_2g_mode_array[i][1];
@@ -502 +494 @@
         size = ARRAY_SIZE(ar9271_2g_tx_array);
         
-        for(int i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++) {
                 reg_offset = ar9271_2g_tx_array[i][0];
                 reg_value = ar9271_2g_tx_array[i][1];
@@ -510 +502 @@
         size = ARRAY_SIZE(ar9271_init_array);
         
-        for(int i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++) {
                 reg_offset = ar9271_init_array[i][0];
                 reg_value = ar9271_init_array[i][1];
@@ -520 +512 @@
 {
         wmi_reg_set_bit(ar9271->htc_device, AR9271_CARRIER_LEAK_CONTROL,
-                AR9271_CARRIER_LEAK_CALIB);
+            AR9271_CARRIER_LEAK_CALIB);
         wmi_reg_clear_bit(ar9271->htc_device, AR9271_ADC_CONTROL,
-                AR9271_ADC_CONTROL_OFF_PWDADC);
+            AR9271_ADC_CONTROL_OFF_PWDADC);
         wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
-                AR9271_AGC_CONTROL_TX_CALIB);
+            AR9271_AGC_CONTROL_TX_CALIB);
         wmi_reg_set_bit(ar9271->htc_device, AR9271_PHY_TPCRG1,
-                AR9271_PHY_TPCRG1_PD_CALIB);
+            AR9271_PHY_TPCRG1_PD_CALIB);
         wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
-                AR9271_AGC_CONTROL_CALIB);
-        
-        int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, 
-                AR9271_AGC_CONTROL_CALIB, 0);
-        if(rc != EOK) {
+            AR9271_AGC_CONTROL_CALIB);
+        
+        int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL,
+            AR9271_AGC_CONTROL_CALIB, 0);
+        if (rc != EOK) {
                 usb_log_error("Failed to wait on calibrate completion.\n");
                 return rc;
@@ -538 +530 @@
         
         wmi_reg_set_bit(ar9271->htc_device, AR9271_ADC_CONTROL,
-                AR9271_ADC_CONTROL_OFF_PWDADC);
+            AR9271_ADC_CONTROL_OFF_PWDADC);
         wmi_reg_clear_bit(ar9271->htc_device, AR9271_CARRIER_LEAK_CONTROL,
-                AR9271_CARRIER_LEAK_CALIB);
+            AR9271_CARRIER_LEAK_CALIB);
         wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL,
-                AR9271_AGC_CONTROL_TX_CALIB);
-        
-        return EOK;
-}
-
-int hw_reset(ar9271_t *ar9271) 
+            AR9271_AGC_CONTROL_TX_CALIB);
+        
+        return EOK;
+}
+
+int hw_reset(ar9271_t *ar9271)
 {
         /* Set physical layer as deactivated. */
@@ -553 +545 @@
         
         if(ar9271->starting_up) {
-                wmi_reg_write(ar9271->htc_device, 
-                        AR9271_RESET_POWER_DOWN_CONTROL,
-                        AR9271_RADIO_RF_RESET);
-
+                wmi_reg_write(ar9271->htc_device,
+                    AR9271_RESET_POWER_DOWN_CONTROL,
+                    AR9271_RADIO_RF_RESET);
+                
                 udelay(50);
         }
@@ -563 +555 @@
         uint32_t config_reg;
         wmi_reg_read(ar9271->htc_device, AR9271_COMMAND, &config_reg);
-        if(config_reg & AR9271_COMMAND_RX_ENABLE) {
+        if (config_reg & AR9271_COMMAND_RX_ENABLE)
                 hw_set_reset(ar9271, true);
-        }
         
         int rc = hw_init_pll(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to init PLL.\n");
                 return rc;
@@ -575 +566 @@
         udelay(500);
         
-        wmi_reg_write(ar9271->htc_device, AR9271_CLOCK_CONTROL, 
-                AR9271_MAX_CPU_CLOCK);
+        wmi_reg_write(ar9271->htc_device, AR9271_CLOCK_CONTROL,
+            AR9271_MAX_CPU_CLOCK);
         
         udelay(100);
         
-        if(ar9271->starting_up) {
-                wmi_reg_write(ar9271->htc_device, 
-                        AR9271_RESET_POWER_DOWN_CONTROL,
-                        AR9271_GATE_MAC_CONTROL);
-
+        if (ar9271->starting_up) {
+                wmi_reg_write(ar9271->htc_device,
+                    AR9271_RESET_POWER_DOWN_CONTROL,
+                    AR9271_GATE_MAC_CONTROL);
+                
                 udelay(50);
         }
@@ -591 +582 @@
         
         /* Set physical layer mode. */
-        wmi_reg_write(ar9271->htc_device, AR9271_PHY_MODE, 
-                AR9271_PHY_MODE_DYNAMIC);
+        wmi_reg_write(ar9271->htc_device, AR9271_PHY_MODE,
+            AR9271_PHY_MODE_DYNAMIC);
         
         /* Reset device operating mode. */
         rc = hw_reset_operating_mode(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to reset operating mode.\n");
                 return rc;
@@ -603 +594 @@
         /* Set initial channel frequency. */
         rc = hw_set_freq(ar9271, IEEE80211_FIRST_FREQ);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to set channel.\n");
                 return rc;
@@ -609 +600 @@
         
         /* Initialize transmission queues. */
-        for(int i = 0; i < AR9271_QUEUES_COUNT; i++) {
-                wmi_reg_write(ar9271->htc_device, 
-                        AR9271_QUEUE_BASE_MASK + (i << 2),
-                        1 << i);
+        for (unsigned int i = 0; i < AR9271_QUEUES_COUNT; i++) {
+                wmi_reg_write(ar9271->htc_device,
+                    AR9271_QUEUE_BASE_MASK + (i << 2), 1 << i);
         }
         
         /* Activate physical layer. */
         rc = hw_activate_phy(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to activate physical layer.\n");
                 return rc;
@@ -624 +614 @@
         /* Calibration. */
         rc = hw_calibration(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to calibrate device.\n");
                 return rc;
@@ -630 +620 @@
         
         rc = hw_noise_floor_calibration(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to calibrate noise floor.\n");
                 return rc;
@@ -641 +631 @@
 }
 
-/**
- * Initialize hardware of AR9271 device.
- * 
+/** Initialize hardware of AR9271 device.
+ *
  * @param ar9271 Device structure.
- * 
+ *
  * @return EOK if succeed, negative error code otherwise.
  */
@@ -651 +640 @@
 {
         int rc = hw_init_proc(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW reset device.\n");
                 return rc;
@@ -657 +646 @@
         
         rc = hw_init_led(ar9271);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to HW init led.\n");
                 return rc;

uspace/drv/nic/ar9271/hw.h

@@ -34 +34 @@
 
 #ifndef ATHEROS_HW_H
-#define ATHEROS_HW_H
+#define ATHEROS_HW_H
 
 #include "ar9271.h"
 
-#define HW_WAIT_LOOPS 1000
-#define HW_WAIT_TIME_US 10
+#define HW_WAIT_LOOPS    1000
+#define HW_WAIT_TIME_US  10
 
-extern int hw_init(ar9271_t *ar9271);
-extern int hw_freq_switch(ar9271_t *, uint16_t freq);
-extern int hw_rx_init(ar9271_t *ar9271);
-extern int hw_reset(ar9271_t *ar9271);
-extern int hw_set_bssid(ar9271_t *ar9271);
-extern int hw_set_rx_filter(ar9271_t *ar9271, bool assoc);
+extern int hw_init(ar9271_t *);
+extern int hw_freq_switch(ar9271_t *, uint16_t);
+extern int hw_rx_init(ar9271_t *);
+extern int hw_reset(ar9271_t *);
+extern int hw_set_bssid(ar9271_t *);
+extern int hw_set_rx_filter(ar9271_t *, bool);
 
-#endif  /* ATHEROS_HW_H */
+#endif  /* ATHEROS_HW_H */

uspace/drv/nic/ar9271/wmi.c

@@ -34 +34 @@
 
 #include <usb/debug.h>
-
 #include <malloc.h>
 #include <mem.h>
 #include <byteorder.h>
-
 #include "wmi.h"
 
-/**
- * WMI registry read.
- * 
+/** WMI registry read.
+ *
  * @param htc_device HTC device structure.
  * @param reg_offset Registry offset (address) to be read.
- * @param res Stored result.
- * 
- * @return EOK if succeed, negative error code otherwise.
+ * @param res        Stored result.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 int wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res)
@@ -54 +52 @@
         uint32_t cmd_value = host2uint32_t_be(reg_offset);
         
-        void *resp_buffer = 
-                malloc(htc_device->ath_device->ctrl_response_length);
-        
-        int rc = wmi_send_command(htc_device, WMI_REG_READ, 
-                (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer);
-        
-        if(rc != EOK) {
+        void *resp_buffer =
+            malloc(htc_device->ath_device->ctrl_response_length);
+        
+        int rc = wmi_send_command(htc_device, WMI_REG_READ,
+            (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer);
+        
+        if (rc != EOK) {
                 usb_log_error("Failed to read registry value.\n");
                 return rc;
         }
         
-        uint32_t *resp_value = (uint32_t *) ((void*) resp_buffer + 
-                sizeof(htc_frame_header_t) +
-                sizeof(wmi_command_header_t));
+        uint32_t *resp_value = (uint32_t *) ((void *) resp_buffer +
+            sizeof(htc_frame_header_t) + sizeof(wmi_command_header_t));
         
         *res = uint32_t_be2host(*resp_value);
@@ -74 +71 @@
 }
 
-/**
- * WMI registry write.
- * 
- * @param htc_device HTC device structure.
- * @param reg_offset Registry offset (address) to be written.
- * @param val Value to be written
- * 
- * @return EOK if succeed, negative error code otherwise.
+/** WMI registry write.
+ *
+ * @param htc_device HTC device structure.
+ * @param reg_offset Registry offset (address) to be written.
+ * @param val        Value to be written
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 int wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val)
 {
         uint32_t cmd_buffer[] = {
-            host2uint32_t_be(reg_offset),
-            host2uint32_t_be(val)
+                host2uint32_t_be(reg_offset),
+                host2uint32_t_be(val)
         };
         
-        void *resp_buffer = 
-                malloc(htc_device->ath_device->ctrl_response_length);
-        
-        int rc = wmi_send_command(htc_device, WMI_REG_WRITE, 
-                (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer);
+        void *resp_buffer =
+            malloc(htc_device->ath_device->ctrl_response_length);
+        
+        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+            (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer);
         
         free(resp_buffer);
         
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to write registry value.\n");
                 return rc;
@@ -106 +103 @@
 }
 
-/**
- * WMI registry set or clear specified bits.
- * 
- * @param htc_device HTC device structure.
- * @param reg_offset Registry offset (address) to be written.
- * @param set_bit Bit to be set.
- * @param clear_bit Bit to be cleared.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t set_bit, uint32_t clear_bit)
+/** WMI registry set or clear specified bits.
+ *
+ * @param htc_device HTC device structure.
+ * @param reg_offset Registry offset (address) to be written.
+ * @param set_bit    Bit to be set.
+ * @param clear_bit  Bit to be cleared.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+    uint32_t set_bit, uint32_t clear_bit)
 {
         uint32_t value;
         
         int rc = wmi_reg_read(htc_device, reg_offset, &value);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to read registry value in RMW "
-                        "function.\n");
+                    "function.\n");
                 return rc;
         }
@@ -132 +129 @@
         
         rc = wmi_reg_write(htc_device, reg_offset, value);
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to write registry value in RMW "
-                        "function.\n");
-                return rc;
-        }
-        
-        return rc;
-}
-
-/**
- * WMI registry set specified bit.
- * 
- * @param htc_device HTC device structure.
- * @param reg_offset Registry offset (address) to be written.
- * @param set_bit Bit to be set.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t set_bit)
+                    "function.\n");
+                return rc;
+        }
+        
+        return rc;
+}
+
+/** WMI registry set specified bit.
+ *
+ * @param htc_device HTC device structure.
+ * @param reg_offset Registry offset (address) to be written.
+ * @param set_bit    Bit to be set.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset,
+    uint32_t set_bit)
 {
         return wmi_reg_set_clear_bit(htc_device, reg_offset, set_bit, 0);
 }
 
-/**
- * WMI registry clear specified bit.
- * 
- * @param htc_device HTC device structure.
- * @param reg_offset Registry offset (address) to be written.
- * @param clear_bit Bit to be cleared.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t clear_bit)
+/** WMI registry clear specified bit.
+ *
+ * @param htc_device HTC device structure.
+ * @param reg_offset Registry offset (address) to be written.
+ * @param clear_bit  Bit to be cleared.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+    uint32_t clear_bit)
 {
         return wmi_reg_set_clear_bit(htc_device, reg_offset, 0, clear_bit);
 }
 
-/**
- * WMI multi registry write.
- * 
+/** WMI multi registry write.
+ *
  * @param htc_device HTC device structure.
  * @param reg_buffer Array of registry values to be written.
- * @param elements Number of elements in array.
- * 
- * @return EOK if succeed, negative error code otherwise.
+ * @param elements   Number of elements in array.
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
  */
 int wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer,
-        size_t elements)
+    size_t elements)
 {
         size_t buffer_size = sizeof(wmi_reg_t) * elements;
         void *buffer = malloc(buffer_size);
-        void *resp_buffer = 
-                malloc(htc_device->ath_device->ctrl_response_length);
+        void *resp_buffer =
+            malloc(htc_device->ath_device->ctrl_response_length);
         
         /* Convert values to correct endianness. */
-        for(size_t i = 0; i < elements; i++) {
+        for (size_t i = 0; i < elements; i++) {
                 wmi_reg_t *buffer_element = &reg_buffer[i];
                 wmi_reg_t *buffer_it = (wmi_reg_t *)
-                        ((void *) buffer + i*sizeof(wmi_reg_t));
-                buffer_it->offset = 
-                        host2uint32_t_be(buffer_element->offset);
+                    ((void *) buffer + i * sizeof(wmi_reg_t));
+                buffer_it->offset =
+                    host2uint32_t_be(buffer_element->offset);
                 buffer_it->value =
-                        host2uint32_t_be(buffer_element->value);
-        }
-        
-        int rc = wmi_send_command(htc_device, WMI_REG_WRITE, 
-                (uint8_t *) buffer, buffer_size, resp_buffer);
+                    host2uint32_t_be(buffer_element->value);
+        }
+        
+        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+            (uint8_t *) buffer, buffer_size, resp_buffer);
         
         free(buffer);
         free(resp_buffer);
         
-        if(rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to write multi registry value.\n");
                 return rc;
@@ -213 +210 @@
 }
 
-/**
- * Send WMI message to HTC device.
- * 
- * @param htc_device HTC device structure.
- * @param command_id Command identification.
- * @param command_buffer Buffer with command data.
- * @param command_length Length of command data.
+/** Send WMI message to HTC device.
+ *
+ * @param htc_device      HTC device structure.
+ * @param command_id      Command identification.
+ * @param command_buffer  Buffer with command data.
+ * @param command_length  Length of command data.
  * @param response_buffer Buffer with response data.
- * 
- * @return EOK if succeed, negative error code otherwise.
- */
-int wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id, 
-    uint8_t *command_buffer, uint32_t command_length, void *response_buffer) 
-{
-        size_t header_size = sizeof(wmi_command_header_t) + 
-                sizeof(htc_frame_header_t);
+ *
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id,
+    uint8_t *command_buffer, uint32_t command_length, void *response_buffer)
+{
+        size_t header_size = sizeof(wmi_command_header_t) +
+            sizeof(htc_frame_header_t);
         size_t buffer_size = header_size + command_length;
         void *buffer = malloc(buffer_size);
         
-        if(command_buffer != NULL) {
+        if (command_buffer != NULL)
                 memcpy(buffer+header_size, command_buffer, command_length);
-        }
         
         /* Set up WMI header */
         wmi_command_header_t *wmi_header = (wmi_command_header_t *)
-                ((void *) buffer + sizeof(htc_frame_header_t));
-        wmi_header->command_id = 
-                host2uint16_t_be(command_id);
-        wmi_header->sequence_number = 
-                host2uint16_t_be(++htc_device->sequence_number);
+            ((void *) buffer + sizeof(htc_frame_header_t));
+        wmi_header->command_id = host2uint16_t_be(command_id);
+        wmi_header->sequence_number =
+            host2uint16_t_be(++htc_device->sequence_number);
         
         /* Send message. */
         int rc = htc_send_control_message(htc_device, buffer, buffer_size,
-                htc_device->endpoints.wmi_endpoint);
-        if(rc != EOK) {
+            htc_device->endpoints.wmi_endpoint);
+        if (rc != EOK) {
                 free(buffer);
                 usb_log_error("Failed to send WMI message. Error: %d\n", rc);
@@ -256 +251 @@
         
         bool clean_resp_buffer = false;
-        size_t response_buffer_size = 
-                htc_device->ath_device->ctrl_response_length;
-        if(response_buffer == NULL) {
+        size_t response_buffer_size =
+            htc_device->ath_device->ctrl_response_length;
+        if (response_buffer == NULL) {
                 response_buffer = malloc(response_buffer_size);
                 clean_resp_buffer = true;
@@ -267 +262 @@
         uint16_t cmd_id;
         do {
-                rc = htc_read_control_message(htc_device, response_buffer, 
-                        response_buffer_size, NULL);
-                if(rc != EOK) {
+                rc = htc_read_control_message(htc_device, response_buffer,
+                    response_buffer_size, NULL);
+                if (rc != EOK) {
                         free(buffer);
                         usb_log_error("Failed to receive WMI message response. "
@@ -276 +271 @@
                 }
                 
-                if(response_buffer_size < sizeof(htc_frame_header_t) + 
-                        sizeof(wmi_command_header_t)) {
+                if (response_buffer_size < sizeof(htc_frame_header_t) +
+                    sizeof(wmi_command_header_t)) {
                         free(buffer);
                         usb_log_error("Corrupted response received.\n");
@@ -283 +278 @@
                 }
                 
-                wmi_command_header_t *wmi_hdr = (wmi_command_header_t *) 
-                        ((void*) response_buffer + sizeof(htc_frame_header_t));
+                wmi_command_header_t *wmi_hdr = (wmi_command_header_t *)
+                    ((void *) response_buffer + sizeof(htc_frame_header_t));
                 cmd_id = uint16_t_be2host(wmi_hdr->command_id);
         } while(cmd_id & WMI_MGMT_CMD_MASK);
         
-        if(clean_resp_buffer) {
+        if (clean_resp_buffer)
                 free(response_buffer);
-        }
-        
-        return rc;
-}
+        
+        return rc;
+}

uspace/drv/nic/ar9271/wmi.h

@@ -35 +35 @@
 
 #ifndef ATHEROS_WMI_H
-#define ATHEROS_WMI_H
+#define ATHEROS_WMI_H
 
 #include "htc.h"
 
 /* Macros for creating service identificators. */
-#define WMI_SERVICE_GROUP 1
-#define CREATE_SERVICE_ID(group, i) (int) (((int) group << 8) | (int) (i))
+#define WMI_SERVICE_GROUP  1
 
-#define WMI_MGMT_CMD_MASK 0x1000
+#define CREATE_SERVICE_ID(group, i) \
+        (unsigned int) (((unsigned int) group << 8) | (unsigned int) (i))
 
-/**
- * WMI header structure.
+#define WMI_MGMT_CMD_MASK  0x1000
+
+/** WMI header structure.
+ *
  */
 typedef struct {
-    uint16_t command_id;                /**< Big Endian value! */
-    uint16_t sequence_number;           /**< Big Endian value! */
+        uint16_t command_id;       /**< Big Endian value! */
+        uint16_t sequence_number;  /**< Big Endian value! */
 } __attribute__((packed)) wmi_command_header_t;
 
-/**
- * WMI services IDs
+/** WMI services IDs
+ *
  */
 typedef enum {
@@ -68 +70 @@
 } wmi_services_t;
 
-/**
- * List of WMI commands
+/** List of WMI commands
+ *
  */
 typedef enum {
         WMI_ECHO = 0x0001,
         WMI_ACCESS_MEMORY,
-
+        
         /* Commands used for HOST -> DEVICE communication */
         WMI_GET_FW_VERSION,
@@ -107 +109 @@
 } wmi_command_t;
 
-/**
- * Structure used when sending registry buffer
+/**Structure used when sending registry buffer
+ *
  */
 typedef struct {
-        uint32_t offset;                /**< Big Endian value! */
-        uint32_t value;                 /**< Big Endian value! */
+        uint32_t offset;  /**< Big Endian value! */
+        uint32_t value;   /**< Big Endian value! */
 } wmi_reg_t;
 
-extern int wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t *res);
-extern int wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t val);
-extern int wmi_reg_set_clear_bit(htc_device_t *htc_device, 
-        uint32_t reg_offset, uint32_t set_bit, uint32_t clear_bit);
-extern int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t set_bit);
-extern int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, 
-        uint32_t clear_bit);
-extern int wmi_reg_buffer_write(htc_device_t *htc_device, 
-        wmi_reg_t *reg_buffer, size_t elements);
-extern int wmi_send_command(htc_device_t *htc_device, 
-        wmi_command_t command_id, 
-        uint8_t *command_buffer, uint32_t command_length, 
-        void *response_buffer);
+extern int wmi_reg_read(htc_device_t *, uint32_t, uint32_t *);
+extern int wmi_reg_write(htc_device_t *, uint32_t, uint32_t);
+extern int wmi_reg_set_clear_bit(htc_device_t *, uint32_t, uint32_t, uint32_t);
+extern int wmi_reg_set_bit(htc_device_t *, uint32_t, uint32_t);
+extern int wmi_reg_clear_bit(htc_device_t *, uint32_t, uint32_t);
+extern int wmi_reg_buffer_write(htc_device_t *, wmi_reg_t *, size_t);
+extern int wmi_send_command(htc_device_t *, wmi_command_t, uint8_t *, uint32_t,
+    void *);
 
-#endif  /* ATHEROS_WMI_H */
-
+#endif  /* ATHEROS_WMI_H */

uspace/lib/c/include/ieee80211/ieee80211.h

@@ -44 +44 @@
 
 /** Max length of scan results array. */
-#define IEEE80211_MAX_RESULTS_LENGTH 32
+#define IEEE80211_MAX_RESULTS_LENGTH  32
 
 /** Max SSID length including null character. */
-#define IEEE80211_MAX_SSID_LENGTH 35
+#define IEEE80211_MAX_SSID_LENGTH  35
 
 /** WiFi security authentication method indicator. */
@@ -97 +97 @@
 /** @}
  */
-

uspace/lib/crypto/aes.c

@@ -28 +28 @@
 
 /** @file aes.c
- * 
+ *
  * Implementation of AES-128 symmetric cipher cryptographic algorithm.
- * 
+ *
  * Based on FIPS 197.
  */
@@ -37 +37 @@
 #include <errno.h>
 #include <mem.h>
-
 #include "crypto.h"
 
 /* Number of elements in rows/columns in AES arrays. */
-#define ELEMS 4
+#define ELEMS  4
 
 /* Number of elements (words) in cipher. */
-#define CIPHER_ELEMS 4
+#define CIPHER_ELEMS  4
 
 /* Length of AES block. */
-#define BLOCK_LEN 16
+#define BLOCK_LEN  16
 
 /* Number of iterations in AES algorithm. */
-#define ROUNDS 10
-
-/* 
- * Irreducible polynomial used in AES algorithm. 
- * 
+#define ROUNDS  10
+
+/** Irreducible polynomial used in AES algorithm.
+ *
  * NOTE: x^8 + x^4 + x^3 + x + 1.
- */
-#define AES_IP 0x1B
-
-/* Precomputed values for AES sub_byte transformation. */
+ *
+ */
+#define AES_IP  0x1b
+
+/** Precomputed values for AES sub_byte transformation. */
 static const uint8_t sbox[BLOCK_LEN][BLOCK_LEN] = {
         {
-                0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 
+                0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
                 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76
         },
         {
-                0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 
+                0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
                 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0
         },
@@ -74 +73 @@
         },
         {
-                0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 
+                0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
                 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75
         },
         {
-                0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 
+                0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
                 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84
         },
         {
-                0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 
+                0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
                 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf
         },
         {
-                0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 
+                0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
                 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8
         },
         {
-                0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 
+                0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
                 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2
         },
         {
-                0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 
+                0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
                 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73
         },
         {
-                0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 
+                0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
                 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb
         },
         {
-                0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 
+                0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
                 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79
         },
         {
-                0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 
+                0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
                 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08
         },
         {
-                0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 
+                0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
                 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a
         },
         {
-                0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 
+                0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
                 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e
         },
         {
-                0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 
+                0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
                 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf
         },
         {
-                0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 
+                0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
                 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
         }
 };
 
-/* Precomputed values for AES inv_sub_byte transformation. */
+/** Precomputed values for AES inv_sub_byte transformation. */
 static uint8_t inv_sbox[BLOCK_LEN][BLOCK_LEN] = {
         {
-                0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 
+                0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
                 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb
         },
         {
-                0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 
+                0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
                 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb
         },
         {
-                0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 
+                0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d,
                 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e
         },
         {
-                0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 
+                0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2,
                 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25
         },
         {
-                0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 
+                0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
                 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92
         },
         {
-                0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 
+                0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda,
                 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84
         },
         {
-                0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 
+                0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a,
                 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06
         },
         {
-                0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 
+                0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
                 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b
         },
         {
-                0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 
+                0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea,
                 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73
         },
         {
-                0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 
+                0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85,
                 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e
         },
         {
-                0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 
+                0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
                 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b
         },
         {
-                0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 
+                0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20,
                 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4
         },
         {
-                0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 
+                0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31,
                 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f
         },
         {
-                0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 
+                0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
                 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
         },
         {
-                0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 
+                0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0,
                 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
         },
         {
-                0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 
+                0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26,
                 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
         }
 };
 
-/* Precomputed values of powers of 2 in GF(2^8) left shifted by 24b. */
+/** Precomputed values of powers of 2 in GF(2^8) left shifted by 24b. */
 static const uint32_t r_con_array[] = {
-        0x01000000, 0x02000000, 0x04000000, 0x08000000, 
+        0x01000000, 0x02000000, 0x04000000, 0x08000000,
         0x10000000, 0x20000000, 0x40000000, 0x80000000,
-        0x1B000000, 0x36000000
+        0x1b000000, 0x36000000
 };
 
-/**
- * Perform substitution transformation on given byte.
- * 
+/** Perform substitution transformation on given byte.
+ *
  * @param byte Input byte.
- * @param inv Flag indicating whether to use inverse table.
- * 
+ * @param inv  Flag indicating whether to use inverse table.
+ *
  * @return Substituted value.
+ *
  */
 static uint8_t sub_byte(uint8_t byte, bool inv)
@@ -215 +214 @@
         uint8_t j = byte & 0xF;
         
-        if(!inv) {
+        if (!inv)
                 return sbox[i][j];
-        } else {
-                return inv_sbox[i][j];
-        }
-}
-
-/**
- * Perform substitution transformation on state table.
- * 
+        
+        return inv_sbox[i][j];
+}
+
+/** Perform substitution transformation on state table.
+ *
  * @param state State table to be modified.
- * @param inv Flag indicating whether to use inverse table.
+ * @param inv   Flag indicating whether to use inverse table.
+ *
  */
 static void sub_bytes(uint8_t state[ELEMS][ELEMS], bool inv)
@@ -232 +230 @@
         uint8_t val;
         
-        for(size_t i = 0; i < ELEMS; i++) {
-                for(size_t j = 0; j < ELEMS; j++) {
+        for (size_t i = 0; i < ELEMS; i++) {
+                for (size_t j = 0; j < ELEMS; j++) {
                         val = state[i][j];
                         state[i][j] = sub_byte(val, inv);
@@ -240 +238 @@
 }
 
-/**
- * Perform shift rows transformation on state table.
- * 
+/** Perform shift rows transformation on state table.
+ *
  * @param state State table to be modified.
+ *
  */
 static void shift_rows(uint8_t state[ELEMS][ELEMS])
@@ -249 +247 @@
         uint8_t temp[ELEMS];
         
-        for(size_t i = 1; i < ELEMS; i++) {
+        for (size_t i = 1; i < ELEMS; i++) {
                 memcpy(temp, state[i], i);
                 memcpy(state[i], state[i] + i, ELEMS - i);
@@ -256 +254 @@
 }
 
-/**
- * Perform inverted shift rows transformation on state table.
- * 
+/** Perform inverted shift rows transformation on state table.
+ *
  * @param state State table to be modified.
+ *
  */
 static void inv_shift_rows(uint8_t state[ELEMS][ELEMS])
@@ -265 +263 @@
         uint8_t temp[ELEMS];
         
-        for(size_t i = 1; i < ELEMS; i++) {
+        for (size_t i = 1; i < ELEMS; i++) {
                 memcpy(temp, state[i], ELEMS - i);
                 memcpy(state[i], state[i] + ELEMS - i, i);
@@ -272 +270 @@
 }
 
-/**
- * Multiplication in GF(2^8).
- * 
+/** Multiplication in GF(2^8).
+ *
  * @param x First factor.
  * @param y Second factor.
- * 
+ *
  * @return Multiplication of given factors in GF(2^8).
- */
-static uint8_t galois_mult(uint8_t x, uint8_t y) {
-        uint8_t result = 0;
-        uint8_t F_bitH;
-        
-        for(size_t i = 0; i < 8; i++) {
-                if (y & 1) 
+ *
+ */
+static uint8_t galois_mult(uint8_t x, uint8_t y)
+{
+        uint8_t result = 0;
+        uint8_t f_bith;
+        
+        for (size_t i = 0; i < 8; i++) {
+                if (y & 1)
                         result ^= x;
-                F_bitH = (x & 0x80);
-                x <<= 1;
-                if (F_bitH) 
-                        x ^= AES_IP;
-                y >>= 1;
-        }
-        
-        return result;
-}
-
-/**
- * Perform mix columns transformation on state table.
- * 
+                
+                f_bith = (x & 0x80);
+                x <<= 1;
+                
+                if (f_bith)
+                        x ^= AES_IP;
+                
+                y >>= 1;
+        }
+        
+        return result;
+}
+
+/** Perform mix columns transformation on state table.
+ *
  * @param state State table to be modified.
+ *
  */
 static void mix_columns(uint8_t state[ELEMS][ELEMS])
@@ -307 +309 @@
         memcpy(orig_state, state, BLOCK_LEN);
         
-        for(size_t j = 0; j < ELEMS; j++) {
-                state[0][j] = 
-                        galois_mult(0x2, orig_state[0][j]) ^
-                        galois_mult(0x3, orig_state[1][j]) ^
-                        orig_state[2][j] ^
-                        orig_state[3][j];
-                state[1][j] = 
-                        orig_state[0][j] ^
-                        galois_mult(0x2, orig_state[1][j]) ^
-                        galois_mult(0x3, orig_state[2][j]) ^
-                        orig_state[3][j];
-                state[2][j] = 
-                        orig_state[0][j] ^
-                        orig_state[1][j] ^
-                        galois_mult(0x2, orig_state[2][j]) ^
-                        galois_mult(0x3, orig_state[3][j]);
-                state[3][j] = 
-                        galois_mult(0x3, orig_state[0][j]) ^
-                        orig_state[1][j] ^
-                        orig_state[2][j] ^
-                        galois_mult(0x2, orig_state[3][j]);
-        }
-}
-
-/**
- * Perform inverted mix columns transformation on state table.
- * 
+        for (size_t j = 0; j < ELEMS; j++) {
+                state[0][j] =
+                    galois_mult(0x2, orig_state[0][j]) ^
+                    galois_mult(0x3, orig_state[1][j]) ^
+                    orig_state[2][j] ^
+                    orig_state[3][j];
+                state[1][j] =
+                    orig_state[0][j] ^
+                    galois_mult(0x2, orig_state[1][j]) ^
+                    galois_mult(0x3, orig_state[2][j]) ^
+                    orig_state[3][j];
+                state[2][j] =
+                    orig_state[0][j] ^
+                    orig_state[1][j] ^
+                    galois_mult(0x2, orig_state[2][j]) ^
+                    galois_mult(0x3, orig_state[3][j]);
+                state[3][j] =
+                    galois_mult(0x3, orig_state[0][j]) ^
+                    orig_state[1][j] ^
+                    orig_state[2][j] ^
+                    galois_mult(0x2, orig_state[3][j]);
+        }
+}
+
+/** Perform inverted mix columns transformation on state table.
+ *
  * @param state State table to be modified.
+ *
  */
 static void inv_mix_columns(uint8_t state[ELEMS][ELEMS])
@@ -341 +343 @@
         memcpy(orig_state, state, BLOCK_LEN);
         
-        for(size_t j = 0; j < ELEMS; j++) {
-                state[0][j] = 
-                        galois_mult(0x0E, orig_state[0][j]) ^
-                        galois_mult(0x0B, orig_state[1][j]) ^
-                        galois_mult(0x0D, orig_state[2][j]) ^
-                        galois_mult(0x09, orig_state[3][j]);
-                state[1][j] = 
-                        galois_mult(0x09, orig_state[0][j]) ^
-                        galois_mult(0x0E, orig_state[1][j]) ^
-                        galois_mult(0x0B, orig_state[2][j]) ^
-                        galois_mult(0x0D, orig_state[3][j]);
-                state[2][j] = 
-                        galois_mult(0x0D, orig_state[0][j]) ^
-                        galois_mult(0x09, orig_state[1][j]) ^
-                        galois_mult(0x0E, orig_state[2][j]) ^
-                        galois_mult(0x0B, orig_state[3][j]);
-                state[3][j] = 
-                        galois_mult(0x0B, orig_state[0][j]) ^
-                        galois_mult(0x0D, orig_state[1][j]) ^
-                        galois_mult(0x09, orig_state[2][j]) ^
-                        galois_mult(0x0E, orig_state[3][j]);
-        }
-}
-
-/**
- * Perform round key transformation on state table.
- * 
- * @param state State table to be modified.
+        for (size_t j = 0; j < ELEMS; j++) {
+                state[0][j] =
+                    galois_mult(0x0e, orig_state[0][j]) ^
+                    galois_mult(0x0b, orig_state[1][j]) ^
+                    galois_mult(0x0d, orig_state[2][j]) ^
+                    galois_mult(0x09, orig_state[3][j]);
+                state[1][j] =
+                    galois_mult(0x09, orig_state[0][j]) ^
+                    galois_mult(0x0e, orig_state[1][j]) ^
+                    galois_mult(0x0b, orig_state[2][j]) ^
+                    galois_mult(0x0d, orig_state[3][j]);
+                state[2][j] =
+                    galois_mult(0x0d, orig_state[0][j]) ^
+                    galois_mult(0x09, orig_state[1][j]) ^
+                    galois_mult(0x0e, orig_state[2][j]) ^
+                    galois_mult(0x0b, orig_state[3][j]);
+                state[3][j] =
+                    galois_mult(0x0b, orig_state[0][j]) ^
+                    galois_mult(0x0d, orig_state[1][j]) ^
+                    galois_mult(0x09, orig_state[2][j]) ^
+                    galois_mult(0x0e, orig_state[3][j]);
+        }
+}
+
+/** Perform round key transformation on state table.
+ *
+ * @param state     State table to be modified.
  * @param round_key Round key to be applied on state table.
+ *
  */
 static void add_round_key(uint8_t state[ELEMS][ELEMS], uint32_t *round_key)
@@ -375 +377 @@
         uint8_t byte_round;
         uint8_t shift;
-        uint32_t mask = 0xFF;
-        
-        for(size_t j = 0; j < ELEMS; j++) {
-                for(size_t i = 0; i < ELEMS; i++) {
-                        shift = 24 - 8*i;
+        uint32_t mask = 0xff;
+        
+        for (size_t j = 0; j < ELEMS; j++) {
+                for (size_t i = 0; i < ELEMS; i++) {
+                        shift = 24 - 8 * i;
                         byte_round = (round_key[j] & (mask << shift)) >> shift;
                         state[i][j] = state[i][j] ^ byte_round;
@@ -386 +388 @@
 }
 
-/**
- * Perform substitution transformation on given word.
- * 
+/** Perform substitution transformation on given word.
+ *
  * @param byte Input word.
- * 
+ *
  * @return Substituted word.
+ *
  */
 static uint32_t sub_word(uint32_t word)
@@ -398 +400 @@
         uint8_t *start = (uint8_t *) &temp;
         
-        for(size_t i = 0; i < 4; i++) {
-                *(start+i) = sub_byte(*(start+i), false);
-        }
+        for (size_t i = 0; i < 4; i++)
+                *(start + i) = sub_byte(*(start + i), false);
         
         return temp;
 }
 
-/**
- * Perform left rotation by one byte on given word.
- * 
+/** Perform left rotation by one byte on given word.
+ *
  * @param byte Input word.
- * 
+ *
  * @return Rotated word.
+ *
  */
 static uint32_t rot_word(uint32_t word)
@@ -417 +418 @@
 }
 
-/**
- * Key expansion procedure for AES algorithm.
- * 
- * @param key Input key.
+/** Key expansion procedure for AES algorithm.
+ *
+ * @param key     Input key.
  * @param key_exp Result key expansion.
+ *
  */
 static void key_expansion(uint8_t *key, uint32_t *key_exp)
@@ -427 +428 @@
         uint32_t temp;
         
-        for(size_t i = 0; i < CIPHER_ELEMS; i++) {
-                key_exp[i] = 
-                        (key[4*i] << 24) + 
-                        (key[4*i+1] << 16) + 
-                        (key[4*i+2] << 8) +
-                        (key[4*i+3]);
-        }
-        
-        for(size_t i = CIPHER_ELEMS; i < ELEMS * (ROUNDS + 1); i++) {
-                temp = key_exp[i-1];
-                
-                if((i % CIPHER_ELEMS) == 0) {
-                        temp = sub_word(rot_word(temp)) ^ 
-                                r_con_array[i/CIPHER_ELEMS - 1];
+        for (size_t i = 0; i < CIPHER_ELEMS; i++) {
+                key_exp[i] =
+                    (key[4 * i] << 24) +
+                    (key[4 * i + 1] << 16) +
+                    (key[4 * i + 2] << 8) +
+                    (key[4 * i + 3]);
+        }
+        
+        for (size_t i = CIPHER_ELEMS; i < ELEMS * (ROUNDS + 1); i++) {
+                temp = key_exp[i - 1];
+                
+                if ((i % CIPHER_ELEMS) == 0) {
+                        temp = sub_word(rot_word(temp)) ^
+                            r_con_array[i / CIPHER_ELEMS - 1];
                 }
                 
@@ -447 +448 @@
 }
 
-/**
- * AES-128 encryption algorithm.
- * 
- * @param key Input key.
- * @param input Input data sequence to be encrypted.
+/** AES-128 encryption algorithm.
+ *
+ * @param key    Input key.
+ * @param input  Input data sequence to be encrypted.
  * @param output Encrypted data sequence.
- * 
- * @return EINVAL when input or key not specified, ENOMEM when pointer for 
- * output is not allocated, otherwise EOK.  
+ *
+ * @return EINVAL when input or key not specified,
+ *         ENOMEM when pointer for output is not allocated,
+ *         otherwise EOK.
+ *
  */
 int aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output)
 {
-        if(!key || !input)
+        if ((!key) || (!input))
                 return EINVAL;
         
-        if(!output)
+        if (!output)
                 return ENOMEM;
         
         /* Create key expansion. */
-        uint32_t key_exp[ELEMS * (ROUNDS+1)];
+        uint32_t key_exp[ELEMS * (ROUNDS + 1)];
         key_expansion(key, key_exp);
         
         /* Copy input into state array. */
         uint8_t state[ELEMS][ELEMS];
-        for(size_t i = 0; i < ELEMS; i++) {
-                for(size_t j = 0; j < ELEMS; j++) {
-                        state[i][j] = input[i + ELEMS*j];
-                }
+        for (size_t i = 0; i < ELEMS; i++) {
+                for (size_t j = 0; j < ELEMS; j++)
+                        state[i][j] = input[i + ELEMS * j];
         }
         
@@ -480 +481 @@
         add_round_key(state, key_exp);
         
-        for(size_t k = 1; k <= ROUNDS; k++) {
+        for (size_t k = 1; k <= ROUNDS; k++) {
                 sub_bytes(state, false);
                 shift_rows(state);
-                if(k < ROUNDS)
+                
+                if (k < ROUNDS)
                         mix_columns(state);
-                add_round_key(state, key_exp + k*ELEMS);
+                
+                add_round_key(state, key_exp + k * ELEMS);
         }
         
         /* Copy state array into output. */
-        for(size_t i = 0; i < ELEMS; i++) {
-                for(size_t j = 0; j < ELEMS; j++) {
-                        output[i + j*ELEMS] = state[i][j];
-                }
+        for (size_t i = 0; i < ELEMS; i++) {
+                for (size_t j = 0; j < ELEMS; j++)
+                        output[i + j * ELEMS] = state[i][j];
         }
         
@@ -498 +500 @@
 }
 
-/**
- * AES-128 decryption algorithm.
- * 
- * @param key Input key.
- * @param input Input data sequence to be decrypted.
+/** AES-128 decryption algorithm.
+ *
+ * @param key    Input key.
+ * @param input  Input data sequence to be decrypted.
  * @param output Decrypted data sequence.
- * 
- * @return EINVAL when input or key not specified, ENOMEM when pointer for 
- * output is not allocated, otherwise EOK.  
+ *
+ * @return EINVAL when input or key not specified,
+ *         ENOMEM when pointer for output is not allocated,
+ *         otherwise EOK.
+ *
  */
 int aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output)
 {
-        if(!key || !input)
+        if ((!key) || (!input))
                 return EINVAL;
         
-        if(!output)
+        if (!output)
                 return ENOMEM;
         
         /* Create key expansion. */
-        uint32_t key_exp[ELEMS * (ROUNDS+1)];
+        uint32_t key_exp[ELEMS * (ROUNDS + 1)];
         key_expansion(key, key_exp);
         
         /* Copy input into state array. */
         uint8_t state[ELEMS][ELEMS];
-        for(size_t i = 0; i < ELEMS; i++) {
-                for(size_t j = 0; j < ELEMS; j++) {
-                        state[i][j] = input[i + ELEMS*j];
-                }
+        for (size_t i = 0; i < ELEMS; i++) {
+                for (size_t j = 0; j < ELEMS; j++)
+                        state[i][j] = input[i + ELEMS * j];
         }
         
         /* Processing loop. */
-        add_round_key(state, key_exp + ROUNDS*ELEMS);
-        
-        for(int k = ROUNDS - 1; k >= 0; k--) {
+        add_round_key(state, key_exp + ROUNDS * ELEMS);
+        
+        for (int k = ROUNDS - 1; k >= 0; k--) {
                 inv_shift_rows(state);
                 sub_bytes(state, true);
-                add_round_key(state, key_exp + k*ELEMS);
-                if(k > 0)
+                add_round_key(state, key_exp + k * ELEMS);
+                
+                if (k > 0)
                         inv_mix_columns(state);
         }
         
         /* Copy state array into output. */
-        for(size_t i = 0; i < ELEMS; i++) {
-                for(size_t j = 0; j < ELEMS; j++) {
-                        output[i + j*ELEMS] = state[i][j];
-                }
+        for (size_t i = 0; i < ELEMS; i++) {
+                for (size_t j = 0; j < ELEMS; j++)
+                        output[i + j * ELEMS] = state[i][j];
         }
         

uspace/lib/crypto/crypto.c

@@ -28 +28 @@
 
 /** @file crypto.c
- * 
+ *
  * Cryptographic functions library.
  */
@@ -37 +37 @@
 #include <errno.h>
 #include <byteorder.h>
-
 #include "crypto.h"
 
-/* Hash function procedure definition. */
-typedef void (*HASH_FUNC)(uint32_t*, uint32_t*);
-
-/* Length of HMAC block. */
-#define HMAC_BLOCK_LENGTH 64
-
-/* Ceiling for UINT32. */
-#define ceil_uint32(val) (((val) - (uint32_t)(val)) > 0 ? \
-        (uint32_t)((val) + 1) : (uint32_t)(val))
-
-/* Floor for UINT32. */
-#define floor_uint32(val) (((val) - (uint32_t)(val)) < 0 ? \
-        (uint32_t)((val) - 1) : (uint32_t)(val))
-
-/* Pick value at specified index from array or zero if out of bounds. */
-#define get_at(input, size, i) (i < size ? input[i] : 0)
-
-/* Init values used in SHA1 and MD5 functions. */
+/** Hash function procedure definition. */
+typedef void (*hash_fnc_t)(uint32_t *, uint32_t *);
+
+/** Length of HMAC block. */
+#define HMAC_BLOCK_LENGTH  64
+
+/** Ceiling for uint32_t. */
+#define ceil_uint32(val) \
+        (((val) - (uint32_t) (val)) > 0 ? \
+        (uint32_t) ((val) + 1) : (uint32_t) (val))
+
+/** Floor for uint32_t. */
+#define floor_uint32(val) \
+        (((val) - (uint32_t) (val)) < 0 ? \
+        (uint32_t) ((val) - 1) : (uint32_t) (val))
+
+/** Pick value at specified index from array or zero if out of bounds. */
+#define get_at(input, size, i) \
+        ((i) < (size) ? (input[i]) : 0)
+
+/** Init values used in SHA1 and MD5 functions. */
 static const uint32_t hash_init[] = {
-        0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
+        0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0
 };
 
-/* Shift amount array for MD5 algorithm. */
+/** Shift amount array for MD5 algorithm. */
 static const uint32_t md5_shift[] = {
         7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,
@@ -70 +72 @@
 };
 
-/* Substitution box for MD5 algorithm. */
+/** Substitution box for MD5 algorithm. */
 static const uint32_t md5_sbox[] = {
         0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
@@ -90 +92 @@
 };
 
-/**
- * Working procedure of MD5 cryptographic hash function.
- * 
- * @param h Working array with interim hash parts values.
+/** Working procedure of MD5 cryptographic hash function.
+ *
+ * @param h         Working array with interim hash parts values.
  * @param sched_arr Input array with scheduled values from input string.
+ *
  */
 static void md5_proc(uint32_t *h, uint32_t *sched_arr)
 {
         uint32_t f, g, temp;
-        uint32_t w[HASH_MD5/4];
-        
-        memcpy(w, h, (HASH_MD5/4) * sizeof(uint32_t));
-        
-        for(size_t k = 0; k < 64; k++) {
-                if(k < 16) {
+        uint32_t w[HASH_MD5 / 4];
+        
+        memcpy(w, h, (HASH_MD5 / 4) * sizeof(uint32_t));
+        
+        for (size_t k = 0; k < 64; k++) {
+                if (k < 16) {
                         f = (w[1] & w[2]) | (~w[1] & w[3]);
                         g = k;
-                } else if(k >= 16 && k < 32) {
+                } else if ((k >= 16) && (k < 32)) {
                         f = (w[1] & w[3]) | (w[2] & ~w[3]);
-                        g = (5*k + 1) % 16;
-                } else if(k >= 32 && k < 48) {
+                        g = (5 * k + 1) % 16;
+                } else if ((k >= 32) && (k < 48)) {
                         f = w[1] ^ w[2] ^ w[3];
-                        g = (3*k + 5) % 16;
+                        g = (3 * k + 5) % 16;
                 } else {
                         f = w[2] ^ (w[1] | ~w[3]);
-                        g = 7*k % 16;
+                        g = 7 * k % 16;
                 }
+                
                 temp = w[3];
                 w[3] = w[2];
                 w[2] = w[1];
-                w[1] += rotl_uint32(w[0] + f + md5_sbox[k] + 
-                        uint32_t_byteorder_swap(sched_arr[g]),  
-                        md5_shift[k]);
+                w[1] += rotl_uint32(w[0] + f + md5_sbox[k] +
+                    uint32_t_byteorder_swap(sched_arr[g]),
+                    md5_shift[k]);
                 w[0] = temp;
         }
         
-        for(uint8_t k = 0; k < HASH_MD5/4; k++)
+        for (uint8_t k = 0; k < HASH_MD5 / 4; k++)
                 h[k] += w[k];
 }
 
-/**
- * Working procedure of SHA-1 cryptographic hash function.
- * 
- * @param h Working array with interim hash parts values.
+/** Working procedure of SHA-1 cryptographic hash function.
+ *
+ * @param h         Working array with interim hash parts values.
  * @param sched_arr Input array with scheduled values from input string.
+ *
  */
 static void sha1_proc(uint32_t *h, uint32_t *sched_arr)
 {
         uint32_t f, cf, temp;
-        uint32_t w[HASH_SHA1/4];
-        
-        for(size_t k = 16; k < 80; k++) {
+        uint32_t w[HASH_SHA1 / 4];
+        
+        for (size_t k = 16; k < 80; k++) {
                 sched_arr[k] = rotl_uint32(
-                        sched_arr[k-3] ^
-                        sched_arr[k-8] ^
-                        sched_arr[k-14] ^
-                        sched_arr[k-16], 
-                        1);
-        }
-
-        memcpy(w, h, (HASH_SHA1/4) * sizeof(uint32_t));
-        
-        for(size_t k = 0; k < 80; k++) {
-                if(k < 20) {
+                    sched_arr[k-3] ^
+                    sched_arr[k-8] ^
+                    sched_arr[k-14] ^
+                    sched_arr[k-16],
+                    1);
+        }
+        
+        memcpy(w, h, (HASH_SHA1 / 4) * sizeof(uint32_t));
+        
+        for (size_t k = 0; k < 80; k++) {
+                if (k < 20) {
                         f = (w[1] & w[2]) | (~w[1] & w[3]);
                         cf = 0x5A827999;
-                } else if(k >= 20 && k < 40) {
+                } else if ((k >= 20) && (k < 40)) {
                         f = w[1] ^ w[2] ^ w[3];
-                        cf = 0x6ED9EBA1;
-                } else if(k >= 40 && k < 60) {
+                        cf = 0x6ed9eba1;
+                } else if ((k >= 40) && (k < 60)) {
                         f = (w[1] & w[2]) | (w[1] & w[3]) | (w[2] & w[3]);
-                        cf = 0x8F1BBCDC;
+                        cf = 0x8f1bbcdc;
                 } else {
                         f = w[1] ^ w[2] ^ w[3];
-                        cf = 0xCA62C1D6;
+                        cf = 0xca62c1d6;
                 }
-
+                
                 temp = rotl_uint32(w[0], 5) + f + w[4] + cf + sched_arr[k];
-
+                
                 w[4] = w[3];
                 w[3] = w[2];
@@ -175 +178 @@
                 w[0] = temp;
         }
-
-        for(uint8_t k = 0; k < HASH_SHA1/4; k++)
+        
+        for (uint8_t k = 0; k < HASH_SHA1 / 4; k++)
                 h[k] += w[k];
 }
 
-/**
- * Create hash based on selected algorithm.
- * 
- * @param input Input message byte sequence.
+/** Create hash based on selected algorithm.
+ *
+ * @param input      Input message byte sequence.
  * @param input_size Size of message sequence.
- * @param output Result hash byte sequence.
- * @param hash_sel Hash function selector.
- * 
- * @return EINVAL when input not specified, ENOMEM when pointer for 
- * output hash result is not allocated, otherwise EOK. 
+ * @param output     Result hash byte sequence.
+ * @param hash_sel   Hash function selector.
+ *
+ * @return EINVAL when input not specified,
+ *         ENOMEM when pointer for output hash result
+ *         is not allocated, otherwise EOK.
+ *
  */
 int create_hash(uint8_t *input, size_t input_size, uint8_t *output,
-        hash_func_t hash_sel)
-{
-        if(!input)
+    hash_func_t hash_sel)
+{
+        if (!input)
                 return EINVAL;
         
-        if(!output)
+        if (!output)
                 return ENOMEM;
         
-        HASH_FUNC hash_func = (hash_sel == HASH_MD5) ? md5_proc : sha1_proc;
+        hash_fnc_t hash_func = (hash_sel == HASH_MD5) ? md5_proc : sha1_proc;
         
         /* Prepare scheduled input. */
@@ -207 +211 @@
         work_input[input_size] = 0x80;
         
-        size_t blocks = ceil_uint32((((double)input_size + 1) / 4 + 2) / 16);
+        // FIXME: double?
+        size_t blocks = ceil_uint32((((double) input_size + 1) / 4 + 2) / 16);
         uint32_t work_arr[blocks * 16];
-        for(size_t i = 0; i < blocks; i++) {
-                for(size_t j = 0; j < 16; j++) {
-                        work_arr[i*16 + j] = 
-                        (get_at(work_input, input_size+1, i*64+j*4) << 24) |
-                        (get_at(work_input, input_size+1, i*64+j*4+1) << 16) |
-                        (get_at(work_input, input_size+1, i*64+j*4+2) << 8) |
-                        get_at(work_input, input_size+1, i*64+j*4+3);
+        for (size_t i = 0; i < blocks; i++) {
+                for (size_t j = 0; j < 16; j++) {
+                        work_arr[i*16 + j] =
+                            (get_at(work_input, input_size + 1, i * 64 + j * 4) << 24) |
+                            (get_at(work_input, input_size + 1, i * 64 + j * 4 + 1) << 16) |
+                            (get_at(work_input, input_size + 1, i * 64 + j * 4 + 2) << 8) |
+                            get_at(work_input, input_size + 1, i * 64 + j * 4 + 3);
                 }
         }
         
-        uint64_t bits_size = (uint64_t)(input_size * 8);
-        if(hash_sel == HASH_MD5)
+        uint64_t bits_size = (uint64_t) (input_size * 8);
+        if (hash_sel == HASH_MD5)
                 bits_size = uint64_t_byteorder_swap(bits_size);
         
         work_arr[(blocks - 1) * 16 + 14] = bits_size >> 32;
-        work_arr[(blocks - 1) * 16 + 15] = bits_size & 0xFFFFFFFF;
+        work_arr[(blocks - 1) * 16 + 15] = bits_size & 0xffffffff;
         
         /* Hash computation. */
-        uint32_t h[hash_sel/4];
-        memcpy(h, hash_init, (hash_sel/4) * sizeof(uint32_t));
+        uint32_t h[hash_sel / 4];
+        memcpy(h, hash_init, (hash_sel / 4) * sizeof(uint32_t));
         uint32_t sched_arr[80];
-        for(size_t i = 0; i < blocks; i++) {
-                for(size_t k = 0; k < 16; k++) {
-                        sched_arr[k] = work_arr[i*16 + k];
-                }
+        for (size_t i = 0; i < blocks; i++) {
+                for (size_t k = 0; k < 16; k++)
+                        sched_arr[k] = work_arr[i * 16 + k];
                 
                 hash_func(h, sched_arr);
@@ -239 +243 @@
         
         /* Copy hash parts into final result. */
-        for(size_t i = 0; i < hash_sel/4; i++) {
-                if(hash_sel == HASH_SHA1)
+        for (size_t i = 0; i < hash_sel / 4; i++) {
+                if (hash_sel == HASH_SHA1)
                         h[i] = uint32_t_byteorder_swap(h[i]);
-                memcpy(output + i*sizeof(uint32_t), &h[i], sizeof(uint32_t));
+                
+                memcpy(output + i * sizeof(uint32_t), &h[i], sizeof(uint32_t));
         }
         
@@ -248 +253 @@
 }
 
-/**
- * Hash-based message authentication code.
- * 
- * @param key Cryptographic key sequence.
+/** Hash-based message authentication code.
+ *
+ * @param key      Cryptographic key sequence.
  * @param key_size Size of key sequence.
- * @param msg Message sequence.
+ * @param msg      Message sequence.
  * @param msg_size Size of message sequence.
- * @param hash Output parameter for result hash.
+ * @param hash     Output parameter for result hash.
  * @param hash_sel Hash function selector.
- * 
- * @return EINVAL when key or message not specified, ENOMEM when pointer for 
- * output hash result is not allocated, otherwise EOK.
+ *
+ * @return EINVAL when key or message not specified,
+ *         ENOMEM when pointer for output hash result
+ *         is not allocated, otherwise EOK.
+ *
  */
 int hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size, 
-        uint8_t *hash, hash_func_t hash_sel)
-{
-        if(!key || !msg)
+    uint8_t *hash, hash_func_t hash_sel)
+{
+        if ((!key) || (!msg))
                 return EINVAL;
         
-        if(!hash)
+        if (!hash)
                 return ENOMEM;
         
@@ -276 +282 @@
         memset(work_key, 0, HMAC_BLOCK_LENGTH);
         
-        if(key_size > HMAC_BLOCK_LENGTH) {
+        if(key_size > HMAC_BLOCK_LENGTH)
                 create_hash(key, key_size, work_key, hash_sel);
-        } else {
+        else
                 memcpy(work_key, key, key_size);
-        }
-        
-        for(size_t i = 0; i < HMAC_BLOCK_LENGTH; i++) {
-                o_key_pad[i] = work_key[i] ^ 0x5C;
+        
+        for (size_t i = 0; i < HMAC_BLOCK_LENGTH; i++) {
+                o_key_pad[i] = work_key[i] ^ 0x5c;
                 i_key_pad[i] = work_key[i] ^ 0x36;
         }
@@ -291 +296 @@
         memcpy(temp_work + HMAC_BLOCK_LENGTH, msg, msg_size);
         
-        create_hash(temp_work, HMAC_BLOCK_LENGTH + msg_size, temp_hash, 
-                hash_sel);
+        create_hash(temp_work, HMAC_BLOCK_LENGTH + msg_size, temp_hash,
+            hash_sel);
         
         memcpy(temp_work, o_key_pad, HMAC_BLOCK_LENGTH);
@@ -302 +307 @@
 }
 
-/**
- * Password-Based Key Derivation Function 2 as defined in RFC 2898,
- * using HMAC-SHA1 with 4096 iterations and 32 bytes key result used
- * for WPA/WPA2.
- * 
- * @param pass Password sequence.
+/** Password-Based Key Derivation Function 2.
+ *
+ * As defined in RFC 2898, using HMAC-SHA1 with 4096 iterations
+ * and 32 bytes key result used for WPA/WPA2.
+ *
+ * @param pass      Password sequence.
  * @param pass_size Password sequence length.
- * @param salt Salt sequence to be used with password.
+ * @param salt      Salt sequence to be used with password.
  * @param salt_size Salt sequence length.
- * @param hash Output parameter for result hash (32 byte value).
- * 
- * @return EINVAL when pass or salt not specified, ENOMEM when pointer for 
- * output hash result is not allocated, otherwise EOK.
- */
-int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size, 
-        uint8_t *hash)
-{
-        if(!pass || !salt)
+ * @param hash      Output parameter for result hash (32 byte value).
+ *
+ * @return EINVAL when pass or salt not specified,
+ *         ENOMEM when pointer for output hash result
+ *         is not allocated, otherwise EOK.
+ *
+ */
+int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size,
+    uint8_t *hash)
+{
+        if ((!pass) || (!salt))
                 return EINVAL;
         
-        if(!hash)
+        if (!hash)
                 return ENOMEM;
         
@@ -330 +337 @@
         uint8_t temp_hmac[HASH_SHA1];
         uint8_t xor_hmac[HASH_SHA1];
-        uint8_t temp_hash[HASH_SHA1*2];
-        
-        for(size_t i = 0; i < 2; i++) {
-                uint32_t be_i = host2uint32_t_be(i+1);
+        uint8_t temp_hash[HASH_SHA1 * 2];
+        
+        for (size_t i = 0; i < 2; i++) {
+                uint32_t be_i = host2uint32_t_be(i + 1);
+                
                 memcpy(work_salt + salt_size, &be_i, 4);
                 hmac(pass, pass_size, work_salt, salt_size + 4,
-                        work_hmac, HASH_SHA1);
+                    work_hmac, HASH_SHA1);
                 memcpy(xor_hmac, work_hmac, HASH_SHA1);
                 
-                for(size_t k = 1; k < 4096; k++) {
+                for (size_t k = 1; k < 4096; k++) {
                         memcpy(temp_hmac, work_hmac, HASH_SHA1);
-                        hmac(pass, pass_size, temp_hmac, HASH_SHA1, 
-                                work_hmac, HASH_SHA1);
-                        for(size_t t = 0; t < HASH_SHA1; t++) {
+                        hmac(pass, pass_size, temp_hmac, HASH_SHA1,
+                            work_hmac, HASH_SHA1);
+                        
+                        for (size_t t = 0; t < HASH_SHA1; t++)
                                 xor_hmac[t] ^= work_hmac[t];
-                        }
                 }
-                memcpy(temp_hash + i*HASH_SHA1, xor_hmac, HASH_SHA1);
+                
+                memcpy(temp_hash + i * HASH_SHA1, xor_hmac, HASH_SHA1);
         }
         

uspace/lib/crypto/crypto.h

@@ -32 +32 @@
 #include <sys/types.h>
 
-#define AES_CIPHER_LENGTH 16
-#define PBKDF2_KEY_LENGTH 32
+#define AES_CIPHER_LENGTH  16
+#define PBKDF2_KEY_LENGTH  32
 
-/* Left rotation for UINT32. */
-#define rotl_uint32(val, shift) (((val) << shift) | ((val) >> (32 - shift)))
+/* Left rotation for uint32_t. */
+#define rotl_uint32(val, shift) \
+        (((val) << shift) | ((val) >> (32 - shift)))
 
-/* Right rotation for UINT32. */
-#define rotr_uint32(val, shift) (((val) >> shift) | ((val) << (32 - shift)))
+/* Right rotation for uint32_t. */
+#define rotr_uint32(val, shift) \
+        (((val) >> shift) | ((val) << (32 - shift)))
 
 /** Hash function selector and also result hash length indicator. */
 typedef enum {
-        HASH_MD5 =      16,
-        HASH_SHA1 =     20
+        HASH_MD5 =  16,
+        HASH_SHA1 = 20
 } hash_func_t;
 
-extern int rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size, 
-        size_t skip, uint8_t *output);
-extern int aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output);
-extern int aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output);
-extern int create_hash(uint8_t *input, size_t input_size, uint8_t *output, 
-        hash_func_t hash_sel);
-extern int hmac(uint8_t *key, size_t key_size, uint8_t *msg, size_t msg_size, 
-        uint8_t *hash, hash_func_t hash_sel);
-extern int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, 
-        size_t salt_size, uint8_t *hash);
+extern int rc4(uint8_t *, size_t, uint8_t *, size_t, size_t, uint8_t *);
+extern int aes_encrypt(uint8_t *, uint8_t *, uint8_t *);
+extern int aes_decrypt(uint8_t *, uint8_t *, uint8_t *);
+extern int create_hash(uint8_t *, size_t, uint8_t *, hash_func_t);
+extern int hmac(uint8_t *, size_t, uint8_t *, size_t, uint8_t *, hash_func_t);
+extern int pbkdf2(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
 
 #endif

uspace/lib/crypto/rc4.c

@@ -28 +28 @@
 
 /** @file rc4.c
- * 
+ *
  * Implementation of ARC4 symmetric cipher cryptographic algorithm.