Changes in / [ef521d4:66b3e0b] in mainline

Location:

uspace/drv/bus/usb/ar9271

Files:

• ar9271.c (modified) (2 diffs)
• htc.c (modified) (15 diffs)
• hw.c (modified) (1 diff)
• wmi.c (modified) (2 diffs)

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

@@ -267 +267 @@
         assert(addr);
         
-        // TODO
+        fibril_mutex_lock(&ar9271->htc_device->rx_lock);
+        
+        uint32_t *mac0_dest = (uint32_t *)(addr->address);
+        uint16_t *mac4_dest = (uint16_t *)(addr->address + 4);
+        
+        void *ar9271_mac_addr = 0;
+
+        /* Read MAC address from the i/o (4byte + 2byte reads) */
+        // TODO: Now just testing register address
+        /*
+        usb_log_info("Trying to get some testing register from device.\n");
+        
+        uint32_t result;
+        int rc = wmi_reg_read(ar9271->usb_device, 
+            0x50040,
+            //AR9271_MAC_REG_OFFSET | AR9271_MAC_PCU_STA_ADDR_L32, 
+            &result);
+        if(rc != EOK) {
+                usb_log_info("Failed to read registry value. Error: %d\n", rc);
+                return rc;
+        }
+        
+        usb_log_info("Registry value: %x\n", result);
+         */
+        
+        fibril_mutex_unlock(&ar9271->htc_device->rx_lock);
 }
 
@@ -492 +517 @@
         nic_t *nic = nic_get_from_ddf_dev(dev);
         
-        /* TODO: Report HW address here. */
+        /*
+        nic_address_t addr;
+        ar9271_hw_get_addr(ar9271, &addr);
+        rc = nic_report_address(nic, &addr);
+        
+        usb_log_info("Reported address.\n");
+        */
         
         /* Create AR9271 function.*/

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

@@ -50 +50 @@
 static inline uint8_t wmi_service_to_download_pipe(wmi_services_t service_id)
 {
-        return (service_id == WMI_CONTROL_SERVICE) ? 3 : 2;
+        switch(service_id) {
+                case WMI_CONTROL_SERVICE:
+                        return 3;
+                default:
+                        return 2;
+        }
 }
 
@@ -62 +67 @@
 static inline uint8_t wmi_service_to_upload_pipe(wmi_services_t service_id)
 {
-        return (service_id == WMI_CONTROL_SERVICE) ? 4 : 1;
+        switch(service_id) {
+                case WMI_CONTROL_SERVICE:
+                        return 4;
+                default:
+                        return 1;
+        }
 }
 
@@ -116 +126 @@
  * @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.
+ * @return EOK if succeed, negative error code otherwise.
  */
 static int htc_connect_service(htc_device_t *htc_device, 
@@ -143 +152 @@
                 htc_device->endpoints.ctrl_endpoint);
         if(rc != EOK) {
-                free(buffer);
                 usb_log_error("Failed to send HTC message. Error: %d\n", rc);
                 return rc;
@@ -156 +164 @@
         rc = htc_read_message(htc_device, buffer, buffer_size, NULL);
         if(rc != EOK) {
-                free(buffer);
                 usb_log_error("Failed to receive HTC service connect response. "
                         "Error: %d\n", rc);
@@ -169 +176 @@
         if(response_message->status == HTC_SERVICE_SUCCESS) {
                 *response_endpoint_no = response_message->endpoint_id;
-                rc = EOK;
+                return EOK;
         } else {
                 usb_log_error("Failed to connect HTC service. "
                         "Message status: %d\n", response_message->status);
-                rc = EINVAL;
+                return rc;
         }
-        
-        free(buffer);
-        
-        return rc;
 }
 
@@ -190 +193 @@
 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) + 50;
         void *buffer = malloc(buffer_size);
         htc_config_msg_t *config_message = (htc_config_msg_t *)
@@ -202 +204 @@
         config_message->pipe_id = 1;
 
-        /* Send HTC message. */
         int rc = htc_send_message(htc_device, buffer, buffer_size,
                 htc_device->endpoints.ctrl_endpoint);
         if(rc != EOK) {
-                free(buffer);
                 usb_log_error("Failed to send HTC config message. "
                         "Error: %d\n", rc);
@@ -222 +222 @@
                 usb_log_error("Failed to receive HTC config response message. "
                         "Error: %d\n", rc);
-        }
-        
-        free(buffer);
+                return rc;
+        }
 
         return rc;
@@ -238 +237 @@
 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) + 50;
         void *buffer = malloc(buffer_size);
         htc_setup_complete_msg_t *complete_message = 
@@ -248 +246 @@
                 host2uint16_t_be(HTC_MESSAGE_SETUP_COMPLETE);
 
-        /* Send HTC message. */
         int rc = htc_send_message(htc_device, buffer, buffer_size, 
                 htc_device->endpoints.ctrl_endpoint);
@@ -254 +251 @@
                 usb_log_error("Failed to send HTC setup complete message. "
                         "Error: %d\n", rc);
-        }
-        
-        free(buffer);
+                return rc;
+        }
 
         return rc;
@@ -267 +263 @@
  * @param htc_device HTC device structure.
  * 
- * @return EOK if succeed, EINVAL if response error, negative error code 
- * otherwise.
+ * @return EOK if succeed, negative error code otherwise.
  */
 static int htc_check_ready(htc_device_t *htc_device)
@@ -275 +270 @@
         void *buffer = malloc(buffer_size);
 
-        /* Read response from device. */
         int rc = htc_read_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);
@@ -287 +280 @@
                 sizeof(htc_frame_header_t));
         if(uint16_t_be2host(*message_id) == HTC_MESSAGE_READY) {
-                rc = EOK;
+                return EOK;
         } else {
-                rc = EINVAL;
-        }
-        
-        free(buffer);
-        
-        return rc;
+                return EINVAL;
+        }
 }
 

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

@@ -128 +128 @@
         }
         
-        /* TODO: Finish HW init. */
-        
         return EOK;
 }

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

@@ -163 +163 @@
                 host2uint16_t_be(++htc_device->sequence_number);
         
-        /* Send message. */
         int rc = htc_send_message(htc_device, buffer, buffer_size,
                 htc_device->endpoints.wmi_endpoint);
         if(rc != EOK) {
-                free(buffer);
                 usb_log_error("Failed to send WMI message. Error: %d\n", rc);
-                return rc;
         }
         
@@ -177 +174 @@
         buffer = malloc(buffer_size);
         
-        /* Read response. */
         rc = htc_read_message(htc_device, buffer, buffer_size, NULL);
         if(rc != EOK) {