ath6kl: Bringing in the upstream version

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

 /*
- * Copyright (c) 2004-2008 Atheros Communications Inc.
+ * Copyright (c) 2004-2010 Atheros Communications Inc.
  * All rights reserved.
  *
  * This file implements the Atheros PS and patch parser.
  * It implements APIs to parse data buffer with patch and PS information and convert it to HCI commands.
  *
  *
  *
  * ar3kpsparser.c
  *
  *
  *
  * The software source and binaries included in this development package are
  * licensed, not sold. You, or your company, received the package under one
  * or more license agreements. The rights granted to you are specifically
  * listed in these license agreement(s). All other rights remain with Atheros
  * Communications, Inc., its subsidiaries, or the respective owner including
  * those listed on the included copyright notices..  Distribution of any
  * portion of this package must be in strict compliance with the license
  * agreement(s) terms.
  *
  *
  *
  */
 
 
 #include "ar3kpsparser.h"
 
+#include <linux/ctype.h>
+#include <linux/kernel.h>
+
 #define BD_ADDR_SIZE            6
 #define WRITE_PATCH             8
 #define ENABLE_PATCH            11
 #define PS_RESET                2
 #define PS_WRITE                1
 #define PS_VERIFY_CRC           9
 #define CHANGE_BDADDR           15
 
 #define HCI_COMMAND_HEADER      7
 
@@ skipping 14 matching lines @@
 
 /* Constant values used by parser */
 #define BYTES_OF_PS_DATA_PER_LINE         16
 #define RAMPS_MAX_PS_DATA_PER_TAG         20000
 
 
 /* Number pf PS/Patch entries in an HCI packet */
 #define MAX_BYTE_LENGTH                   244
 
 #define SKIP_BLANKS(str) while (*str == ' ') str++
-#define MIN(x, y) (((x) <= (y))? (x):(y))
-#define MAX(x, y) (((x) >= (y))? (x):(y))
-
-#define UNUSED(x) (x=x)
-
-#define IS_BETWEEN(x, lower, upper) (((lower) <= (x)) && ((x) <= (upper)))
-#define IS_DIGIT(c) (IS_BETWEEN((c), '0', '9'))
-#define IS_HEX(c)   (IS_BETWEEN((c), '0', '9') || IS_BETWEEN((c), 'a', 'f') || IS_BETWEEN((c), 'A', 'F'))
-#define TO_LOWER(c) (IS_BETWEEN((c), 'A', 'Z') ? ((c) - 'A' + 'a') : (c))
-#define IS_BLANK(c) ((c) == ' ')
-#define CONV_DEC_DIGIT_TO_VALUE(c) ((c) - '0')
-#define CONV_HEX_DIGIT_TO_VALUE(c) (IS_DIGIT(c) ? ((c) - '0') : (IS_BETWEEN((c), 'A', 'Z') ? ((c) - 'A' + 10) : ((c) - 'a' + 10))) 
-#define CONV_VALUE_TO_HEX(v) ((A_UINT8)( ((v & 0x0F) <= 9) ? ((v & 0x0F) + '0') : ((v & 0x0F) - 10 + 'A') ) )
-
 
 enum MinBootFileFormatE
 {
    MB_FILEFORMAT_RADIOTBL,
    MB_FILEFORMAT_PATCH,
    MB_FILEFORMAT_COEXCONFIG
 };
 
 enum RamPsSection
 {
@@ skipping 388 matching lines @@
                             stReadStatus.uCharCount++;
             } else {
                             stReadStatus.uCharCount = 0;
             }
             }
                     uReadCount = (ByteCount > BYTES_OF_PS_DATA_PER_LINE)? BYTES_OF_PS_DATA_PER_LINE: ByteCount;
                     //AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" "));
                     if((stPS_DataFormat.eDataType == eHex) && stPS_DataFormat.bIsArray == true) {
                        while(uReadCount > 0) {
                            PsTagEntry[TagCount].TagData[stReadStatus.uByteCount] =
-                                                     (A_UINT8)(CONV_HEX_DIGIT_TO_VALUE(pCharLine[stReadStatus.uCharCount]) << 4)
-                                                     | (A_UINT8)(CONV_HEX_DIGIT_TO_VALUE(pCharLine[stReadStatus.uCharCount + 1]));
+                                                     (A_UINT8)(hex_to_bin(pCharLine[stReadStatus.uCharCount]) << 4)
+                                                     | (A_UINT8)(hex_to_bin(pCharLine[stReadStatus.uCharCount + 1]));
 
                            PsTagEntry[TagCount].TagData[stReadStatus.uByteCount+1] =
-                                                     (A_UINT8)(CONV_HEX_DIGIT_TO_VALUE(pCharLine[stReadStatus.uCharCount + 3]) << 4)
-                                                     | (A_UINT8)(CONV_HEX_DIGIT_TO_VALUE(pCharLine[stReadStatus.uCharCount + 4]));
+                                                     (A_UINT8)(hex_to_bin(pCharLine[stReadStatus.uCharCount + 3]) << 4)
+                                                     | (A_UINT8)(hex_to_bin(pCharLine[stReadStatus.uCharCount + 4]));
 
                            stReadStatus.uCharCount += 6; // read two bytes, plus a space;
                            stReadStatus.uByteCount += 2;
                            uReadCount -= 2;
                        }
                        if(ByteCount > BYTES_OF_PS_DATA_PER_LINE) {
                               ByteCount -= BYTES_OF_PS_DATA_PER_LINE;
                        }
                        else {
                           ByteCount = 0;
@@ skipping 65 matching lines @@
 
 
 /********************/
 
 
 A_STATUS GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer)
 {
     unsigned char ch;
 
     ch = AthReadChar(srcbuffer,len,pos);
-    if(ch != '\0' && IS_HEX(ch)) {
+    if(ch != '\0' && isxdigit(ch)) {
         buffer[0] =  ch;
     } else 
     {
         return A_ERROR;
     }
     ch = AthReadChar(srcbuffer,len,pos);
-    if(ch != '\0' && IS_HEX(ch)) {
+    if(ch != '\0' && isxdigit(ch)) {
         buffer[1] =  ch;
     } else 
     {
         return A_ERROR;
     }
     return A_OK;
 }
 
 A_STATUS AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen)
 {
 
     char  Byte[3];
     char   Line[MAX_BYTE_LENGTH + 1];
     int    ByteCount,ByteCount_Org;
     int count;
     int i,j,k;
     int data;
     A_UINT32 filepos;
     Byte[2] = '\0';
     j = 0;
     filepos = 0;
     Patch_Count = 0;
 
     while(NULL != AthGetLine(Line,MAX_BYTE_LENGTH,patchbuffer,patchlen,&filepos)) {
-        if(strlen(Line) <= 1 || !IS_HEX(Line[0])) {
+        if(strlen(Line) <= 1 || !isxdigit(Line[0])) {
             continue;
         } else {
             break;
         }
     }
     ByteCount = A_STRTOL(Line, NULL, 16);
     ByteCount_Org = ByteCount;
 
     while(ByteCount > MAX_BYTE_LENGTH){
 
@@ skipping 169 matching lines @@
             Crc |= RAM_PATCH_REGION;
     if(Tag_Count > 0)
             Crc |= RAM_PS_REGION;
     AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("PS Thread Started CRC %x Patch Count %d  Tag Count %d \n",Crc,Patch_Count,Tag_Count));
     
     if(Patch_Count || Tag_Count ){
     NumcmdEntry+=(2 + Patch_Count + Tag_Count); /* CRC Packet + PS Reset Packet  + Patch List + PS List*/
         if(Patch_Count > 0) {
             NumcmdEntry++; /* Patch Enable Command */
         }
-           AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Num Cmd Entries %d Size  %d  \r\n",NumcmdEntry,sizeof(PSCmdPacket) * NumcmdEntry));
+           AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Num Cmd Entries %d Size  %d  \r\n",NumcmdEntry,(A_UINT32)sizeof(PSCmdPacket) * NumcmdEntry));
         (*HciPacketList) = A_MALLOC(sizeof(PSCmdPacket) * NumcmdEntry);
     if(NULL == *HciPacketList) {
                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("memory allocation failed  \r\n"));
         }
         AthPSCreateHCICommand(PS_VERIFY_CRC,Crc,*HciPacketList,numPackets);
         if(Patch_Count > 0){
             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** Write Patch**** \r\n"));
                 AthPSCreateHCICommand(WRITE_PATCH,Patch_Count,*HciPacketList,numPackets);
                 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** Enable Patch**** \r\n"));
                 AthPSCreateHCICommand(ENABLE_PATCH,0,*HciPacketList,numPackets);
@@ skipping 161 matching lines @@
     int i;
     if(*HciPacketList == NULL) {
         return A_ERROR;
     }
     for(i = 0; i < numPackets;i++) {
         A_FREE((*HciPacketList)[i].Hcipacket);
     }  
     A_FREE(*HciPacketList);
     return A_OK;
 }