Changeset 56c0930 in mainline for uspace/drv/bus/usb/ar9271/wmi.c

Timestamp:

2015-02-20T14:33:29Z (10 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

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

Children:

4cb0148

Parents:

ab365c4

Message:

Started writing TX and RX handlers, VIF init, setting RX filter, PLL init and calibration, some corrections. Added HW values array initialization, registered diagnostic polling fibril. But still not receiving any packets…

File:

• uspace/drv/bus/usb/ar9271/wmi.c (modified) (8 diffs)

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

@@ -54 +54 @@
         uint32_t cmd_value = host2uint32_t_be(reg_offset);
         
-        size_t buffer_size = MAX_RESPONSE_LENGTH;
-        void *resp_buffer = malloc(buffer_size);
+        void *resp_buffer = 
+                malloc(htc_device->ath_device->ctrl_response_length);
         
         int rc = wmi_send_command(htc_device, WMI_REG_READ, 
@@ -90 +90 @@
         };
         
-        void *resp_buffer = malloc(MAX_RESPONSE_LENGTH);
+        void *resp_buffer = 
+                malloc(htc_device->ath_device->ctrl_response_length);
         
         int rc = wmi_send_command(htc_device, WMI_REG_WRITE, 
@@ -115 +116 @@
  * @return EOK if succeed, negative error code otherwise.
  */
-int wmi_reg_clear_set_bit(htc_device_t *htc_device, uint32_t reg_offset, 
+int wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, 
         uint32_t set_bit, uint32_t clear_bit)
 {
@@ -152 +153 @@
         uint32_t set_bit)
 {
-        return wmi_reg_clear_set_bit(htc_device, reg_offset, set_bit, 0);
+        return wmi_reg_set_clear_bit(htc_device, reg_offset, set_bit, 0);
 }
 
@@ -167 +168 @@
         uint32_t clear_bit)
 {
-        return wmi_reg_clear_set_bit(htc_device, reg_offset, 0, clear_bit);
+        return wmi_reg_set_clear_bit(htc_device, reg_offset, 0, clear_bit);
 }
 
@@ -184 +185 @@
         size_t buffer_size = sizeof(wmi_reg_t) * elements;
         void *buffer = malloc(buffer_size);
-        void *resp_buffer = malloc(MAX_RESPONSE_LENGTH);
+        void *resp_buffer = 
+                malloc(htc_device->ath_device->ctrl_response_length);
         
         /* Convert values to correct endianness. */
@@ -240 +242 @@
         
         /* Send message. */
-        int rc = htc_send_message(htc_device, buffer, buffer_size,
+        int rc = htc_send_control_message(htc_device, buffer, buffer_size,
                 htc_device->endpoints.wmi_endpoint);
         if(rc != EOK) {
@@ -251 +253 @@
         
         bool clean_resp_buffer = false;
+        size_t response_buffer_size = 
+                htc_device->ath_device->ctrl_response_length;
         if(response_buffer == NULL) {
-                response_buffer = malloc(MAX_RESPONSE_LENGTH);
+                response_buffer = malloc(response_buffer_size);
                 clean_resp_buffer = true;
         }
         
         /* Read response. */
-        rc = htc_read_message(htc_device, response_buffer, MAX_RESPONSE_LENGTH, 
-                NULL);
+        rc = htc_read_control_message(htc_device, response_buffer, 
+                response_buffer_size, NULL);
         if(rc != EOK) {
                 free(buffer);