ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c

Index: chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
diff --git a/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
index de236d269f0d0fc0bfa6adef72749269557284b4..22c6c6659f5b5f9a004ed25ae4543e01c200380b 100644
--- a/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+++ b/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
@@ -1,15 +1,18 @@
 //------------------------------------------------------------------------------
-// <copyright file="hif_scatter.c" company="Atheros">
-//    Copyright (c) 2009 Atheros Corporation.  All rights reserved.
+// Copyright (c) 2009-2010 Atheros Corporation.  All rights reserved.
 // 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 //
 //------------------------------------------------------------------------------
@@ -127,17 +130,17 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
         /* assemble SG list */   
     for (i = 0 ; i < pReq->ValidScatterEntries ; i++, pSg++) {
             /* setup each sg entry */
-        if ((A_UINT32)pReq->ScatterList[i].pBuffer & 0x3) {
+        if ((unsigned long)pReq->ScatterList[i].pBuffer & 0x3) {
                 /* note some scatter engines can handle unaligned buffers, print this
                  * as informational only */
             AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER,
-                            ("HIF: (%s) Scatter Buffer is unaligned 0x%08x\n",
+                            ("HIF: (%s) Scatter Buffer is unaligned 0x%lx\n",
                             pReq->Request & HIF_WRITE ? "WRITE":"READ",
-                            (A_UINT32)pReq->ScatterList[i].pBuffer)); 
+                            (unsigned long)pReq->ScatterList[i].pBuffer)); 
         }
         
-        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("  %d:  Addr:0x%X, Len:%d \n",
-            i,(A_UINT32)pReq->ScatterList[i].pBuffer,pReq->ScatterList[i].Length));
+        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("  %d:  Addr:0x%lX, Len:%d \n",
+            i,(unsigned long)pReq->ScatterList[i].pBuffer,pReq->ScatterList[i].Length));
             
         sg_set_buf(pSg, pReq->ScatterList[i].pBuffer, pReq->ScatterList[i].Length);
     }
@@ -182,12 +185,12 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
     pReq->CompletionStatus = status;
     
     if (pReq->Request & HIF_ASYNCHRONOUS) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: async_task completion routine req: 0x%X (%d)\n",(unsigned int)busrequest, status));
+        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: async_task completion routine req: 0x%lX (%d)\n",(unsigned long)busrequest, status));
             /* complete the request */
         A_ASSERT(pReq->CompletionRoutine != NULL);
         pReq->CompletionRoutine(pReq);
     } else {
-        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER async_task upping busrequest : 0x%X (%d)\n", (unsigned int)busrequest,status));
+        AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER async_task upping busrequest : 0x%lX (%d)\n", (unsigned long)busrequest,status));
             /* signal wait */
         up(&busrequest->sem_req);
     }
@@ -242,7 +245,7 @@ static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
         AddToAsyncList(device, pReqPriv->busrequest);
 
         if (request & HIF_SYNCHRONOUS) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: queued sync req: 0x%X\n", (unsigned int)pReqPriv->busrequest));
+            AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: queued sync req: 0x%lX\n", (unsigned long)pReqPriv->busrequest));
             /* signal thread and wait */
             up(&device->sem_async);
             if (down_interruptible(&pReqPriv->busrequest->sem_req) != 0) {
@@ -254,7 +257,7 @@ static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
                 status = pReq->CompletionStatus;
             }
         } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: queued async req: 0x%X\n", (unsigned int)pReqPriv->busrequest));
+            AR_DEBUG_PRINTF(ATH_DEBUG_SCATTER, ("HIF-SCATTER: queued async req: 0x%lX\n", (unsigned long)pReqPriv->busrequest));
                 /* wake thread, it will process and then take care of the async callback */
             up(&device->sem_async);
             status = A_OK;