diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-10 21:55:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-11 17:31:49 -0500 |
commit | 495abc7995ffff39ba4333ad8e382017dc2192f8 (patch) | |
tree | 12e8bba742e04ce9ebcdf7a6d91e292cd17751d6 /drivers | |
parent | 26da4b510dab790905801e99c83230ea517d7eab (diff) |
staging: ath6kl: remove-typedef AR6K_DEVICE
remove-typedef -s AR6K_DEVICE \
"struct ar6k_device" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 64 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 74 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 28 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 32 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/htc2/htc_internal.h | 2 |
7 files changed, 106 insertions, 106 deletions
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c index 9090a3912f6..85d45a7461f 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c | |||
@@ -35,19 +35,19 @@ | |||
35 | 35 | ||
36 | #define MAILBOX_FOR_BLOCK_SIZE 1 | 36 | #define MAILBOX_FOR_BLOCK_SIZE 1 |
37 | 37 | ||
38 | int DevEnableInterrupts(AR6K_DEVICE *pDev); | 38 | int DevEnableInterrupts(struct ar6k_device *pDev); |
39 | int DevDisableInterrupts(AR6K_DEVICE *pDev); | 39 | int DevDisableInterrupts(struct ar6k_device *pDev); |
40 | 40 | ||
41 | static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev); | 41 | static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev); |
42 | 42 | ||
43 | void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket) | 43 | void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket) |
44 | { | 44 | { |
45 | LOCK_AR6K(pDev); | 45 | LOCK_AR6K(pDev); |
46 | HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket); | 46 | HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket); |
47 | UNLOCK_AR6K(pDev); | 47 | UNLOCK_AR6K(pDev); |
48 | } | 48 | } |
49 | 49 | ||
50 | HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev) | 50 | HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev) |
51 | { | 51 | { |
52 | HTC_PACKET *pPacket; | 52 | HTC_PACKET *pPacket; |
53 | 53 | ||
@@ -58,7 +58,7 @@ HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev) | |||
58 | return pPacket; | 58 | return pPacket; |
59 | } | 59 | } |
60 | 60 | ||
61 | void DevCleanup(AR6K_DEVICE *pDev) | 61 | void DevCleanup(struct ar6k_device *pDev) |
62 | { | 62 | { |
63 | DevCleanupGMbox(pDev); | 63 | DevCleanupGMbox(pDev); |
64 | 64 | ||
@@ -74,7 +74,7 @@ void DevCleanup(AR6K_DEVICE *pDev) | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | int DevSetup(AR6K_DEVICE *pDev) | 77 | int DevSetup(struct ar6k_device *pDev) |
78 | { | 78 | { |
79 | u32 blocksizes[AR6K_MAILBOXES]; | 79 | u32 blocksizes[AR6K_MAILBOXES]; |
80 | int status = 0; | 80 | int status = 0; |
@@ -216,7 +216,7 @@ int DevSetup(AR6K_DEVICE *pDev) | |||
216 | 216 | ||
217 | } | 217 | } |
218 | 218 | ||
219 | int DevEnableInterrupts(AR6K_DEVICE *pDev) | 219 | int DevEnableInterrupts(struct ar6k_device *pDev) |
220 | { | 220 | { |
221 | int status; | 221 | int status; |
222 | AR6K_IRQ_ENABLE_REGISTERS regs; | 222 | AR6K_IRQ_ENABLE_REGISTERS regs; |
@@ -276,7 +276,7 @@ int DevEnableInterrupts(AR6K_DEVICE *pDev) | |||
276 | return status; | 276 | return status; |
277 | } | 277 | } |
278 | 278 | ||
279 | int DevDisableInterrupts(AR6K_DEVICE *pDev) | 279 | int DevDisableInterrupts(struct ar6k_device *pDev) |
280 | { | 280 | { |
281 | AR6K_IRQ_ENABLE_REGISTERS regs; | 281 | AR6K_IRQ_ENABLE_REGISTERS regs; |
282 | 282 | ||
@@ -301,7 +301,7 @@ int DevDisableInterrupts(AR6K_DEVICE *pDev) | |||
301 | } | 301 | } |
302 | 302 | ||
303 | /* enable device interrupts */ | 303 | /* enable device interrupts */ |
304 | int DevUnmaskInterrupts(AR6K_DEVICE *pDev) | 304 | int DevUnmaskInterrupts(struct ar6k_device *pDev) |
305 | { | 305 | { |
306 | /* for good measure, make sure interrupt are disabled before unmasking at the HIF | 306 | /* for good measure, make sure interrupt are disabled before unmasking at the HIF |
307 | * layer. | 307 | * layer. |
@@ -327,7 +327,7 @@ int DevUnmaskInterrupts(AR6K_DEVICE *pDev) | |||
327 | } | 327 | } |
328 | 328 | ||
329 | /* disable all device interrupts */ | 329 | /* disable all device interrupts */ |
330 | int DevMaskInterrupts(AR6K_DEVICE *pDev) | 330 | int DevMaskInterrupts(struct ar6k_device *pDev) |
331 | { | 331 | { |
332 | /* mask the interrupt at the HIF layer, we don't want a stray interrupt taken while | 332 | /* mask the interrupt at the HIF layer, we don't want a stray interrupt taken while |
333 | * we zero out our shadow registers in DevDisableInterrupts()*/ | 333 | * we zero out our shadow registers in DevDisableInterrupts()*/ |
@@ -339,7 +339,7 @@ int DevMaskInterrupts(AR6K_DEVICE *pDev) | |||
339 | /* callback when our fetch to enable/disable completes */ | 339 | /* callback when our fetch to enable/disable completes */ |
340 | static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket) | 340 | static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket) |
341 | { | 341 | { |
342 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 342 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
343 | 343 | ||
344 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); | 344 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); |
345 | 345 | ||
@@ -355,7 +355,7 @@ static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacke | |||
355 | /* disable packet reception (used in case the host runs out of buffers) | 355 | /* disable packet reception (used in case the host runs out of buffers) |
356 | * this is the "override" method when the HIF reports another methods to | 356 | * this is the "override" method when the HIF reports another methods to |
357 | * disable recv events */ | 357 | * disable recv events */ |
358 | static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) | 358 | static int DevDoEnableDisableRecvOverride(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode) |
359 | { | 359 | { |
360 | int status = 0; | 360 | int status = 0; |
361 | HTC_PACKET *pIOPacket = NULL; | 361 | HTC_PACKET *pIOPacket = NULL; |
@@ -403,7 +403,7 @@ static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bo | |||
403 | /* disable packet reception (used in case the host runs out of buffers) | 403 | /* disable packet reception (used in case the host runs out of buffers) |
404 | * this is the "normal" method using the interrupt enable registers through | 404 | * this is the "normal" method using the interrupt enable registers through |
405 | * the host I/F */ | 405 | * the host I/F */ |
406 | static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode) | 406 | static int DevDoEnableDisableRecvNormal(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode) |
407 | { | 407 | { |
408 | int status = 0; | 408 | int status = 0; |
409 | HTC_PACKET *pIOPacket = NULL; | 409 | HTC_PACKET *pIOPacket = NULL; |
@@ -470,7 +470,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool | |||
470 | } | 470 | } |
471 | 471 | ||
472 | 472 | ||
473 | int DevStopRecv(AR6K_DEVICE *pDev, bool AsyncMode) | 473 | int DevStopRecv(struct ar6k_device *pDev, bool AsyncMode) |
474 | { | 474 | { |
475 | if (NULL == pDev->HifMaskUmaskRecvEvent) { | 475 | if (NULL == pDev->HifMaskUmaskRecvEvent) { |
476 | return DevDoEnableDisableRecvNormal(pDev,false,AsyncMode); | 476 | return DevDoEnableDisableRecvNormal(pDev,false,AsyncMode); |
@@ -479,7 +479,7 @@ int DevStopRecv(AR6K_DEVICE *pDev, bool AsyncMode) | |||
479 | } | 479 | } |
480 | } | 480 | } |
481 | 481 | ||
482 | int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode) | 482 | int DevEnableRecv(struct ar6k_device *pDev, bool AsyncMode) |
483 | { | 483 | { |
484 | if (NULL == pDev->HifMaskUmaskRecvEvent) { | 484 | if (NULL == pDev->HifMaskUmaskRecvEvent) { |
485 | return DevDoEnableDisableRecvNormal(pDev,true,AsyncMode); | 485 | return DevDoEnableDisableRecvNormal(pDev,true,AsyncMode); |
@@ -488,7 +488,7 @@ int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode) | |||
488 | } | 488 | } |
489 | } | 489 | } |
490 | 490 | ||
491 | int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending) | 491 | int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRecvPending) |
492 | { | 492 | { |
493 | int status = 0; | 493 | int status = 0; |
494 | u8 host_int_status = 0x0; | 494 | u8 host_int_status = 0x0; |
@@ -536,7 +536,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin | |||
536 | return status; | 536 | return status; |
537 | } | 537 | } |
538 | 538 | ||
539 | void DevDumpRegisters(AR6K_DEVICE *pDev, | 539 | void DevDumpRegisters(struct ar6k_device *pDev, |
540 | AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs, | 540 | AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs, |
541 | AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs) | 541 | AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs) |
542 | { | 542 | { |
@@ -590,7 +590,7 @@ void DevDumpRegisters(AR6K_DEVICE *pDev, | |||
590 | static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context) | 590 | static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context) |
591 | { | 591 | { |
592 | DL_LIST *pItem; | 592 | DL_LIST *pItem; |
593 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 593 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
594 | LOCK_AR6K(pDev); | 594 | LOCK_AR6K(pDev); |
595 | pItem = DL_ListRemoveItemFromHead(&pDev->ScatterReqHead); | 595 | pItem = DL_ListRemoveItemFromHead(&pDev->ScatterReqHead); |
596 | UNLOCK_AR6K(pDev); | 596 | UNLOCK_AR6K(pDev); |
@@ -602,7 +602,7 @@ static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context) | |||
602 | 602 | ||
603 | static void DevFreeScatterReq(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) | 603 | static void DevFreeScatterReq(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) |
604 | { | 604 | { |
605 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 605 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
606 | LOCK_AR6K(pDev); | 606 | LOCK_AR6K(pDev); |
607 | DL_ListInsertTail(&pDev->ScatterReqHead, &pReq->ListLink); | 607 | DL_ListInsertTail(&pDev->ScatterReqHead, &pReq->ListLink); |
608 | UNLOCK_AR6K(pDev); | 608 | UNLOCK_AR6K(pDev); |
@@ -650,7 +650,7 @@ int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, bool FromDMA) | |||
650 | 650 | ||
651 | static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) | 651 | static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) |
652 | { | 652 | { |
653 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 653 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
654 | HIF_SCATTER_REQ *pReq = (HIF_SCATTER_REQ *)pPacket->pPktContext; | 654 | HIF_SCATTER_REQ *pReq = (HIF_SCATTER_REQ *)pPacket->pPktContext; |
655 | 655 | ||
656 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevReadWriteScatterAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); | 656 | AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevReadWriteScatterAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); |
@@ -666,7 +666,7 @@ static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket) | |||
666 | 666 | ||
667 | static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) | 667 | static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) |
668 | { | 668 | { |
669 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 669 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
670 | int status = 0; | 670 | int status = 0; |
671 | HTC_PACKET *pIOPacket = NULL; | 671 | HTC_PACKET *pIOPacket = NULL; |
672 | u32 request = pReq->Request; | 672 | u32 request = pReq->Request; |
@@ -734,7 +734,7 @@ static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) | |||
734 | } | 734 | } |
735 | 735 | ||
736 | 736 | ||
737 | static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev) | 737 | static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev) |
738 | { | 738 | { |
739 | HIF_SCATTER_REQ *pReq; | 739 | HIF_SCATTER_REQ *pReq; |
740 | 740 | ||
@@ -749,7 +749,7 @@ static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev) | |||
749 | } | 749 | } |
750 | 750 | ||
751 | /* function to set up virtual scatter support if HIF layer has not implemented the interface */ | 751 | /* function to set up virtual scatter support if HIF layer has not implemented the interface */ |
752 | static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev) | 752 | static int DevSetupVirtualScatterSupport(struct ar6k_device *pDev) |
753 | { | 753 | { |
754 | int status = 0; | 754 | int status = 0; |
755 | int bufferSize, sgreqSize; | 755 | int bufferSize, sgreqSize; |
@@ -810,7 +810,7 @@ static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev) | |||
810 | return status; | 810 | return status; |
811 | } | 811 | } |
812 | 812 | ||
813 | int DevCleanupMsgBundling(AR6K_DEVICE *pDev) | 813 | int DevCleanupMsgBundling(struct ar6k_device *pDev) |
814 | { | 814 | { |
815 | if(NULL != pDev) | 815 | if(NULL != pDev) |
816 | { | 816 | { |
@@ -820,7 +820,7 @@ int DevCleanupMsgBundling(AR6K_DEVICE *pDev) | |||
820 | return 0; | 820 | return 0; |
821 | } | 821 | } |
822 | 822 | ||
823 | int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer) | 823 | int DevSetupMsgBundling(struct ar6k_device *pDev, int MaxMsgsPerTransfer) |
824 | { | 824 | { |
825 | int status; | 825 | int status; |
826 | 826 | ||
@@ -885,7 +885,7 @@ int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer) | |||
885 | return status; | 885 | return status; |
886 | } | 886 | } |
887 | 887 | ||
888 | int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async) | 888 | int DevSubmitScatterRequest(struct ar6k_device *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async) |
889 | { | 889 | { |
890 | int status; | 890 | int status; |
891 | 891 | ||
@@ -1134,7 +1134,7 @@ static u16 GetEndMarker(void) | |||
1134 | #define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR | 1134 | #define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR |
1135 | 1135 | ||
1136 | /* send the ordered buffers to the target */ | 1136 | /* send the ordered buffers to the target */ |
1137 | static int SendBuffers(AR6K_DEVICE *pDev, int mbox) | 1137 | static int SendBuffers(struct ar6k_device *pDev, int mbox) |
1138 | { | 1138 | { |
1139 | int status = 0; | 1139 | int status = 0; |
1140 | u32 request = HIF_WR_SYNC_BLOCK_INC; | 1140 | u32 request = HIF_WR_SYNC_BLOCK_INC; |
@@ -1178,7 +1178,7 @@ static int SendBuffers(AR6K_DEVICE *pDev, int mbox) | |||
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | /* poll the mailbox credit counter until we get a credit or timeout */ | 1180 | /* poll the mailbox credit counter until we get a credit or timeout */ |
1181 | static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) | 1181 | static int GetCredits(struct ar6k_device *pDev, int mbox, int *pCredits) |
1182 | { | 1182 | { |
1183 | int status = 0; | 1183 | int status = 0; |
1184 | int timeout = TEST_CREDITS_RECV_TIMEOUT; | 1184 | int timeout = TEST_CREDITS_RECV_TIMEOUT; |
@@ -1225,7 +1225,7 @@ static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) | |||
1225 | 1225 | ||
1226 | 1226 | ||
1227 | /* wait for the buffers to come back */ | 1227 | /* wait for the buffers to come back */ |
1228 | static int RecvBuffers(AR6K_DEVICE *pDev, int mbox) | 1228 | static int RecvBuffers(struct ar6k_device *pDev, int mbox) |
1229 | { | 1229 | { |
1230 | int status = 0; | 1230 | int status = 0; |
1231 | u32 request = HIF_RD_SYNC_BLOCK_INC; | 1231 | u32 request = HIF_RD_SYNC_BLOCK_INC; |
@@ -1303,7 +1303,7 @@ static int RecvBuffers(AR6K_DEVICE *pDev, int mbox) | |||
1303 | 1303 | ||
1304 | } | 1304 | } |
1305 | 1305 | ||
1306 | static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox) | 1306 | static int DoOneMboxHWTest(struct ar6k_device *pDev, int mbox) |
1307 | { | 1307 | { |
1308 | int status; | 1308 | int status; |
1309 | 1309 | ||
@@ -1339,7 +1339,7 @@ static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox) | |||
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | /* here is where the test starts */ | 1341 | /* here is where the test starts */ |
1342 | int DoMboxHWTest(AR6K_DEVICE *pDev) | 1342 | int DoMboxHWTest(struct ar6k_device *pDev) |
1343 | { | 1343 | { |
1344 | int i; | 1344 | int i; |
1345 | int status; | 1345 | int status; |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h index e0c3926c0bc..ebcc82b1362 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h | |||
@@ -105,7 +105,7 @@ typedef struct _AR6K_GMBOX_INFO { | |||
105 | bool CreditCountIRQEnabled; | 105 | bool CreditCountIRQEnabled; |
106 | } AR6K_GMBOX_INFO; | 106 | } AR6K_GMBOX_INFO; |
107 | 107 | ||
108 | typedef struct _AR6K_DEVICE { | 108 | struct ar6k_device { |
109 | A_MUTEX_T Lock; | 109 | A_MUTEX_T Lock; |
110 | u8 _Pad1[A_CACHE_LINE_PAD]; | 110 | u8 _Pad1[A_CACHE_LINE_PAD]; |
111 | AR6K_IRQ_PROC_REGISTERS IrqProcRegisters; /* cache-line safe with pads around */ | 111 | AR6K_IRQ_PROC_REGISTERS IrqProcRegisters; /* cache-line safe with pads around */ |
@@ -141,24 +141,24 @@ typedef struct _AR6K_DEVICE { | |||
141 | bool GMboxEnabled; | 141 | bool GMboxEnabled; |
142 | AR6K_GMBOX_CTRL_REGISTERS GMboxControlRegisters; | 142 | AR6K_GMBOX_CTRL_REGISTERS GMboxControlRegisters; |
143 | int RecheckIRQStatusCnt; | 143 | int RecheckIRQStatusCnt; |
144 | } AR6K_DEVICE; | 144 | }; |
145 | 145 | ||
146 | #define LOCK_AR6K(p) A_MUTEX_LOCK(&(p)->Lock); | 146 | #define LOCK_AR6K(p) A_MUTEX_LOCK(&(p)->Lock); |
147 | #define UNLOCK_AR6K(p) A_MUTEX_UNLOCK(&(p)->Lock); | 147 | #define UNLOCK_AR6K(p) A_MUTEX_UNLOCK(&(p)->Lock); |
148 | #define REF_IRQ_STATUS_RECHECK(p) (p)->RecheckIRQStatusCnt = 1 /* note: no need to lock this, it only gets set */ | 148 | #define REF_IRQ_STATUS_RECHECK(p) (p)->RecheckIRQStatusCnt = 1 /* note: no need to lock this, it only gets set */ |
149 | 149 | ||
150 | int DevSetup(AR6K_DEVICE *pDev); | 150 | int DevSetup(struct ar6k_device *pDev); |
151 | void DevCleanup(AR6K_DEVICE *pDev); | 151 | void DevCleanup(struct ar6k_device *pDev); |
152 | int DevUnmaskInterrupts(AR6K_DEVICE *pDev); | 152 | int DevUnmaskInterrupts(struct ar6k_device *pDev); |
153 | int DevMaskInterrupts(AR6K_DEVICE *pDev); | 153 | int DevMaskInterrupts(struct ar6k_device *pDev); |
154 | int DevPollMboxMsgRecv(AR6K_DEVICE *pDev, | 154 | int DevPollMboxMsgRecv(struct ar6k_device *pDev, |
155 | u32 *pLookAhead, | 155 | u32 *pLookAhead, |
156 | int TimeoutMS); | 156 | int TimeoutMS); |
157 | int DevRWCompletionHandler(void *context, int status); | 157 | int DevRWCompletionHandler(void *context, int status); |
158 | int DevDsrHandler(void *context); | 158 | int DevDsrHandler(void *context); |
159 | int DevCheckPendingRecvMsgsAsync(void *context); | 159 | int DevCheckPendingRecvMsgsAsync(void *context); |
160 | void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev); | 160 | void DevAsyncIrqProcessComplete(struct ar6k_device *pDev); |
161 | void DevDumpRegisters(AR6K_DEVICE *pDev, | 161 | void DevDumpRegisters(struct ar6k_device *pDev, |
162 | AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs, | 162 | AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs, |
163 | AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs); | 163 | AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs); |
164 | 164 | ||
@@ -166,17 +166,17 @@ void DevDumpRegisters(AR6K_DEVICE *pDev, | |||
166 | #define DEV_STOP_RECV_SYNC false | 166 | #define DEV_STOP_RECV_SYNC false |
167 | #define DEV_ENABLE_RECV_ASYNC true | 167 | #define DEV_ENABLE_RECV_ASYNC true |
168 | #define DEV_ENABLE_RECV_SYNC false | 168 | #define DEV_ENABLE_RECV_SYNC false |
169 | int DevStopRecv(AR6K_DEVICE *pDev, bool ASyncMode); | 169 | int DevStopRecv(struct ar6k_device *pDev, bool ASyncMode); |
170 | int DevEnableRecv(AR6K_DEVICE *pDev, bool ASyncMode); | 170 | int DevEnableRecv(struct ar6k_device *pDev, bool ASyncMode); |
171 | int DevEnableInterrupts(AR6K_DEVICE *pDev); | 171 | int DevEnableInterrupts(struct ar6k_device *pDev); |
172 | int DevDisableInterrupts(AR6K_DEVICE *pDev); | 172 | int DevDisableInterrupts(struct ar6k_device *pDev); |
173 | int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending); | 173 | int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRecvPending); |
174 | 174 | ||
175 | #define DEV_CALC_RECV_PADDED_LEN(pDev, length) (((length) + (pDev)->BlockMask) & (~((pDev)->BlockMask))) | 175 | #define DEV_CALC_RECV_PADDED_LEN(pDev, length) (((length) + (pDev)->BlockMask) & (~((pDev)->BlockMask))) |
176 | #define DEV_CALC_SEND_PADDED_LEN(pDev, length) DEV_CALC_RECV_PADDED_LEN(pDev,length) | 176 | #define DEV_CALC_SEND_PADDED_LEN(pDev, length) DEV_CALC_RECV_PADDED_LEN(pDev,length) |
177 | #define DEV_IS_LEN_BLOCK_ALIGNED(pDev, length) (((length) % (pDev)->BlockSize) == 0) | 177 | #define DEV_IS_LEN_BLOCK_ALIGNED(pDev, length) (((length) % (pDev)->BlockSize) == 0) |
178 | 178 | ||
179 | static INLINE int DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 SendLength) { | 179 | static INLINE int DevSendPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 SendLength) { |
180 | u32 paddedLength; | 180 | u32 paddedLength; |
181 | bool sync = (pPacket->Completion == NULL) ? true : false; | 181 | bool sync = (pPacket->Completion == NULL) ? true : false; |
182 | int status; | 182 | int status; |
@@ -219,7 +219,7 @@ static INLINE int DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 Send | |||
219 | return status; | 219 | return status; |
220 | } | 220 | } |
221 | 221 | ||
222 | static INLINE int DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 RecvLength) { | 222 | static INLINE int DevRecvPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 RecvLength) { |
223 | u32 paddedLength; | 223 | u32 paddedLength; |
224 | int status; | 224 | int status; |
225 | bool sync = (pPacket->Completion == NULL) ? true : false; | 225 | bool sync = (pPacket->Completion == NULL) ? true : false; |
@@ -296,9 +296,9 @@ static INLINE int DEV_PREPARE_SCATTER_OPERATION(HIF_SCATTER_REQ *pReq) { | |||
296 | } | 296 | } |
297 | 297 | ||
298 | 298 | ||
299 | int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer); | 299 | int DevSetupMsgBundling(struct ar6k_device *pDev, int MaxMsgsPerTransfer); |
300 | 300 | ||
301 | int DevCleanupMsgBundling(AR6K_DEVICE *pDev); | 301 | int DevCleanupMsgBundling(struct ar6k_device *pDev); |
302 | 302 | ||
303 | #define DEV_GET_MAX_MSG_PER_BUNDLE(pDev) (pDev)->HifScatterInfo.MaxScatterEntries | 303 | #define DEV_GET_MAX_MSG_PER_BUNDLE(pDev) (pDev)->HifScatterInfo.MaxScatterEntries |
304 | #define DEV_GET_MAX_BUNDLE_LENGTH(pDev) (pDev)->HifScatterInfo.MaxTransferSizePerScatterReq | 304 | #define DEV_GET_MAX_BUNDLE_LENGTH(pDev) (pDev)->HifScatterInfo.MaxTransferSizePerScatterReq |
@@ -315,10 +315,10 @@ int DevCleanupMsgBundling(AR6K_DEVICE *pDev); | |||
315 | #define DEV_SCATTER_WRITE false | 315 | #define DEV_SCATTER_WRITE false |
316 | #define DEV_SCATTER_ASYNC true | 316 | #define DEV_SCATTER_ASYNC true |
317 | #define DEV_SCATTER_SYNC false | 317 | #define DEV_SCATTER_SYNC false |
318 | int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async); | 318 | int DevSubmitScatterRequest(struct ar6k_device *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async); |
319 | 319 | ||
320 | #ifdef MBOXHW_UNIT_TEST | 320 | #ifdef MBOXHW_UNIT_TEST |
321 | int DoMboxHWTest(AR6K_DEVICE *pDev); | 321 | int DoMboxHWTest(struct ar6k_device *pDev); |
322 | #endif | 322 | #endif |
323 | 323 | ||
324 | /* completely virtual */ | 324 | /* completely virtual */ |
@@ -329,7 +329,7 @@ typedef struct _DEV_SCATTER_DMA_VIRTUAL_INFO { | |||
329 | 329 | ||
330 | 330 | ||
331 | 331 | ||
332 | void DumpAR6KDevState(AR6K_DEVICE *pDev); | 332 | void DumpAR6KDevState(struct ar6k_device *pDev); |
333 | 333 | ||
334 | /**************************************************/ | 334 | /**************************************************/ |
335 | /****** GMBOX functions and definitions | 335 | /****** GMBOX functions and definitions |
@@ -339,10 +339,10 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev); | |||
339 | 339 | ||
340 | #ifdef ATH_AR6K_ENABLE_GMBOX | 340 | #ifdef ATH_AR6K_ENABLE_GMBOX |
341 | 341 | ||
342 | void DevCleanupGMbox(AR6K_DEVICE *pDev); | 342 | void DevCleanupGMbox(struct ar6k_device *pDev); |
343 | int DevSetupGMbox(AR6K_DEVICE *pDev); | 343 | int DevSetupGMbox(struct ar6k_device *pDev); |
344 | int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev); | 344 | int DevCheckGMboxInterrupts(struct ar6k_device *pDev); |
345 | void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev); | 345 | void DevNotifyGMboxTargetFailure(struct ar6k_device *pDev); |
346 | 346 | ||
347 | #else | 347 | #else |
348 | 348 | ||
@@ -351,7 +351,7 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev); | |||
351 | #define DevCheckGMboxInterrupts(p) 0 | 351 | #define DevCheckGMboxInterrupts(p) 0 |
352 | #define DevNotifyGMboxTargetFailure(p) | 352 | #define DevNotifyGMboxTargetFailure(p) |
353 | 353 | ||
354 | static INLINE int DevSetupGMbox(AR6K_DEVICE *pDev) { | 354 | static INLINE int DevSetupGMbox(struct ar6k_device *pDev) { |
355 | pDev->GMboxEnabled = false; | 355 | pDev->GMboxEnabled = false; |
356 | return 0; | 356 | return 0; |
357 | } | 357 | } |
@@ -361,12 +361,12 @@ static INLINE int DevSetupGMbox(AR6K_DEVICE *pDev) { | |||
361 | #ifdef ATH_AR6K_ENABLE_GMBOX | 361 | #ifdef ATH_AR6K_ENABLE_GMBOX |
362 | 362 | ||
363 | /* GMBOX protocol modules must expose each of these internal APIs */ | 363 | /* GMBOX protocol modules must expose each of these internal APIs */ |
364 | HCI_TRANSPORT_HANDLE GMboxAttachProtocol(AR6K_DEVICE *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo); | 364 | HCI_TRANSPORT_HANDLE GMboxAttachProtocol(struct ar6k_device *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo); |
365 | int GMboxProtocolInstall(AR6K_DEVICE *pDev); | 365 | int GMboxProtocolInstall(struct ar6k_device *pDev); |
366 | void GMboxProtocolUninstall(AR6K_DEVICE *pDev); | 366 | void GMboxProtocolUninstall(struct ar6k_device *pDev); |
367 | 367 | ||
368 | /* API used by GMBOX protocol modules */ | 368 | /* API used by GMBOX protocol modules */ |
369 | AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle); | 369 | struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle); |
370 | #define DEV_GMBOX_SET_PROTOCOL(pDev,recv_callback,credits_pending,failure,statedump,context) \ | 370 | #define DEV_GMBOX_SET_PROTOCOL(pDev,recv_callback,credits_pending,failure,statedump,context) \ |
371 | { \ | 371 | { \ |
372 | (pDev)->GMboxInfo.pProtocolContext = (context); \ | 372 | (pDev)->GMboxInfo.pProtocolContext = (context); \ |
@@ -378,8 +378,8 @@ AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle); | |||
378 | 378 | ||
379 | #define DEV_GMBOX_GET_PROTOCOL(pDev) (pDev)->GMboxInfo.pProtocolContext | 379 | #define DEV_GMBOX_GET_PROTOCOL(pDev) (pDev)->GMboxInfo.pProtocolContext |
380 | 380 | ||
381 | int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength); | 381 | int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength); |
382 | int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 ReadLength); | 382 | int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength); |
383 | 383 | ||
384 | #define PROC_IO_ASYNC true | 384 | #define PROC_IO_ASYNC true |
385 | #define PROC_IO_SYNC false | 385 | #define PROC_IO_SYNC false |
@@ -393,11 +393,11 @@ typedef enum GMBOX_IRQ_ACTION_TYPE { | |||
393 | GMBOX_CREDIT_IRQ_DISABLE, | 393 | GMBOX_CREDIT_IRQ_DISABLE, |
394 | } GMBOX_IRQ_ACTION_TYPE; | 394 | } GMBOX_IRQ_ACTION_TYPE; |
395 | 395 | ||
396 | int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE, bool AsyncMode); | 396 | int DevGMboxIRQAction(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE, bool AsyncMode); |
397 | int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits); | 397 | int DevGMboxReadCreditCounter(struct ar6k_device *pDev, bool AsyncMode, int *pCredits); |
398 | int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize); | 398 | int DevGMboxReadCreditSize(struct ar6k_device *pDev, int *pCreditSize); |
399 | int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes); | 399 | int DevGMboxRecvLookAheadPeek(struct ar6k_device *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes); |
400 | int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int SignalNumber, int AckTimeoutMS); | 400 | int DevGMboxSetTargetInterrupt(struct ar6k_device *pDev, int SignalNumber, int AckTimeoutMS); |
401 | 401 | ||
402 | #endif | 402 | #endif |
403 | 403 | ||
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c index bee4850b54f..aa455907457 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | |||
@@ -33,10 +33,10 @@ | |||
33 | #include "htc_packet.h" | 33 | #include "htc_packet.h" |
34 | #include "ar6k.h" | 34 | #include "ar6k.h" |
35 | 35 | ||
36 | extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket); | 36 | extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket); |
37 | extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev); | 37 | extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev); |
38 | 38 | ||
39 | static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev); | 39 | static int DevServiceDebugInterrupt(struct ar6k_device *pDev); |
40 | 40 | ||
41 | #define DELAY_PER_INTERVAL_MS 10 /* 10 MS delay per polling interval */ | 41 | #define DELAY_PER_INTERVAL_MS 10 /* 10 MS delay per polling interval */ |
42 | 42 | ||
@@ -59,7 +59,7 @@ int DevRWCompletionHandler(void *context, int status) | |||
59 | } | 59 | } |
60 | 60 | ||
61 | /* mailbox recv message polling */ | 61 | /* mailbox recv message polling */ |
62 | int DevPollMboxMsgRecv(AR6K_DEVICE *pDev, | 62 | int DevPollMboxMsgRecv(struct ar6k_device *pDev, |
63 | u32 *pLookAhead, | 63 | u32 *pLookAhead, |
64 | int TimeoutMS) | 64 | int TimeoutMS) |
65 | { | 65 | { |
@@ -152,7 +152,7 @@ int DevPollMboxMsgRecv(AR6K_DEVICE *pDev, | |||
152 | return status; | 152 | return status; |
153 | } | 153 | } |
154 | 154 | ||
155 | static int DevServiceCPUInterrupt(AR6K_DEVICE *pDev) | 155 | static int DevServiceCPUInterrupt(struct ar6k_device *pDev) |
156 | { | 156 | { |
157 | int status; | 157 | int status; |
158 | u8 cpu_int_status; | 158 | u8 cpu_int_status; |
@@ -192,7 +192,7 @@ static int DevServiceCPUInterrupt(AR6K_DEVICE *pDev) | |||
192 | } | 192 | } |
193 | 193 | ||
194 | 194 | ||
195 | static int DevServiceErrorInterrupt(AR6K_DEVICE *pDev) | 195 | static int DevServiceErrorInterrupt(struct ar6k_device *pDev) |
196 | { | 196 | { |
197 | int status; | 197 | int status; |
198 | u8 error_int_status; | 198 | u8 error_int_status; |
@@ -245,7 +245,7 @@ static int DevServiceErrorInterrupt(AR6K_DEVICE *pDev) | |||
245 | return status; | 245 | return status; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev) | 248 | static int DevServiceDebugInterrupt(struct ar6k_device *pDev) |
249 | { | 249 | { |
250 | u32 dummy; | 250 | u32 dummy; |
251 | int status; | 251 | int status; |
@@ -275,7 +275,7 @@ static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev) | |||
275 | return status; | 275 | return status; |
276 | } | 276 | } |
277 | 277 | ||
278 | static int DevServiceCounterInterrupt(AR6K_DEVICE *pDev) | 278 | static int DevServiceCounterInterrupt(struct ar6k_device *pDev) |
279 | { | 279 | { |
280 | u8 counter_int_status; | 280 | u8 counter_int_status; |
281 | 281 | ||
@@ -302,7 +302,7 @@ static int DevServiceCounterInterrupt(AR6K_DEVICE *pDev) | |||
302 | /* callback when our fetch to get interrupt status registers completes */ | 302 | /* callback when our fetch to get interrupt status registers completes */ |
303 | static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket) | 303 | static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket) |
304 | { | 304 | { |
305 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 305 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
306 | u32 lookAhead = 0; | 306 | u32 lookAhead = 0; |
307 | bool otherInts = false; | 307 | bool otherInts = false; |
308 | 308 | ||
@@ -390,7 +390,7 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket) | |||
390 | * recv messages, this starts off a series of async requests to read interrupt registers */ | 390 | * recv messages, this starts off a series of async requests to read interrupt registers */ |
391 | int DevCheckPendingRecvMsgsAsync(void *context) | 391 | int DevCheckPendingRecvMsgsAsync(void *context) |
392 | { | 392 | { |
393 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)context; | 393 | struct ar6k_device *pDev = (struct ar6k_device *)context; |
394 | int status = 0; | 394 | int status = 0; |
395 | HTC_PACKET *pIOPacket; | 395 | HTC_PACKET *pIOPacket; |
396 | 396 | ||
@@ -460,14 +460,14 @@ int DevCheckPendingRecvMsgsAsync(void *context) | |||
460 | return status; | 460 | return status; |
461 | } | 461 | } |
462 | 462 | ||
463 | void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev) | 463 | void DevAsyncIrqProcessComplete(struct ar6k_device *pDev) |
464 | { | 464 | { |
465 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("DevAsyncIrqProcessComplete - forcing HIF IRQ ACK \n")); | 465 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("DevAsyncIrqProcessComplete - forcing HIF IRQ ACK \n")); |
466 | HIFAckInterrupt(pDev->HIFDevice); | 466 | HIFAckInterrupt(pDev->HIFDevice); |
467 | } | 467 | } |
468 | 468 | ||
469 | /* process pending interrupts synchronously */ | 469 | /* process pending interrupts synchronously */ |
470 | static int ProcessPendingIRQs(AR6K_DEVICE *pDev, bool *pDone, bool *pASyncProcessing) | 470 | static int ProcessPendingIRQs(struct ar6k_device *pDev, bool *pDone, bool *pASyncProcessing) |
471 | { | 471 | { |
472 | int status = 0; | 472 | int status = 0; |
473 | u8 host_int_status = 0; | 473 | u8 host_int_status = 0; |
@@ -683,7 +683,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, bool *pDone, bool *pASyncProces | |||
683 | /* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/ | 683 | /* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/ |
684 | int DevDsrHandler(void *context) | 684 | int DevDsrHandler(void *context) |
685 | { | 685 | { |
686 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)context; | 686 | struct ar6k_device *pDev = (struct ar6k_device *)context; |
687 | int status = 0; | 687 | int status = 0; |
688 | bool done = false; | 688 | bool done = false; |
689 | bool asyncProc = false; | 689 | bool asyncProc = false; |
@@ -744,7 +744,7 @@ int DevDsrHandler(void *context) | |||
744 | } | 744 | } |
745 | 745 | ||
746 | #ifdef ATH_DEBUG_MODULE | 746 | #ifdef ATH_DEBUG_MODULE |
747 | void DumpAR6KDevState(AR6K_DEVICE *pDev) | 747 | void DumpAR6KDevState(struct ar6k_device *pDev) |
748 | { | 748 | { |
749 | int status; | 749 | int status; |
750 | AR6K_IRQ_ENABLE_REGISTERS regs; | 750 | AR6K_IRQ_ENABLE_REGISTERS regs; |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c index 46bcb275e43..cbfbdea2795 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | |||
@@ -54,14 +54,14 @@ | |||
54 | 54 | ||
55 | 55 | ||
56 | /* external APIs for allocating and freeing internal I/O packets to handle ASYNC I/O */ | 56 | /* external APIs for allocating and freeing internal I/O packets to handle ASYNC I/O */ |
57 | extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket); | 57 | extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket); |
58 | extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev); | 58 | extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev); |
59 | 59 | ||
60 | 60 | ||
61 | /* callback when our fetch to enable/disable completes */ | 61 | /* callback when our fetch to enable/disable completes */ |
62 | static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket) | 62 | static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket) |
63 | { | 63 | { |
64 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 64 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
65 | 65 | ||
66 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxIRQActionAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); | 66 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxIRQActionAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); |
67 | 67 | ||
@@ -74,7 +74,7 @@ static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket) | |||
74 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxIRQActionAsyncHandler \n")); | 74 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxIRQActionAsyncHandler \n")); |
75 | } | 75 | } |
76 | 76 | ||
77 | static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode) | 77 | static int DevGMboxCounterEnableDisable(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode) |
78 | { | 78 | { |
79 | int status = 0; | 79 | int status = 0; |
80 | AR6K_IRQ_ENABLE_REGISTERS regs; | 80 | AR6K_IRQ_ENABLE_REGISTERS regs; |
@@ -155,7 +155,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE | |||
155 | } | 155 | } |
156 | 156 | ||
157 | 157 | ||
158 | int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode) | 158 | int DevGMboxIRQAction(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode) |
159 | { | 159 | { |
160 | int status = 0; | 160 | int status = 0; |
161 | HTC_PACKET *pIOPacket = NULL; | 161 | HTC_PACKET *pIOPacket = NULL; |
@@ -261,7 +261,7 @@ int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool A | |||
261 | return status; | 261 | return status; |
262 | } | 262 | } |
263 | 263 | ||
264 | void DevCleanupGMbox(AR6K_DEVICE *pDev) | 264 | void DevCleanupGMbox(struct ar6k_device *pDev) |
265 | { | 265 | { |
266 | if (pDev->GMboxEnabled) { | 266 | if (pDev->GMboxEnabled) { |
267 | pDev->GMboxEnabled = false; | 267 | pDev->GMboxEnabled = false; |
@@ -269,7 +269,7 @@ void DevCleanupGMbox(AR6K_DEVICE *pDev) | |||
269 | } | 269 | } |
270 | } | 270 | } |
271 | 271 | ||
272 | int DevSetupGMbox(AR6K_DEVICE *pDev) | 272 | int DevSetupGMbox(struct ar6k_device *pDev) |
273 | { | 273 | { |
274 | int status = 0; | 274 | int status = 0; |
275 | u8 muxControl[4]; | 275 | u8 muxControl[4]; |
@@ -322,7 +322,7 @@ int DevSetupGMbox(AR6K_DEVICE *pDev) | |||
322 | return status; | 322 | return status; |
323 | } | 323 | } |
324 | 324 | ||
325 | int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev) | 325 | int DevCheckGMboxInterrupts(struct ar6k_device *pDev) |
326 | { | 326 | { |
327 | int status = 0; | 327 | int status = 0; |
328 | u8 counter_int_status; | 328 | u8 counter_int_status; |
@@ -396,7 +396,7 @@ int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev) | |||
396 | } | 396 | } |
397 | 397 | ||
398 | 398 | ||
399 | int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength) | 399 | int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength) |
400 | { | 400 | { |
401 | u32 paddedLength; | 401 | u32 paddedLength; |
402 | bool sync = (pPacket->Completion == NULL) ? true : false; | 402 | bool sync = (pPacket->Completion == NULL) ? true : false; |
@@ -433,7 +433,7 @@ int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength) | |||
433 | return status; | 433 | return status; |
434 | } | 434 | } |
435 | 435 | ||
436 | int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 ReadLength) | 436 | int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength) |
437 | { | 437 | { |
438 | 438 | ||
439 | u32 paddedLength; | 439 | u32 paddedLength; |
@@ -518,7 +518,7 @@ static int ProcessCreditCounterReadBuffer(u8 *pBuffer, int Length) | |||
518 | /* callback when our fetch to enable/disable completes */ | 518 | /* callback when our fetch to enable/disable completes */ |
519 | static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket) | 519 | static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket) |
520 | { | 520 | { |
521 | AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; | 521 | struct ar6k_device *pDev = (struct ar6k_device *)Context; |
522 | 522 | ||
523 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxReadCreditsAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); | 523 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxReadCreditsAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev)); |
524 | 524 | ||
@@ -539,7 +539,7 @@ static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket) | |||
539 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxReadCreditsAsyncHandler \n")); | 539 | AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxReadCreditsAsyncHandler \n")); |
540 | } | 540 | } |
541 | 541 | ||
542 | int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits) | 542 | int DevGMboxReadCreditCounter(struct ar6k_device *pDev, bool AsyncMode, int *pCredits) |
543 | { | 543 | { |
544 | int status = 0; | 544 | int status = 0; |
545 | HTC_PACKET *pIOPacket = NULL; | 545 | HTC_PACKET *pIOPacket = NULL; |
@@ -602,7 +602,7 @@ int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits) | |||
602 | return status; | 602 | return status; |
603 | } | 603 | } |
604 | 604 | ||
605 | int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize) | 605 | int DevGMboxReadCreditSize(struct ar6k_device *pDev, int *pCreditSize) |
606 | { | 606 | { |
607 | int status; | 607 | int status; |
608 | u8 buffer[4]; | 608 | u8 buffer[4]; |
@@ -626,7 +626,7 @@ int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize) | |||
626 | return status; | 626 | return status; |
627 | } | 627 | } |
628 | 628 | ||
629 | void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev) | 629 | void DevNotifyGMboxTargetFailure(struct ar6k_device *pDev) |
630 | { | 630 | { |
631 | /* Target ASSERTED!!! */ | 631 | /* Target ASSERTED!!! */ |
632 | if (pDev->GMboxInfo.pTargetFailureCallback != NULL) { | 632 | if (pDev->GMboxInfo.pTargetFailureCallback != NULL) { |
@@ -634,7 +634,7 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev) | |||
634 | } | 634 | } |
635 | } | 635 | } |
636 | 636 | ||
637 | int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes) | 637 | int DevGMboxRecvLookAheadPeek(struct ar6k_device *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes) |
638 | { | 638 | { |
639 | 639 | ||
640 | int status = 0; | 640 | int status = 0; |
@@ -676,7 +676,7 @@ int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLoo | |||
676 | return status; | 676 | return status; |
677 | } | 677 | } |
678 | 678 | ||
679 | int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS) | 679 | int DevGMboxSetTargetInterrupt(struct ar6k_device *pDev, int Signal, int AckTimeoutMS) |
680 | { | 680 | { |
681 | int status = 0; | 681 | int status = 0; |
682 | int i; | 682 | int i; |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c index 177f04dc967..3ee3d40893d 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | |||
@@ -66,7 +66,7 @@ typedef struct { | |||
66 | HTC_PACKET_QUEUE SendQueue; /* write queue holding HCI Command and ACL packets */ | 66 | 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 | 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 | HTC_PACKET_QUEUE HCIEventBuffers; /* recv queue holding buffers for incomming event packets */ |
69 | 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; |
72 | int CreditsMax; | 72 | int CreditsMax; |
@@ -846,7 +846,7 @@ static void FlushRecvBuffers(GMBOX_PROTO_HCI_UART *pProt) | |||
846 | 846 | ||
847 | /*** protocol module install entry point ***/ | 847 | /*** protocol module install entry point ***/ |
848 | 848 | ||
849 | int GMboxProtocolInstall(AR6K_DEVICE *pDev) | 849 | int GMboxProtocolInstall(struct ar6k_device *pDev) |
850 | { | 850 | { |
851 | int status = 0; | 851 | int status = 0; |
852 | GMBOX_PROTO_HCI_UART *pProtocol = NULL; | 852 | GMBOX_PROTO_HCI_UART *pProtocol = NULL; |
@@ -889,7 +889,7 @@ int GMboxProtocolInstall(AR6K_DEVICE *pDev) | |||
889 | } | 889 | } |
890 | 890 | ||
891 | /*** protocol module uninstall entry point ***/ | 891 | /*** protocol module uninstall entry point ***/ |
892 | void GMboxProtocolUninstall(AR6K_DEVICE *pDev) | 892 | void GMboxProtocolUninstall(struct ar6k_device *pDev) |
893 | { | 893 | { |
894 | GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)DEV_GMBOX_GET_PROTOCOL(pDev); | 894 | GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)DEV_GMBOX_GET_PROTOCOL(pDev); |
895 | 895 | ||
@@ -939,7 +939,7 @@ static int NotifyTransportReady(GMBOX_PROTO_HCI_UART *pProt) | |||
939 | HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo) | 939 | HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo) |
940 | { | 940 | { |
941 | GMBOX_PROTO_HCI_UART *pProtocol = NULL; | 941 | GMBOX_PROTO_HCI_UART *pProtocol = NULL; |
942 | AR6K_DEVICE *pDev; | 942 | struct ar6k_device *pDev; |
943 | 943 | ||
944 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportAttach \n")); | 944 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportAttach \n")); |
945 | 945 | ||
@@ -984,7 +984,7 @@ HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_I | |||
984 | void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans) | 984 | void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans) |
985 | { | 985 | { |
986 | GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)HciTrans; | 986 | GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)HciTrans; |
987 | AR6K_DEVICE *pDev = pProtocol->pDev; | 987 | struct ar6k_device *pDev = pProtocol->pDev; |
988 | 988 | ||
989 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportDetach \n")); | 989 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportDetach \n")); |
990 | 990 | ||
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c index c200cfd339b..8bde7bf38b3 100644 --- a/drivers/staging/ath6kl/htc2/htc.c +++ b/drivers/staging/ath6kl/htc2/htc.c | |||
@@ -573,7 +573,7 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle, | |||
573 | #endif | 573 | #endif |
574 | } | 574 | } |
575 | 575 | ||
576 | AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle) | 576 | struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle) |
577 | { | 577 | { |
578 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); | 578 | HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); |
579 | return &target->Device; | 579 | return &target->Device; |
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h index 73f6ed933eb..8bc3162cdfb 100644 --- a/drivers/staging/ath6kl/htc2/htc_internal.h +++ b/drivers/staging/ath6kl/htc2/htc_internal.h | |||
@@ -122,7 +122,7 @@ typedef struct _HTC_TARGET { | |||
122 | A_MUTEX_T HTCLock; | 122 | A_MUTEX_T HTCLock; |
123 | A_MUTEX_T HTCRxLock; | 123 | A_MUTEX_T HTCRxLock; |
124 | A_MUTEX_T HTCTxLock; | 124 | A_MUTEX_T HTCTxLock; |
125 | AR6K_DEVICE Device; /* AR6K - specific state */ | 125 | struct ar6k_device Device; /* AR6K - specific state */ |
126 | u32 OpStateFlags; | 126 | u32 OpStateFlags; |
127 | u32 RecvStateFlags; | 127 | u32 RecvStateFlags; |
128 | HTC_ENDPOINT_ID EpWaitingForBuffers; | 128 | HTC_ENDPOINT_ID EpWaitingForBuffers; |