ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/htc2/htc_services.c

 //------------------------------------------------------------------------------
 // <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.
 //
 //
 //------------------------------------------------------------------------------
 //==============================================================================
 // Author(s): ="Atheros"
 //==============================================================================
 #include "htc_internal.h"
 
 void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket)
 {
@@ skipping 10 matching lines @@
     if (pPacket->Status == A_ECANCELED) {
         /* this is a flush operation, return the control packet back to the pool */
         HTC_FREE_CONTROL_RX((HTC_TARGET*)Context,pPacket);    
         return;
     }  
     
         /* the only control messages we are expecting are NULL messages (credit resports) */   
     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]);
 }
 
 A_STATUS HTCSendSetupComplete(HTC_TARGET *target)
 {
     HTC_PACKET             *pSendPacket = NULL;
     A_STATUS                status;
 
@@ skipping 63 matching lines @@
     HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
     A_STATUS                            status = A_OK;
     HTC_PACKET                          *pRecvPacket = NULL;
     HTC_PACKET                          *pSendPacket = NULL;
     HTC_CONNECT_SERVICE_RESPONSE_MSG    *pResponseMsg;
     HTC_CONNECT_SERVICE_MSG             *pConnectMsg;
     HTC_ENDPOINT_ID                     assignedEndpoint = ENDPOINT_MAX;
     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 {
 
         AR_DEBUG_ASSERT(pConnectReq->ServiceID != 0);
 
         if (HTC_CTRL_RSVD_SVC == pConnectReq->ServiceID) {
                 /* special case for pseudo control service */
             assignedEndpoint = ENDPOINT_0;
             maxMsgSize = HTC_MAX_CONTROL_MESSAGE_LENGTH;
         } else {
@@ skipping 291 matching lines @@
             if (target->EndPoint[ep].ServiceID == ServicePriorityOrder[i]) {
                     /* queue this one to the list */
                 AddToEndpointDistList(target, &target->EndPoint[ep].CreditDist);
                 break;
             }
         }
         AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
     }
 
 }