Atheros patch to support ath3k BT device.

chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c

 /*
  * Copyright (c) 2004-2008 Atheros Communications Inc.
  * All rights reserved.
  *
  * This file implements the Atheros PS and patch downloaded for HCI UART Transport driver.
  * This file can be used for HCI SDIO transport implementation for AR6002 with HCI_TRANSPORT_SDIO
  * defined.
  *
  *
  * ar3kcpsconfig.c
@@ skipping 122 matching lines @@
     const struct firmware* firmware;
     A_UINT32 numCmds;
     A_UINT8 *event;
     A_UINT8 *bufferToFree;
     struct hci_dev *device;
     A_UCHAR *buffer;
     A_UINT32 len;
     A_UINT32 DevType;
     A_UCHAR *PsFileName;
     A_UCHAR *patchFileName;
+    A_UCHAR path[256];
+    A_UCHAR config_path[256];
     AR3K_CONFIG_INFO *hdev = (AR3K_CONFIG_INFO*)arg;
     struct device *firmwareDev = NULL;
     status = 0;
     HciCmdList = NULL;
 #ifdef HCI_TRANSPORT_SDIO
     device = hdev->pBtStackHCIDev; 
     firmwareDev = device->parent;
 #else 
     device = hdev;
     firmwareDev = &device->dev;
     AthEnableSyncCommandOp(TRUE);    
 #endif /* HCI_TRANSPORT_SDIO */
     /* First verify if the controller is an FPGA or ASIC, so depending on the device type the PS file to be written will be different.
      */ 
     if(A_ERROR == getDeviceType(hdev,&DevType)) {
         status = 1;
         goto complete;
     }
     if(A_ERROR == ReadVersionInfo(hdev)) {
         status = 1;
         goto complete;
     }
     patchFileName = PATCH_FILE;
+    snprintf(path, sizeof(path), "%s/%xcoex/",CONFIG_PATH,Rom_Version);
     if(DevType){
         if(DevType == 0xdeadc0de){
                 PsFileName =  PS_ASIC_FILE;
             } else{
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" FPGA Test Image : %x %x  \n",Rom_Version,Build_Version));
+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" FPGA Test Image : %x %x  \n",Rom_Version,Build_Version));
                 if((Rom_Version == 0x99999999) && (Build_Version == 1)){
                         
-                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("FPGA Test Image : Skipping Patch File load\n"));
-                        patchFileName = NULL;
+                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("FPGA Test Image : Skipping Patch File load\n"));
+                        patchFileName = NULL;
                 }
                 PsFileName =  PS_FPGA_FILE;
             }
     }
     else{
             PsFileName =  PS_ASIC_FILE;
     }
 
-    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%x: FPGA/ASIC PS File Name %s\n", DevType,PsFileName));
+    snprintf(config_path, sizeof(config_path), "%s%s",path,PsFileName);
+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%x: FPGA/ASIC PS File Name %s\n", DevType,config_path));
     /* Read the PS file to a dynamically allocated buffer */
-    if(request_firmware(&firmware,PsFileName,firmwareDev) < 0) {
+    if(request_firmware(&firmware,config_path,firmwareDev) < 0) {
         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open error\n", __FUNCTION__ ));
         status = 1;
         goto complete;
 
     }
     if(NULL == firmware || firmware->size == 0) {
         status = 1;
         goto complete;
     }
     buffer = (A_UCHAR *)A_MALLOC(firmware->size);
     if(buffer != NULL) {
     /* Copy the read file to a local Dynamic buffer */
         memcpy(buffer,firmware->data,firmware->size);
         len = firmware->size;
         release_firmware(firmware);
         /* Parse the PS buffer to a global variable */
         status = AthDoParsePS(buffer,len);
         A_FREE(buffer);
     } else {
         release_firmware(firmware);
     }
 
 
     /* Read the patch file to a dynamically allocated buffer */
-    if((patchFileName == NULL) || (request_firmware(&firmware,patchFileName,firmwareDev) < 0)) {
+        if(patchFileName != NULL)
+                snprintf(config_path,
+                         sizeof(config_path), "%s%s",path,patchFileName);
+        else {
+                status = 0;
+        }
+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch File Name %s\n", config_path));
+    if((patchFileName == NULL) || (request_firmware(&firmware,config_path,firmwareDev) < 0)) {
         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open error\n", __FUNCTION__ ));
         /* 
          *  It is not necessary that Patch file be available, continue with PS Operations if.
          *  failed.
          */
         status = 0;
 
     } else {
         if(NULL == firmware || firmware->size == 0) {
             status = 0;
@@ skipping 74 matching lines @@
             goto complete;
         }
     }
 #ifndef HCI_TRANSPORT_SDIO
         if(bdaddr[0] != '\0') {
                 write_bdaddr(hdev,bdaddr);
         } else
 #endif /* HCI_TRANSPORT_SDIO */
         {
                  /* Read Contents of BDADDR file if user has not provided any option */
-        if(request_firmware(&firmware,BDADDR_FILE,firmwareDev) < 0) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open error\n", __FUNCTION__ ));
-                status = 1;
-                goto complete;
-        }
-        if(NULL == firmware || firmware->size == 0) {
-                status = 1;
-                goto complete;
-        }
+                sprintf(config_path,"%s%s",path,BDADDR_FILE);
+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch File Name %s\n", config_path));
+        if(request_firmware(&firmware,config_path,firmwareDev) < 0) {
+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open error\n", __FUNCTION__ ));
+                status = 1;
+                goto complete;
+        }
+        if(NULL == firmware || firmware->size == 0) {
+                status = 1;
+                goto complete;
+        }
                 write_bdaddr(hdev,(A_UCHAR *)firmware->data);
-        release_firmware(firmware);
+        release_firmware(firmware);
         }
 complete:
 #ifndef HCI_TRANSPORT_SDIO
     AthEnableSyncCommandOp(FALSE);    
     PSTagMode = FALSE;
     wake_up_interruptible(&PsCompleteEvent);
 #endif /* HCI_TRANSPORT_SDIO */
     if(NULL != HciCmdList) {
         AthFreeCommandList(&HciCmdList,numCmds);
     }
@@ skipping 171 matching lines @@
         }
 
     }
     if(bufferToFree != NULL) {
         A_FREE(bufferToFree);
    }
     return result;
 }