ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h

Index: chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h
diff --git a/chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h b/chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h
index a4c1ff87a2d39d92fecbfd7f743f568c12f78e49..b30fd877aebf17ac42dd838f97c7dea46c8fa6ce 100644
--- a/chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h
+++ b/chromeos/drivers/ath6kl/htc2/AR6000/ar6k.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="ar6k.h" company="Atheros">
-//    Copyright (c) 2007-2008 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2007-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.
 //
 //
 //------------------------------------------------------------------------------
@@ -81,6 +85,8 @@ typedef PREPACK struct _AR6K_GMBOX_CTRL_REGISTERS {
 #ifndef A_CACHE_LINE_PAD
 #define A_CACHE_LINE_PAD                        128
 #endif
+#define AR6K_MIN_SCATTER_ENTRIES_PER_REQ        2
+#define AR6K_MIN_TRANSFER_SIZE_PER_SCATTER      4*1024
 
 /* buffers for ASYNC I/O */
 typedef struct AR6K_ASYNC_REG_IO_BUFFER {
@@ -164,7 +170,7 @@ A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
 A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
 A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev);
 A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev);
-
+A_STATUS DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_BOOL *pbIsRecvPending);
 
 #define DEV_CALC_RECV_PADDED_LEN(pDev, length) (((length) + (pDev)->BlockMask) & (~((pDev)->BlockMask)))
 #define DEV_CALC_SEND_PADDED_LEN(pDev, length) DEV_CALC_RECV_PADDED_LEN(pDev,length)
@@ -234,8 +240,8 @@ static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_U
     }
 
     AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-                ("DevRecvPacket (0x%X : hdr:0x%X) Padded Length: %d Mbox:0x%X (mode:%s)\n",
-                (A_UINT32)pPacket, pPacket->PktInfo.AsRx.ExpectedHdr,
+                ("DevRecvPacket (0x%lX : hdr:0x%X) Padded Length: %d Mbox:0x%X (mode:%s)\n",
+                (unsigned long)pPacket, pPacket->PktInfo.AsRx.ExpectedHdr,
                 paddedLength,
                 pDev->MailBoxInfo.MboxAddresses[HTC_MAILBOX],
                 sync ? "SYNC" : "ASYNC"));