ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/htc2/htc_services.c

Index: chromeos/drivers/ath6kl/htc2/htc_services.c
diff --git a/chromeos/drivers/ath6kl/htc2/htc_services.c b/chromeos/drivers/ath6kl/htc2/htc_services.c
index acef96e238c3422857491cf55e8717610a617f47..64fddc0ee376d2476737066b4d558021f3eef2ad 100644
--- a/chromeos/drivers/ath6kl/htc2/htc_services.c
+++ b/chromeos/drivers/ath6kl/htc2/htc_services.c
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="htc_services.c" 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.
 //
 //
 //------------------------------------------------------------------------------
@@ -40,12 +44,14 @@ void HTCControlRecv(void *Context, HTC_PACKET *pPacket)
     if (pPacket->ActualLength > 0) {
         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
                         ("HTCControlRecv, got message with length:%d \n",
-                        pPacket->ActualLength + HTC_HDR_LENGTH));
-    
+                        pPacket->ActualLength + (A_UINT32)HTC_HDR_LENGTH));
+
+#ifdef ATH_DEBUG_MODULE
             /* dump header and message */
         DebugDumpBytes(pPacket->pBuffer - HTC_HDR_LENGTH,
                        pPacket->ActualLength + HTC_HDR_LENGTH,
                        "Unexpected ENDPOINT 0 Message");
+#endif
     }
 
     HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket,&((HTC_TARGET*)Context)->EndPoint[0]);
@@ -129,8 +135,8 @@ A_STATUS HTCConnectService(HTC_HANDLE               HTCHandle,
     HTC_ENDPOINT                        *pEndpoint;
     unsigned int                        maxMsgSize = 0;
 
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:0x%X SvcID:0x%X \n",
-               (A_UINT32)target, pConnectReq->ServiceID));
+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:0x%lX SvcID:0x%X \n",
+               (unsigned long)target, pConnectReq->ServiceID));
 
     do {