Changeset 9e5a51c in mainline for uspace/drv/bus/usb/ar9271/htc.c

Timestamp:

2015-03-08T22:20:34Z (9 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

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

Children:

864762a

Parents:

4cb0148

Message:

Fixed PLL initialization value that blocked communication with external devices. Started implementing IEEE802.11 scanning and authentication functions.

File:

• uspace/drv/bus/usb/ar9271/htc.c (modified) (5 diffs)

uspace/drv/bus/usb/ar9271/htc.c

@@ -71 +71 @@
         htc_sta_msg_t sta_msg;
         
+        memset(&vif_msg, 0, sizeof(htc_vif_msg_t));
+        memset(&sta_msg, 0, sizeof(htc_sta_msg_t));
+        
         nic_address_t addr;
         nic_t *nic = nic_get_from_ddf_dev(htc_device->ieee80211_dev->ddf_dev);
@@ -99 +102 @@
         vif_msg.rts_thres = host2uint16_t_be(HTC_RTS_THRESHOLD);
         
-        int rc = wmi_send_command(htc_device, WMI_VAP_CREATE, 
-                (uint8_t *) &vif_msg, sizeof(vif_msg), NULL);
-        if(rc != EOK) {
-                usb_log_error("Failed to send VAP create command.\n");
-                return rc;
-        }
+        wmi_send_command(htc_device, WMI_VAP_CREATE, (uint8_t *) &vif_msg, 
+                sizeof(vif_msg), NULL);
         
         sta_msg.is_vif_sta = 1;
-        sta_msg.max_ampdu = host2uint16_t_be(HTC_MAX_AMPDU);
+        sta_msg.max_ampdu = host2uint16_t_be(0xFFFF);
         sta_msg.sta_index = 0;
         sta_msg.vif_index = 0;
         
-        rc = wmi_send_command(htc_device, WMI_NODE_CREATE, 
-                (uint8_t *) &sta_msg, sizeof(sta_msg), NULL);
-        if(rc != EOK) {
-                usb_log_error("Failed to send NODE create command.\n");
-                return rc;
-        }
+        wmi_send_command(htc_device, WMI_NODE_CREATE, (uint8_t *) &sta_msg, 
+                sizeof(sta_msg), NULL);
         
         /* Write first 4 bytes of MAC address. */
@@ -122 +117 @@
         memcpy(&id0, &addr.address, 4);
         id0 = host2uint32_t_le(id0);
-        rc = wmi_reg_write(htc_device, AR9271_STATION_ID0, id0);
-        if(rc != EOK)
-                return rc;
-        
+        wmi_reg_write(htc_device, AR9271_STATION_ID0, id0);
+
         /* Write last 2 bytes of MAC address (and preserve existing data). */
         uint32_t id1;
-        rc = wmi_reg_read(htc_device, AR9271_STATION_ID1, &id1);
-        if(rc != EOK)
-                return rc;
+        wmi_reg_read(htc_device, AR9271_STATION_ID1, &id1);
+
         uint16_t id1_addr;
         memcpy(&id1_addr, &addr.address[4], 2);
         id1 = (id1 & ~AR9271_STATION_ID1_MASK) | host2uint16_t_le(id1_addr);
-        rc = wmi_reg_write(htc_device, AR9271_STATION_ID1, id1);
-        if(rc != EOK)
-                return rc;
+        wmi_reg_write(htc_device, AR9271_STATION_ID1, id1);
         
         /* TODO: Set BSSID mask for AP mode. */
@@ -146 +136 @@
         size_t buffer_size, uint8_t endpoint_id)
 {
+        memset(header, 0, sizeof(htc_frame_header_t));
+        
         header->endpoint_id = endpoint_id;
-        header->flags = 0;
         header->payload_length = 
                 host2uint16_t_be(buffer_size - sizeof(htc_frame_header_t));
-        
-        header->control_bytes[0] = 0x02;
-        header->control_bytes[1] = 0x88;
-        header->control_bytes[2] = 0xFF;
-        header->control_bytes[3] = 0xFF;
 }
 
@@ -257 +243 @@
                 sizeof(htc_service_msg_t);
         void *buffer = malloc(buffer_size);
+        memset(buffer, 0, buffer_size);
         
         /* Fill service message structure. */