diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-14 13:58:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:58:50 -0400 |
commit | 6ca0f664e18f967dad2ff47c4de447b1d37fbdfc (patch) | |
tree | 1c2cb79baa60a51de675c4cd79a8d87e2ebe447d /drivers/staging | |
parent | c6528e2f0dca96ee2c4bf7f1600d9537fad88197 (diff) |
ath6kl: remove-typedef HTC_PACKET_QUEUE
remove-typedef -s HTC_PACKET_QUEUE \
"struct htc_packet_queue" drivers/staging/ath6kl/
Tested-by: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 18 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc.c | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc_internal.h | 14 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc_recv.c | 24 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc_send.c | 22 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/hci_transport_api.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/htc_api.h | 16 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/htc_packet.h | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 8 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/export_hci_transport.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/export_hci_transport.h | 2 |
14 files changed, 65 insertions, 65 deletions
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h index b01542e2c3a..1ff221838c0 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h | |||
@@ -118,7 +118,7 @@ struct ar6k_device { | |||
118 | struct hif_device_mbox_info MailBoxInfo; | 118 | struct hif_device_mbox_info MailBoxInfo; |
119 | HIF_PENDING_EVENTS_FUNC GetPendingEventsFunc; | 119 | HIF_PENDING_EVENTS_FUNC GetPendingEventsFunc; |
120 | void *HTCContext; | 120 | void *HTCContext; |
121 | HTC_PACKET_QUEUE RegisterIOList; | 121 | struct htc_packet_queue RegisterIOList; |
122 | struct ar6k_async_reg_io_buffer RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS]; | 122 | struct ar6k_async_reg_io_buffer RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS]; |
123 | void (*TargetFailureCallback)(void *Context); | 123 | void (*TargetFailureCallback)(void *Context); |
124 | int (*MessagePendingCallback)(void *Context, | 124 | int (*MessagePendingCallback)(void *Context, |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c index 90e303f342a..8cf46b13390 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | |||
@@ -63,9 +63,9 @@ struct gmbox_proto_hci_uart { | |||
63 | u32 RecvStateFlags; | 63 | u32 RecvStateFlags; |
64 | u32 SendStateFlags; | 64 | u32 SendStateFlags; |
65 | HCI_TRANSPORT_PACKET_TYPE WaitBufferType; | 65 | HCI_TRANSPORT_PACKET_TYPE WaitBufferType; |
66 | HTC_PACKET_QUEUE SendQueue; /* write queue holding HCI Command and ACL packets */ | 66 | struct htc_packet_queue SendQueue; /* write queue holding HCI Command and ACL packets */ |
67 | HTC_PACKET_QUEUE HCIACLRecvBuffers; /* recv queue holding buffers for incomming ACL packets */ | 67 | struct htc_packet_queue HCIACLRecvBuffers; /* recv queue holding buffers for incomming ACL packets */ |
68 | HTC_PACKET_QUEUE HCIEventBuffers; /* recv queue holding buffers for incomming event packets */ | 68 | struct htc_packet_queue HCIEventBuffers; /* recv queue holding buffers for incomming event packets */ |
69 | struct ar6k_device *pDev; | 69 | struct ar6k_device *pDev; |
70 | A_MUTEX_T HCIRxLock; | 70 | A_MUTEX_T HCIRxLock; |
71 | A_MUTEX_T HCITxLock; | 71 | A_MUTEX_T HCITxLock; |
@@ -366,7 +366,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB | |||
366 | LOCK_HCI_RX(pProt); | 366 | LOCK_HCI_RX(pProt); |
367 | 367 | ||
368 | } else { | 368 | } else { |
369 | HTC_PACKET_QUEUE *pQueue; | 369 | struct htc_packet_queue *pQueue; |
370 | /* user is using a refill handler that can refill multiple HTC buffers */ | 370 | /* user is using a refill handler that can refill multiple HTC buffers */ |
371 | 371 | ||
372 | /* select buffer queue */ | 372 | /* select buffer queue */ |
@@ -483,7 +483,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB | |||
483 | 483 | ||
484 | /* check if we need to refill recv buffers */ | 484 | /* check if we need to refill recv buffers */ |
485 | if ((pProt->HCIConfig.pHCIPktRecvRefill != NULL) && !recvRefillCalled) { | 485 | if ((pProt->HCIConfig.pHCIPktRecvRefill != NULL) && !recvRefillCalled) { |
486 | HTC_PACKET_QUEUE *pQueue; | 486 | struct htc_packet_queue *pQueue; |
487 | int watermark; | 487 | int watermark; |
488 | 488 | ||
489 | if (pktType == HCI_ACL_TYPE) { | 489 | if (pktType == HCI_ACL_TYPE) { |
@@ -514,7 +514,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB | |||
514 | 514 | ||
515 | /* see if we need to recycle the recv buffer */ | 515 | /* see if we need to recycle the recv buffer */ |
516 | if (status && (pPacket != NULL)) { | 516 | if (status && (pPacket != NULL)) { |
517 | HTC_PACKET_QUEUE queue; | 517 | struct htc_packet_queue queue; |
518 | 518 | ||
519 | if (A_EPROTO == status) { | 519 | if (A_EPROTO == status) { |
520 | DebugDumpBytes(pPacket->pBuffer, totalRecvLength, "Bad HCI-UART Recv packet"); | 520 | DebugDumpBytes(pPacket->pBuffer, totalRecvLength, "Bad HCI-UART Recv packet"); |
@@ -797,7 +797,7 @@ static int HCITrySend(struct gmbox_proto_hci_uart *pProt, struct htc_packet *pPa | |||
797 | static void FlushSendQueue(struct gmbox_proto_hci_uart *pProt) | 797 | static void FlushSendQueue(struct gmbox_proto_hci_uart *pProt) |
798 | { | 798 | { |
799 | struct htc_packet *pPacket; | 799 | struct htc_packet *pPacket; |
800 | HTC_PACKET_QUEUE discardQueue; | 800 | struct htc_packet_queue discardQueue; |
801 | 801 | ||
802 | INIT_HTC_PACKET_QUEUE(&discardQueue); | 802 | INIT_HTC_PACKET_QUEUE(&discardQueue); |
803 | 803 | ||
@@ -820,7 +820,7 @@ static void FlushSendQueue(struct gmbox_proto_hci_uart *pProt) | |||
820 | 820 | ||
821 | static void FlushRecvBuffers(struct gmbox_proto_hci_uart *pProt) | 821 | static void FlushRecvBuffers(struct gmbox_proto_hci_uart *pProt) |
822 | { | 822 | { |
823 | HTC_PACKET_QUEUE discardQueue; | 823 | struct htc_packet_queue discardQueue; |
824 | struct htc_packet *pPacket; | 824 | struct htc_packet *pPacket; |
825 | 825 | ||
826 | INIT_HTC_PACKET_QUEUE(&discardQueue); | 826 | INIT_HTC_PACKET_QUEUE(&discardQueue); |
@@ -1001,7 +1001,7 @@ void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans) | |||
1001 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportAttach \n")); | 1001 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportAttach \n")); |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue) | 1004 | int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet_queue *pQueue) |
1005 | { | 1005 | { |
1006 | struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)HciTrans; | 1006 | struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)HciTrans; |
1007 | int status = 0; | 1007 | int status = 0; |
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c index 04ba80ef822..bf4fdb34e9e 100644 --- a/drivers/staging/ath6kl/htc2/htc.c +++ b/drivers/staging/ath6kl/htc2/htc.c | |||
@@ -43,14 +43,14 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(htc, | |||
43 | static void HTCReportFailure(void *Context); | 43 | static void HTCReportFailure(void *Context); |
44 | static void ResetEndpointStates(HTC_TARGET *target); | 44 | static void ResetEndpointStates(HTC_TARGET *target); |
45 | 45 | ||
46 | void HTCFreeControlBuffer(HTC_TARGET *target, struct htc_packet *pPacket, HTC_PACKET_QUEUE *pList) | 46 | void HTCFreeControlBuffer(HTC_TARGET *target, struct htc_packet *pPacket, struct htc_packet_queue *pList) |
47 | { | 47 | { |
48 | LOCK_HTC(target); | 48 | LOCK_HTC(target); |
49 | HTC_PACKET_ENQUEUE(pList,pPacket); | 49 | HTC_PACKET_ENQUEUE(pList,pPacket); |
50 | UNLOCK_HTC(target); | 50 | UNLOCK_HTC(target); |
51 | } | 51 | } |
52 | 52 | ||
53 | struct htc_packet *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList) | 53 | struct htc_packet *HTCAllocControlBuffer(HTC_TARGET *target, struct htc_packet_queue *pList) |
54 | { | 54 | { |
55 | struct htc_packet *pPacket; | 55 | struct htc_packet *pPacket; |
56 | 56 | ||
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h index 5f85350b50a..67de917dc6f 100644 --- a/drivers/staging/ath6kl/htc2/htc_internal.h +++ b/drivers/staging/ath6kl/htc2/htc_internal.h | |||
@@ -69,15 +69,15 @@ struct htc_endpoint { | |||
69 | HTC_ENDPOINT_ID Id; | 69 | HTC_ENDPOINT_ID Id; |
70 | HTC_SERVICE_ID ServiceID; /* service ID this endpoint is bound to | 70 | HTC_SERVICE_ID ServiceID; /* service ID this endpoint is bound to |
71 | non-zero value means this endpoint is in use */ | 71 | non-zero value means this endpoint is in use */ |
72 | HTC_PACKET_QUEUE TxQueue; /* HTC frame buffer TX queue */ | 72 | struct htc_packet_queue TxQueue; /* HTC frame buffer TX queue */ |
73 | HTC_PACKET_QUEUE RxBuffers; /* HTC frame buffer RX list */ | 73 | struct htc_packet_queue RxBuffers; /* HTC frame buffer RX list */ |
74 | struct htc_endpoint_credit_dist CreditDist; /* credit distribution structure (exposed to driver layer) */ | 74 | struct htc_endpoint_credit_dist CreditDist; /* credit distribution structure (exposed to driver layer) */ |
75 | struct htc_ep_callbacks EpCallBacks; /* callbacks associated with this endpoint */ | 75 | struct htc_ep_callbacks EpCallBacks; /* callbacks associated with this endpoint */ |
76 | int MaxTxQueueDepth; /* max depth of the TX queue before we need to | 76 | int MaxTxQueueDepth; /* max depth of the TX queue before we need to |
77 | call driver's full handler */ | 77 | call driver's full handler */ |
78 | int MaxMsgLength; /* max length of endpoint message */ | 78 | int MaxMsgLength; /* max length of endpoint message */ |
79 | int TxProcessCount; /* reference count to continue tx processing */ | 79 | int TxProcessCount; /* reference count to continue tx processing */ |
80 | HTC_PACKET_QUEUE RecvIndicationQueue; /* recv packets ready to be indicated */ | 80 | struct htc_packet_queue RecvIndicationQueue; /* recv packets ready to be indicated */ |
81 | int RxProcessCount; /* reference count to allow single processing context */ | 81 | int RxProcessCount; /* reference count to allow single processing context */ |
82 | struct _HTC_TARGET *target; /* back pointer to target */ | 82 | struct _HTC_TARGET *target; /* back pointer to target */ |
83 | u8 SeqNo; /* TX seq no (helpful) for debugging */ | 83 | u8 SeqNo; /* TX seq no (helpful) for debugging */ |
@@ -112,8 +112,8 @@ typedef struct _HTC_TARGET { | |||
112 | struct htc_endpoint EndPoint[ENDPOINT_MAX]; | 112 | struct htc_endpoint EndPoint[ENDPOINT_MAX]; |
113 | struct htc_control_buffer HTCControlBuffers[NUM_CONTROL_BUFFERS]; | 113 | struct htc_control_buffer HTCControlBuffers[NUM_CONTROL_BUFFERS]; |
114 | struct htc_endpoint_credit_dist *EpCreditDistributionListHead; | 114 | struct htc_endpoint_credit_dist *EpCreditDistributionListHead; |
115 | HTC_PACKET_QUEUE ControlBufferTXFreeList; | 115 | struct htc_packet_queue ControlBufferTXFreeList; |
116 | HTC_PACKET_QUEUE ControlBufferRXFreeList; | 116 | struct htc_packet_queue ControlBufferRXFreeList; |
117 | HTC_CREDIT_DIST_CALLBACK DistributeCredits; | 117 | HTC_CREDIT_DIST_CALLBACK DistributeCredits; |
118 | HTC_CREDIT_INIT_CALLBACK InitCredits; | 118 | HTC_CREDIT_INIT_CALLBACK InitCredits; |
119 | void *pCredDistContext; | 119 | void *pCredDistContext; |
@@ -165,8 +165,8 @@ typedef struct _HTC_TARGET { | |||
165 | void HTCControlTxComplete(void *Context, struct htc_packet *pPacket); | 165 | void HTCControlTxComplete(void *Context, struct htc_packet *pPacket); |
166 | void HTCControlRecv(void *Context, struct htc_packet *pPacket); | 166 | void HTCControlRecv(void *Context, struct htc_packet *pPacket); |
167 | int HTCWaitforControlMessage(HTC_TARGET *target, struct htc_packet **ppControlPacket); | 167 | int HTCWaitforControlMessage(HTC_TARGET *target, struct htc_packet **ppControlPacket); |
168 | struct htc_packet *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList); | 168 | struct htc_packet *HTCAllocControlBuffer(HTC_TARGET *target, struct htc_packet_queue *pList); |
169 | void HTCFreeControlBuffer(HTC_TARGET *target, struct htc_packet *pPacket, HTC_PACKET_QUEUE *pList); | 169 | void HTCFreeControlBuffer(HTC_TARGET *target, struct htc_packet *pPacket, struct htc_packet_queue *pList); |
170 | int HTCIssueSend(HTC_TARGET *target, struct htc_packet *pPacket); | 170 | int HTCIssueSend(HTC_TARGET *target, struct htc_packet *pPacket); |
171 | void HTCRecvCompleteHandler(void *Context, struct htc_packet *pPacket); | 171 | void HTCRecvCompleteHandler(void *Context, struct htc_packet *pPacket); |
172 | int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLookAheads, bool *pAsyncProc, int *pNumPktsFetched); | 172 | int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLookAheads, bool *pAsyncProc, int *pNumPktsFetched); |
diff --git a/drivers/staging/ath6kl/htc2/htc_recv.c b/drivers/staging/ath6kl/htc2/htc_recv.c index f70296321b7..8ad1d03fceb 100644 --- a/drivers/staging/ath6kl/htc2/htc_recv.c +++ b/drivers/staging/ath6kl/htc2/htc_recv.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | static void DoRecvCompletion(struct htc_endpoint *pEndpoint, | 53 | static void DoRecvCompletion(struct htc_endpoint *pEndpoint, |
54 | HTC_PACKET_QUEUE *pQueueToIndicate) | 54 | struct htc_packet_queue *pQueueToIndicate) |
55 | { | 55 | { |
56 | 56 | ||
57 | do { | 57 | do { |
@@ -434,7 +434,7 @@ static INLINE void HTCAsyncRecvCheckMorePackets(HTC_TARGET *target, | |||
434 | /* unload the recv completion queue */ | 434 | /* unload the recv completion queue */ |
435 | static INLINE void DrainRecvIndicationQueue(HTC_TARGET *target, struct htc_endpoint *pEndpoint) | 435 | static INLINE void DrainRecvIndicationQueue(HTC_TARGET *target, struct htc_endpoint *pEndpoint) |
436 | { | 436 | { |
437 | HTC_PACKET_QUEUE recvCompletions; | 437 | struct htc_packet_queue recvCompletions; |
438 | 438 | ||
439 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+DrainRecvIndicationQueue \n")); | 439 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+DrainRecvIndicationQueue \n")); |
440 | 440 | ||
@@ -690,7 +690,7 @@ static int AllocAndPrepareRxPackets(HTC_TARGET *target, | |||
690 | u32 LookAheads[], | 690 | u32 LookAheads[], |
691 | int Messages, | 691 | int Messages, |
692 | struct htc_endpoint *pEndpoint, | 692 | struct htc_endpoint *pEndpoint, |
693 | HTC_PACKET_QUEUE *pQueue) | 693 | struct htc_packet_queue *pQueue) |
694 | { | 694 | { |
695 | int status = 0; | 695 | int status = 0; |
696 | struct htc_packet *pPacket; | 696 | struct htc_packet *pPacket; |
@@ -889,7 +889,7 @@ static void HTCAsyncRecvScatterCompletion(struct hif_scatter_req *pScatterReq) | |||
889 | HTC_TARGET *target = (HTC_TARGET *)pScatterReq->Context; | 889 | HTC_TARGET *target = (HTC_TARGET *)pScatterReq->Context; |
890 | int status; | 890 | int status; |
891 | bool partialBundle = false; | 891 | bool partialBundle = false; |
892 | HTC_PACKET_QUEUE localRecvQueue; | 892 | struct htc_packet_queue localRecvQueue; |
893 | bool procError = false; | 893 | bool procError = false; |
894 | 894 | ||
895 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCAsyncRecvScatterCompletion TotLen: %d Entries: %d\n", | 895 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCAsyncRecvScatterCompletion TotLen: %d Entries: %d\n", |
@@ -985,8 +985,8 @@ static void HTCAsyncRecvScatterCompletion(struct hif_scatter_req *pScatterReq) | |||
985 | } | 985 | } |
986 | 986 | ||
987 | static int HTCIssueRecvPacketBundle(HTC_TARGET *target, | 987 | static int HTCIssueRecvPacketBundle(HTC_TARGET *target, |
988 | HTC_PACKET_QUEUE *pRecvPktQueue, | 988 | struct htc_packet_queue *pRecvPktQueue, |
989 | HTC_PACKET_QUEUE *pSyncCompletionQueue, | 989 | struct htc_packet_queue *pSyncCompletionQueue, |
990 | int *pNumPacketsFetched, | 990 | int *pNumPacketsFetched, |
991 | bool PartialBundle) | 991 | bool PartialBundle) |
992 | { | 992 | { |
@@ -1126,7 +1126,7 @@ int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLook | |||
1126 | bool asyncProc = false; | 1126 | bool asyncProc = false; |
1127 | u32 lookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE]; | 1127 | u32 lookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE]; |
1128 | int pktsFetched; | 1128 | int pktsFetched; |
1129 | HTC_PACKET_QUEUE recvPktQueue, syncCompletedPktsQueue; | 1129 | struct htc_packet_queue recvPktQueue, syncCompletedPktsQueue; |
1130 | bool partialBundle; | 1130 | bool partialBundle; |
1131 | HTC_ENDPOINT_ID id; | 1131 | HTC_ENDPOINT_ID id; |
1132 | int totalFetched = 0; | 1132 | int totalFetched = 0; |
@@ -1283,7 +1283,7 @@ int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLook | |||
1283 | 1283 | ||
1284 | /* unload sync completion queue */ | 1284 | /* unload sync completion queue */ |
1285 | while (!HTC_QUEUE_EMPTY(&syncCompletedPktsQueue)) { | 1285 | while (!HTC_QUEUE_EMPTY(&syncCompletedPktsQueue)) { |
1286 | HTC_PACKET_QUEUE container; | 1286 | struct htc_packet_queue container; |
1287 | 1287 | ||
1288 | pPacket = HTC_PACKET_DEQUEUE(&syncCompletedPktsQueue); | 1288 | pPacket = HTC_PACKET_DEQUEUE(&syncCompletedPktsQueue); |
1289 | A_ASSERT(pPacket != NULL); | 1289 | A_ASSERT(pPacket != NULL); |
@@ -1385,7 +1385,7 @@ int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLook | |||
1385 | return status; | 1385 | return status; |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) | 1388 | int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, struct htc_packet_queue *pPktQueue) |
1389 | { | 1389 | { |
1390 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); | 1390 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); |
1391 | struct htc_endpoint *pEndpoint; | 1391 | struct htc_endpoint *pEndpoint; |
@@ -1457,7 +1457,7 @@ int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) | |||
1457 | /* Makes a buffer available to the HTC module */ | 1457 | /* Makes a buffer available to the HTC module */ |
1458 | int HTCAddReceivePkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket) | 1458 | int HTCAddReceivePkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket) |
1459 | { | 1459 | { |
1460 | HTC_PACKET_QUEUE queue; | 1460 | struct htc_packet_queue queue; |
1461 | INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket); | 1461 | INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket); |
1462 | return HTCAddReceivePktMultiple(HTCHandle, &queue); | 1462 | return HTCAddReceivePktMultiple(HTCHandle, &queue); |
1463 | } | 1463 | } |
@@ -1486,10 +1486,10 @@ void HTCUnblockRecv(HTC_HANDLE HTCHandle) | |||
1486 | } | 1486 | } |
1487 | } | 1487 | } |
1488 | 1488 | ||
1489 | static void HTCFlushRxQueue(HTC_TARGET *target, struct htc_endpoint *pEndpoint, HTC_PACKET_QUEUE *pQueue) | 1489 | static void HTCFlushRxQueue(HTC_TARGET *target, struct htc_endpoint *pEndpoint, struct htc_packet_queue *pQueue) |
1490 | { | 1490 | { |
1491 | struct htc_packet *pPacket; | 1491 | struct htc_packet *pPacket; |
1492 | HTC_PACKET_QUEUE container; | 1492 | struct htc_packet_queue container; |
1493 | 1493 | ||
1494 | LOCK_HTC_RX(target); | 1494 | LOCK_HTC_RX(target); |
1495 | 1495 | ||
diff --git a/drivers/staging/ath6kl/htc2/htc_send.c b/drivers/staging/ath6kl/htc2/htc_send.c index 8fb05d9fdbc..80526588082 100644 --- a/drivers/staging/ath6kl/htc2/htc_send.c +++ b/drivers/staging/ath6kl/htc2/htc_send.c | |||
@@ -44,7 +44,7 @@ typedef enum _HTC_SEND_QUEUE_RESULT { | |||
44 | } | 44 | } |
45 | 45 | ||
46 | static void DoSendCompletion(struct htc_endpoint *pEndpoint, | 46 | static void DoSendCompletion(struct htc_endpoint *pEndpoint, |
47 | HTC_PACKET_QUEUE *pQueueToIndicate) | 47 | struct htc_packet_queue *pQueueToIndicate) |
48 | { | 48 | { |
49 | do { | 49 | do { |
50 | 50 | ||
@@ -105,7 +105,7 @@ static void HTCSendPktCompletionHandler(void *Context, struct htc_packet *pPacke | |||
105 | { | 105 | { |
106 | HTC_TARGET *target = (HTC_TARGET *)Context; | 106 | HTC_TARGET *target = (HTC_TARGET *)Context; |
107 | struct htc_endpoint *pEndpoint = &target->EndPoint[pPacket->Endpoint]; | 107 | struct htc_endpoint *pEndpoint = &target->EndPoint[pPacket->Endpoint]; |
108 | HTC_PACKET_QUEUE container; | 108 | struct htc_packet_queue container; |
109 | 109 | ||
110 | CompleteSentPacket(target,pEndpoint,pPacket); | 110 | CompleteSentPacket(target,pEndpoint,pPacket); |
111 | INIT_HTC_PACKET_QUEUE_AND_ADD(&container,pPacket); | 111 | INIT_HTC_PACKET_QUEUE_AND_ADD(&container,pPacket); |
@@ -148,7 +148,7 @@ int HTCIssueSend(HTC_TARGET *target, struct htc_packet *pPacket) | |||
148 | /* get HTC send packets from the TX queue on an endpoint */ | 148 | /* get HTC send packets from the TX queue on an endpoint */ |
149 | static INLINE void GetHTCSendPackets(HTC_TARGET *target, | 149 | static INLINE void GetHTCSendPackets(HTC_TARGET *target, |
150 | struct htc_endpoint *pEndpoint, | 150 | struct htc_endpoint *pEndpoint, |
151 | HTC_PACKET_QUEUE *pQueue) | 151 | struct htc_packet_queue *pQueue) |
152 | { | 152 | { |
153 | int creditsRequired; | 153 | int creditsRequired; |
154 | int remainder; | 154 | int remainder; |
@@ -271,7 +271,7 @@ static void HTCAsyncSendScatterCompletion(struct hif_scatter_req *pScatterReq) | |||
271 | struct htc_endpoint *pEndpoint = (struct htc_endpoint *)pScatterReq->Context; | 271 | struct htc_endpoint *pEndpoint = (struct htc_endpoint *)pScatterReq->Context; |
272 | HTC_TARGET *target = (HTC_TARGET *)pEndpoint->target; | 272 | HTC_TARGET *target = (HTC_TARGET *)pEndpoint->target; |
273 | int status = 0; | 273 | int status = 0; |
274 | HTC_PACKET_QUEUE sendCompletes; | 274 | struct htc_packet_queue sendCompletes; |
275 | 275 | ||
276 | INIT_HTC_PACKET_QUEUE(&sendCompletes); | 276 | INIT_HTC_PACKET_QUEUE(&sendCompletes); |
277 | 277 | ||
@@ -310,7 +310,7 @@ static void HTCAsyncSendScatterCompletion(struct hif_scatter_req *pScatterReq) | |||
310 | * - we drop below the minimum number of messages for a bundle | 310 | * - we drop below the minimum number of messages for a bundle |
311 | * */ | 311 | * */ |
312 | static void HTCIssueSendBundle(struct htc_endpoint *pEndpoint, | 312 | static void HTCIssueSendBundle(struct htc_endpoint *pEndpoint, |
313 | HTC_PACKET_QUEUE *pQueue, | 313 | struct htc_packet_queue *pQueue, |
314 | int *pBundlesSent, | 314 | int *pBundlesSent, |
315 | int *pTotalBundlesPkts) | 315 | int *pTotalBundlesPkts) |
316 | { | 316 | { |
@@ -479,9 +479,9 @@ static void HTCIssueSendBundle(struct htc_endpoint *pEndpoint, | |||
479 | * this function returns the result of the attempt to send a queue of HTC packets */ | 479 | * this function returns the result of the attempt to send a queue of HTC packets */ |
480 | static HTC_SEND_QUEUE_RESULT HTCTrySend(HTC_TARGET *target, | 480 | static HTC_SEND_QUEUE_RESULT HTCTrySend(HTC_TARGET *target, |
481 | struct htc_endpoint *pEndpoint, | 481 | struct htc_endpoint *pEndpoint, |
482 | HTC_PACKET_QUEUE *pCallersSendQueue) | 482 | struct htc_packet_queue *pCallersSendQueue) |
483 | { | 483 | { |
484 | HTC_PACKET_QUEUE sendQueue; /* temp queue to hold packets at various stages */ | 484 | struct htc_packet_queue sendQueue; /* temp queue to hold packets at various stages */ |
485 | struct htc_packet *pPacket; | 485 | struct htc_packet *pPacket; |
486 | int bundlesSent; | 486 | int bundlesSent; |
487 | int pktsInBundles; | 487 | int pktsInBundles; |
@@ -668,7 +668,7 @@ static HTC_SEND_QUEUE_RESULT HTCTrySend(HTC_TARGET *target, | |||
668 | return HTC_SEND_QUEUE_OK; | 668 | return HTC_SEND_QUEUE_OK; |
669 | } | 669 | } |
670 | 670 | ||
671 | int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) | 671 | int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, struct htc_packet_queue *pPktQueue) |
672 | { | 672 | { |
673 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); | 673 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); |
674 | struct htc_endpoint *pEndpoint; | 674 | struct htc_endpoint *pEndpoint; |
@@ -711,7 +711,7 @@ int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) | |||
711 | /* HTC API - HTCSendPkt */ | 711 | /* HTC API - HTCSendPkt */ |
712 | int HTCSendPkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket) | 712 | int HTCSendPkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket) |
713 | { | 713 | { |
714 | HTC_PACKET_QUEUE queue; | 714 | struct htc_packet_queue queue; |
715 | 715 | ||
716 | AR_DEBUG_PRINTF(ATH_DEBUG_SEND, | 716 | AR_DEBUG_PRINTF(ATH_DEBUG_SEND, |
717 | ("+-HTCSendPkt: Enter endPointId: %d, buffer: 0x%lX, length: %d \n", | 717 | ("+-HTCSendPkt: Enter endPointId: %d, buffer: 0x%lX, length: %d \n", |
@@ -841,8 +841,8 @@ void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEnt | |||
841 | static void HTCFlushEndpointTX(HTC_TARGET *target, struct htc_endpoint *pEndpoint, HTC_TX_TAG Tag) | 841 | static void HTCFlushEndpointTX(HTC_TARGET *target, struct htc_endpoint *pEndpoint, HTC_TX_TAG Tag) |
842 | { | 842 | { |
843 | struct htc_packet *pPacket; | 843 | struct htc_packet *pPacket; |
844 | HTC_PACKET_QUEUE discardQueue; | 844 | struct htc_packet_queue discardQueue; |
845 | HTC_PACKET_QUEUE container; | 845 | struct htc_packet_queue container; |
846 | 846 | ||
847 | /* initialize the discard queue */ | 847 | /* initialize the discard queue */ |
848 | INIT_HTC_PACKET_QUEUE(&discardQueue); | 848 | INIT_HTC_PACKET_QUEUE(&discardQueue); |
diff --git a/drivers/staging/ath6kl/include/hci_transport_api.h b/drivers/staging/ath6kl/include/hci_transport_api.h index 3eac1922183..5e903fad23f 100644 --- a/drivers/staging/ath6kl/include/hci_transport_api.h +++ b/drivers/staging/ath6kl/include/hci_transport_api.h | |||
@@ -141,7 +141,7 @@ void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans); | |||
141 | @example: | 141 | @example: |
142 | @see also: | 142 | @see also: |
143 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ | 143 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
144 | int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); | 144 | int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet_queue *pQueue); |
145 | 145 | ||
146 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 146 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
147 | @desc: Send an HCI packet packet | 147 | @desc: Send an HCI packet packet |
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h index ca85bada6d5..ae41f985c9f 100644 --- a/drivers/staging/ath6kl/include/htc_api.h +++ b/drivers/staging/ath6kl/include/htc_api.h | |||
@@ -51,21 +51,21 @@ struct htc_init_info { | |||
51 | /* per service connection send completion */ | 51 | /* per service connection send completion */ |
52 | typedef void (*HTC_EP_SEND_PKT_COMPLETE)(void *,struct htc_packet *); | 52 | typedef void (*HTC_EP_SEND_PKT_COMPLETE)(void *,struct htc_packet *); |
53 | /* per service connection callback when a plurality of packets have been sent | 53 | /* per service connection callback when a plurality of packets have been sent |
54 | * The HTC_PACKET_QUEUE is a temporary queue object (e.g. freed on return from the callback) | 54 | * The struct htc_packet_queue is a temporary queue object (e.g. freed on return from the callback) |
55 | * to hold a list of completed send packets. | 55 | * to hold a list of completed send packets. |
56 | * If the handler cannot fully traverse the packet queue before returning, it should | 56 | * If the handler cannot fully traverse the packet queue before returning, it should |
57 | * transfer the items of the queue into the caller's private queue using: | 57 | * transfer the items of the queue into the caller's private queue using: |
58 | * HTC_PACKET_ENQUEUE() */ | 58 | * HTC_PACKET_ENQUEUE() */ |
59 | typedef void (*HTC_EP_SEND_PKT_COMP_MULTIPLE)(void *,HTC_PACKET_QUEUE *); | 59 | typedef void (*HTC_EP_SEND_PKT_COMP_MULTIPLE)(void *,struct htc_packet_queue *); |
60 | /* per service connection pkt received */ | 60 | /* per service connection pkt received */ |
61 | typedef void (*HTC_EP_RECV_PKT)(void *,struct htc_packet *); | 61 | typedef void (*HTC_EP_RECV_PKT)(void *,struct htc_packet *); |
62 | /* per service connection callback when a plurality of packets are received | 62 | /* per service connection callback when a plurality of packets are received |
63 | * The HTC_PACKET_QUEUE is a temporary queue object (e.g. freed on return from the callback) | 63 | * The struct htc_packet_queue is a temporary queue object (e.g. freed on return from the callback) |
64 | * to hold a list of recv packets. | 64 | * to hold a list of recv packets. |
65 | * If the handler cannot fully traverse the packet queue before returning, it should | 65 | * If the handler cannot fully traverse the packet queue before returning, it should |
66 | * transfer the items of the queue into the caller's private queue using: | 66 | * transfer the items of the queue into the caller's private queue using: |
67 | * HTC_PACKET_ENQUEUE() */ | 67 | * HTC_PACKET_ENQUEUE() */ |
68 | typedef void (*HTC_EP_RECV_PKT_MULTIPLE)(void *,HTC_PACKET_QUEUE *); | 68 | typedef void (*HTC_EP_RECV_PKT_MULTIPLE)(void *,struct htc_packet_queue *); |
69 | 69 | ||
70 | /* Optional per service connection receive buffer re-fill callback, | 70 | /* Optional per service connection receive buffer re-fill callback, |
71 | * On some OSes (like Linux) packets are allocated from a global pool and indicated up | 71 | * On some OSes (like Linux) packets are allocated from a global pool and indicated up |
@@ -502,7 +502,7 @@ void HTCUnblockRecv(HTC_HANDLE HTCHandle); | |||
502 | @return: 0 | 502 | @return: 0 |
503 | @notes: Caller must initialize each packet using SET_HTC_PACKET_INFO_TX() macro. | 503 | @notes: Caller must initialize each packet using SET_HTC_PACKET_INFO_TX() macro. |
504 | The queue must only contain packets directed at the same endpoint. | 504 | The queue must only contain packets directed at the same endpoint. |
505 | Caller supplies a pointer to an HTC_PACKET_QUEUE structure holding the TX packets in FIFO order. | 505 | Caller supplies a pointer to an struct htc_packet_queue structure holding the TX packets in FIFO order. |
506 | This API will remove the packets from the pkt queue and place them into the HTC Tx Queue | 506 | This API will remove the packets from the pkt queue and place them into the HTC Tx Queue |
507 | and bundle messages where possible. | 507 | and bundle messages where possible. |
508 | The caller may allocate the pkt queue on the stack to hold the packets. | 508 | The caller may allocate the pkt queue on the stack to hold the packets. |
@@ -511,7 +511,7 @@ void HTCUnblockRecv(HTC_HANDLE HTCHandle); | |||
511 | @example: | 511 | @example: |
512 | @see also: HTCFlushEndpoint | 512 | @see also: HTCFlushEndpoint |
513 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ | 513 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
514 | int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue); | 514 | int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, struct htc_packet_queue *pPktQueue); |
515 | 515 | ||
516 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 516 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
517 | @desc: Add multiple receive packets to HTC | 517 | @desc: Add multiple receive packets to HTC |
@@ -523,14 +523,14 @@ int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue); | |||
523 | @notes: user must supply HTC packets for capturing incomming HTC frames. The caller | 523 | @notes: user must supply HTC packets for capturing incomming HTC frames. The caller |
524 | must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL() | 524 | must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL() |
525 | macro. The queue must only contain recv packets for the same endpoint. | 525 | macro. The queue must only contain recv packets for the same endpoint. |
526 | Caller supplies a pointer to an HTC_PACKET_QUEUE structure holding the recv packet. | 526 | Caller supplies a pointer to an struct htc_packet_queue structure holding the recv packet. |
527 | This API will remove the packets from the pkt queue and place them into internal | 527 | This API will remove the packets from the pkt queue and place them into internal |
528 | recv packet list. | 528 | recv packet list. |
529 | The caller may allocate the pkt queue on the stack to hold the packets. | 529 | The caller may allocate the pkt queue on the stack to hold the packets. |
530 | @example: | 530 | @example: |
531 | @see also: | 531 | @see also: |
532 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ | 532 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
533 | int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue); | 533 | int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, struct htc_packet_queue *pPktQueue); |
534 | 534 | ||
535 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 535 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
536 | @desc: Check if an endpoint is marked active | 536 | @desc: Check if an endpoint is marked active |
diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h index 4311c932b30..ca23efd06e6 100644 --- a/drivers/staging/ath6kl/include/htc_packet.h +++ b/drivers/staging/ath6kl/include/htc_packet.h | |||
@@ -139,10 +139,10 @@ struct htc_packet { | |||
139 | } | 139 | } |
140 | 140 | ||
141 | /* HTC Packet Queueing Macros */ | 141 | /* HTC Packet Queueing Macros */ |
142 | typedef struct _HTC_PACKET_QUEUE { | 142 | struct htc_packet_queue { |
143 | struct dl_list QueueHead; | 143 | struct dl_list QueueHead; |
144 | int Depth; | 144 | int Depth; |
145 | } HTC_PACKET_QUEUE; | 145 | }; |
146 | 146 | ||
147 | /* initialize queue */ | 147 | /* initialize queue */ |
148 | #define INIT_HTC_PACKET_QUEUE(pQ) \ | 148 | #define INIT_HTC_PACKET_QUEUE(pQ) \ |
@@ -165,7 +165,7 @@ typedef struct _HTC_PACKET_QUEUE { | |||
165 | /* test if a queue is empty */ | 165 | /* test if a queue is empty */ |
166 | #define HTC_QUEUE_EMPTY(pQ) ((pQ)->Depth == 0) | 166 | #define HTC_QUEUE_EMPTY(pQ) ((pQ)->Depth == 0) |
167 | /* get packet at head without removing it */ | 167 | /* get packet at head without removing it */ |
168 | static INLINE struct htc_packet *HTC_GET_PKT_AT_HEAD(HTC_PACKET_QUEUE *queue) { | 168 | static INLINE struct htc_packet *HTC_GET_PKT_AT_HEAD(struct htc_packet_queue *queue) { |
169 | if (queue->Depth == 0) { | 169 | if (queue->Depth == 0) { |
170 | return NULL; | 170 | return NULL; |
171 | } | 171 | } |
@@ -179,7 +179,7 @@ static INLINE struct htc_packet *HTC_GET_PKT_AT_HEAD(HTC_PACKET_QUEUE *queue) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | /* dequeue an HTC packet from the head of the queue */ | 181 | /* dequeue an HTC packet from the head of the queue */ |
182 | static INLINE struct htc_packet *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) { | 182 | static INLINE struct htc_packet *HTC_PACKET_DEQUEUE(struct htc_packet_queue *queue) { |
183 | struct dl_list *pItem = DL_ListRemoveItemFromHead(&queue->QueueHead); | 183 | struct dl_list *pItem = DL_ListRemoveItemFromHead(&queue->QueueHead); |
184 | if (pItem != NULL) { | 184 | if (pItem != NULL) { |
185 | queue->Depth--; | 185 | queue->Depth--; |
@@ -189,7 +189,7 @@ static INLINE struct htc_packet *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) { | |||
189 | } | 189 | } |
190 | 190 | ||
191 | /* dequeue an HTC packet from the tail of the queue */ | 191 | /* dequeue an HTC packet from the tail of the queue */ |
192 | static INLINE struct htc_packet *HTC_PACKET_DEQUEUE_TAIL(HTC_PACKET_QUEUE *queue) { | 192 | static INLINE struct htc_packet *HTC_PACKET_DEQUEUE_TAIL(struct htc_packet_queue *queue) { |
193 | struct dl_list *pItem = DL_ListRemoveItemFromTail(&queue->QueueHead); | 193 | struct dl_list *pItem = DL_ListRemoveItemFromTail(&queue->QueueHead); |
194 | if (pItem != NULL) { | 194 | if (pItem != NULL) { |
195 | queue->Depth--; | 195 | queue->Depth--; |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index ebfc7fdb53a..fab1e02f23f 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -317,7 +317,7 @@ static void ar6000_rx(void *Context, struct htc_packet *pPacket); | |||
317 | 317 | ||
318 | static void ar6000_rx_refill(void *Context,HTC_ENDPOINT_ID Endpoint); | 318 | static void ar6000_rx_refill(void *Context,HTC_ENDPOINT_ID Endpoint); |
319 | 319 | ||
320 | static void ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPackets); | 320 | static void ar6000_tx_complete(void *Context, struct htc_packet_queue *pPackets); |
321 | 321 | ||
322 | static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packet *pPacket); | 322 | static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packet *pPacket); |
323 | 323 | ||
@@ -3461,7 +3461,7 @@ static HTC_SEND_FULL_ACTION ar6000_tx_queue_full(void *Context, struct htc_packe | |||
3461 | 3461 | ||
3462 | 3462 | ||
3463 | static void | 3463 | static void |
3464 | ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPacketQueue) | 3464 | ar6000_tx_complete(void *Context, struct htc_packet_queue *pPacketQueue) |
3465 | { | 3465 | { |
3466 | AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; | 3466 | AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; |
3467 | u32 mapNo = 0; | 3467 | u32 mapNo = 0; |
@@ -3992,7 +3992,7 @@ ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint) | |||
3992 | int RxBuffers; | 3992 | int RxBuffers; |
3993 | int buffersToRefill; | 3993 | int buffersToRefill; |
3994 | struct htc_packet *pPacket; | 3994 | struct htc_packet *pPacket; |
3995 | HTC_PACKET_QUEUE queue; | 3995 | struct htc_packet_queue queue; |
3996 | 3996 | ||
3997 | buffersToRefill = (int)AR6000_MAX_RX_BUFFERS - | 3997 | buffersToRefill = (int)AR6000_MAX_RX_BUFFERS - |
3998 | HTCGetNumRecvBuffers(ar->arHtcTarget, Endpoint); | 3998 | HTCGetNumRecvBuffers(ar->arHtcTarget, Endpoint); |
@@ -6323,7 +6323,7 @@ static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, st | |||
6323 | struct sk_buff *new_skb; | 6323 | struct sk_buff *new_skb; |
6324 | int i; | 6324 | int i; |
6325 | int pkts = 0; | 6325 | int pkts = 0; |
6326 | HTC_PACKET_QUEUE pktQueue; | 6326 | struct htc_packet_queue pktQueue; |
6327 | EPPING_HEADER *eppingHdr; | 6327 | EPPING_HEADER *eppingHdr; |
6328 | 6328 | ||
6329 | eppingHdr = A_NETBUF_DATA(dupskb); | 6329 | eppingHdr = A_NETBUF_DATA(dupskb); |
diff --git a/drivers/staging/ath6kl/os/linux/export_hci_transport.c b/drivers/staging/ath6kl/os/linux/export_hci_transport.c index 319dc2ea731..787a8bdb5cb 100644 --- a/drivers/staging/ath6kl/os/linux/export_hci_transport.c +++ b/drivers/staging/ath6kl/os/linux/export_hci_transport.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, struct hci_transport_config_info *pInfo); | 39 | HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, struct hci_transport_config_info *pInfo); |
40 | void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); | 40 | void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); |
41 | int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); | 41 | int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet_queue *pQueue); |
42 | int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet *pPacket, bool Synchronous); | 42 | int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet *pPacket, bool Synchronous); |
43 | void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); | 43 | void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); |
44 | int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); | 44 | int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); |
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index 4324a9d1b0e..4b7f5a81b65 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c | |||
@@ -79,7 +79,7 @@ struct ar6k_hci_bridge_info { | |||
79 | struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ | 79 | struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ |
80 | bool HciNormalMode; /* Actual HCI mode enabled (non-TEST)*/ | 80 | bool HciNormalMode; /* Actual HCI mode enabled (non-TEST)*/ |
81 | bool HciRegistered; /* HCI device registered with stack */ | 81 | bool HciRegistered; /* HCI device registered with stack */ |
82 | HTC_PACKET_QUEUE HTCPacketStructHead; | 82 | struct htc_packet_queue HTCPacketStructHead; |
83 | u8 *pHTCStructAlloc; | 83 | u8 *pHTCStructAlloc; |
84 | spinlock_t BridgeLock; | 84 | spinlock_t BridgeLock; |
85 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 85 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
@@ -163,7 +163,7 @@ static void RefillRecvBuffers(struct ar6k_hci_bridge_info *pHcidevInfo, | |||
163 | { | 163 | { |
164 | int length, i; | 164 | int length, i; |
165 | void *osBuf = NULL; | 165 | void *osBuf = NULL; |
166 | HTC_PACKET_QUEUE queue; | 166 | struct htc_packet_queue queue; |
167 | struct htc_packet *pPacket; | 167 | struct htc_packet *pPacket; |
168 | 168 | ||
169 | INIT_HTC_PACKET_QUEUE(&queue); | 169 | INIT_HTC_PACKET_QUEUE(&queue); |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index 29ac8300c47..8d8a964bac1 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | |||
@@ -586,7 +586,7 @@ typedef struct ar6_softc { | |||
586 | u16 ap_beacon_interval; | 586 | u16 ap_beacon_interval; |
587 | u16 arRTS; | 587 | u16 arRTS; |
588 | u16 arACS; /* AP mode - Auto Channel Selection */ | 588 | u16 arACS; /* AP mode - Auto Channel Selection */ |
589 | HTC_PACKET_QUEUE amsdu_rx_buffer_queue; | 589 | struct htc_packet_queue amsdu_rx_buffer_queue; |
590 | bool bIsDestroyProgress; /* flag to indicate ar6k destroy is in progress */ | 590 | bool bIsDestroyProgress; /* flag to indicate ar6k destroy is in progress */ |
591 | A_TIMER disconnect_timer; | 591 | A_TIMER disconnect_timer; |
592 | u8 rxMetaVersion; | 592 | u8 rxMetaVersion; |
diff --git a/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h b/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h index 8e52de7c280..31f4f783dcc 100644 --- a/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h +++ b/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | extern HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, struct hci_transport_config_info *pInfo); | 28 | extern HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, struct hci_transport_config_info *pInfo); |
29 | extern void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); | 29 | extern void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); |
30 | extern int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); | 30 | extern int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet_queue *pQueue); |
31 | extern int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet *pPacket, bool Synchronous); | 31 | extern int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, struct htc_packet *pPacket, bool Synchronous); |
32 | extern void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); | 32 | extern void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); |
33 | extern int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); | 33 | extern int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); |