aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ath6kl
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-01-27 23:04:19 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-31 16:53:11 -0500
commit1f4c34bded914e81b4388ccfdfab8a31da5ab0c3 (patch)
tree17143db6180c0e30c4634f69d67e67d761fc37e1 /drivers/staging/ath6kl
parenta789325dc3aa89bb5001d26b542d7abc775b46f1 (diff)
staging: ath6kl: Convert enum A_STATUS to int
Convert enum members to int as well. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl')
-rw-r--r--drivers/staging/ath6kl/bmi/include/bmi_internal.h4
-rw-r--r--drivers/staging/ath6kl/bmi/src/bmi.c72
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h10
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c46
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c12
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k.c74
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k.h72
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c38
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c40
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c58
-rw-r--r--drivers/staging/ath6kl/htc2/htc.c10
-rw-r--r--drivers/staging/ath6kl/htc2/htc_internal.h8
-rw-r--r--drivers/staging/ath6kl/htc2/htc_recv.c40
-rw-r--r--drivers/staging/ath6kl/htc2/htc_send.c10
-rw-r--r--drivers/staging/ath6kl/htc2/htc_services.c8
-rw-r--r--drivers/staging/ath6kl/include/a_debug.h4
-rw-r--r--drivers/staging/ath6kl/include/ar3kconfig.h4
-rw-r--r--drivers/staging/ath6kl/include/ar6000_diag.h10
-rw-r--r--drivers/staging/ath6kl/include/bmi.h34
-rw-r--r--drivers/staging/ath6kl/include/common/athdefs.h75
-rw-r--r--drivers/staging/ath6kl/include/common_drv.h24
-rw-r--r--drivers/staging/ath6kl/include/dset_api.h4
-rw-r--r--drivers/staging/ath6kl/include/gpio_api.h10
-rw-r--r--drivers/staging/ath6kl/include/hci_transport_api.h18
-rw-r--r--drivers/staging/ath6kl/include/hif.h34
-rw-r--r--drivers/staging/ath6kl/include/htc_api.h18
-rw-r--r--drivers/staging/ath6kl/include/htc_packet.h2
-rw-r--r--drivers/staging/ath6kl/include/wlan_api.h2
-rw-r--r--drivers/staging/ath6kl/include/wmi_api.h274
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kconfig.c38
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c28
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h4
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c18
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h6
-rw-r--r--drivers/staging/ath6kl/miscdrv/common_drv.c66
-rw-r--r--drivers/staging/ath6kl/miscdrv/credit_dist.c2
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_android.c6
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c106
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_pm.c34
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_raw_if.c6
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6k_pal.c14
-rw-r--r--drivers/staging/ath6kl/os/linux/cfg80211.c10
-rw-r--r--drivers/staging/ath6kl/os/linux/export_hci_transport.c28
-rw-r--r--drivers/staging/ath6kl/os/linux/hci_bridge.c48
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6000_drv.h8
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h30
-rw-r--r--drivers/staging/ath6kl/os/linux/include/cfg80211.h2
-rw-r--r--drivers/staging/ath6kl/os/linux/include/export_hci_transport.h22
-rw-r--r--drivers/staging/ath6kl/os/linux/include/osapi_linux.h18
-rw-r--r--drivers/staging/ath6kl/os/linux/ioctl.c38
-rw-r--r--drivers/staging/ath6kl/os/linux/netbuf.c18
-rw-r--r--drivers/staging/ath6kl/os/linux/wireless_ext.c8
-rw-r--r--drivers/staging/ath6kl/reorder/rcv_aggr.c4
-rw-r--r--drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c2
-rw-r--r--drivers/staging/ath6kl/wmi/wmi.c528
55 files changed, 1055 insertions, 1052 deletions
diff --git a/drivers/staging/ath6kl/bmi/include/bmi_internal.h b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
index a44027cee4e..34e86f31eb9 100644
--- a/drivers/staging/ath6kl/bmi/include/bmi_internal.h
+++ b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
@@ -41,12 +41,12 @@
41/* ------ Global Variable Declarations ------- */ 41/* ------ Global Variable Declarations ------- */
42static A_BOOL bmiDone; 42static A_BOOL bmiDone;
43 43
44A_STATUS 44int
45bmiBufferSend(HIF_DEVICE *device, 45bmiBufferSend(HIF_DEVICE *device,
46 A_UCHAR *buffer, 46 A_UCHAR *buffer,
47 A_UINT32 length); 47 A_UINT32 length);
48 48
49A_STATUS 49int
50bmiBufferReceive(HIF_DEVICE *device, 50bmiBufferReceive(HIF_DEVICE *device,
51 A_UCHAR *buffer, 51 A_UCHAR *buffer,
52 A_UINT32 length, 52 A_UINT32 length,
diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c
index f17f5636f5b..a782166875e 100644
--- a/drivers/staging/ath6kl/bmi/src/bmi.c
+++ b/drivers/staging/ath6kl/bmi/src/bmi.c
@@ -105,10 +105,10 @@ BMICleanup(void)
105 } 105 }
106} 106}
107 107
108A_STATUS 108int
109BMIDone(HIF_DEVICE *device) 109BMIDone(HIF_DEVICE *device)
110{ 110{
111 A_STATUS status; 111 int status;
112 A_UINT32 cid; 112 A_UINT32 cid;
113 113
114 if (bmiDone) { 114 if (bmiDone) {
@@ -141,10 +141,10 @@ BMIDone(HIF_DEVICE *device)
141 return A_OK; 141 return A_OK;
142} 142}
143 143
144A_STATUS 144int
145BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) 145BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
146{ 146{
147 A_STATUS status; 147 int status;
148 A_UINT32 cid; 148 A_UINT32 cid;
149 149
150 if (bmiDone) { 150 if (bmiDone) {
@@ -200,14 +200,14 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
200 return A_OK; 200 return A_OK;
201} 201}
202 202
203A_STATUS 203int
204BMIReadMemory(HIF_DEVICE *device, 204BMIReadMemory(HIF_DEVICE *device,
205 A_UINT32 address, 205 A_UINT32 address,
206 A_UCHAR *buffer, 206 A_UCHAR *buffer,
207 A_UINT32 length) 207 A_UINT32 length)
208{ 208{
209 A_UINT32 cid; 209 A_UINT32 cid;
210 A_STATUS status; 210 int status;
211 A_UINT32 offset; 211 A_UINT32 offset;
212 A_UINT32 remaining, rxlen; 212 A_UINT32 remaining, rxlen;
213 213
@@ -256,14 +256,14 @@ BMIReadMemory(HIF_DEVICE *device,
256 return A_OK; 256 return A_OK;
257} 257}
258 258
259A_STATUS 259int
260BMIWriteMemory(HIF_DEVICE *device, 260BMIWriteMemory(HIF_DEVICE *device,
261 A_UINT32 address, 261 A_UINT32 address,
262 A_UCHAR *buffer, 262 A_UCHAR *buffer,
263 A_UINT32 length) 263 A_UINT32 length)
264{ 264{
265 A_UINT32 cid; 265 A_UINT32 cid;
266 A_STATUS status; 266 int status;
267 A_UINT32 offset; 267 A_UINT32 offset;
268 A_UINT32 remaining, txlen; 268 A_UINT32 remaining, txlen;
269 const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length); 269 const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
@@ -321,13 +321,13 @@ BMIWriteMemory(HIF_DEVICE *device,
321 return A_OK; 321 return A_OK;
322} 322}
323 323
324A_STATUS 324int
325BMIExecute(HIF_DEVICE *device, 325BMIExecute(HIF_DEVICE *device,
326 A_UINT32 address, 326 A_UINT32 address,
327 A_UINT32 *param) 327 A_UINT32 *param)
328{ 328{
329 A_UINT32 cid; 329 A_UINT32 cid;
330 A_STATUS status; 330 int status;
331 A_UINT32 offset; 331 A_UINT32 offset;
332 332
333 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); 333 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
@@ -369,12 +369,12 @@ BMIExecute(HIF_DEVICE *device,
369 return A_OK; 369 return A_OK;
370} 370}
371 371
372A_STATUS 372int
373BMISetAppStart(HIF_DEVICE *device, 373BMISetAppStart(HIF_DEVICE *device,
374 A_UINT32 address) 374 A_UINT32 address)
375{ 375{
376 A_UINT32 cid; 376 A_UINT32 cid;
377 A_STATUS status; 377 int status;
378 A_UINT32 offset; 378 A_UINT32 offset;
379 379
380 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); 380 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
@@ -406,13 +406,13 @@ BMISetAppStart(HIF_DEVICE *device,
406 return A_OK; 406 return A_OK;
407} 407}
408 408
409A_STATUS 409int
410BMIReadSOCRegister(HIF_DEVICE *device, 410BMIReadSOCRegister(HIF_DEVICE *device,
411 A_UINT32 address, 411 A_UINT32 address,
412 A_UINT32 *param) 412 A_UINT32 *param)
413{ 413{
414 A_UINT32 cid; 414 A_UINT32 cid;
415 A_STATUS status; 415 int status;
416 A_UINT32 offset; 416 A_UINT32 offset;
417 417
418 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); 418 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
@@ -452,13 +452,13 @@ BMIReadSOCRegister(HIF_DEVICE *device,
452 return A_OK; 452 return A_OK;
453} 453}
454 454
455A_STATUS 455int
456BMIWriteSOCRegister(HIF_DEVICE *device, 456BMIWriteSOCRegister(HIF_DEVICE *device,
457 A_UINT32 address, 457 A_UINT32 address,
458 A_UINT32 param) 458 A_UINT32 param)
459{ 459{
460 A_UINT32 cid; 460 A_UINT32 cid;
461 A_STATUS status; 461 int status;
462 A_UINT32 offset; 462 A_UINT32 offset;
463 463
464 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); 464 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
@@ -492,7 +492,7 @@ BMIWriteSOCRegister(HIF_DEVICE *device,
492 return A_OK; 492 return A_OK;
493} 493}
494 494
495A_STATUS 495int
496BMIrompatchInstall(HIF_DEVICE *device, 496BMIrompatchInstall(HIF_DEVICE *device,
497 A_UINT32 ROM_addr, 497 A_UINT32 ROM_addr,
498 A_UINT32 RAM_addr, 498 A_UINT32 RAM_addr,
@@ -501,7 +501,7 @@ BMIrompatchInstall(HIF_DEVICE *device,
501 A_UINT32 *rompatch_id) 501 A_UINT32 *rompatch_id)
502{ 502{
503 A_UINT32 cid; 503 A_UINT32 cid;
504 A_STATUS status; 504 int status;
505 A_UINT32 offset; 505 A_UINT32 offset;
506 506
507 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) + 507 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
@@ -548,12 +548,12 @@ BMIrompatchInstall(HIF_DEVICE *device,
548 return A_OK; 548 return A_OK;
549} 549}
550 550
551A_STATUS 551int
552BMIrompatchUninstall(HIF_DEVICE *device, 552BMIrompatchUninstall(HIF_DEVICE *device,
553 A_UINT32 rompatch_id) 553 A_UINT32 rompatch_id)
554{ 554{
555 A_UINT32 cid; 555 A_UINT32 cid;
556 A_STATUS status; 556 int status;
557 A_UINT32 offset; 557 A_UINT32 offset;
558 558
559 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id))); 559 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id)));
@@ -585,14 +585,14 @@ BMIrompatchUninstall(HIF_DEVICE *device,
585 return A_OK; 585 return A_OK;
586} 586}
587 587
588static A_STATUS 588static int
589_BMIrompatchChangeActivation(HIF_DEVICE *device, 589_BMIrompatchChangeActivation(HIF_DEVICE *device,
590 A_UINT32 rompatch_count, 590 A_UINT32 rompatch_count,
591 A_UINT32 *rompatch_list, 591 A_UINT32 *rompatch_list,
592 A_UINT32 do_activate) 592 A_UINT32 do_activate)
593{ 593{
594 A_UINT32 cid; 594 A_UINT32 cid;
595 A_STATUS status; 595 int status;
596 A_UINT32 offset; 596 A_UINT32 offset;
597 A_UINT32 length; 597 A_UINT32 length;
598 598
@@ -629,7 +629,7 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device,
629 return A_OK; 629 return A_OK;
630} 630}
631 631
632A_STATUS 632int
633BMIrompatchActivate(HIF_DEVICE *device, 633BMIrompatchActivate(HIF_DEVICE *device,
634 A_UINT32 rompatch_count, 634 A_UINT32 rompatch_count,
635 A_UINT32 *rompatch_list) 635 A_UINT32 *rompatch_list)
@@ -637,7 +637,7 @@ BMIrompatchActivate(HIF_DEVICE *device,
637 return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1); 637 return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
638} 638}
639 639
640A_STATUS 640int
641BMIrompatchDeactivate(HIF_DEVICE *device, 641BMIrompatchDeactivate(HIF_DEVICE *device,
642 A_UINT32 rompatch_count, 642 A_UINT32 rompatch_count,
643 A_UINT32 *rompatch_list) 643 A_UINT32 *rompatch_list)
@@ -645,13 +645,13 @@ BMIrompatchDeactivate(HIF_DEVICE *device,
645 return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0); 645 return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
646} 646}
647 647
648A_STATUS 648int
649BMILZData(HIF_DEVICE *device, 649BMILZData(HIF_DEVICE *device,
650 A_UCHAR *buffer, 650 A_UCHAR *buffer,
651 A_UINT32 length) 651 A_UINT32 length)
652{ 652{
653 A_UINT32 cid; 653 A_UINT32 cid;
654 A_STATUS status; 654 int status;
655 A_UINT32 offset; 655 A_UINT32 offset;
656 A_UINT32 remaining, txlen; 656 A_UINT32 remaining, txlen;
657 const A_UINT32 header = sizeof(cid) + sizeof(length); 657 const A_UINT32 header = sizeof(cid) + sizeof(length);
@@ -695,12 +695,12 @@ BMILZData(HIF_DEVICE *device,
695 return A_OK; 695 return A_OK;
696} 696}
697 697
698A_STATUS 698int
699BMILZStreamStart(HIF_DEVICE *device, 699BMILZStreamStart(HIF_DEVICE *device,
700 A_UINT32 address) 700 A_UINT32 address)
701{ 701{
702 A_UINT32 cid; 702 A_UINT32 cid;
703 A_STATUS status; 703 int status;
704 A_UINT32 offset; 704 A_UINT32 offset;
705 705
706 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); 706 A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
@@ -733,12 +733,12 @@ BMILZStreamStart(HIF_DEVICE *device,
733} 733}
734 734
735/* BMI Access routines */ 735/* BMI Access routines */
736A_STATUS 736int
737bmiBufferSend(HIF_DEVICE *device, 737bmiBufferSend(HIF_DEVICE *device,
738 A_UCHAR *buffer, 738 A_UCHAR *buffer,
739 A_UINT32 length) 739 A_UINT32 length)
740{ 740{
741 A_STATUS status; 741 int status;
742 A_UINT32 timeout; 742 A_UINT32 timeout;
743 A_UINT32 address; 743 A_UINT32 address;
744 A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; 744 A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
@@ -781,13 +781,13 @@ bmiBufferSend(HIF_DEVICE *device,
781 return status; 781 return status;
782} 782}
783 783
784A_STATUS 784int
785bmiBufferReceive(HIF_DEVICE *device, 785bmiBufferReceive(HIF_DEVICE *device,
786 A_UCHAR *buffer, 786 A_UCHAR *buffer,
787 A_UINT32 length, 787 A_UINT32 length,
788 A_BOOL want_timeout) 788 A_BOOL want_timeout)
789{ 789{
790 A_STATUS status; 790 int status;
791 A_UINT32 address; 791 A_UINT32 address;
792 A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; 792 A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
793 HIF_PENDING_EVENTS_INFO hifPendingEvents; 793 HIF_PENDING_EVENTS_INFO hifPendingEvents;
@@ -957,10 +957,10 @@ bmiBufferReceive(HIF_DEVICE *device,
957 return A_OK; 957 return A_OK;
958} 958}
959 959
960A_STATUS 960int
961BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length) 961BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length)
962{ 962{
963 A_STATUS status = A_ERROR; 963 int status = A_ERROR;
964 A_UINT32 lastWord = 0; 964 A_UINT32 lastWord = 0;
965 A_UINT32 lastWordOffset = length & ~0x3; 965 A_UINT32 lastWordOffset = length & ~0x3;
966 A_UINT32 unalignedBytes = length & 0x3; 966 A_UINT32 unalignedBytes = length & 0x3;
@@ -997,13 +997,13 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32
997 return status; 997 return status;
998} 998}
999 999
1000A_STATUS 1000int
1001BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length) 1001BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length)
1002{ 1002{
1003 return bmiBufferSend(device, buffer, length); 1003 return bmiBufferSend(device, buffer, length);
1004} 1004}
1005 1005
1006A_STATUS 1006int
1007BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout) 1007BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout)
1008{ 1008{
1009 return bmiBufferReceive(device, buffer, length, want_timeout); 1009 return bmiBufferReceive(device, buffer, length, want_timeout);
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
index 857f35f36ca..f72ba6cf50c 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
@@ -58,7 +58,7 @@ typedef struct bus_request {
58 A_UINT32 length; 58 A_UINT32 length;
59 A_UINT32 request; 59 A_UINT32 request;
60 void *context; 60 void *context;
61 A_STATUS status; 61 int status;
62 struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */ 62 struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */
63} BUS_REQUEST; 63} BUS_REQUEST;
64 64
@@ -110,18 +110,18 @@ typedef struct _HIF_SCATTER_REQ_PRIV {
110 110
111#define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0) 111#define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0)
112 112
113A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo); 113int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo);
114void CleanupHIFScatterResources(HIF_DEVICE *device); 114void CleanupHIFScatterResources(HIF_DEVICE *device);
115A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest); 115int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest);
116 116
117#else // HIF_LINUX_MMC_SCATTER_SUPPORT 117#else // HIF_LINUX_MMC_SCATTER_SUPPORT
118 118
119static inline A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) 119static inline int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
120{ 120{
121 return A_ENOTSUP; 121 return A_ENOTSUP;
122} 122}
123 123
124static inline A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) 124static inline int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
125{ 125{
126 return A_ENOTSUP; 126 return A_ENOTSUP;
127} 127}
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
index e96662b84ed..61166a5cb02 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -107,8 +107,8 @@ extern A_UINT32 busspeedlow;
107extern A_UINT32 debughif; 107extern A_UINT32 debughif;
108 108
109static void ResetAllCards(void); 109static void ResetAllCards(void);
110static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func); 110static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func);
111static A_STATUS hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func); 111static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func);
112 112
113#ifdef DEBUG 113#ifdef DEBUG
114 114
@@ -123,7 +123,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(hif,
123 123
124 124
125/* ------ Functions ------ */ 125/* ------ Functions ------ */
126A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks) 126int HIFInit(OSDRV_CALLBACKS *callbacks)
127{ 127{
128 int status; 128 int status;
129 AR_DEBUG_ASSERT(callbacks != NULL); 129 AR_DEBUG_ASSERT(callbacks != NULL);
@@ -152,7 +152,7 @@ A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks)
152 152
153} 153}
154 154
155static A_STATUS 155static int
156__HIFReadWrite(HIF_DEVICE *device, 156__HIFReadWrite(HIF_DEVICE *device,
157 A_UINT32 address, 157 A_UINT32 address,
158 A_UCHAR *buffer, 158 A_UCHAR *buffer,
@@ -161,7 +161,7 @@ __HIFReadWrite(HIF_DEVICE *device,
161 void *context) 161 void *context)
162{ 162{
163 A_UINT8 opcode; 163 A_UINT8 opcode;
164 A_STATUS status = A_OK; 164 int status = A_OK;
165 int ret; 165 int ret;
166 A_UINT8 *tbuffer; 166 A_UINT8 *tbuffer;
167 A_BOOL bounced = FALSE; 167 A_BOOL bounced = FALSE;
@@ -329,7 +329,7 @@ void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest)
329 329
330 330
331/* queue a read/write request */ 331/* queue a read/write request */
332A_STATUS 332int
333HIFReadWrite(HIF_DEVICE *device, 333HIFReadWrite(HIF_DEVICE *device,
334 A_UINT32 address, 334 A_UINT32 address,
335 A_UCHAR *buffer, 335 A_UCHAR *buffer,
@@ -337,7 +337,7 @@ HIFReadWrite(HIF_DEVICE *device,
337 A_UINT32 request, 337 A_UINT32 request,
338 void *context) 338 void *context)
339{ 339{
340 A_STATUS status = A_OK; 340 int status = A_OK;
341 BUS_REQUEST *busrequest; 341 BUS_REQUEST *busrequest;
342 342
343 343
@@ -375,7 +375,7 @@ HIFReadWrite(HIF_DEVICE *device,
375 /* interrupted, exit */ 375 /* interrupted, exit */
376 return A_ERROR; 376 return A_ERROR;
377 } else { 377 } else {
378 A_STATUS status = busrequest->status; 378 int status = busrequest->status;
379 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: sync return freeing 0x%lX: 0x%X\n", 379 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: sync return freeing 0x%lX: 0x%X\n",
380 (unsigned long)busrequest, busrequest->status)); 380 (unsigned long)busrequest, busrequest->status));
381 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: freeing req: 0x%X\n", (unsigned int)request)); 381 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: freeing req: 0x%X\n", (unsigned int)request));
@@ -402,7 +402,7 @@ static int async_task(void *param)
402 { 402 {
403 HIF_DEVICE *device; 403 HIF_DEVICE *device;
404 BUS_REQUEST *request; 404 BUS_REQUEST *request;
405 A_STATUS status; 405 int status;
406 unsigned long flags; 406 unsigned long flags;
407 407
408 device = (HIF_DEVICE *)param; 408 device = (HIF_DEVICE *)param;
@@ -488,7 +488,7 @@ static A_INT32 IssueSDCommand(HIF_DEVICE *device, A_UINT32 opcode, A_UINT32 arg,
488 return err; 488 return err;
489} 489}
490 490
491A_STATUS ReinitSDIO(HIF_DEVICE *device) 491int ReinitSDIO(HIF_DEVICE *device)
492{ 492{
493 A_INT32 err; 493 A_INT32 err;
494 struct mmc_host *host; 494 struct mmc_host *host;
@@ -647,10 +647,10 @@ A_STATUS ReinitSDIO(HIF_DEVICE *device)
647 return (err) ? A_ERROR : A_OK; 647 return (err) ? A_ERROR : A_OK;
648} 648}
649 649
650A_STATUS 650int
651PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config) 651PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config)
652{ 652{
653 A_STATUS status = A_OK; 653 int status = A_OK;
654#if defined(CONFIG_PM) 654#if defined(CONFIG_PM)
655 struct sdio_func *func = device->func; 655 struct sdio_func *func = device->func;
656 int old_reset_val; 656 int old_reset_val;
@@ -690,12 +690,12 @@ PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config)
690 return status; 690 return status;
691} 691}
692 692
693A_STATUS 693int
694HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, 694HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
695 void *config, A_UINT32 configLen) 695 void *config, A_UINT32 configLen)
696{ 696{
697 A_UINT32 count; 697 A_UINT32 count;
698 A_STATUS status = A_OK; 698 int status = A_OK;
699 699
700 switch(opcode) { 700 switch(opcode) {
701 case HIF_DEVICE_GET_MBOX_BLOCK_SIZE: 701 case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
@@ -774,7 +774,7 @@ HIFShutDownDevice(HIF_DEVICE *device)
774static void 774static void
775hifIRQHandler(struct sdio_func *func) 775hifIRQHandler(struct sdio_func *func)
776{ 776{
777 A_STATUS status; 777 int status;
778 HIF_DEVICE *device; 778 HIF_DEVICE *device;
779 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifIRQHandler\n")); 779 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifIRQHandler\n"));
780 780
@@ -949,10 +949,10 @@ hifFreeBusRequest(HIF_DEVICE *device, BUS_REQUEST *busrequest)
949 spin_unlock_irqrestore(&device->lock, flag); 949 spin_unlock_irqrestore(&device->lock, flag);
950} 950}
951 951
952static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func) 952static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func)
953{ 953{
954 int ret; 954 int ret;
955 A_STATUS status = A_OK; 955 int status = A_OK;
956 956
957 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDisableFunc\n")); 957 AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDisableFunc\n"));
958 device = getHifDevice(func); 958 device = getHifDevice(func);
@@ -1080,7 +1080,7 @@ static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func)
1080static int hifDeviceSuspend(struct device *dev) 1080static int hifDeviceSuspend(struct device *dev)
1081{ 1081{
1082 struct sdio_func *func=dev_to_sdio_func(dev); 1082 struct sdio_func *func=dev_to_sdio_func(dev);
1083 A_STATUS status = A_OK; 1083 int status = A_OK;
1084 HIF_DEVICE *device; 1084 HIF_DEVICE *device;
1085 1085
1086 device = getHifDevice(func); 1086 device = getHifDevice(func);
@@ -1107,7 +1107,7 @@ static int hifDeviceSuspend(struct device *dev)
1107static int hifDeviceResume(struct device *dev) 1107static int hifDeviceResume(struct device *dev)
1108{ 1108{
1109 struct sdio_func *func=dev_to_sdio_func(dev); 1109 struct sdio_func *func=dev_to_sdio_func(dev);
1110 A_STATUS status = A_OK; 1110 int status = A_OK;
1111 HIF_DEVICE *device; 1111 HIF_DEVICE *device;
1112 1112
1113 device = getHifDevice(func); 1113 device = getHifDevice(func);
@@ -1126,7 +1126,7 @@ static int hifDeviceResume(struct device *dev)
1126 1126
1127static void hifDeviceRemoved(struct sdio_func *func) 1127static void hifDeviceRemoved(struct sdio_func *func)
1128{ 1128{
1129 A_STATUS status = A_OK; 1129 int status = A_OK;
1130 HIF_DEVICE *device; 1130 HIF_DEVICE *device;
1131 AR_DEBUG_ASSERT(func != NULL); 1131 AR_DEBUG_ASSERT(func != NULL);
1132 1132
@@ -1151,11 +1151,11 @@ static void hifDeviceRemoved(struct sdio_func *func)
1151/* 1151/*
1152 * This should be moved to AR6K HTC layer. 1152 * This should be moved to AR6K HTC layer.
1153 */ 1153 */
1154A_STATUS hifWaitForPendingRecv(HIF_DEVICE *device) 1154int hifWaitForPendingRecv(HIF_DEVICE *device)
1155{ 1155{
1156 A_INT32 cnt = 10; 1156 A_INT32 cnt = 10;
1157 A_UINT8 host_int_status; 1157 A_UINT8 host_int_status;
1158 A_STATUS status = A_OK; 1158 int status = A_OK;
1159 1159
1160 do { 1160 do {
1161 while (atomic_read(&device->irqHandling)) { 1161 while (atomic_read(&device->irqHandling)) {
@@ -1233,7 +1233,7 @@ void HIFReleaseDevice(HIF_DEVICE *device)
1233 device->claimedContext = NULL; 1233 device->claimedContext = NULL;
1234} 1234}
1235 1235
1236A_STATUS HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks) 1236int HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks)
1237{ 1237{
1238 if (device->htcCallbacks.context != NULL) { 1238 if (device->htcCallbacks.context != NULL) {
1239 /* already in use! */ 1239 /* already in use! */
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
index ee8b47746a1..ceeced47cd2 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
@@ -79,7 +79,7 @@ static HIF_SCATTER_REQ *AllocScatterReq(HIF_DEVICE *device)
79} 79}
80 80
81 /* called by async task to perform the operation synchronously using direct MMC APIs */ 81 /* called by async task to perform the operation synchronously using direct MMC APIs */
82A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) 82int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
83{ 83{
84 int i; 84 int i;
85 A_UINT8 rw; 85 A_UINT8 rw;
@@ -89,7 +89,7 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
89 struct mmc_data data; 89 struct mmc_data data;
90 HIF_SCATTER_REQ_PRIV *pReqPriv; 90 HIF_SCATTER_REQ_PRIV *pReqPriv;
91 HIF_SCATTER_REQ *pReq; 91 HIF_SCATTER_REQ *pReq;
92 A_STATUS status = A_OK; 92 int status = A_OK;
93 struct scatterlist *pSg; 93 struct scatterlist *pSg;
94 94
95 pReqPriv = busrequest->pScatterReq; 95 pReqPriv = busrequest->pScatterReq;
@@ -199,9 +199,9 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
199} 199}
200 200
201 /* callback to issue a read-write scatter request */ 201 /* callback to issue a read-write scatter request */
202static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq) 202static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
203{ 203{
204 A_STATUS status = A_EINVAL; 204 int status = A_EINVAL;
205 A_UINT32 request = pReq->Request; 205 A_UINT32 request = pReq->Request;
206 HIF_SCATTER_REQ_PRIV *pReqPriv = (HIF_SCATTER_REQ_PRIV *)pReq->HIFPrivate[0]; 206 HIF_SCATTER_REQ_PRIV *pReqPriv = (HIF_SCATTER_REQ_PRIV *)pReq->HIFPrivate[0];
207 207
@@ -275,9 +275,9 @@ static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
275} 275}
276 276
277 /* setup of HIF scatter resources */ 277 /* setup of HIF scatter resources */
278A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) 278int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
279{ 279{
280 A_STATUS status = A_ERROR; 280 int status = A_ERROR;
281 int i; 281 int i;
282 HIF_SCATTER_REQ_PRIV *pReqPriv; 282 HIF_SCATTER_REQ_PRIV *pReqPriv;
283 BUS_REQUEST *busrequest; 283 BUS_REQUEST *busrequest;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 1efc85ce02b..8c6d6591eca 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -35,8 +35,8 @@
35 35
36#define MAILBOX_FOR_BLOCK_SIZE 1 36#define MAILBOX_FOR_BLOCK_SIZE 1
37 37
38A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev); 38int DevEnableInterrupts(AR6K_DEVICE *pDev);
39A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev); 39int DevDisableInterrupts(AR6K_DEVICE *pDev);
40 40
41static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev); 41static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev);
42 42
@@ -74,10 +74,10 @@ void DevCleanup(AR6K_DEVICE *pDev)
74 } 74 }
75} 75}
76 76
77A_STATUS DevSetup(AR6K_DEVICE *pDev) 77int DevSetup(AR6K_DEVICE *pDev)
78{ 78{
79 A_UINT32 blocksizes[AR6K_MAILBOXES]; 79 A_UINT32 blocksizes[AR6K_MAILBOXES];
80 A_STATUS status = A_OK; 80 int status = A_OK;
81 int i; 81 int i;
82 HTC_CALLBACKS htcCallbacks; 82 HTC_CALLBACKS htcCallbacks;
83 83
@@ -216,9 +216,9 @@ A_STATUS DevSetup(AR6K_DEVICE *pDev)
216 216
217} 217}
218 218
219A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev) 219int DevEnableInterrupts(AR6K_DEVICE *pDev)
220{ 220{
221 A_STATUS status; 221 int status;
222 AR6K_IRQ_ENABLE_REGISTERS regs; 222 AR6K_IRQ_ENABLE_REGISTERS regs;
223 223
224 LOCK_AR6K(pDev); 224 LOCK_AR6K(pDev);
@@ -276,7 +276,7 @@ A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev)
276 return status; 276 return status;
277} 277}
278 278
279A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev) 279int DevDisableInterrupts(AR6K_DEVICE *pDev)
280{ 280{
281 AR6K_IRQ_ENABLE_REGISTERS regs; 281 AR6K_IRQ_ENABLE_REGISTERS regs;
282 282
@@ -301,7 +301,7 @@ A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev)
301} 301}
302 302
303/* enable device interrupts */ 303/* enable device interrupts */
304A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev) 304int DevUnmaskInterrupts(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.
@@ -309,7 +309,7 @@ A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev)
309 * and when HTC is finally ready to handle interrupts, other software can perform target "soft" resets. 309 * and when HTC is finally ready to handle interrupts, other software can perform target "soft" resets.
310 * The AR6K interrupt enables reset back to an "enabled" state when this happens. 310 * The AR6K interrupt enables reset back to an "enabled" state when this happens.
311 * */ 311 * */
312 A_STATUS IntStatus = A_OK; 312 int IntStatus = A_OK;
313 DevDisableInterrupts(pDev); 313 DevDisableInterrupts(pDev);
314 314
315#ifdef THREAD_X 315#ifdef THREAD_X
@@ -327,7 +327,7 @@ A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev)
327} 327}
328 328
329/* disable all device interrupts */ 329/* disable all device interrupts */
330A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev) 330int DevMaskInterrupts(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()*/
@@ -355,9 +355,9 @@ 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 */
358static A_STATUS DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode) 358static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
359{ 359{
360 A_STATUS status = A_OK; 360 int status = A_OK;
361 HTC_PACKET *pIOPacket = NULL; 361 HTC_PACKET *pIOPacket = NULL;
362 362
363 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n", 363 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n",
@@ -403,9 +403,9 @@ static A_STATUS DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableR
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 */
406static A_STATUS DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode) 406static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
407{ 407{
408 A_STATUS status = A_OK; 408 int status = A_OK;
409 HTC_PACKET *pIOPacket = NULL; 409 HTC_PACKET *pIOPacket = NULL;
410 AR6K_IRQ_ENABLE_REGISTERS regs; 410 AR6K_IRQ_ENABLE_REGISTERS regs;
411 411
@@ -470,7 +470,7 @@ static A_STATUS DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRec
470} 470}
471 471
472 472
473A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode) 473int DevStopRecv(AR6K_DEVICE *pDev, A_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 @@ A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
479 } 479 }
480} 480}
481 481
482A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode) 482int DevEnableRecv(AR6K_DEVICE *pDev, A_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,9 +488,9 @@ A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
488 } 488 }
489} 489}
490 490
491A_STATUS DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_BOOL *pbIsRecvPending) 491int DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_BOOL *pbIsRecvPending)
492{ 492{
493 A_STATUS status = A_OK; 493 int status = A_OK;
494 A_UCHAR host_int_status = 0x0; 494 A_UCHAR host_int_status = 0x0;
495 A_UINT32 counter = 0x0; 495 A_UINT32 counter = 0x0;
496 496
@@ -608,7 +608,7 @@ static void DevFreeScatterReq(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)
608 UNLOCK_AR6K(pDev); 608 UNLOCK_AR6K(pDev);
609} 609}
610 610
611A_STATUS DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, A_BOOL FromDMA) 611int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, A_BOOL FromDMA)
612{ 612{
613 A_UINT8 *pDMABuffer = NULL; 613 A_UINT8 *pDMABuffer = NULL;
614 int i, remaining; 614 int i, remaining;
@@ -664,10 +664,10 @@ static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket)
664 AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-DevReadWriteScatterAsyncHandler \n")); 664 AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-DevReadWriteScatterAsyncHandler \n"));
665} 665}
666 666
667static A_STATUS DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq) 667static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)
668{ 668{
669 AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context; 669 AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
670 A_STATUS status = A_OK; 670 int status = A_OK;
671 HTC_PACKET *pIOPacket = NULL; 671 HTC_PACKET *pIOPacket = NULL;
672 A_UINT32 request = pReq->Request; 672 A_UINT32 request = pReq->Request;
673 673
@@ -749,9 +749,9 @@ 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 */
752static A_STATUS DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev) 752static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev)
753{ 753{
754 A_STATUS status = A_OK; 754 int status = A_OK;
755 int bufferSize, sgreqSize; 755 int bufferSize, sgreqSize;
756 int i; 756 int i;
757 DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo; 757 DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo;
@@ -811,9 +811,9 @@ static A_STATUS DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev)
811} 811}
812 812
813 813
814A_STATUS DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer) 814int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer)
815{ 815{
816 A_STATUS status; 816 int status;
817 817
818 if (pDev->MailBoxInfo.Flags & HIF_MBOX_FLAG_NO_BUNDLING) { 818 if (pDev->MailBoxInfo.Flags & HIF_MBOX_FLAG_NO_BUNDLING) {
819 AR_DEBUG_PRINTF(ATH_DEBUG_WARN, ("HIF requires bundling disabled\n")); 819 AR_DEBUG_PRINTF(ATH_DEBUG_WARN, ("HIF requires bundling disabled\n"));
@@ -876,9 +876,9 @@ A_STATUS DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer)
876 return status; 876 return status;
877} 877}
878 878
879A_STATUS DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, A_BOOL Read, A_BOOL Async) 879int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, A_BOOL Read, A_BOOL Async)
880{ 880{
881 A_STATUS status; 881 int status;
882 882
883 if (Read) { 883 if (Read) {
884 /* read operation */ 884 /* read operation */
@@ -1125,9 +1125,9 @@ static A_UINT16 GetEndMarker(void)
1125#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR 1125#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
1126 1126
1127/* send the ordered buffers to the target */ 1127/* send the ordered buffers to the target */
1128static A_STATUS SendBuffers(AR6K_DEVICE *pDev, int mbox) 1128static int SendBuffers(AR6K_DEVICE *pDev, int mbox)
1129{ 1129{
1130 A_STATUS status = A_OK; 1130 int status = A_OK;
1131 A_UINT32 request = HIF_WR_SYNC_BLOCK_INC; 1131 A_UINT32 request = HIF_WR_SYNC_BLOCK_INC;
1132 BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH]; 1132 BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH];
1133 int i; 1133 int i;
@@ -1169,9 +1169,9 @@ static A_STATUS SendBuffers(AR6K_DEVICE *pDev, int mbox)
1169} 1169}
1170 1170
1171/* poll the mailbox credit counter until we get a credit or timeout */ 1171/* poll the mailbox credit counter until we get a credit or timeout */
1172static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) 1172static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
1173{ 1173{
1174 A_STATUS status = A_OK; 1174 int status = A_OK;
1175 int timeout = TEST_CREDITS_RECV_TIMEOUT; 1175 int timeout = TEST_CREDITS_RECV_TIMEOUT;
1176 A_UINT8 credits = 0; 1176 A_UINT8 credits = 0;
1177 A_UINT32 address; 1177 A_UINT32 address;
@@ -1216,9 +1216,9 @@ static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
1216 1216
1217 1217
1218/* wait for the buffers to come back */ 1218/* wait for the buffers to come back */
1219static A_STATUS RecvBuffers(AR6K_DEVICE *pDev, int mbox) 1219static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
1220{ 1220{
1221 A_STATUS status = A_OK; 1221 int status = A_OK;
1222 A_UINT32 request = HIF_RD_SYNC_BLOCK_INC; 1222 A_UINT32 request = HIF_RD_SYNC_BLOCK_INC;
1223 BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH]; 1223 BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH];
1224 int curBuffer; 1224 int curBuffer;
@@ -1294,9 +1294,9 @@ static A_STATUS RecvBuffers(AR6K_DEVICE *pDev, int mbox)
1294 1294
1295} 1295}
1296 1296
1297static A_STATUS DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox) 1297static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
1298{ 1298{
1299 A_STATUS status; 1299 int status;
1300 1300
1301 do { 1301 do {
1302 /* send out buffers */ 1302 /* send out buffers */
@@ -1330,10 +1330,10 @@ static A_STATUS DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
1330} 1330}
1331 1331
1332/* here is where the test starts */ 1332/* here is where the test starts */
1333A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev) 1333int DoMboxHWTest(AR6K_DEVICE *pDev)
1334{ 1334{
1335 int i; 1335 int i;
1336 A_STATUS status; 1336 int status;
1337 int credits = 0; 1337 int credits = 0;
1338 A_UINT8 params[4]; 1338 A_UINT8 params[4];
1339 int numBufs; 1339 int numBufs;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index b30fd877aeb..7578e91562b 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -98,9 +98,9 @@ typedef struct AR6K_ASYNC_REG_IO_BUFFER {
98 98
99typedef struct _AR6K_GMBOX_INFO { 99typedef struct _AR6K_GMBOX_INFO {
100 void *pProtocolContext; 100 void *pProtocolContext;
101 A_STATUS (*pMessagePendingCallBack)(void *pContext, A_UINT8 LookAheadBytes[], int ValidBytes); 101 int (*pMessagePendingCallBack)(void *pContext, A_UINT8 LookAheadBytes[], int ValidBytes);
102 A_STATUS (*pCreditsPendingCallback)(void *pContext, int NumCredits, A_BOOL CreditIRQEnabled); 102 int (*pCreditsPendingCallback)(void *pContext, int NumCredits, A_BOOL CreditIRQEnabled);
103 void (*pTargetFailureCallback)(void *pContext, A_STATUS Status); 103 void (*pTargetFailureCallback)(void *pContext, int Status);
104 void (*pStateDumpCallback)(void *pContext); 104 void (*pStateDumpCallback)(void *pContext);
105 A_BOOL CreditCountIRQEnabled; 105 A_BOOL CreditCountIRQEnabled;
106} AR6K_GMBOX_INFO; 106} AR6K_GMBOX_INFO;
@@ -121,7 +121,7 @@ typedef struct _AR6K_DEVICE {
121 HTC_PACKET_QUEUE RegisterIOList; 121 HTC_PACKET_QUEUE RegisterIOList;
122 AR6K_ASYNC_REG_IO_BUFFER RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS]; 122 AR6K_ASYNC_REG_IO_BUFFER RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
123 void (*TargetFailureCallback)(void *Context); 123 void (*TargetFailureCallback)(void *Context);
124 A_STATUS (*MessagePendingCallback)(void *Context, 124 int (*MessagePendingCallback)(void *Context,
125 A_UINT32 LookAheads[], 125 A_UINT32 LookAheads[],
126 int NumLookAheads, 126 int NumLookAheads,
127 A_BOOL *pAsyncProc, 127 A_BOOL *pAsyncProc,
@@ -147,16 +147,16 @@ typedef struct _AR6K_DEVICE {
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
150A_STATUS DevSetup(AR6K_DEVICE *pDev); 150int DevSetup(AR6K_DEVICE *pDev);
151void DevCleanup(AR6K_DEVICE *pDev); 151void DevCleanup(AR6K_DEVICE *pDev);
152A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev); 152int DevUnmaskInterrupts(AR6K_DEVICE *pDev);
153A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev); 153int DevMaskInterrupts(AR6K_DEVICE *pDev);
154A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev, 154int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
155 A_UINT32 *pLookAhead, 155 A_UINT32 *pLookAhead,
156 int TimeoutMS); 156 int TimeoutMS);
157A_STATUS DevRWCompletionHandler(void *context, A_STATUS status); 157int DevRWCompletionHandler(void *context, int status);
158A_STATUS DevDsrHandler(void *context); 158int DevDsrHandler(void *context);
159A_STATUS DevCheckPendingRecvMsgsAsync(void *context); 159int DevCheckPendingRecvMsgsAsync(void *context);
160void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev); 160void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev);
161void DevDumpRegisters(AR6K_DEVICE *pDev, 161void DevDumpRegisters(AR6K_DEVICE *pDev,
162 AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs, 162 AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
@@ -166,20 +166,20 @@ 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
169A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode); 169int DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
170A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode); 170int DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
171A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev); 171int DevEnableInterrupts(AR6K_DEVICE *pDev);
172A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev); 172int DevDisableInterrupts(AR6K_DEVICE *pDev);
173A_STATUS DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_BOOL *pbIsRecvPending); 173int DevWaitForPendingRecv(AR6K_DEVICE *pDev,A_UINT32 TimeoutInMs,A_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
179static INLINE A_STATUS DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 SendLength) { 179static INLINE int DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 SendLength) {
180 A_UINT32 paddedLength; 180 A_UINT32 paddedLength;
181 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE; 181 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
182 A_STATUS status; 182 int status;
183 183
184 /* adjust the length to be a multiple of block size if appropriate */ 184 /* adjust the length to be a multiple of block size if appropriate */
185 paddedLength = DEV_CALC_SEND_PADDED_LEN(pDev, SendLength); 185 paddedLength = DEV_CALC_SEND_PADDED_LEN(pDev, SendLength);
@@ -219,9 +219,9 @@ static INLINE A_STATUS DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_U
219 return status; 219 return status;
220} 220}
221 221
222static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 RecvLength) { 222static INLINE int DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 RecvLength) {
223 A_UINT32 paddedLength; 223 A_UINT32 paddedLength;
224 A_STATUS status; 224 int status;
225 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE; 225 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
226 226
227 /* adjust the length to be a multiple of block size if appropriate */ 227 /* adjust the length to be a multiple of block size if appropriate */
@@ -272,7 +272,7 @@ static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_U
272 * 272 *
273 */ 273 */
274 274
275A_STATUS DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, A_BOOL FromDMA); 275int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, A_BOOL FromDMA);
276 276
277 /* copy any READ data back into scatter list */ 277 /* copy any READ data back into scatter list */
278#define DEV_FINISH_SCATTER_OPERATION(pR) \ 278#define DEV_FINISH_SCATTER_OPERATION(pR) \
@@ -283,7 +283,7 @@ A_STATUS DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, A_BOOL FromDMA
283 } 283 }
284 284
285 /* copy any WRITE data to bounce buffer */ 285 /* copy any WRITE data to bounce buffer */
286static INLINE A_STATUS DEV_PREPARE_SCATTER_OPERATION(HIF_SCATTER_REQ *pReq) { 286static INLINE int DEV_PREPARE_SCATTER_OPERATION(HIF_SCATTER_REQ *pReq) {
287 if ((pReq->Request & HIF_WRITE) && (pReq->ScatterMethod == HIF_SCATTER_DMA_BOUNCE)) { 287 if ((pReq->Request & HIF_WRITE) && (pReq->ScatterMethod == HIF_SCATTER_DMA_BOUNCE)) {
288 return DevCopyScatterListToFromDMABuffer(pReq,TO_DMA_BUFFER); 288 return DevCopyScatterListToFromDMABuffer(pReq,TO_DMA_BUFFER);
289 } else { 289 } else {
@@ -292,7 +292,7 @@ static INLINE A_STATUS DEV_PREPARE_SCATTER_OPERATION(HIF_SCATTER_REQ *pReq) {
292} 292}
293 293
294 294
295A_STATUS DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer); 295int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer);
296 296
297#define DEV_GET_MAX_MSG_PER_BUNDLE(pDev) (pDev)->HifScatterInfo.MaxScatterEntries 297#define DEV_GET_MAX_MSG_PER_BUNDLE(pDev) (pDev)->HifScatterInfo.MaxScatterEntries
298#define DEV_GET_MAX_BUNDLE_LENGTH(pDev) (pDev)->HifScatterInfo.MaxTransferSizePerScatterReq 298#define DEV_GET_MAX_BUNDLE_LENGTH(pDev) (pDev)->HifScatterInfo.MaxTransferSizePerScatterReq
@@ -309,10 +309,10 @@ A_STATUS DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer);
309#define DEV_SCATTER_WRITE FALSE 309#define DEV_SCATTER_WRITE FALSE
310#define DEV_SCATTER_ASYNC TRUE 310#define DEV_SCATTER_ASYNC TRUE
311#define DEV_SCATTER_SYNC FALSE 311#define DEV_SCATTER_SYNC FALSE
312A_STATUS DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, A_BOOL Read, A_BOOL Async); 312int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, A_BOOL Read, A_BOOL Async);
313 313
314#ifdef MBOXHW_UNIT_TEST 314#ifdef MBOXHW_UNIT_TEST
315A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev); 315int DoMboxHWTest(AR6K_DEVICE *pDev);
316#endif 316#endif
317 317
318 /* completely virtual */ 318 /* completely virtual */
@@ -334,8 +334,8 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev);
334#ifdef ATH_AR6K_ENABLE_GMBOX 334#ifdef ATH_AR6K_ENABLE_GMBOX
335 335
336void DevCleanupGMbox(AR6K_DEVICE *pDev); 336void DevCleanupGMbox(AR6K_DEVICE *pDev);
337A_STATUS DevSetupGMbox(AR6K_DEVICE *pDev); 337int DevSetupGMbox(AR6K_DEVICE *pDev);
338A_STATUS DevCheckGMboxInterrupts(AR6K_DEVICE *pDev); 338int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev);
339void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev); 339void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev);
340 340
341#else 341#else
@@ -345,7 +345,7 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev);
345#define DevCheckGMboxInterrupts(p) A_OK 345#define DevCheckGMboxInterrupts(p) A_OK
346#define DevNotifyGMboxTargetFailure(p) 346#define DevNotifyGMboxTargetFailure(p)
347 347
348static INLINE A_STATUS DevSetupGMbox(AR6K_DEVICE *pDev) { 348static INLINE int DevSetupGMbox(AR6K_DEVICE *pDev) {
349 pDev->GMboxEnabled = FALSE; 349 pDev->GMboxEnabled = FALSE;
350 return A_OK; 350 return A_OK;
351} 351}
@@ -356,7 +356,7 @@ static INLINE A_STATUS DevSetupGMbox(AR6K_DEVICE *pDev) {
356 356
357 /* GMBOX protocol modules must expose each of these internal APIs */ 357 /* GMBOX protocol modules must expose each of these internal APIs */
358HCI_TRANSPORT_HANDLE GMboxAttachProtocol(AR6K_DEVICE *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo); 358HCI_TRANSPORT_HANDLE GMboxAttachProtocol(AR6K_DEVICE *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo);
359A_STATUS GMboxProtocolInstall(AR6K_DEVICE *pDev); 359int GMboxProtocolInstall(AR6K_DEVICE *pDev);
360void GMboxProtocolUninstall(AR6K_DEVICE *pDev); 360void GMboxProtocolUninstall(AR6K_DEVICE *pDev);
361 361
362 /* API used by GMBOX protocol modules */ 362 /* API used by GMBOX protocol modules */
@@ -372,8 +372,8 @@ AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle);
372 372
373#define DEV_GMBOX_GET_PROTOCOL(pDev) (pDev)->GMboxInfo.pProtocolContext 373#define DEV_GMBOX_GET_PROTOCOL(pDev) (pDev)->GMboxInfo.pProtocolContext
374 374
375A_STATUS DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 WriteLength); 375int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 WriteLength);
376A_STATUS DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 ReadLength); 376int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 ReadLength);
377 377
378#define PROC_IO_ASYNC TRUE 378#define PROC_IO_ASYNC TRUE
379#define PROC_IO_SYNC FALSE 379#define PROC_IO_SYNC FALSE
@@ -387,11 +387,11 @@ typedef enum GMBOX_IRQ_ACTION_TYPE {
387 GMBOX_CREDIT_IRQ_DISABLE, 387 GMBOX_CREDIT_IRQ_DISABLE,
388} GMBOX_IRQ_ACTION_TYPE; 388} GMBOX_IRQ_ACTION_TYPE;
389 389
390A_STATUS DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE, A_BOOL AsyncMode); 390int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE, A_BOOL AsyncMode);
391A_STATUS DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCredits); 391int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCredits);
392A_STATUS DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize); 392int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize);
393A_STATUS DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer, int *pLookAheadBytes); 393int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer, int *pLookAheadBytes);
394A_STATUS DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int SignalNumber, int AckTimeoutMS); 394int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int SignalNumber, int AckTimeoutMS);
395 395
396#endif 396#endif
397 397
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index 920123b9ba1..21d88f19011 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -36,12 +36,12 @@
36extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket); 36extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
37extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev); 37extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
38 38
39static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev); 39static int DevServiceDebugInterrupt(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
43/* completion routine for ALL HIF layer async I/O */ 43/* completion routine for ALL HIF layer async I/O */
44A_STATUS DevRWCompletionHandler(void *context, A_STATUS status) 44int DevRWCompletionHandler(void *context, int status)
45{ 45{
46 HTC_PACKET *pPacket = (HTC_PACKET *)context; 46 HTC_PACKET *pPacket = (HTC_PACKET *)context;
47 47
@@ -59,11 +59,11 @@ A_STATUS DevRWCompletionHandler(void *context, A_STATUS status)
59} 59}
60 60
61/* mailbox recv message polling */ 61/* mailbox recv message polling */
62A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev, 62int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
63 A_UINT32 *pLookAhead, 63 A_UINT32 *pLookAhead,
64 int TimeoutMS) 64 int TimeoutMS)
65{ 65{
66 A_STATUS status = A_OK; 66 int status = A_OK;
67 int timeout = TimeoutMS/DELAY_PER_INTERVAL_MS; 67 int timeout = TimeoutMS/DELAY_PER_INTERVAL_MS;
68 68
69 A_ASSERT(timeout > 0); 69 A_ASSERT(timeout > 0);
@@ -152,9 +152,9 @@ A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
152 return status; 152 return status;
153} 153}
154 154
155static A_STATUS DevServiceCPUInterrupt(AR6K_DEVICE *pDev) 155static int DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
156{ 156{
157 A_STATUS status; 157 int status;
158 A_UINT8 cpu_int_status; 158 A_UINT8 cpu_int_status;
159 A_UINT8 regBuffer[4]; 159 A_UINT8 regBuffer[4];
160 160
@@ -192,9 +192,9 @@ static A_STATUS DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
192} 192}
193 193
194 194
195static A_STATUS DevServiceErrorInterrupt(AR6K_DEVICE *pDev) 195static int DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
196{ 196{
197 A_STATUS status; 197 int status;
198 A_UINT8 error_int_status; 198 A_UINT8 error_int_status;
199 A_UINT8 regBuffer[4]; 199 A_UINT8 regBuffer[4];
200 200
@@ -245,10 +245,10 @@ static A_STATUS DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
245 return status; 245 return status;
246} 246}
247 247
248static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev) 248static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
249{ 249{
250 A_UINT32 dummy; 250 A_UINT32 dummy;
251 A_STATUS status; 251 int status;
252 252
253 /* Send a target failure event to the application */ 253 /* Send a target failure event to the application */
254 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Target debug interrupt\n")); 254 AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Target debug interrupt\n"));
@@ -275,7 +275,7 @@ static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
275 return status; 275 return status;
276} 276}
277 277
278static A_STATUS DevServiceCounterInterrupt(AR6K_DEVICE *pDev) 278static int DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
279{ 279{
280 A_UINT8 counter_int_status; 280 A_UINT8 counter_int_status;
281 281
@@ -363,7 +363,7 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
363 HIFAckInterrupt(pDev->HIFDevice); 363 HIFAckInterrupt(pDev->HIFDevice);
364 } else { 364 } else {
365 int fetched = 0; 365 int fetched = 0;
366 A_STATUS status; 366 int status;
367 367
368 AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, 368 AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
369 (" DevGetEventAsyncHandler : detected another message, lookahead :0x%X \n", 369 (" DevGetEventAsyncHandler : detected another message, lookahead :0x%X \n",
@@ -388,10 +388,10 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
388 388
389/* called by the HTC layer when it wants us to check if the device has any more pending 389/* called by the HTC layer when it wants us to check if the device has any more pending
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 */
391A_STATUS DevCheckPendingRecvMsgsAsync(void *context) 391int DevCheckPendingRecvMsgsAsync(void *context)
392{ 392{
393 AR6K_DEVICE *pDev = (AR6K_DEVICE *)context; 393 AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
394 A_STATUS status = A_OK; 394 int status = A_OK;
395 HTC_PACKET *pIOPacket; 395 HTC_PACKET *pIOPacket;
396 396
397 /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can 397 /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can
@@ -467,9 +467,9 @@ void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev)
467} 467}
468 468
469/* process pending interrupts synchronously */ 469/* process pending interrupts synchronously */
470static A_STATUS ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncProcessing) 470static int ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncProcessing)
471{ 471{
472 A_STATUS status = A_OK; 472 int status = A_OK;
473 A_UINT8 host_int_status = 0; 473 A_UINT8 host_int_status = 0;
474 A_UINT32 lookAhead = 0; 474 A_UINT32 lookAhead = 0;
475 475
@@ -681,10 +681,10 @@ static A_STATUS ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pAS
681 681
682 682
683/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/ 683/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/
684A_STATUS DevDsrHandler(void *context) 684int DevDsrHandler(void *context)
685{ 685{
686 AR6K_DEVICE *pDev = (AR6K_DEVICE *)context; 686 AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
687 A_STATUS status = A_OK; 687 int status = A_OK;
688 A_BOOL done = FALSE; 688 A_BOOL done = FALSE;
689 A_BOOL asyncProc = FALSE; 689 A_BOOL asyncProc = FALSE;
690 690
@@ -746,7 +746,7 @@ A_STATUS DevDsrHandler(void *context)
746#ifdef ATH_DEBUG_MODULE 746#ifdef ATH_DEBUG_MODULE
747void DumpAR6KDevState(AR6K_DEVICE *pDev) 747void DumpAR6KDevState(AR6K_DEVICE *pDev)
748{ 748{
749 A_STATUS status; 749 int status;
750 AR6K_IRQ_ENABLE_REGISTERS regs; 750 AR6K_IRQ_ENABLE_REGISTERS regs;
751 AR6K_IRQ_PROC_REGISTERS procRegs; 751 AR6K_IRQ_PROC_REGISTERS procRegs;
752 752
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
index e3d270d1d62..d6b18eeaccf 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
@@ -74,9 +74,9 @@ 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
77static A_STATUS DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, A_BOOL AsyncMode) 77static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, A_BOOL AsyncMode)
78{ 78{
79 A_STATUS status = A_OK; 79 int status = A_OK;
80 AR6K_IRQ_ENABLE_REGISTERS regs; 80 AR6K_IRQ_ENABLE_REGISTERS regs;
81 HTC_PACKET *pIOPacket = NULL; 81 HTC_PACKET *pIOPacket = NULL;
82 82
@@ -155,9 +155,9 @@ static A_STATUS DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION
155} 155}
156 156
157 157
158A_STATUS DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, A_BOOL AsyncMode) 158int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, A_BOOL AsyncMode)
159{ 159{
160 A_STATUS status = A_OK; 160 int status = A_OK;
161 HTC_PACKET *pIOPacket = NULL; 161 HTC_PACKET *pIOPacket = NULL;
162 A_UINT8 GMboxIntControl[4]; 162 A_UINT8 GMboxIntControl[4];
163 163
@@ -269,9 +269,9 @@ void DevCleanupGMbox(AR6K_DEVICE *pDev)
269 } 269 }
270} 270}
271 271
272A_STATUS DevSetupGMbox(AR6K_DEVICE *pDev) 272int DevSetupGMbox(AR6K_DEVICE *pDev)
273{ 273{
274 A_STATUS status = A_OK; 274 int status = A_OK;
275 A_UINT8 muxControl[4]; 275 A_UINT8 muxControl[4];
276 276
277 do { 277 do {
@@ -322,9 +322,9 @@ A_STATUS DevSetupGMbox(AR6K_DEVICE *pDev)
322 return status; 322 return status;
323} 323}
324 324
325A_STATUS DevCheckGMboxInterrupts(AR6K_DEVICE *pDev) 325int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
326{ 326{
327 A_STATUS status = A_OK; 327 int status = A_OK;
328 A_UINT8 counter_int_status; 328 A_UINT8 counter_int_status;
329 int credits; 329 int credits;
330 A_UINT8 host_int_status2; 330 A_UINT8 host_int_status2;
@@ -396,11 +396,11 @@ A_STATUS DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
396} 396}
397 397
398 398
399A_STATUS DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 WriteLength) 399int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 WriteLength)
400{ 400{
401 A_UINT32 paddedLength; 401 A_UINT32 paddedLength;
402 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE; 402 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
403 A_STATUS status; 403 int status;
404 A_UINT32 address; 404 A_UINT32 address;
405 405
406 /* adjust the length to be a multiple of block size if appropriate */ 406 /* adjust the length to be a multiple of block size if appropriate */
@@ -433,11 +433,11 @@ A_STATUS DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 WriteLen
433 return status; 433 return status;
434} 434}
435 435
436A_STATUS DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 ReadLength) 436int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 ReadLength)
437{ 437{
438 438
439 A_UINT32 paddedLength; 439 A_UINT32 paddedLength;
440 A_STATUS status; 440 int status;
441 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE; 441 A_BOOL sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
442 442
443 /* adjust the length to be a multiple of block size if appropriate */ 443 /* adjust the length to be a multiple of block size if appropriate */
@@ -539,9 +539,9 @@ 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
542A_STATUS DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCredits) 542int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCredits)
543{ 543{
544 A_STATUS status = A_OK; 544 int status = A_OK;
545 HTC_PACKET *pIOPacket = NULL; 545 HTC_PACKET *pIOPacket = NULL;
546 546
547 AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+DevGMboxReadCreditCounter (%s) \n", AsyncMode ? "ASYNC" : "SYNC")); 547 AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+DevGMboxReadCreditCounter (%s) \n", AsyncMode ? "ASYNC" : "SYNC"));
@@ -602,9 +602,9 @@ A_STATUS DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, A_BOOL AsyncMode, int *pCr
602 return status; 602 return status;
603} 603}
604 604
605A_STATUS DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize) 605int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize)
606{ 606{
607 A_STATUS status; 607 int status;
608 A_UINT8 buffer[4]; 608 A_UINT8 buffer[4];
609 609
610 status = HIFReadWrite(pDev->HIFDevice, 610 status = HIFReadWrite(pDev->HIFDevice,
@@ -634,10 +634,10 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev)
634 } 634 }
635} 635}
636 636
637A_STATUS DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer, int *pLookAheadBytes) 637int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer, int *pLookAheadBytes)
638{ 638{
639 639
640 A_STATUS status = A_OK; 640 int status = A_OK;
641 AR6K_IRQ_PROC_REGISTERS procRegs; 641 AR6K_IRQ_PROC_REGISTERS procRegs;
642 int maxCopy; 642 int maxCopy;
643 643
@@ -676,9 +676,9 @@ A_STATUS DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, A_UINT8 *pLookAheadBuffer,
676 return status; 676 return status;
677} 677}
678 678
679A_STATUS DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS) 679int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS)
680{ 680{
681 A_STATUS status = A_OK; 681 int status = A_OK;
682 int i; 682 int i;
683 A_UINT8 buffer[4]; 683 A_UINT8 buffer[4];
684 684
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
index db6d30c113b..6b61dc4c41c 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
@@ -94,7 +94,7 @@ typedef struct {
94 (p)->HCIConfig.pHCISendComplete((p)->HCIConfig.pContext, (pt)); \ 94 (p)->HCIConfig.pHCISendComplete((p)->HCIConfig.pContext, (pt)); \
95} 95}
96 96
97static A_STATUS HCITrySend(GMBOX_PROTO_HCI_UART *pProt, HTC_PACKET *pPacket, A_BOOL Synchronous); 97static int HCITrySend(GMBOX_PROTO_HCI_UART *pProt, HTC_PACKET *pPacket, A_BOOL Synchronous);
98 98
99static void HCIUartCleanup(GMBOX_PROTO_HCI_UART *pProtocol) 99static void HCIUartCleanup(GMBOX_PROTO_HCI_UART *pProtocol)
100{ 100{
@@ -106,9 +106,9 @@ static void HCIUartCleanup(GMBOX_PROTO_HCI_UART *pProtocol)
106 A_FREE(pProtocol); 106 A_FREE(pProtocol);
107} 107}
108 108
109static A_STATUS InitTxCreditState(GMBOX_PROTO_HCI_UART *pProt) 109static int InitTxCreditState(GMBOX_PROTO_HCI_UART *pProt)
110{ 110{
111 A_STATUS status; 111 int status;
112 int credits; 112 int credits;
113 int creditPollCount = CREDIT_POLL_COUNT; 113 int creditPollCount = CREDIT_POLL_COUNT;
114 A_BOOL gotCredits = FALSE; 114 A_BOOL gotCredits = FALSE;
@@ -184,13 +184,13 @@ static A_STATUS InitTxCreditState(GMBOX_PROTO_HCI_UART *pProt)
184 return status; 184 return status;
185} 185}
186 186
187static A_STATUS CreditsAvailableCallback(void *pContext, int Credits, A_BOOL CreditIRQEnabled) 187static int CreditsAvailableCallback(void *pContext, int Credits, A_BOOL CreditIRQEnabled)
188{ 188{
189 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext; 189 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext;
190 A_BOOL enableCreditIrq = FALSE; 190 A_BOOL enableCreditIrq = FALSE;
191 A_BOOL disableCreditIrq = FALSE; 191 A_BOOL disableCreditIrq = FALSE;
192 A_BOOL doPendingSends = FALSE; 192 A_BOOL doPendingSends = FALSE;
193 A_STATUS status = A_OK; 193 int status = A_OK;
194 194
195 /** this callback is called under 2 conditions: 195 /** this callback is called under 2 conditions:
196 * 1. The credit IRQ interrupt was enabled and signaled. 196 * 1. The credit IRQ interrupt was enabled and signaled.
@@ -269,14 +269,14 @@ static A_STATUS CreditsAvailableCallback(void *pContext, int Credits, A_BOOL Cre
269 return status; 269 return status;
270} 270}
271 271
272static INLINE void NotifyTransportFailure(GMBOX_PROTO_HCI_UART *pProt, A_STATUS status) 272static INLINE void NotifyTransportFailure(GMBOX_PROTO_HCI_UART *pProt, int status)
273{ 273{
274 if (pProt->HCIConfig.TransportFailure != NULL) { 274 if (pProt->HCIConfig.TransportFailure != NULL) {
275 pProt->HCIConfig.TransportFailure(pProt->HCIConfig.pContext, status); 275 pProt->HCIConfig.TransportFailure(pProt->HCIConfig.pContext, status);
276 } 276 }
277} 277}
278 278
279static void FailureCallback(void *pContext, A_STATUS Status) 279static void FailureCallback(void *pContext, int Status)
280{ 280{
281 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext; 281 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext;
282 282
@@ -299,10 +299,10 @@ static void StateDumpCallback(void *pContext)
299 AR_DEBUG_PRINTF(ATH_DEBUG_ANY,("==================================================\n")); 299 AR_DEBUG_PRINTF(ATH_DEBUG_ANY,("==================================================\n"));
300} 300}
301 301
302static A_STATUS HCIUartMessagePending(void *pContext, A_UINT8 LookAheadBytes[], int ValidBytes) 302static int HCIUartMessagePending(void *pContext, A_UINT8 LookAheadBytes[], int ValidBytes)
303{ 303{
304 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext; 304 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)pContext;
305 A_STATUS status = A_OK; 305 int status = A_OK;
306 int totalRecvLength = 0; 306 int totalRecvLength = 0;
307 HCI_TRANSPORT_PACKET_TYPE pktType = HCI_PACKET_INVALID; 307 HCI_TRANSPORT_PACKET_TYPE pktType = HCI_PACKET_INVALID;
308 A_BOOL recvRefillCalled = FALSE; 308 A_BOOL recvRefillCalled = FALSE;
@@ -542,9 +542,9 @@ static void HCISendPacketCompletion(void *Context, HTC_PACKET *pPacket)
542 AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HCISendPacketCompletion \n")); 542 AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HCISendPacketCompletion \n"));
543} 543}
544 544
545static A_STATUS SeekCreditsSynch(GMBOX_PROTO_HCI_UART *pProt) 545static int SeekCreditsSynch(GMBOX_PROTO_HCI_UART *pProt)
546{ 546{
547 A_STATUS status = A_OK; 547 int status = A_OK;
548 int credits; 548 int credits;
549 int retry = 100; 549 int retry = 100;
550 550
@@ -574,9 +574,9 @@ static A_STATUS SeekCreditsSynch(GMBOX_PROTO_HCI_UART *pProt)
574 return status; 574 return status;
575} 575}
576 576
577static A_STATUS HCITrySend(GMBOX_PROTO_HCI_UART *pProt, HTC_PACKET *pPacket, A_BOOL Synchronous) 577static int HCITrySend(GMBOX_PROTO_HCI_UART *pProt, HTC_PACKET *pPacket, A_BOOL Synchronous)
578{ 578{
579 A_STATUS status = A_OK; 579 int status = A_OK;
580 int transferLength; 580 int transferLength;
581 int creditsRequired, remainder; 581 int creditsRequired, remainder;
582 A_UINT8 hciUartType; 582 A_UINT8 hciUartType;
@@ -841,9 +841,9 @@ static void FlushRecvBuffers(GMBOX_PROTO_HCI_UART *pProt)
841 841
842/*** protocol module install entry point ***/ 842/*** protocol module install entry point ***/
843 843
844A_STATUS GMboxProtocolInstall(AR6K_DEVICE *pDev) 844int GMboxProtocolInstall(AR6K_DEVICE *pDev)
845{ 845{
846 A_STATUS status = A_OK; 846 int status = A_OK;
847 GMBOX_PROTO_HCI_UART *pProtocol = NULL; 847 GMBOX_PROTO_HCI_UART *pProtocol = NULL;
848 848
849 do { 849 do {
@@ -903,10 +903,10 @@ void GMboxProtocolUninstall(AR6K_DEVICE *pDev)
903 903
904} 904}
905 905
906static A_STATUS NotifyTransportReady(GMBOX_PROTO_HCI_UART *pProt) 906static int NotifyTransportReady(GMBOX_PROTO_HCI_UART *pProt)
907{ 907{
908 HCI_TRANSPORT_PROPERTIES props; 908 HCI_TRANSPORT_PROPERTIES props;
909 A_STATUS status = A_OK; 909 int status = A_OK;
910 910
911 do { 911 do {
912 912
@@ -996,10 +996,10 @@ void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans)
996 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportAttach \n")); 996 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportAttach \n"));
997} 997}
998 998
999A_STATUS HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue) 999int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue)
1000{ 1000{
1001 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1001 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1002 A_STATUS status = A_OK; 1002 int status = A_OK;
1003 A_BOOL unblockRecv = FALSE; 1003 A_BOOL unblockRecv = FALSE;
1004 HTC_PACKET *pPacket; 1004 HTC_PACKET *pPacket;
1005 1005
@@ -1064,7 +1064,7 @@ A_STATUS HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_Q
1064 return A_OK; 1064 return A_OK;
1065} 1065}
1066 1066
1067A_STATUS HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous) 1067int HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous)
1068{ 1068{
1069 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1069 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1070 1070
@@ -1097,9 +1097,9 @@ void HCI_TransportStop(HCI_TRANSPORT_HANDLE HciTrans)
1097 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportStop \n")); 1097 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("-HCI_TransportStop \n"));
1098} 1098}
1099 1099
1100A_STATUS HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans) 1100int HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans)
1101{ 1101{
1102 A_STATUS status; 1102 int status;
1103 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1103 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1104 1104
1105 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportStart \n")); 1105 AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportStart \n"));
@@ -1144,7 +1144,7 @@ A_STATUS HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans)
1144 return status; 1144 return status;
1145} 1145}
1146 1146
1147A_STATUS HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable) 1147int HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable)
1148{ 1148{
1149 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1149 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1150 return DevGMboxIRQAction(pProt->pDev, 1150 return DevGMboxIRQAction(pProt->pDev,
@@ -1153,12 +1153,12 @@ A_STATUS HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A_BO
1153 1153
1154} 1154}
1155 1155
1156A_STATUS HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans, 1156int HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,
1157 HTC_PACKET *pPacket, 1157 HTC_PACKET *pPacket,
1158 int MaxPollMS) 1158 int MaxPollMS)
1159{ 1159{
1160 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1160 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1161 A_STATUS status = A_OK; 1161 int status = A_OK;
1162 A_UINT8 lookAhead[8]; 1162 A_UINT8 lookAhead[8];
1163 int bytes; 1163 int bytes;
1164 int totalRecvLength; 1164 int totalRecvLength;
@@ -1225,12 +1225,12 @@ A_STATUS HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,
1225 1225
1226#define LSB_SCRATCH_IDX 4 1226#define LSB_SCRATCH_IDX 4
1227#define MSB_SCRATCH_IDX 5 1227#define MSB_SCRATCH_IDX 5
1228A_STATUS HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud) 1228int HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud)
1229{ 1229{
1230 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1230 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1231 HIF_DEVICE *pHIFDevice = (HIF_DEVICE *)(pProt->pDev->HIFDevice); 1231 HIF_DEVICE *pHIFDevice = (HIF_DEVICE *)(pProt->pDev->HIFDevice);
1232 A_UINT32 scaledBaud, scratchAddr; 1232 A_UINT32 scaledBaud, scratchAddr;
1233 A_STATUS status = A_OK; 1233 int status = A_OK;
1234 1234
1235 /* Divide the desired baud rate by 100 1235 /* Divide the desired baud rate by 100
1236 * Store the LSB in the local scratch register 4 and the MSB in the local 1236 * Store the LSB in the local scratch register 4 and the MSB in the local
@@ -1256,9 +1256,9 @@ A_STATUS HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud)
1256 return status; 1256 return status;
1257} 1257}
1258 1258
1259A_STATUS HCI_TransportEnablePowerMgmt(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable) 1259int HCI_TransportEnablePowerMgmt(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable)
1260{ 1260{
1261 A_STATUS status; 1261 int status;
1262 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans; 1262 GMBOX_PROTO_HCI_UART *pProt = (GMBOX_PROTO_HCI_UART *)HciTrans;
1263 1263
1264 if (Enable) { 1264 if (Enable) {
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index 7df62a20d48..2ab5975d79e 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -93,7 +93,7 @@ static void HTCCleanup(HTC_TARGET *target)
93HTC_HANDLE HTCCreate(void *hif_handle, HTC_INIT_INFO *pInfo) 93HTC_HANDLE HTCCreate(void *hif_handle, HTC_INIT_INFO *pInfo)
94{ 94{
95 HTC_TARGET *target = NULL; 95 HTC_TARGET *target = NULL;
96 A_STATUS status = A_OK; 96 int status = A_OK;
97 int i; 97 int i;
98 A_UINT32 ctrl_bufsz; 98 A_UINT32 ctrl_bufsz;
99 A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX]; 99 A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX];
@@ -222,10 +222,10 @@ void *HTCGetHifDevice(HTC_HANDLE HTCHandle)
222 222
223/* wait for the target to arrive (sends HTC Ready message) 223/* wait for the target to arrive (sends HTC Ready message)
224 * this operation is fully synchronous and the message is polled for */ 224 * this operation is fully synchronous and the message is polled for */
225A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle) 225int HTCWaitTarget(HTC_HANDLE HTCHandle)
226{ 226{
227 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); 227 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
228 A_STATUS status; 228 int status;
229 HTC_PACKET *pPacket = NULL; 229 HTC_PACKET *pPacket = NULL;
230 HTC_READY_EX_MSG *pRdyMsg; 230 HTC_READY_EX_MSG *pRdyMsg;
231 231
@@ -369,11 +369,11 @@ A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle)
369 369
370 370
371/* Start HTC, enable interrupts and let the target know host has finished setup */ 371/* Start HTC, enable interrupts and let the target know host has finished setup */
372A_STATUS HTCStart(HTC_HANDLE HTCHandle) 372int HTCStart(HTC_HANDLE HTCHandle)
373{ 373{
374 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); 374 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
375 HTC_PACKET *pPacket; 375 HTC_PACKET *pPacket;
376 A_STATUS status; 376 int status;
377 377
378 AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Enter\n")); 378 AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Enter\n"));
379 379
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index bd6754beb22..46364cba333 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -164,14 +164,14 @@ typedef struct _HTC_TARGET {
164/* internal HTC functions */ 164/* internal HTC functions */
165void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket); 165void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket);
166void HTCControlRecv(void *Context, HTC_PACKET *pPacket); 166void HTCControlRecv(void *Context, HTC_PACKET *pPacket);
167A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket); 167int HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket);
168HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList); 168HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList);
169void HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList); 169void HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList);
170A_STATUS HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket); 170int HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket);
171void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket); 171void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket);
172A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 MsgLookAheads[], int NumLookAheads, A_BOOL *pAsyncProc, int *pNumPktsFetched); 172int HTCRecvMessagePendingHandler(void *Context, A_UINT32 MsgLookAheads[], int NumLookAheads, A_BOOL *pAsyncProc, int *pNumPktsFetched);
173void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint); 173void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint);
174A_STATUS HTCSendSetupComplete(HTC_TARGET *target); 174int HTCSendSetupComplete(HTC_TARGET *target);
175void HTCFlushRecvBuffers(HTC_TARGET *target); 175void HTCFlushRecvBuffers(HTC_TARGET *target);
176void HTCFlushSendPkts(HTC_TARGET *target); 176void HTCFlushSendPkts(HTC_TARGET *target);
177 177
diff --git a/drivers/staging/ath6kl/htc2/htc_recv.c b/drivers/staging/ath6kl/htc2/htc_recv.c
index 3503657fe7d..189d5106c9b 100644
--- a/drivers/staging/ath6kl/htc2/htc_recv.c
+++ b/drivers/staging/ath6kl/htc2/htc_recv.c
@@ -83,7 +83,7 @@ static void DoRecvCompletion(HTC_ENDPOINT *pEndpoint,
83 83
84} 84}
85 85
86static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target, 86static INLINE int HTCProcessTrailer(HTC_TARGET *target,
87 A_UINT8 *pBuffer, 87 A_UINT8 *pBuffer,
88 int Length, 88 int Length,
89 A_UINT32 *pNextLookAheads, 89 A_UINT32 *pNextLookAheads,
@@ -95,7 +95,7 @@ static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target,
95 HTC_LOOKAHEAD_REPORT *pLookAhead; 95 HTC_LOOKAHEAD_REPORT *pLookAhead;
96 A_UINT8 *pOrigBuffer; 96 A_UINT8 *pOrigBuffer;
97 int origLength; 97 int origLength;
98 A_STATUS status; 98 int status;
99 99
100 AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessTrailer (length:%d) \n", Length)); 100 AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessTrailer (length:%d) \n", Length));
101 101
@@ -226,14 +226,14 @@ static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target,
226 226
227/* process a received message (i.e. strip off header, process any trailer data) 227/* process a received message (i.e. strip off header, process any trailer data)
228 * note : locks must be released when this function is called */ 228 * note : locks must be released when this function is called */
229static A_STATUS HTCProcessRecvHeader(HTC_TARGET *target, 229static int HTCProcessRecvHeader(HTC_TARGET *target,
230 HTC_PACKET *pPacket, 230 HTC_PACKET *pPacket,
231 A_UINT32 *pNextLookAheads, 231 A_UINT32 *pNextLookAheads,
232 int *pNumLookAheads) 232 int *pNumLookAheads)
233{ 233{
234 A_UINT8 temp; 234 A_UINT8 temp;
235 A_UINT8 *pBuf; 235 A_UINT8 *pBuf;
236 A_STATUS status = A_OK; 236 int status = A_OK;
237 A_UINT16 payloadLen; 237 A_UINT16 payloadLen;
238 A_UINT32 lookAhead; 238 A_UINT32 lookAhead;
239 239
@@ -392,7 +392,7 @@ static INLINE void HTCAsyncRecvCheckMorePackets(HTC_TARGET *target,
392{ 392{
393 /* was there a lookahead for the next packet? */ 393 /* was there a lookahead for the next packet? */
394 if (NumLookAheads > 0) { 394 if (NumLookAheads > 0) {
395 A_STATUS nextStatus; 395 int nextStatus;
396 int fetched = 0; 396 int fetched = 0;
397 AR_DEBUG_PRINTF(ATH_DEBUG_RECV, 397 AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
398 ("HTCAsyncRecvCheckMorePackets - num lookaheads were non-zero : %d \n", 398 ("HTCAsyncRecvCheckMorePackets - num lookaheads were non-zero : %d \n",
@@ -521,7 +521,7 @@ void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket)
521 HTC_ENDPOINT *pEndpoint; 521 HTC_ENDPOINT *pEndpoint;
522 A_UINT32 nextLookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE]; 522 A_UINT32 nextLookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE];
523 int numLookAheads = 0; 523 int numLookAheads = 0;
524 A_STATUS status; 524 int status;
525 A_BOOL checkMorePkts = TRUE; 525 A_BOOL checkMorePkts = TRUE;
526 526
527 AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCRecvCompleteHandler (pkt:0x%lX, status:%d, ep:%d) \n", 527 AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCRecvCompleteHandler (pkt:0x%lX, status:%d, ep:%d) \n",
@@ -587,9 +587,9 @@ void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket)
587/* synchronously wait for a control message from the target, 587/* synchronously wait for a control message from the target,
588 * This function is used at initialization time ONLY. At init messages 588 * This function is used at initialization time ONLY. At init messages
589 * on ENDPOINT 0 are expected. */ 589 * on ENDPOINT 0 are expected. */
590A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket) 590int HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket)
591{ 591{
592 A_STATUS status; 592 int status;
593 A_UINT32 lookAhead; 593 A_UINT32 lookAhead;
594 HTC_PACKET *pPacket = NULL; 594 HTC_PACKET *pPacket = NULL;
595 HTC_FRAME_HDR *pHdr; 595 HTC_FRAME_HDR *pHdr;
@@ -686,13 +686,13 @@ A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPack
686 return status; 686 return status;
687} 687}
688 688
689static A_STATUS AllocAndPrepareRxPackets(HTC_TARGET *target, 689static int AllocAndPrepareRxPackets(HTC_TARGET *target,
690 A_UINT32 LookAheads[], 690 A_UINT32 LookAheads[],
691 int Messages, 691 int Messages,
692 HTC_ENDPOINT *pEndpoint, 692 HTC_ENDPOINT *pEndpoint,
693 HTC_PACKET_QUEUE *pQueue) 693 HTC_PACKET_QUEUE *pQueue)
694{ 694{
695 A_STATUS status = A_OK; 695 int status = A_OK;
696 HTC_PACKET *pPacket; 696 HTC_PACKET *pPacket;
697 HTC_FRAME_HDR *pHdr; 697 HTC_FRAME_HDR *pHdr;
698 int i,j; 698 int i,j;
@@ -887,7 +887,7 @@ static void HTCAsyncRecvScatterCompletion(HIF_SCATTER_REQ *pScatterReq)
887 A_UINT32 lookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE]; 887 A_UINT32 lookAheads[HTC_HOST_MAX_MSG_PER_BUNDLE];
888 int numLookAheads = 0; 888 int numLookAheads = 0;
889 HTC_TARGET *target = (HTC_TARGET *)pScatterReq->Context; 889 HTC_TARGET *target = (HTC_TARGET *)pScatterReq->Context;
890 A_STATUS status; 890 int status;
891 A_BOOL partialBundle = FALSE; 891 A_BOOL partialBundle = FALSE;
892 HTC_PACKET_QUEUE localRecvQueue; 892 HTC_PACKET_QUEUE localRecvQueue;
893 A_BOOL procError = FALSE; 893 A_BOOL procError = FALSE;
@@ -984,13 +984,13 @@ static void HTCAsyncRecvScatterCompletion(HIF_SCATTER_REQ *pScatterReq)
984 AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCAsyncRecvScatterCompletion \n")); 984 AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCAsyncRecvScatterCompletion \n"));
985} 985}
986 986
987static A_STATUS HTCIssueRecvPacketBundle(HTC_TARGET *target, 987static int HTCIssueRecvPacketBundle(HTC_TARGET *target,
988 HTC_PACKET_QUEUE *pRecvPktQueue, 988 HTC_PACKET_QUEUE *pRecvPktQueue,
989 HTC_PACKET_QUEUE *pSyncCompletionQueue, 989 HTC_PACKET_QUEUE *pSyncCompletionQueue,
990 int *pNumPacketsFetched, 990 int *pNumPacketsFetched,
991 A_BOOL PartialBundle) 991 A_BOOL PartialBundle)
992{ 992{
993 A_STATUS status = A_OK; 993 int status = A_OK;
994 HIF_SCATTER_REQ *pScatterReq; 994 HIF_SCATTER_REQ *pScatterReq;
995 int i, totalLength; 995 int i, totalLength;
996 int pktsToScatter; 996 int pktsToScatter;
@@ -1117,10 +1117,10 @@ static INLINE void CheckRecvWaterMark(HTC_ENDPOINT *pEndpoint)
1117} 1117}
1118 1118
1119/* callback when device layer or lookahead report parsing detects a pending message */ 1119/* callback when device layer or lookahead report parsing detects a pending message */
1120A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 MsgLookAheads[], int NumLookAheads, A_BOOL *pAsyncProc, int *pNumPktsFetched) 1120int HTCRecvMessagePendingHandler(void *Context, A_UINT32 MsgLookAheads[], int NumLookAheads, A_BOOL *pAsyncProc, int *pNumPktsFetched)
1121{ 1121{
1122 HTC_TARGET *target = (HTC_TARGET *)Context; 1122 HTC_TARGET *target = (HTC_TARGET *)Context;
1123 A_STATUS status = A_OK; 1123 int status = A_OK;
1124 HTC_PACKET *pPacket; 1124 HTC_PACKET *pPacket;
1125 HTC_ENDPOINT *pEndpoint; 1125 HTC_ENDPOINT *pEndpoint;
1126 A_BOOL asyncProc = FALSE; 1126 A_BOOL asyncProc = FALSE;
@@ -1385,12 +1385,12 @@ A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 MsgLookAheads[], i
1385 return status; 1385 return status;
1386} 1386}
1387 1387
1388A_STATUS HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) 1388int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, 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 HTC_ENDPOINT *pEndpoint; 1391 HTC_ENDPOINT *pEndpoint;
1392 A_BOOL unblockRecv = FALSE; 1392 A_BOOL unblockRecv = FALSE;
1393 A_STATUS status = A_OK; 1393 int status = A_OK;
1394 HTC_PACKET *pFirstPacket; 1394 HTC_PACKET *pFirstPacket;
1395 1395
1396 pFirstPacket = HTC_GET_PKT_AT_HEAD(pPktQueue); 1396 pFirstPacket = HTC_GET_PKT_AT_HEAD(pPktQueue);
@@ -1455,7 +1455,7 @@ A_STATUS HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQu
1455} 1455}
1456 1456
1457/* Makes a buffer available to the HTC module */ 1457/* Makes a buffer available to the HTC module */
1458A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) 1458int HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
1459{ 1459{
1460 HTC_PACKET_QUEUE queue; 1460 HTC_PACKET_QUEUE queue;
1461 INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket); 1461 INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket);
@@ -1563,11 +1563,11 @@ int HTCGetNumRecvBuffers(HTC_HANDLE HTCHandle,
1563 return HTC_PACKET_QUEUE_DEPTH(&(target->EndPoint[Endpoint].RxBuffers)); 1563 return HTC_PACKET_QUEUE_DEPTH(&(target->EndPoint[Endpoint].RxBuffers));
1564} 1564}
1565 1565
1566A_STATUS HTCWaitForPendingRecv(HTC_HANDLE HTCHandle, 1566int HTCWaitForPendingRecv(HTC_HANDLE HTCHandle,
1567 A_UINT32 TimeoutInMs, 1567 A_UINT32 TimeoutInMs,
1568 A_BOOL *pbIsRecvPending) 1568 A_BOOL *pbIsRecvPending)
1569{ 1569{
1570 A_STATUS status = A_OK; 1570 int status = A_OK;
1571 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); 1571 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
1572 1572
1573 status = DevWaitForPendingRecv(&target->Device, 1573 status = DevWaitForPendingRecv(&target->Device,
diff --git a/drivers/staging/ath6kl/htc2/htc_send.c b/drivers/staging/ath6kl/htc2/htc_send.c
index bc7ee784826..797400802e2 100644
--- a/drivers/staging/ath6kl/htc2/htc_send.c
+++ b/drivers/staging/ath6kl/htc2/htc_send.c
@@ -113,9 +113,9 @@ static void HTCSendPktCompletionHandler(void *Context, HTC_PACKET *pPacket)
113 DO_EP_TX_COMPLETION(pEndpoint,&container); 113 DO_EP_TX_COMPLETION(pEndpoint,&container);
114} 114}
115 115
116A_STATUS HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket) 116int HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket)
117{ 117{
118 A_STATUS status; 118 int status;
119 A_BOOL sync = FALSE; 119 A_BOOL sync = FALSE;
120 120
121 if (pPacket->Completion == NULL) { 121 if (pPacket->Completion == NULL) {
@@ -270,7 +270,7 @@ static void HTCAsyncSendScatterCompletion(HIF_SCATTER_REQ *pScatterReq)
270 HTC_PACKET *pPacket; 270 HTC_PACKET *pPacket;
271 HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pScatterReq->Context; 271 HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pScatterReq->Context;
272 HTC_TARGET *target = (HTC_TARGET *)pEndpoint->target; 272 HTC_TARGET *target = (HTC_TARGET *)pEndpoint->target;
273 A_STATUS status = A_OK; 273 int status = A_OK;
274 HTC_PACKET_QUEUE sendCompletes; 274 HTC_PACKET_QUEUE sendCompletes;
275 275
276 INIT_HTC_PACKET_QUEUE(&sendCompletes); 276 INIT_HTC_PACKET_QUEUE(&sendCompletes);
@@ -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
671A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) 671int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, 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 HTC_ENDPOINT *pEndpoint; 674 HTC_ENDPOINT *pEndpoint;
@@ -709,7 +709,7 @@ A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue)
709} 709}
710 710
711/* HTC API - HTCSendPkt */ 711/* HTC API - HTCSendPkt */
712A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) 712int HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
713{ 713{
714 HTC_PACKET_QUEUE queue; 714 HTC_PACKET_QUEUE queue;
715 715
diff --git a/drivers/staging/ath6kl/htc2/htc_services.c b/drivers/staging/ath6kl/htc2/htc_services.c
index 64fddc0ee37..a7866026497 100644
--- a/drivers/staging/ath6kl/htc2/htc_services.c
+++ b/drivers/staging/ath6kl/htc2/htc_services.c
@@ -57,10 +57,10 @@ void HTCControlRecv(void *Context, HTC_PACKET *pPacket)
57 HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket,&((HTC_TARGET*)Context)->EndPoint[0]); 57 HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket,&((HTC_TARGET*)Context)->EndPoint[0]);
58} 58}
59 59
60A_STATUS HTCSendSetupComplete(HTC_TARGET *target) 60int HTCSendSetupComplete(HTC_TARGET *target)
61{ 61{
62 HTC_PACKET *pSendPacket = NULL; 62 HTC_PACKET *pSendPacket = NULL;
63 A_STATUS status; 63 int status;
64 64
65 do { 65 do {
66 /* allocate a packet to send to the target */ 66 /* allocate a packet to send to the target */
@@ -121,12 +121,12 @@ A_STATUS HTCSendSetupComplete(HTC_TARGET *target)
121} 121}
122 122
123 123
124A_STATUS HTCConnectService(HTC_HANDLE HTCHandle, 124int HTCConnectService(HTC_HANDLE HTCHandle,
125 HTC_SERVICE_CONNECT_REQ *pConnectReq, 125 HTC_SERVICE_CONNECT_REQ *pConnectReq,
126 HTC_SERVICE_CONNECT_RESP *pConnectResp) 126 HTC_SERVICE_CONNECT_RESP *pConnectResp)
127{ 127{
128 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); 128 HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
129 A_STATUS status = A_OK; 129 int status = A_OK;
130 HTC_PACKET *pRecvPacket = NULL; 130 HTC_PACKET *pRecvPacket = NULL;
131 HTC_PACKET *pSendPacket = NULL; 131 HTC_PACKET *pSendPacket = NULL;
132 HTC_CONNECT_SERVICE_RESPONSE_MSG *pResponseMsg; 132 HTC_CONNECT_SERVICE_RESPONSE_MSG *pResponseMsg;
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h
index 5a1b01fbb93..007010cfad9 100644
--- a/drivers/staging/ath6kl/include/a_debug.h
+++ b/drivers/staging/ath6kl/include/a_debug.h
@@ -181,8 +181,8 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo);
181 181
182#endif 182#endif
183 183
184A_STATUS a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask); 184int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask);
185A_STATUS a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask); 185int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask);
186void a_dump_module_debug_info_by_name(A_CHAR *module_name); 186void a_dump_module_debug_info_by_name(A_CHAR *module_name);
187void a_module_debug_support_init(void); 187void a_module_debug_support_init(void);
188void a_module_debug_support_cleanup(void); 188void a_module_debug_support_cleanup(void);
diff --git a/drivers/staging/ath6kl/include/ar3kconfig.h b/drivers/staging/ath6kl/include/ar3kconfig.h
index a10788cee46..24f5b2aa96c 100644
--- a/drivers/staging/ath6kl/include/ar3kconfig.h
+++ b/drivers/staging/ath6kl/include/ar3kconfig.h
@@ -54,9 +54,9 @@ typedef struct {
54 A_UINT8 bdaddr[6]; /* Bluetooth device address */ 54 A_UINT8 bdaddr[6]; /* Bluetooth device address */
55} AR3K_CONFIG_INFO; 55} AR3K_CONFIG_INFO;
56 56
57A_STATUS AR3KConfigure(AR3K_CONFIG_INFO *pConfigInfo); 57int AR3KConfigure(AR3K_CONFIG_INFO *pConfigInfo);
58 58
59A_STATUS AR3KConfigureExit(void *config); 59int AR3KConfigureExit(void *config);
60 60
61#ifdef __cplusplus 61#ifdef __cplusplus
62} 62}
diff --git a/drivers/staging/ath6kl/include/ar6000_diag.h b/drivers/staging/ath6kl/include/ar6000_diag.h
index b53512e23d3..1470d207098 100644
--- a/drivers/staging/ath6kl/include/ar6000_diag.h
+++ b/drivers/staging/ath6kl/include/ar6000_diag.h
@@ -25,21 +25,21 @@
25#define AR6000_DIAG_H_ 25#define AR6000_DIAG_H_
26 26
27 27
28A_STATUS 28int
29ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 29ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
30 30
31A_STATUS 31int
32ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 32ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
33 33
34A_STATUS 34int
35ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 35ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
36 A_UCHAR *data, A_UINT32 length); 36 A_UCHAR *data, A_UINT32 length);
37 37
38A_STATUS 38int
39ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 39ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
40 A_UCHAR *data, A_UINT32 length); 40 A_UCHAR *data, A_UINT32 length);
41 41
42A_STATUS 42int
43ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval); 43ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval);
44 44
45void 45void
diff --git a/drivers/staging/ath6kl/include/bmi.h b/drivers/staging/ath6kl/include/bmi.h
index 27aa98df9c0..9b45dc31231 100644
--- a/drivers/staging/ath6kl/include/bmi.h
+++ b/drivers/staging/ath6kl/include/bmi.h
@@ -43,44 +43,44 @@ BMIInit(void);
43void 43void
44BMICleanup(void); 44BMICleanup(void);
45 45
46A_STATUS 46int
47BMIDone(HIF_DEVICE *device); 47BMIDone(HIF_DEVICE *device);
48 48
49A_STATUS 49int
50BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info); 50BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
51 51
52A_STATUS 52int
53BMIReadMemory(HIF_DEVICE *device, 53BMIReadMemory(HIF_DEVICE *device,
54 A_UINT32 address, 54 A_UINT32 address,
55 A_UCHAR *buffer, 55 A_UCHAR *buffer,
56 A_UINT32 length); 56 A_UINT32 length);
57 57
58A_STATUS 58int
59BMIWriteMemory(HIF_DEVICE *device, 59BMIWriteMemory(HIF_DEVICE *device,
60 A_UINT32 address, 60 A_UINT32 address,
61 A_UCHAR *buffer, 61 A_UCHAR *buffer,
62 A_UINT32 length); 62 A_UINT32 length);
63 63
64A_STATUS 64int
65BMIExecute(HIF_DEVICE *device, 65BMIExecute(HIF_DEVICE *device,
66 A_UINT32 address, 66 A_UINT32 address,
67 A_UINT32 *param); 67 A_UINT32 *param);
68 68
69A_STATUS 69int
70BMISetAppStart(HIF_DEVICE *device, 70BMISetAppStart(HIF_DEVICE *device,
71 A_UINT32 address); 71 A_UINT32 address);
72 72
73A_STATUS 73int
74BMIReadSOCRegister(HIF_DEVICE *device, 74BMIReadSOCRegister(HIF_DEVICE *device,
75 A_UINT32 address, 75 A_UINT32 address,
76 A_UINT32 *param); 76 A_UINT32 *param);
77 77
78A_STATUS 78int
79BMIWriteSOCRegister(HIF_DEVICE *device, 79BMIWriteSOCRegister(HIF_DEVICE *device,
80 A_UINT32 address, 80 A_UINT32 address,
81 A_UINT32 param); 81 A_UINT32 param);
82 82
83A_STATUS 83int
84BMIrompatchInstall(HIF_DEVICE *device, 84BMIrompatchInstall(HIF_DEVICE *device,
85 A_UINT32 ROM_addr, 85 A_UINT32 ROM_addr,
86 A_UINT32 RAM_addr, 86 A_UINT32 RAM_addr,
@@ -88,41 +88,41 @@ BMIrompatchInstall(HIF_DEVICE *device,
88 A_UINT32 do_activate, 88 A_UINT32 do_activate,
89 A_UINT32 *patch_id); 89 A_UINT32 *patch_id);
90 90
91A_STATUS 91int
92BMIrompatchUninstall(HIF_DEVICE *device, 92BMIrompatchUninstall(HIF_DEVICE *device,
93 A_UINT32 rompatch_id); 93 A_UINT32 rompatch_id);
94 94
95A_STATUS 95int
96BMIrompatchActivate(HIF_DEVICE *device, 96BMIrompatchActivate(HIF_DEVICE *device,
97 A_UINT32 rompatch_count, 97 A_UINT32 rompatch_count,
98 A_UINT32 *rompatch_list); 98 A_UINT32 *rompatch_list);
99 99
100A_STATUS 100int
101BMIrompatchDeactivate(HIF_DEVICE *device, 101BMIrompatchDeactivate(HIF_DEVICE *device,
102 A_UINT32 rompatch_count, 102 A_UINT32 rompatch_count,
103 A_UINT32 *rompatch_list); 103 A_UINT32 *rompatch_list);
104 104
105A_STATUS 105int
106BMILZStreamStart(HIF_DEVICE *device, 106BMILZStreamStart(HIF_DEVICE *device,
107 A_UINT32 address); 107 A_UINT32 address);
108 108
109A_STATUS 109int
110BMILZData(HIF_DEVICE *device, 110BMILZData(HIF_DEVICE *device,
111 A_UCHAR *buffer, 111 A_UCHAR *buffer,
112 A_UINT32 length); 112 A_UINT32 length);
113 113
114A_STATUS 114int
115BMIFastDownload(HIF_DEVICE *device, 115BMIFastDownload(HIF_DEVICE *device,
116 A_UINT32 address, 116 A_UINT32 address,
117 A_UCHAR *buffer, 117 A_UCHAR *buffer,
118 A_UINT32 length); 118 A_UINT32 length);
119 119
120A_STATUS 120int
121BMIRawWrite(HIF_DEVICE *device, 121BMIRawWrite(HIF_DEVICE *device,
122 A_UCHAR *buffer, 122 A_UCHAR *buffer,
123 A_UINT32 length); 123 A_UINT32 length);
124 124
125A_STATUS 125int
126BMIRawRead(HIF_DEVICE *device, 126BMIRawRead(HIF_DEVICE *device,
127 A_UCHAR *buffer, 127 A_UCHAR *buffer,
128 A_UINT32 length, 128 A_UINT32 length,
diff --git a/drivers/staging/ath6kl/include/common/athdefs.h b/drivers/staging/ath6kl/include/common/athdefs.h
index b59bfd3af0a..2cd07201238 100644
--- a/drivers/staging/ath6kl/include/common/athdefs.h
+++ b/drivers/staging/ath6kl/include/common/athdefs.h
@@ -31,44 +31,47 @@
31 31
32/* 32/*
33 * Generic error codes that can be used by hw, sta, ap, sim, dk 33 * Generic error codes that can be used by hw, sta, ap, sim, dk
34 * and any other environments. Since these are enums, feel free to 34 * and any other environments.
35 * add any more codes that you need. 35 * Feel free to add any more codes that you need.
36 */ 36 */
37 37
38typedef enum { 38#define A_ERROR (-1) /* Generic error return */
39 A_ERROR = -1, /* Generic error return */ 39#define A_OK 0 /* success */
40 A_OK = 0, /* success */ 40#define A_DEVICE_NOT_FOUND 1 /* not able to find PCI device */
41 /* Following values start at 1 */ 41#define A_NO_MEMORY 2 /* not able to allocate memory,
42 A_DEVICE_NOT_FOUND, /* not able to find PCI device */ 42 * not avail#defineable */
43 A_NO_MEMORY, /* not able to allocate memory, not available */ 43#define A_MEMORY_NOT_AVAIL 3 /* memory region is not free for
44 A_MEMORY_NOT_AVAIL, /* memory region is not free for mapping */ 44 * mapping */
45 A_NO_FREE_DESC, /* no free descriptors available */ 45#define A_NO_FREE_DESC 4 /* no free descriptors available */
46 A_BAD_ADDRESS, /* address does not match descriptor */ 46#define A_BAD_ADDRESS 5 /* address does not match descriptor */
47 A_WIN_DRIVER_ERROR, /* used in NT_HW version, if problem at init */ 47#define A_WIN_DRIVER_ERROR 6 /* used in NT_HW version,
48 A_REGS_NOT_MAPPED, /* registers not correctly mapped */ 48 * if problem at init */
49 A_EPERM, /* Not superuser */ 49#define A_REGS_NOT_MAPPED 7 /* registers not correctly mapped */
50 A_EACCES, /* Access denied */ 50#define A_EPERM 8 /* Not superuser */
51 A_ENOENT, /* No such entry, search failed, etc. */ 51#define A_EACCES 0 /* Access denied */
52 A_EEXIST, /* The object already exists (can't create) */ 52#define A_ENOENT 10 /* No such entry, search failed, etc. */
53 A_EFAULT, /* Bad address fault */ 53#define A_EEXIST 11 /* The object already exists
54 A_EBUSY, /* Object is busy */ 54 * (can't create) */
55 A_EINVAL, /* Invalid parameter */ 55#define A_EFAULT 12 /* Bad address fault */
56 A_EMSGSIZE, /* Inappropriate message buffer length */ 56#define A_EBUSY 13 /* Object is busy */
57 A_ECANCELED, /* Operation canceled */ 57#define A_EINVAL 14 /* Invalid parameter */
58 A_ENOTSUP, /* Operation not supported */ 58#define A_EMSGSIZE 15 /* Bad message buffer length */
59 A_ECOMM, /* Communication error on send */ 59#define A_ECANCELED 16 /* Operation canceled */
60 A_EPROTO, /* Protocol error */ 60#define A_ENOTSUP 17 /* Operation not supported */
61 A_ENODEV, /* No such device */ 61#define A_ECOMM 18 /* Communication error on send */
62 A_EDEVNOTUP, /* device is not UP */ 62#define A_EPROTO 19 /* Protocol error */
63 A_NO_RESOURCE, /* No resources for requested operation */ 63#define A_ENODEV 20 /* No such device */
64 A_HARDWARE, /* Hardware failure */ 64#define A_EDEVNOTUP 21 /* device is not UP */
65 A_PENDING, /* Asynchronous routine; will send up results la 65#define A_NO_RESOURCE 22 /* No resources for
66ter (typically in callback) */ 66 * requested operation */
67 A_EBADCHANNEL, /* The channel cannot be used */ 67#define A_HARDWARE 23 /* Hardware failure */
68 A_DECRYPT_ERROR, /* Decryption error */ 68#define A_PENDING 24 /* Asynchronous routine; will send up
69 A_PHY_ERROR, /* RX PHY error */ 69 * results later
70 A_CONSUMED /* Object was consumed */ 70 * (typically in callback) */
71} A_STATUS; 71#define A_EBADCHANNEL 25 /* The channel cannot be used */
72#define A_DECRYPT_ERROR 26 /* Decryption error */
73#define A_PHY_ERROR 27 /* RX PHY error */
74#define A_CONSUMED 28 /* Object was consumed */
72 75
73#define A_SUCCESS(x) (x == A_OK) 76#define A_SUCCESS(x) (x == A_OK)
74#define A_FAILED(x) (!A_SUCCESS(x)) 77#define A_FAILED(x) (!A_SUCCESS(x))
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h
index 8ebb93d5f3c..c6f0b2dc550 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -64,28 +64,28 @@ extern "C" {
64#endif 64#endif
65 65
66/* OS-independent APIs */ 66/* OS-independent APIs */
67A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo); 67int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo);
68 68
69A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 69int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
70 70
71A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 71int ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
72 72
73A_STATUS ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, A_UCHAR *data, A_UINT32 length); 73int ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, A_UCHAR *data, A_UINT32 length);
74 74
75A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType, A_BOOL waitForCompletion, A_BOOL coldReset); 75int ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType, A_BOOL waitForCompletion, A_BOOL coldReset);
76 76
77void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType); 77void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
78 78
79A_STATUS ar6000_set_htc_params(HIF_DEVICE *hifDevice, 79int ar6000_set_htc_params(HIF_DEVICE *hifDevice,
80 A_UINT32 TargetType, 80 A_UINT32 TargetType,
81 A_UINT32 MboxIsrYieldValue, 81 A_UINT32 MboxIsrYieldValue,
82 A_UINT8 HtcControlBuffers); 82 A_UINT8 HtcControlBuffers);
83 83
84A_STATUS ar6000_prepare_target(HIF_DEVICE *hifDevice, 84int ar6000_prepare_target(HIF_DEVICE *hifDevice,
85 A_UINT32 TargetType, 85 A_UINT32 TargetType,
86 A_UINT32 TargetVersion); 86 A_UINT32 TargetVersion);
87 87
88A_STATUS ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice, 88int ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice,
89 A_UINT32 TargetType, 89 A_UINT32 TargetType,
90 A_UINT32 Flags); 90 A_UINT32 Flags);
91 91
@@ -93,13 +93,13 @@ void ar6000_copy_cust_data_from_target(HIF_DEVICE *hifDevice, A_UINT32 TargetTyp
93 93
94A_UINT8 *ar6000_get_cust_data_buffer(A_UINT32 TargetType); 94A_UINT8 *ar6000_get_cust_data_buffer(A_UINT32 TargetType);
95 95
96A_STATUS ar6000_setBTState(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize); 96int ar6000_setBTState(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize);
97 97
98A_STATUS ar6000_setDevicePowerState(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize); 98int ar6000_setDevicePowerState(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize);
99 99
100A_STATUS ar6000_setWowMode(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize); 100int ar6000_setWowMode(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize);
101 101
102A_STATUS ar6000_setHostMode(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize); 102int ar6000_setHostMode(void *context, A_UINT8 *pInBuf, A_UINT32 InBufSize);
103 103
104#ifdef __cplusplus 104#ifdef __cplusplus
105} 105}
diff --git a/drivers/staging/ath6kl/include/dset_api.h b/drivers/staging/ath6kl/include/dset_api.h
index 0cc121fd25a..c2014f2b864 100644
--- a/drivers/staging/ath6kl/include/dset_api.h
+++ b/drivers/staging/ath6kl/include/dset_api.h
@@ -39,7 +39,7 @@ extern "C" {
39#endif 39#endif
40 40
41/* Called to send a DataSet Open Reply back to the Target. */ 41/* Called to send a DataSet Open Reply back to the Target. */
42A_STATUS wmi_dset_open_reply(struct wmi_t *wmip, 42int wmi_dset_open_reply(struct wmi_t *wmip,
43 A_UINT32 status, 43 A_UINT32 status,
44 A_UINT32 access_cookie, 44 A_UINT32 access_cookie,
45 A_UINT32 size, 45 A_UINT32 size,
@@ -49,7 +49,7 @@ A_STATUS wmi_dset_open_reply(struct wmi_t *wmip,
49 A_UINT32 targ_reply_arg); 49 A_UINT32 targ_reply_arg);
50 50
51/* Called to send a DataSet Data Reply back to the Target. */ 51/* Called to send a DataSet Data Reply back to the Target. */
52A_STATUS wmi_dset_data_reply(struct wmi_t *wmip, 52int wmi_dset_data_reply(struct wmi_t *wmip,
53 A_UINT32 status, 53 A_UINT32 status,
54 A_UINT8 *host_buf, 54 A_UINT8 *host_buf,
55 A_UINT32 length, 55 A_UINT32 length,
diff --git a/drivers/staging/ath6kl/include/gpio_api.h b/drivers/staging/ath6kl/include/gpio_api.h
index 96a15038335..81c228dd16a 100644
--- a/drivers/staging/ath6kl/include/gpio_api.h
+++ b/drivers/staging/ath6kl/include/gpio_api.h
@@ -28,7 +28,7 @@
28/* 28/*
29 * Send a command to the Target in order to change output on GPIO pins. 29 * Send a command to the Target in order to change output on GPIO pins.
30 */ 30 */
31A_STATUS wmi_gpio_output_set(struct wmi_t *wmip, 31int wmi_gpio_output_set(struct wmi_t *wmip,
32 A_UINT32 set_mask, 32 A_UINT32 set_mask,
33 A_UINT32 clear_mask, 33 A_UINT32 clear_mask,
34 A_UINT32 enable_mask, 34 A_UINT32 enable_mask,
@@ -37,23 +37,23 @@ A_STATUS wmi_gpio_output_set(struct wmi_t *wmip,
37/* 37/*
38 * Send a command to the Target requesting input state of GPIO pins. 38 * Send a command to the Target requesting input state of GPIO pins.
39 */ 39 */
40A_STATUS wmi_gpio_input_get(struct wmi_t *wmip); 40int wmi_gpio_input_get(struct wmi_t *wmip);
41 41
42/* 42/*
43 * Send a command to the Target to change the value of a GPIO register. 43 * Send a command to the Target to change the value of a GPIO register.
44 */ 44 */
45A_STATUS wmi_gpio_register_set(struct wmi_t *wmip, 45int wmi_gpio_register_set(struct wmi_t *wmip,
46 A_UINT32 gpioreg_id, 46 A_UINT32 gpioreg_id,
47 A_UINT32 value); 47 A_UINT32 value);
48 48
49/* 49/*
50 * Send a command to the Target to fetch the value of a GPIO register. 50 * Send a command to the Target to fetch the value of a GPIO register.
51 */ 51 */
52A_STATUS wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id); 52int wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id);
53 53
54/* 54/*
55 * Send a command to the Target, acknowledging some GPIO interrupts. 55 * Send a command to the Target, acknowledging some GPIO interrupts.
56 */ 56 */
57A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask); 57int wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
58 58
59#endif /* _GPIO_API_H_ */ 59#endif /* _GPIO_API_H_ */
diff --git a/drivers/staging/ath6kl/include/hci_transport_api.h b/drivers/staging/ath6kl/include/hci_transport_api.h
index b5157ea5d9e..b611ab1cef4 100644
--- a/drivers/staging/ath6kl/include/hci_transport_api.h
+++ b/drivers/staging/ath6kl/include/hci_transport_api.h
@@ -90,8 +90,8 @@ typedef struct _HCI_TRANSPORT_CONFIG_INFO {
90 int EventRecvBufferWaterMark; /* low watermark to trigger recv refill */ 90 int EventRecvBufferWaterMark; /* low watermark to trigger recv refill */
91 int MaxSendQueueDepth; /* max number of packets in the single send queue */ 91 int MaxSendQueueDepth; /* max number of packets in the single send queue */
92 void *pContext; /* context for all callbacks */ 92 void *pContext; /* context for all callbacks */
93 void (*TransportFailure)(void *pContext, A_STATUS Status); /* transport failure callback */ 93 void (*TransportFailure)(void *pContext, int Status); /* transport failure callback */
94 A_STATUS (*TransportReady)(HCI_TRANSPORT_HANDLE, HCI_TRANSPORT_PROPERTIES *,void *pContext); /* transport is ready */ 94 int (*TransportReady)(HCI_TRANSPORT_HANDLE, HCI_TRANSPORT_PROPERTIES *,void *pContext); /* transport is ready */
95 void (*TransportRemoved)(void *pContext); /* transport was removed */ 95 void (*TransportRemoved)(void *pContext); /* transport was removed */
96 /* packet processing callbacks */ 96 /* packet processing callbacks */
97 HCI_TRANSPORT_SEND_PKT_COMPLETE pHCISendComplete; 97 HCI_TRANSPORT_SEND_PKT_COMPLETE pHCISendComplete;
@@ -141,7 +141,7 @@ void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans);
141 @example: 141 @example:
142 @see also: 142 @see also:
143+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 143+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
144A_STATUS HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); 144int HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue);
145 145
146/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 146/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
147 @desc: Send an HCI packet packet 147 @desc: Send an HCI packet packet
@@ -166,7 +166,7 @@ A_STATUS HCI_TransportAddReceivePkts(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKE
166 @example: 166 @example:
167 @see also: 167 @see also:
168+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 168+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
169A_STATUS HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous); 169int HCI_TransportSendPkt(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous);
170 170
171 171
172/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 172/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -193,7 +193,7 @@ void HCI_TransportStop(HCI_TRANSPORT_HANDLE HciTrans);
193 @example: 193 @example:
194 @see also: 194 @see also:
195+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 195+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
196A_STATUS HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans); 196int HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans);
197 197
198/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 198/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
199 @desc: Enable or Disable Asynchronous Recv 199 @desc: Enable or Disable Asynchronous Recv
@@ -206,7 +206,7 @@ A_STATUS HCI_TransportStart(HCI_TRANSPORT_HANDLE HciTrans);
206 @example: 206 @example:
207 @see also: 207 @see also:
208+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 208+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
209A_STATUS HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 209int HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
210 210
211/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 211/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
212 @desc: Receive an event packet from the HCI transport synchronously using polling 212 @desc: Receive an event packet from the HCI transport synchronously using polling
@@ -222,7 +222,7 @@ A_STATUS HCI_TransportEnableDisableAsyncRecv(HCI_TRANSPORT_HANDLE HciTrans, A
222 @example: 222 @example:
223 @see also: HCI_TransportEnableDisableAsyncRecv 223 @see also: HCI_TransportEnableDisableAsyncRecv
224+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 224+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
225A_STATUS HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans, 225int HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,
226 HTC_PACKET *pPacket, 226 HTC_PACKET *pPacket,
227 int MaxPollMS); 227 int MaxPollMS);
228 228
@@ -237,7 +237,7 @@ A_STATUS HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,
237 @example: 237 @example:
238 @see also: 238 @see also:
239+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 239+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
240A_STATUS HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud); 240int HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud);
241 241
242/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 242/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
243 @desc: Enable/Disable HCI Transport Power Management 243 @desc: Enable/Disable HCI Transport Power Management
@@ -250,7 +250,7 @@ A_STATUS HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Bau
250 @example: 250 @example:
251 @see also: 251 @see also:
252+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 252+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
253A_STATUS HCI_TransportEnablePowerMgmt(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 253int HCI_TransportEnablePowerMgmt(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
254 254
255#ifdef __cplusplus 255#ifdef __cplusplus
256} 256}
diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h
index 2a082678512..331d9851567 100644
--- a/drivers/staging/ath6kl/include/hif.h
+++ b/drivers/staging/ath6kl/include/hif.h
@@ -293,7 +293,7 @@ typedef struct _HIF_SCATTER_REQ {
293 A_UINT32 TotalLength; /* total length of entire transfer */ 293 A_UINT32 TotalLength; /* total length of entire transfer */
294 A_UINT32 CallerFlags; /* caller specific flags can be stored here */ 294 A_UINT32 CallerFlags; /* caller specific flags can be stored here */
295 HIF_SCATTER_COMP_CB CompletionRoutine; /* completion routine set by caller */ 295 HIF_SCATTER_COMP_CB CompletionRoutine; /* completion routine set by caller */
296 A_STATUS CompletionStatus; /* status of completion */ 296 int CompletionStatus; /* status of completion */
297 void *Context; /* caller context for this request */ 297 void *Context; /* caller context for this request */
298 int ValidScatterEntries; /* number of valid entries set by caller */ 298 int ValidScatterEntries; /* number of valid entries set by caller */
299 HIF_SCATTER_METHOD ScatterMethod; /* scatter method handled by HIF */ 299 HIF_SCATTER_METHOD ScatterMethod; /* scatter method handled by HIF */
@@ -304,7 +304,7 @@ typedef struct _HIF_SCATTER_REQ {
304 304
305typedef HIF_SCATTER_REQ * ( *HIF_ALLOCATE_SCATTER_REQUEST)(HIF_DEVICE *device); 305typedef HIF_SCATTER_REQ * ( *HIF_ALLOCATE_SCATTER_REQUEST)(HIF_DEVICE *device);
306typedef void ( *HIF_FREE_SCATTER_REQUEST)(HIF_DEVICE *device, HIF_SCATTER_REQ *request); 306typedef void ( *HIF_FREE_SCATTER_REQUEST)(HIF_DEVICE *device, HIF_SCATTER_REQ *request);
307typedef A_STATUS ( *HIF_READWRITE_SCATTER)(HIF_DEVICE *device, HIF_SCATTER_REQ *request); 307typedef int ( *HIF_READWRITE_SCATTER)(HIF_DEVICE *device, HIF_SCATTER_REQ *request);
308 308
309typedef struct _HIF_DEVICE_SCATTER_SUPPORT_INFO { 309typedef struct _HIF_DEVICE_SCATTER_SUPPORT_INFO {
310 /* information returned from HIF layer */ 310 /* information returned from HIF layer */
@@ -324,19 +324,19 @@ typedef struct {
324struct htc_callbacks { 324struct htc_callbacks {
325 void *context; /* context to pass to the dsrhandler 325 void *context; /* context to pass to the dsrhandler
326 note : rwCompletionHandler is provided the context passed to HIFReadWrite */ 326 note : rwCompletionHandler is provided the context passed to HIFReadWrite */
327 A_STATUS (* rwCompletionHandler)(void *rwContext, A_STATUS status); 327 int (* rwCompletionHandler)(void *rwContext, int status);
328 A_STATUS (* dsrHandler)(void *context); 328 int (* dsrHandler)(void *context);
329}; 329};
330 330
331typedef struct osdrv_callbacks { 331typedef struct osdrv_callbacks {
332 void *context; /* context to pass for all callbacks except deviceRemovedHandler 332 void *context; /* context to pass for all callbacks except deviceRemovedHandler
333 the deviceRemovedHandler is only called if the device is claimed */ 333 the deviceRemovedHandler is only called if the device is claimed */
334 A_STATUS (* deviceInsertedHandler)(void *context, void *hif_handle); 334 int (* deviceInsertedHandler)(void *context, void *hif_handle);
335 A_STATUS (* deviceRemovedHandler)(void *claimedContext, void *hif_handle); 335 int (* deviceRemovedHandler)(void *claimedContext, void *hif_handle);
336 A_STATUS (* deviceSuspendHandler)(void *context); 336 int (* deviceSuspendHandler)(void *context);
337 A_STATUS (* deviceResumeHandler)(void *context); 337 int (* deviceResumeHandler)(void *context);
338 A_STATUS (* deviceWakeupHandler)(void *context); 338 int (* deviceWakeupHandler)(void *context);
339 A_STATUS (* devicePowerChangeHandler)(void *context, HIF_DEVICE_POWER_CHANGE_TYPE config); 339 int (* devicePowerChangeHandler)(void *context, HIF_DEVICE_POWER_CHANGE_TYPE config);
340} OSDRV_CALLBACKS; 340} OSDRV_CALLBACKS;
341 341
342#define HIF_OTHER_EVENTS (1 << 0) /* other interrupts (non-Recv) are pending, host 342#define HIF_OTHER_EVENTS (1 << 0) /* other interrupts (non-Recv) are pending, host
@@ -355,14 +355,14 @@ typedef struct _HIF_PENDING_EVENTS_INFO {
355 355
356 /* function to get pending events , some HIF modules use special mechanisms 356 /* function to get pending events , some HIF modules use special mechanisms
357 * to detect packet available and other interrupts */ 357 * to detect packet available and other interrupts */
358typedef A_STATUS ( *HIF_PENDING_EVENTS_FUNC)(HIF_DEVICE *device, 358typedef int ( *HIF_PENDING_EVENTS_FUNC)(HIF_DEVICE *device,
359 HIF_PENDING_EVENTS_INFO *pEvents, 359 HIF_PENDING_EVENTS_INFO *pEvents,
360 void *AsyncContext); 360 void *AsyncContext);
361 361
362#define HIF_MASK_RECV TRUE 362#define HIF_MASK_RECV TRUE
363#define HIF_UNMASK_RECV FALSE 363#define HIF_UNMASK_RECV FALSE
364 /* function to mask recv events */ 364 /* function to mask recv events */
365typedef A_STATUS ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE *device, 365typedef int ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE *device,
366 A_BOOL Mask, 366 A_BOOL Mask,
367 void *AsyncContext); 367 void *AsyncContext);
368 368
@@ -372,7 +372,7 @@ typedef A_STATUS ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE *device,
372 * and to set OS driver callbacks (i.e. insertion/removal) to the HIF layer 372 * and to set OS driver callbacks (i.e. insertion/removal) to the HIF layer
373 * 373 *
374 */ 374 */
375A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks); 375int HIFInit(OSDRV_CALLBACKS *callbacks);
376 376
377/* This API claims the HIF device and provides a context for handling removal. 377/* This API claims the HIF device and provides a context for handling removal.
378 * The device removal callback is only called when the OSDRV layer claims 378 * The device removal callback is only called when the OSDRV layer claims
@@ -382,7 +382,7 @@ void HIFClaimDevice(HIF_DEVICE *device, void *claimedContext);
382void HIFReleaseDevice(HIF_DEVICE *device); 382void HIFReleaseDevice(HIF_DEVICE *device);
383 383
384/* This API allows the HTC layer to attach to the HIF device */ 384/* This API allows the HTC layer to attach to the HIF device */
385A_STATUS HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks); 385int HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks);
386/* This API detaches the HTC layer from the HIF device */ 386/* This API detaches the HTC layer from the HIF device */
387void HIFDetachHTC(HIF_DEVICE *device); 387void HIFDetachHTC(HIF_DEVICE *device);
388 388
@@ -398,7 +398,7 @@ void HIFDetachHTC(HIF_DEVICE *device);
398 * length - Amount of data to be transmitted or received. 398 * length - Amount of data to be transmitted or received.
399 * request - Characterizes the attributes of the command. 399 * request - Characterizes the attributes of the command.
400 */ 400 */
401A_STATUS 401int
402HIFReadWrite(HIF_DEVICE *device, 402HIFReadWrite(HIF_DEVICE *device,
403 A_UINT32 address, 403 A_UINT32 address,
404 A_UCHAR *buffer, 404 A_UCHAR *buffer,
@@ -441,7 +441,7 @@ int HIFIRQEventNotify(void);
441int HIFRWCompleteEventNotify(void); 441int HIFRWCompleteEventNotify(void);
442#endif 442#endif
443 443
444A_STATUS 444int
445HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, 445HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
446 void *config, A_UINT32 configLen); 446 void *config, A_UINT32 configLen);
447 447
@@ -449,7 +449,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
449 * This API wait for the remaining MBOX messages to be drained 449 * This API wait for the remaining MBOX messages to be drained
450 * This should be moved to HTC AR6K layer 450 * This should be moved to HTC AR6K layer
451 */ 451 */
452A_STATUS hifWaitForPendingRecv(HIF_DEVICE *device); 452int hifWaitForPendingRecv(HIF_DEVICE *device);
453 453
454#ifdef __cplusplus 454#ifdef __cplusplus
455} 455}
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index b007051e055..94040bff789 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -45,7 +45,7 @@ typedef A_UINT16 HTC_SERVICE_ID;
45 45
46typedef struct _HTC_INIT_INFO { 46typedef struct _HTC_INIT_INFO {
47 void *pContext; /* context for target failure notification */ 47 void *pContext; /* context for target failure notification */
48 void (*TargetFailure)(void *Instance, A_STATUS Status); 48 void (*TargetFailure)(void *Instance, int Status);
49} HTC_INIT_INFO; 49} HTC_INIT_INFO;
50 50
51/* per service connection send completion */ 51/* per service connection send completion */
@@ -319,7 +319,7 @@ void HTCSetCreditDistribution(HTC_HANDLE HTCHandle,
319 @example: 319 @example:
320 @see also: HTCConnectService 320 @see also: HTCConnectService
321+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 321+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
322A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle); 322int HTCWaitTarget(HTC_HANDLE HTCHandle);
323/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 323/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
324 @desc: Start target service communications 324 @desc: Start target service communications
325 @function name: HTCStart 325 @function name: HTCStart
@@ -334,7 +334,7 @@ A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle);
334 @example: 334 @example:
335 @see also: HTCConnectService 335 @see also: HTCConnectService
336+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 336+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
337A_STATUS HTCStart(HTC_HANDLE HTCHandle); 337int HTCStart(HTC_HANDLE HTCHandle);
338/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 338/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
339 @desc: Add receive packet to HTC 339 @desc: Add receive packet to HTC
340 @function name: HTCAddReceivePkt 340 @function name: HTCAddReceivePkt
@@ -348,7 +348,7 @@ A_STATUS HTCStart(HTC_HANDLE HTCHandle);
348 @example: 348 @example:
349 @see also: 349 @see also:
350+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 350+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
351A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket); 351int HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
352/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 352/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
353 @desc: Connect to an HTC service 353 @desc: Connect to an HTC service
354 @function name: HTCConnectService 354 @function name: HTCConnectService
@@ -361,7 +361,7 @@ A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
361 @example: 361 @example:
362 @see also: HTCStart 362 @see also: HTCStart
363+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 363+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
364A_STATUS HTCConnectService(HTC_HANDLE HTCHandle, 364int HTCConnectService(HTC_HANDLE HTCHandle,
365 HTC_SERVICE_CONNECT_REQ *pReq, 365 HTC_SERVICE_CONNECT_REQ *pReq,
366 HTC_SERVICE_CONNECT_RESP *pResp); 366 HTC_SERVICE_CONNECT_RESP *pResp);
367/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 367/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -377,7 +377,7 @@ A_STATUS HTCConnectService(HTC_HANDLE HTCHandle,
377 @example: 377 @example:
378 @see also: HTCFlushEndpoint 378 @see also: HTCFlushEndpoint
379+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 379+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
380A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket); 380int HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
381/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 381/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
382 @desc: Stop HTC service communications 382 @desc: Stop HTC service communications
383 @function name: HTCStop 383 @function name: HTCStop
@@ -511,7 +511,7 @@ void HTCUnblockRecv(HTC_HANDLE HTCHandle);
511 @example: 511 @example:
512 @see also: HTCFlushEndpoint 512 @see also: HTCFlushEndpoint
513+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 513+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
514A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue); 514int HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue);
515 515
516/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 516/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
517 @desc: Add multiple receive packets to HTC 517 @desc: Add multiple receive packets to HTC
@@ -530,7 +530,7 @@ A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueu
530 @example: 530 @example:
531 @see also: 531 @see also:
532+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 532+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
533A_STATUS HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue); 533int HTCAddReceivePktMultiple(HTC_HANDLE HTCHandle, 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
@@ -564,7 +564,7 @@ int HTCGetNumRecvBuffers(HTC_HANDLE HTCHandle,
564/* internally used functions for testing... */ 564/* internally used functions for testing... */
565void HTCEnableRecv(HTC_HANDLE HTCHandle); 565void HTCEnableRecv(HTC_HANDLE HTCHandle);
566void HTCDisableRecv(HTC_HANDLE HTCHandle); 566void HTCDisableRecv(HTC_HANDLE HTCHandle);
567A_STATUS HTCWaitForPendingRecv(HTC_HANDLE HTCHandle, 567int HTCWaitForPendingRecv(HTC_HANDLE HTCHandle,
568 A_UINT32 TimeoutInMs, 568 A_UINT32 TimeoutInMs,
569 A_BOOL *pbIsRecvPending); 569 A_BOOL *pbIsRecvPending);
570 570
diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h
index 15175cff2f2..243268c9d51 100644
--- a/drivers/staging/ath6kl/include/htc_packet.h
+++ b/drivers/staging/ath6kl/include/htc_packet.h
@@ -89,7 +89,7 @@ typedef struct _HTC_PACKET {
89 A_UINT32 BufferLength; /* length of buffer */ 89 A_UINT32 BufferLength; /* length of buffer */
90 A_UINT32 ActualLength; /* actual length of payload */ 90 A_UINT32 ActualLength; /* actual length of payload */
91 HTC_ENDPOINT_ID Endpoint; /* endpoint that this packet was sent/recv'd from */ 91 HTC_ENDPOINT_ID Endpoint; /* endpoint that this packet was sent/recv'd from */
92 A_STATUS Status; /* completion status */ 92 int Status; /* completion status */
93 union { 93 union {
94 HTC_TX_PACKET_INFO AsTx; /* Tx Packet specific info */ 94 HTC_TX_PACKET_INFO AsTx; /* Tx Packet specific info */
95 HTC_RX_PACKET_INFO AsRx; /* Rx Packet specific info */ 95 HTC_RX_PACKET_INFO AsRx; /* Rx Packet specific info */
diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h
index f55a6454a6b..041df74e2db 100644
--- a/drivers/staging/ath6kl/include/wlan_api.h
+++ b/drivers/staging/ath6kl/include/wlan_api.h
@@ -96,7 +96,7 @@ void wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt);
96void wlan_node_table_reset(struct ieee80211_node_table *nt); 96void wlan_node_table_reset(struct ieee80211_node_table *nt);
97void wlan_node_table_cleanup(struct ieee80211_node_table *nt); 97void wlan_node_table_cleanup(struct ieee80211_node_table *nt);
98 98
99A_STATUS wlan_parse_beacon(A_UINT8 *buf, int framelen, 99int wlan_parse_beacon(A_UINT8 *buf, int framelen,
100 struct ieee80211_common_ie *cie); 100 struct ieee80211_common_ie *cie);
101 101
102A_UINT16 wlan_ieee2freq(int chan); 102A_UINT16 wlan_ieee2freq(int chan);
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h
index 4a9154316a3..5207a198ed1 100644
--- a/drivers/staging/ath6kl/include/wmi_api.h
+++ b/drivers/staging/ath6kl/include/wmi_api.h
@@ -70,21 +70,21 @@ void wmi_shutdown(struct wmi_t *wmip);
70HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip); 70HTC_ENDPOINT_ID wmi_get_control_ep(struct wmi_t * wmip);
71void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid); 71void wmi_set_control_ep(struct wmi_t * wmip, HTC_ENDPOINT_ID eid);
72A_UINT16 wmi_get_mapped_qos_queue(struct wmi_t *, A_UINT8); 72A_UINT16 wmi_get_mapped_qos_queue(struct wmi_t *, A_UINT8);
73A_STATUS wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf); 73int wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf);
74A_STATUS wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType, A_BOOL bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,A_UINT8 metaVersion, void *pTxMetaS); 74int wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType, A_BOOL bMoreData, WMI_DATA_HDR_DATA_TYPE data_type,A_UINT8 metaVersion, void *pTxMetaS);
75A_STATUS wmi_dot3_2_dix(void *osbuf); 75int wmi_dot3_2_dix(void *osbuf);
76 76
77A_STATUS wmi_dot11_hdr_remove (struct wmi_t *wmip, void *osbuf); 77int wmi_dot11_hdr_remove (struct wmi_t *wmip, void *osbuf);
78A_STATUS wmi_dot11_hdr_add(struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode); 78int wmi_dot11_hdr_add(struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode);
79 79
80A_STATUS wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf); 80int wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf);
81A_STATUS wmi_syncpoint(struct wmi_t *wmip); 81int wmi_syncpoint(struct wmi_t *wmip);
82A_STATUS wmi_syncpoint_reset(struct wmi_t *wmip); 82int wmi_syncpoint_reset(struct wmi_t *wmip);
83A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT32 layer2Priority, A_BOOL wmmEnabled); 83A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT32 layer2Priority, A_BOOL wmmEnabled);
84 84
85A_UINT8 wmi_determine_userPriority (A_UINT8 *pkt, A_UINT32 layer2Pri); 85A_UINT8 wmi_determine_userPriority (A_UINT8 *pkt, A_UINT32 layer2Pri);
86 86
87A_STATUS wmi_control_rx(struct wmi_t *wmip, void *osbuf); 87int wmi_control_rx(struct wmi_t *wmip, void *osbuf);
88void wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg); 88void wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg);
89void wmi_free_allnodes(struct wmi_t *wmip); 89void wmi_free_allnodes(struct wmi_t *wmip);
90bss_t *wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr); 90bss_t *wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr);
@@ -99,10 +99,10 @@ typedef enum {
99 END_WMIFLAG /* end marker */ 99 END_WMIFLAG /* end marker */
100} WMI_SYNC_FLAG; 100} WMI_SYNC_FLAG;
101 101
102A_STATUS wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId, 102int wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
103 WMI_SYNC_FLAG flag); 103 WMI_SYNC_FLAG flag);
104 104
105A_STATUS wmi_connect_cmd(struct wmi_t *wmip, 105int wmi_connect_cmd(struct wmi_t *wmip,
106 NETWORK_TYPE netType, 106 NETWORK_TYPE netType,
107 DOT11_AUTH_MODE dot11AuthMode, 107 DOT11_AUTH_MODE dot11AuthMode,
108 AUTH_MODE authMode, 108 AUTH_MODE authMode,
@@ -116,209 +116,209 @@ A_STATUS wmi_connect_cmd(struct wmi_t *wmip,
116 A_UINT16 channel, 116 A_UINT16 channel,
117 A_UINT32 ctrl_flags); 117 A_UINT32 ctrl_flags);
118 118
119A_STATUS wmi_reconnect_cmd(struct wmi_t *wmip, 119int wmi_reconnect_cmd(struct wmi_t *wmip,
120 A_UINT8 *bssid, 120 A_UINT8 *bssid,
121 A_UINT16 channel); 121 A_UINT16 channel);
122A_STATUS wmi_disconnect_cmd(struct wmi_t *wmip); 122int wmi_disconnect_cmd(struct wmi_t *wmip);
123A_STATUS wmi_getrev_cmd(struct wmi_t *wmip); 123int wmi_getrev_cmd(struct wmi_t *wmip);
124A_STATUS wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, 124int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
125 A_BOOL forceFgScan, A_BOOL isLegacy, 125 A_BOOL forceFgScan, A_BOOL isLegacy,
126 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, 126 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval,
127 A_INT8 numChan, A_UINT16 *channelList); 127 A_INT8 numChan, A_UINT16 *channelList);
128A_STATUS wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, 128int wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
129 A_UINT16 fg_end_sec, A_UINT16 bg_sec, 129 A_UINT16 fg_end_sec, A_UINT16 bg_sec,
130 A_UINT16 minact_chdw_msec, 130 A_UINT16 minact_chdw_msec,
131 A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec, 131 A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec,
132 A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags, 132 A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
133 A_UINT32 max_dfsch_act_time, 133 A_UINT32 max_dfsch_act_time,
134 A_UINT16 maxact_scan_per_ssid); 134 A_UINT16 maxact_scan_per_ssid);
135A_STATUS wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask); 135int wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask);
136A_STATUS wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag, 136int wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
137 A_UINT8 ssidLength, A_UCHAR *ssid); 137 A_UINT8 ssidLength, A_UCHAR *ssid);
138A_STATUS wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons); 138int wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons);
139A_STATUS wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons); 139int wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons);
140A_STATUS wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType, 140int wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
141 A_UINT8 ieLen, A_UINT8 *ieInfo); 141 A_UINT8 ieLen, A_UINT8 *ieInfo);
142A_STATUS wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode); 142int wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode);
143A_STATUS wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl, 143int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
144 A_UINT16 atim_windows, A_UINT16 timeout_value); 144 A_UINT16 atim_windows, A_UINT16 timeout_value);
145A_STATUS wmi_apps_cmd(struct wmi_t *wmip, A_UINT8 psType, A_UINT32 idle_time, 145int wmi_apps_cmd(struct wmi_t *wmip, A_UINT8 psType, A_UINT32 idle_time,
146 A_UINT32 ps_period, A_UINT8 sleep_period); 146 A_UINT32 ps_period, A_UINT8 sleep_period);
147A_STATUS wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, 147int wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
148 A_UINT16 psPollNum, A_UINT16 dtimPolicy, 148 A_UINT16 psPollNum, A_UINT16 dtimPolicy,
149 A_UINT16 wakup_tx_policy, A_UINT16 num_tx_to_wakeup, 149 A_UINT16 wakup_tx_policy, A_UINT16 num_tx_to_wakeup,
150 A_UINT16 ps_fail_event_policy); 150 A_UINT16 ps_fail_event_policy);
151A_STATUS wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout); 151int wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout);
152A_STATUS wmi_sync_cmd(struct wmi_t *wmip, A_UINT8 syncNumber); 152int wmi_sync_cmd(struct wmi_t *wmip, A_UINT8 syncNumber);
153A_STATUS wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream); 153int wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream);
154A_STATUS wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 streamID); 154int wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 streamID);
155A_STATUS wmi_set_framerate_cmd(struct wmi_t *wmip, A_UINT8 bEnable, A_UINT8 type, A_UINT8 subType, A_UINT16 rateMask); 155int wmi_set_framerate_cmd(struct wmi_t *wmip, A_UINT8 bEnable, A_UINT8 type, A_UINT8 subType, A_UINT16 rateMask);
156A_STATUS wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate); 156int wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate);
157A_STATUS wmi_get_bitrate_cmd(struct wmi_t *wmip); 157int wmi_get_bitrate_cmd(struct wmi_t *wmip);
158A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx); 158A_INT8 wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx);
159A_STATUS wmi_get_regDomain_cmd(struct wmi_t *wmip); 159int wmi_get_regDomain_cmd(struct wmi_t *wmip);
160A_STATUS wmi_get_channelList_cmd(struct wmi_t *wmip); 160int wmi_get_channelList_cmd(struct wmi_t *wmip);
161A_STATUS wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam, 161int wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
162 WMI_PHY_MODE mode, A_INT8 numChan, 162 WMI_PHY_MODE mode, A_INT8 numChan,
163 A_UINT16 *channelList); 163 A_UINT16 *channelList);
164 164
165A_STATUS wmi_set_snr_threshold_params(struct wmi_t *wmip, 165int wmi_set_snr_threshold_params(struct wmi_t *wmip,
166 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); 166 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
167A_STATUS wmi_set_rssi_threshold_params(struct wmi_t *wmip, 167int wmi_set_rssi_threshold_params(struct wmi_t *wmip,
168 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd); 168 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
169A_STATUS wmi_clr_rssi_snr(struct wmi_t *wmip); 169int wmi_clr_rssi_snr(struct wmi_t *wmip);
170A_STATUS wmi_set_lq_threshold_params(struct wmi_t *wmip, 170int wmi_set_lq_threshold_params(struct wmi_t *wmip,
171 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd); 171 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd);
172A_STATUS wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold); 172int wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold);
173A_STATUS wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status, A_UINT8 preamblePolicy); 173int wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status, A_UINT8 preamblePolicy);
174 174
175A_STATUS wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); 175int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
176 176
177A_STATUS wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, 177int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie,
178 A_UINT32 source); 178 A_UINT32 source);
179 179
180A_STATUS wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, 180int wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
181 A_UINT16 tsr, A_BOOL rep, A_UINT16 size, 181 A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
182 A_UINT32 valid); 182 A_UINT32 valid);
183 183
184A_STATUS wmi_get_stats_cmd(struct wmi_t *wmip); 184int wmi_get_stats_cmd(struct wmi_t *wmip);
185 185
186A_STATUS wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, 186int wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex,
187 CRYPTO_TYPE keyType, A_UINT8 keyUsage, 187 CRYPTO_TYPE keyType, A_UINT8 keyUsage,
188 A_UINT8 keyLength,A_UINT8 *keyRSC, 188 A_UINT8 keyLength,A_UINT8 *keyRSC,
189 A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl, A_UINT8 *mac, 189 A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl, A_UINT8 *mac,
190 WMI_SYNC_FLAG sync_flag); 190 WMI_SYNC_FLAG sync_flag);
191A_STATUS wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk); 191int wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk);
192A_STATUS wmi_delete_krk_cmd(struct wmi_t *wmip); 192int wmi_delete_krk_cmd(struct wmi_t *wmip);
193A_STATUS wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex); 193int wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex);
194A_STATUS wmi_set_akmp_params_cmd(struct wmi_t *wmip, 194int wmi_set_akmp_params_cmd(struct wmi_t *wmip,
195 WMI_SET_AKMP_PARAMS_CMD *akmpParams); 195 WMI_SET_AKMP_PARAMS_CMD *akmpParams);
196A_STATUS wmi_get_pmkid_list_cmd(struct wmi_t *wmip); 196int wmi_get_pmkid_list_cmd(struct wmi_t *wmip);
197A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip, 197int wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
198 WMI_SET_PMKID_LIST_CMD *pmkInfo); 198 WMI_SET_PMKID_LIST_CMD *pmkInfo);
199A_STATUS wmi_abort_scan_cmd(struct wmi_t *wmip); 199int wmi_abort_scan_cmd(struct wmi_t *wmip);
200A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM); 200int wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
201A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip); 201int wmi_get_txPwr_cmd(struct wmi_t *wmip);
202A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid); 202int wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
203A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex); 203int wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
204A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en); 204int wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
205A_STATUS wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId, 205int wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
206 A_BOOL set); 206 A_BOOL set);
207A_STATUS wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT8 ac, A_UINT16 txop, 207int wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT8 ac, A_UINT16 txop,
208 A_UINT8 eCWmin, A_UINT8 eCWmax, 208 A_UINT8 eCWmin, A_UINT8 eCWmax,
209 A_UINT8 aifsn); 209 A_UINT8 aifsn);
210A_STATUS wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType, 210int wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
211 A_UINT8 trafficClass, A_UINT8 maxRetries, 211 A_UINT8 trafficClass, A_UINT8 maxRetries,
212 A_UINT8 enableNotify); 212 A_UINT8 enableNotify);
213 213
214void wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid); 214void wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid);
215 215
216A_STATUS wmi_get_roam_tbl_cmd(struct wmi_t *wmip); 216int wmi_get_roam_tbl_cmd(struct wmi_t *wmip);
217A_STATUS wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType); 217int wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType);
218A_STATUS wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p, 218int wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
219 A_UINT8 size); 219 A_UINT8 size);
220A_STATUS wmi_set_powersave_timers_cmd(struct wmi_t *wmip, 220int wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
221 WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd, 221 WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
222 A_UINT8 size); 222 A_UINT8 size);
223 223
224A_STATUS wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode); 224int wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode);
225A_STATUS wmi_opt_tx_frame_cmd(struct wmi_t *wmip, 225int wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
226 A_UINT8 frmType, 226 A_UINT8 frmType,
227 A_UINT8 *dstMacAddr, 227 A_UINT8 *dstMacAddr,
228 A_UINT8 *bssid, 228 A_UINT8 *bssid,
229 A_UINT16 optIEDataLen, 229 A_UINT16 optIEDataLen,
230 A_UINT8 *optIEData); 230 A_UINT8 *optIEData);
231 231
232A_STATUS wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl); 232int wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl);
233A_STATUS wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize); 233int wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize);
234A_STATUS wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSpLen); 234int wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSpLen);
235A_UINT8 convert_userPriority_to_trafficClass(A_UINT8 userPriority); 235A_UINT8 convert_userPriority_to_trafficClass(A_UINT8 userPriority);
236A_UINT8 wmi_get_power_mode_cmd(struct wmi_t *wmip); 236A_UINT8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
237A_STATUS wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance); 237int wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance);
238 238
239#ifdef CONFIG_HOST_TCMD_SUPPORT 239#ifdef CONFIG_HOST_TCMD_SUPPORT
240A_STATUS wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32 len); 240int wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32 len);
241#endif 241#endif
242 242
243A_STATUS wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status); 243int wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status);
244A_STATUS wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd); 244int wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd);
245 245
246A_STATUS wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd); 246int wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd);
247 247
248A_STATUS wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip, 248int wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip,
249 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD * cmd); 249 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD * cmd);
250 250
251A_STATUS wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip, 251int wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip,
252 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD *cmd); 252 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD *cmd);
253 253
254A_STATUS wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip, 254int wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip,
255 WMI_SET_BTCOEX_SCO_CONFIG_CMD * cmd); 255 WMI_SET_BTCOEX_SCO_CONFIG_CMD * cmd);
256 256
257A_STATUS wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip, 257int wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip,
258 WMI_SET_BTCOEX_A2DP_CONFIG_CMD* cmd); 258 WMI_SET_BTCOEX_A2DP_CONFIG_CMD* cmd);
259 259
260 260
261A_STATUS wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD* cmd); 261int wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD* cmd);
262 262
263A_STATUS wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd); 263int wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd);
264 264
265A_STATUS wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip, 265int wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip,
266 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD * cmd); 266 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD * cmd);
267 267
268A_STATUS wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd); 268int wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd);
269 269
270A_STATUS wmi_get_btcoex_stats_cmd(struct wmi_t * wmip); 270int wmi_get_btcoex_stats_cmd(struct wmi_t * wmip);
271 271
272A_STATUS wmi_SGI_cmd(struct wmi_t *wmip, A_UINT32 sgiMask, A_UINT8 sgiPERThreshold); 272int wmi_SGI_cmd(struct wmi_t *wmip, A_UINT32 sgiMask, A_UINT8 sgiPERThreshold);
273 273
274/* 274/*
275 * This function is used to configure the fix rates mask to the target. 275 * This function is used to configure the fix rates mask to the target.
276 */ 276 */
277A_STATUS wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask); 277int wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask);
278A_STATUS wmi_get_ratemask_cmd(struct wmi_t *wmip); 278int wmi_get_ratemask_cmd(struct wmi_t *wmip);
279 279
280A_STATUS wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode); 280int wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
281 281
282A_STATUS wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode); 282int wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
283 283
284A_STATUS wmi_set_qos_supp_cmd(struct wmi_t *wmip,A_UINT8 status); 284int wmi_set_qos_supp_cmd(struct wmi_t *wmip,A_UINT8 status);
285A_STATUS wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status); 285int wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status);
286A_STATUS wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable); 286int wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable);
287A_STATUS wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode); 287int wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode);
288 288
289A_STATUS wmi_get_keepalive_configured(struct wmi_t *wmip); 289int wmi_get_keepalive_configured(struct wmi_t *wmip);
290A_UINT8 wmi_get_keepalive_cmd(struct wmi_t *wmip); 290A_UINT8 wmi_get_keepalive_cmd(struct wmi_t *wmip);
291A_STATUS wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval); 291int wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval);
292 292
293A_STATUS wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, 293int wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType,
294 A_UINT8 ieLen,A_UINT8 *ieInfo); 294 A_UINT8 ieLen,A_UINT8 *ieInfo);
295 295
296A_STATUS wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen); 296int wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen);
297 297
298A_INT32 wmi_get_rate(A_INT8 rateindex); 298A_INT32 wmi_get_rate(A_INT8 rateindex);
299 299
300A_STATUS wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd); 300int wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *cmd);
301 301
302/*Wake on Wireless WMI commands*/ 302/*Wake on Wireless WMI commands*/
303A_STATUS wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, WMI_SET_HOST_SLEEP_MODE_CMD *cmd); 303int wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, WMI_SET_HOST_SLEEP_MODE_CMD *cmd);
304A_STATUS wmi_set_wow_mode_cmd(struct wmi_t *wmip, WMI_SET_WOW_MODE_CMD *cmd); 304int wmi_set_wow_mode_cmd(struct wmi_t *wmip, WMI_SET_WOW_MODE_CMD *cmd);
305A_STATUS wmi_get_wow_list_cmd(struct wmi_t *wmip, WMI_GET_WOW_LIST_CMD *cmd); 305int wmi_get_wow_list_cmd(struct wmi_t *wmip, WMI_GET_WOW_LIST_CMD *cmd);
306A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip, 306int wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
307 WMI_ADD_WOW_PATTERN_CMD *cmd, A_UINT8* pattern, A_UINT8* mask, A_UINT8 pattern_size); 307 WMI_ADD_WOW_PATTERN_CMD *cmd, A_UINT8* pattern, A_UINT8* mask, A_UINT8 pattern_size);
308A_STATUS wmi_del_wow_pattern_cmd(struct wmi_t *wmip, 308int wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
309 WMI_DEL_WOW_PATTERN_CMD *cmd); 309 WMI_DEL_WOW_PATTERN_CMD *cmd);
310A_STATUS wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status); 310int wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
311 311
312A_STATUS 312int
313wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer); 313wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer);
314 314
315A_STATUS 315int
316wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4); 316wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4);
317 317
318A_STATUS 318int
319wmi_del_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4); 319wmi_del_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4);
320 320
321A_STATUS 321int
322wmi_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 enable); 322wmi_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 enable);
323 323
324bss_t * 324bss_t *
@@ -333,93 +333,93 @@ void
333wmi_set_nodeage(struct wmi_t *wmip, A_UINT32 nodeAge); 333wmi_set_nodeage(struct wmi_t *wmip, A_UINT32 nodeAge);
334 334
335#if defined(CONFIG_TARGET_PROFILE_SUPPORT) 335#if defined(CONFIG_TARGET_PROFILE_SUPPORT)
336A_STATUS wmi_prof_cfg_cmd(struct wmi_t *wmip, A_UINT32 period, A_UINT32 nbins); 336int wmi_prof_cfg_cmd(struct wmi_t *wmip, A_UINT32 period, A_UINT32 nbins);
337A_STATUS wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr); 337int wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr);
338A_STATUS wmi_prof_start_cmd(struct wmi_t *wmip); 338int wmi_prof_start_cmd(struct wmi_t *wmip);
339A_STATUS wmi_prof_stop_cmd(struct wmi_t *wmip); 339int wmi_prof_stop_cmd(struct wmi_t *wmip);
340A_STATUS wmi_prof_count_get_cmd(struct wmi_t *wmip); 340int wmi_prof_count_get_cmd(struct wmi_t *wmip);
341#endif /* CONFIG_TARGET_PROFILE_SUPPORT */ 341#endif /* CONFIG_TARGET_PROFILE_SUPPORT */
342#ifdef OS_ROAM_MANAGEMENT 342#ifdef OS_ROAM_MANAGEMENT
343void wmi_scan_indication (struct wmi_t *wmip); 343void wmi_scan_indication (struct wmi_t *wmip);
344#endif 344#endif
345 345
346A_STATUS 346int
347wmi_set_target_event_report_cmd(struct wmi_t *wmip, WMI_SET_TARGET_EVENT_REPORT_CMD* cmd); 347wmi_set_target_event_report_cmd(struct wmi_t *wmip, WMI_SET_TARGET_EVENT_REPORT_CMD* cmd);
348 348
349bss_t *wmi_rm_current_bss (struct wmi_t *wmip, A_UINT8 *id); 349bss_t *wmi_rm_current_bss (struct wmi_t *wmip, A_UINT8 *id);
350A_STATUS wmi_add_current_bss (struct wmi_t *wmip, A_UINT8 *id, bss_t *bss); 350int wmi_add_current_bss (struct wmi_t *wmip, A_UINT8 *id, bss_t *bss);
351 351
352 352
353/* 353/*
354 * AP mode 354 * AP mode
355 */ 355 */
356A_STATUS 356int
357wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p); 357wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p);
358 358
359A_STATUS 359int
360wmi_ap_set_hidden_ssid(struct wmi_t *wmip, A_UINT8 hidden_ssid); 360wmi_ap_set_hidden_ssid(struct wmi_t *wmip, A_UINT8 hidden_ssid);
361 361
362A_STATUS 362int
363wmi_ap_set_num_sta(struct wmi_t *wmip, A_UINT8 num_sta); 363wmi_ap_set_num_sta(struct wmi_t *wmip, A_UINT8 num_sta);
364 364
365A_STATUS 365int
366wmi_ap_set_acl_policy(struct wmi_t *wmip, A_UINT8 policy); 366wmi_ap_set_acl_policy(struct wmi_t *wmip, A_UINT8 policy);
367 367
368A_STATUS 368int
369wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *a); 369wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *a);
370 370
371A_UINT8 371A_UINT8
372acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl); 372acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl);
373 373
374A_STATUS 374int
375wmi_ap_set_mlme(struct wmi_t *wmip, A_UINT8 cmd, A_UINT8 *mac, A_UINT16 reason); 375wmi_ap_set_mlme(struct wmi_t *wmip, A_UINT8 cmd, A_UINT8 *mac, A_UINT16 reason);
376 376
377A_STATUS 377int
378wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, A_BOOL flag); 378wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, A_BOOL flag);
379 379
380A_STATUS 380int
381wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); 381wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period);
382 382
383A_STATUS 383int
384wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell); 384wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell);
385 385
386A_STATUS 386int
387wmi_ap_set_dtim(struct wmi_t *wmip, A_UINT8 dtim); 387wmi_ap_set_dtim(struct wmi_t *wmip, A_UINT8 dtim);
388 388
389A_STATUS 389int
390wmi_ap_set_rateset(struct wmi_t *wmip, A_UINT8 rateset); 390wmi_ap_set_rateset(struct wmi_t *wmip, A_UINT8 rateset);
391 391
392A_STATUS 392int
393wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd); 393wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd);
394 394
395A_STATUS 395int
396wmi_set_ht_op_cmd(struct wmi_t *wmip, A_UINT8 sta_chan_width); 396wmi_set_ht_op_cmd(struct wmi_t *wmip, A_UINT8 sta_chan_width);
397 397
398A_STATUS 398int
399wmi_send_hci_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT16 sz); 399wmi_send_hci_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT16 sz);
400 400
401A_STATUS 401int
402wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); 402wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray);
403 403
404A_STATUS 404int
405wmi_setup_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid); 405wmi_setup_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid);
406 406
407A_STATUS 407int
408wmi_delete_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid, A_BOOL uplink); 408wmi_delete_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid, A_BOOL uplink);
409 409
410A_STATUS 410int
411wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask); 411wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask);
412 412
413A_STATUS 413int
414wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, A_UINT8 rxMetaVersion, A_BOOL rxDot11Hdr, A_BOOL defragOnHost); 414wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, A_UINT8 rxMetaVersion, A_BOOL rxDot11Hdr, A_BOOL defragOnHost);
415 415
416A_STATUS 416int
417wmi_set_thin_mode_cmd(struct wmi_t *wmip, A_BOOL bThinMode); 417wmi_set_thin_mode_cmd(struct wmi_t *wmip, A_BOOL bThinMode);
418 418
419A_STATUS 419int
420wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE precedence); 420wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE precedence);
421 421
422A_STATUS 422int
423wmi_set_pmk_cmd(struct wmi_t *wmip, A_UINT8 *pmk); 423wmi_set_pmk_cmd(struct wmi_t *wmip, A_UINT8 *pmk);
424 424
425A_UINT16 425A_UINT16
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
index 83bc5be3ef1..687f963ec46 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
@@ -47,14 +47,14 @@
47#define HCI_MAX_EVT_RECV_LENGTH 257 47#define HCI_MAX_EVT_RECV_LENGTH 257
48#define EXIT_MIN_BOOT_COMMAND_STATUS_OFFSET 5 48#define EXIT_MIN_BOOT_COMMAND_STATUS_OFFSET 5
49 49
50A_STATUS AthPSInitialize(AR3K_CONFIG_INFO *hdev); 50int AthPSInitialize(AR3K_CONFIG_INFO *hdev);
51 51
52static A_STATUS SendHCICommand(AR3K_CONFIG_INFO *pConfig, 52static int SendHCICommand(AR3K_CONFIG_INFO *pConfig,
53 A_UINT8 *pBuffer, 53 A_UINT8 *pBuffer,
54 int Length) 54 int Length)
55{ 55{
56 HTC_PACKET *pPacket = NULL; 56 HTC_PACKET *pPacket = NULL;
57 A_STATUS status = A_OK; 57 int status = A_OK;
58 58
59 do { 59 do {
60 60
@@ -84,11 +84,11 @@ static A_STATUS SendHCICommand(AR3K_CONFIG_INFO *pConfig,
84 return status; 84 return status;
85} 85}
86 86
87static A_STATUS RecvHCIEvent(AR3K_CONFIG_INFO *pConfig, 87static int RecvHCIEvent(AR3K_CONFIG_INFO *pConfig,
88 A_UINT8 *pBuffer, 88 A_UINT8 *pBuffer,
89 int *pLength) 89 int *pLength)
90{ 90{
91 A_STATUS status = A_OK; 91 int status = A_OK;
92 HTC_PACKET *pRecvPacket = NULL; 92 HTC_PACKET *pRecvPacket = NULL;
93 93
94 do { 94 do {
@@ -122,13 +122,13 @@ static A_STATUS RecvHCIEvent(AR3K_CONFIG_INFO *pConfig,
122 return status; 122 return status;
123} 123}
124 124
125A_STATUS SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, 125int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
126 A_UINT8 *pHCICommand, 126 A_UINT8 *pHCICommand,
127 int CmdLength, 127 int CmdLength,
128 A_UINT8 **ppEventBuffer, 128 A_UINT8 **ppEventBuffer,
129 A_UINT8 **ppBufferToFree) 129 A_UINT8 **ppBufferToFree)
130{ 130{
131 A_STATUS status = A_OK; 131 int status = A_OK;
132 A_UINT8 *pBuffer = NULL; 132 A_UINT8 *pBuffer = NULL;
133 A_UINT8 *pTemp; 133 A_UINT8 *pTemp;
134 int length; 134 int length;
@@ -209,9 +209,9 @@ A_STATUS SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
209 return status; 209 return status;
210} 210}
211 211
212static A_STATUS AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig) 212static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
213{ 213{
214 A_STATUS status = A_OK; 214 int status = A_OK;
215 A_UINT8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0}; 215 A_UINT8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0};
216 A_UINT16 baudVal; 216 A_UINT16 baudVal;
217 A_UINT8 *pEvent = NULL; 217 A_UINT8 *pEvent = NULL;
@@ -274,9 +274,9 @@ static A_STATUS AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
274 return status; 274 return status;
275} 275}
276 276
277static A_STATUS AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig) 277static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
278{ 278{
279 A_STATUS status; 279 int status;
280 A_CHAR exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00, 280 A_CHAR exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
281 0x00,0x00,0x00,0x00,0x00}; 281 0x00,0x00,0x00,0x00,0x00};
282 A_UINT8 *pEvent = NULL; 282 A_UINT8 *pEvent = NULL;
@@ -310,9 +310,9 @@ static A_STATUS AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
310 return status; 310 return status;
311} 311}
312 312
313static A_STATUS AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig) 313static int AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig)
314{ 314{
315 A_STATUS status = A_OK; 315 int status = A_OK;
316 A_UINT8 hciResetCommand[] = {0x03,0x0c,0x0}; 316 A_UINT8 hciResetCommand[] = {0x03,0x0c,0x0};
317 A_UINT8 *pEvent = NULL; 317 A_UINT8 *pEvent = NULL;
318 A_UINT8 *pBufferToFree = NULL; 318 A_UINT8 *pBufferToFree = NULL;
@@ -334,9 +334,9 @@ static A_STATUS AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig)
334 return status; 334 return status;
335} 335}
336 336
337static A_STATUS AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) 337static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
338{ 338{
339 A_STATUS status; 339 int status;
340 /* AR3K vendor specific command for Host Wakeup Config */ 340 /* AR3K vendor specific command for Host Wakeup Config */
341 A_CHAR hostWakeupConfig[] = {0x31,0xFC,0x18, 341 A_CHAR hostWakeupConfig[] = {0x31,0xFC,0x18,
342 0x02,0x00,0x00,0x00, 342 0x02,0x00,0x00,0x00,
@@ -453,9 +453,9 @@ static A_STATUS AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
453 return status; 453 return status;
454} 454}
455 455
456A_STATUS AR3KConfigure(AR3K_CONFIG_INFO *pConfig) 456int AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
457{ 457{
458 A_STATUS status = A_OK; 458 int status = A_OK;
459 459
460 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Configuring AR3K ...\n")); 460 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Configuring AR3K ...\n"));
461 461
@@ -521,9 +521,9 @@ A_STATUS AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
521 return status; 521 return status;
522} 522}
523 523
524A_STATUS AR3KConfigureExit(void *config) 524int AR3KConfigureExit(void *config)
525{ 525{
526 A_STATUS status = A_OK; 526 int status = A_OK;
527 AR3K_CONFIG_INFO *pConfig = (AR3K_CONFIG_INFO *)config; 527 AR3K_CONFIG_INFO *pConfig = (AR3K_CONFIG_INFO *)config;
528 528
529 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Cleaning up AR3K ...\n")); 529 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Cleaning up AR3K ...\n"));
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 0e298dba9fc..50f2edd0827 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -46,7 +46,7 @@ typedef struct {
46 AR3K_CONFIG_INFO *dev; 46 AR3K_CONFIG_INFO *dev;
47}HciCommandListParam; 47}HciCommandListParam;
48 48
49A_STATUS SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, 49int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
50 A_UINT8 *pHCICommand, 50 A_UINT8 *pHCICommand,
51 int CmdLength, 51 int CmdLength,
52 A_UINT8 **ppEventBuffer, 52 A_UINT8 **ppEventBuffer,
@@ -56,8 +56,8 @@ A_UINT32 Rom_Version;
56A_UINT32 Build_Version; 56A_UINT32 Build_Version;
57extern A_BOOL BDADDR; 57extern A_BOOL BDADDR;
58 58
59A_STATUS getDeviceType(AR3K_CONFIG_INFO *pConfig, A_UINT32 * code); 59int getDeviceType(AR3K_CONFIG_INFO *pConfig, A_UINT32 * code);
60A_STATUS ReadVersionInfo(AR3K_CONFIG_INFO *pConfig); 60int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig);
61#ifndef HCI_TRANSPORT_SDIO 61#ifndef HCI_TRANSPORT_SDIO
62 62
63DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent); 63DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent);
@@ -70,7 +70,7 @@ int PSHciWritepacket(struct hci_dev*,A_UCHAR* Data, A_UINT32 len);
70extern char *bdaddr; 70extern char *bdaddr;
71#endif /* HCI_TRANSPORT_SDIO */ 71#endif /* HCI_TRANSPORT_SDIO */
72 72
73A_STATUS write_bdaddr(AR3K_CONFIG_INFO *pConfig,A_UCHAR *bdaddr,int type); 73int write_bdaddr(AR3K_CONFIG_INFO *pConfig,A_UCHAR *bdaddr,int type);
74 74
75int PSSendOps(void *arg); 75int PSSendOps(void *arg);
76 76
@@ -91,9 +91,9 @@ void Hci_log(A_UCHAR * log_string,A_UCHAR *data,A_UINT32 len)
91 91
92 92
93 93
94A_STATUS AthPSInitialize(AR3K_CONFIG_INFO *hdev) 94int AthPSInitialize(AR3K_CONFIG_INFO *hdev)
95{ 95{
96 A_STATUS status = A_OK; 96 int status = A_OK;
97 if(hdev == NULL) { 97 if(hdev == NULL) {
98 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Device handle received\n")); 98 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Device handle received\n"));
99 return A_ERROR; 99 return A_ERROR;
@@ -389,7 +389,7 @@ complete:
389 * with a HCI Command Complete event. 389 * with a HCI Command Complete event.
390 * For HCI SDIO transport, this will be internally defined. 390 * For HCI SDIO transport, this will be internally defined.
391 */ 391 */
392A_STATUS SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, 392int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
393 A_UINT8 *pHCICommand, 393 A_UINT8 *pHCICommand,
394 int CmdLength, 394 int CmdLength,
395 A_UINT8 **ppEventBuffer, 395 A_UINT8 **ppEventBuffer,
@@ -419,7 +419,7 @@ A_STATUS SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
419} 419}
420#endif /* HCI_TRANSPORT_SDIO */ 420#endif /* HCI_TRANSPORT_SDIO */
421 421
422A_STATUS ReadPSEvent(A_UCHAR* Data){ 422int ReadPSEvent(A_UCHAR* Data){
423 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" PS Event %x %x %x\n",Data[4],Data[5],Data[3])); 423 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" PS Event %x %x %x\n",Data[4],Data[5],Data[3]));
424 424
425 if(Data[4] == 0xFC && Data[5] == 0x00) 425 if(Data[4] == 0xFC && Data[5] == 0x00)
@@ -481,14 +481,14 @@ int str2ba(unsigned char *str_bdaddr,unsigned char *bdaddr)
481 return 0; 481 return 0;
482} 482}
483 483
484A_STATUS write_bdaddr(AR3K_CONFIG_INFO *pConfig,A_UCHAR *bdaddr,int type) 484int write_bdaddr(AR3K_CONFIG_INFO *pConfig,A_UCHAR *bdaddr,int type)
485{ 485{
486 A_UCHAR bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, 486 A_UCHAR bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01,
487 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 487 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
488 488
489 A_UINT8 *event; 489 A_UINT8 *event;
490 A_UINT8 *bufferToFree = NULL; 490 A_UINT8 *bufferToFree = NULL;
491 A_STATUS result = A_ERROR; 491 int result = A_ERROR;
492 int inc,outc; 492 int inc,outc;
493 493
494 if (type == BDADDR_TYPE_STRING) 494 if (type == BDADDR_TYPE_STRING)
@@ -516,12 +516,12 @@ A_STATUS write_bdaddr(AR3K_CONFIG_INFO *pConfig,A_UCHAR *bdaddr,int type)
516 return result; 516 return result;
517 517
518} 518}
519A_STATUS ReadVersionInfo(AR3K_CONFIG_INFO *pConfig) 519int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig)
520{ 520{
521 A_UINT8 hciCommand[] = {0x1E,0xfc,0x00}; 521 A_UINT8 hciCommand[] = {0x1E,0xfc,0x00};
522 A_UINT8 *event; 522 A_UINT8 *event;
523 A_UINT8 *bufferToFree = NULL; 523 A_UINT8 *bufferToFree = NULL;
524 A_STATUS result = A_ERROR; 524 int result = A_ERROR;
525 if(A_OK == SendHCICommandWaitCommandComplete(pConfig,hciCommand,sizeof(hciCommand),&event,&bufferToFree)) { 525 if(A_OK == SendHCICommandWaitCommandComplete(pConfig,hciCommand,sizeof(hciCommand),&event,&bufferToFree)) {
526 result = ReadPSEvent(event); 526 result = ReadPSEvent(event);
527 527
@@ -531,13 +531,13 @@ A_STATUS ReadVersionInfo(AR3K_CONFIG_INFO *pConfig)
531 } 531 }
532 return result; 532 return result;
533} 533}
534A_STATUS getDeviceType(AR3K_CONFIG_INFO *pConfig, A_UINT32 * code) 534int getDeviceType(AR3K_CONFIG_INFO *pConfig, A_UINT32 * code)
535{ 535{
536 A_UINT8 hciCommand[] = {0x05,0xfc,0x05,0x00,0x00,0x00,0x00,0x04}; 536 A_UINT8 hciCommand[] = {0x05,0xfc,0x05,0x00,0x00,0x00,0x00,0x04};
537 A_UINT8 *event; 537 A_UINT8 *event;
538 A_UINT8 *bufferToFree = NULL; 538 A_UINT8 *bufferToFree = NULL;
539 A_UINT32 reg; 539 A_UINT32 reg;
540 A_STATUS result = A_ERROR; 540 int result = A_ERROR;
541 *code = 0; 541 *code = 0;
542 hciCommand[3] = (A_UINT8)(FPGA_REGISTER & 0xFF); 542 hciCommand[3] = (A_UINT8)(FPGA_REGISTER & 0xFF);
543 hciCommand[4] = (A_UINT8)((FPGA_REGISTER >> 8) & 0xFF); 543 hciCommand[4] = (A_UINT8)((FPGA_REGISTER >> 8) & 0xFF);
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
index 4e5b7bfc0ea..975bf625024 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
@@ -70,6 +70,6 @@ extern wait_queue_t Eventwait;
70extern A_UCHAR *HciEventpacket; 70extern A_UCHAR *HciEventpacket;
71#endif /* #ifndef HCI_TRANSPORT_SDIO */ 71#endif /* #ifndef HCI_TRANSPORT_SDIO */
72 72
73A_STATUS AthPSInitialize(AR3K_CONFIG_INFO *hdev); 73int AthPSInitialize(AR3K_CONFIG_INFO *hdev);
74A_STATUS ReadPSEvent(A_UCHAR* Data); 74int ReadPSEvent(A_UCHAR* Data);
75#endif /* __AR3KPSCONFIG_H */ 75#endif /* __AR3KPSCONFIG_H */
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
index 8dce0542282..3b2c0ccdf1d 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
@@ -127,10 +127,10 @@ tPsTagEntry PsTagEntry[RAMPS_MAX_PS_TAGS_PER_FILE];
127tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY]; 127tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY];
128 128
129 129
130A_STATUS AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat); 130int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat);
131char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos); 131char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos);
132char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos); 132char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos);
133static A_STATUS AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index); 133static int AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index);
134 134
135/* Function to reads the next character from the input buffer */ 135/* Function to reads the next character from the input buffer */
136char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos) 136char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos)
@@ -315,7 +315,7 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm
315 return (0x0FFF); 315 return (0x0FFF);
316 } 316 }
317} 317}
318A_STATUS AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat) 318int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
319{ 319{
320 char *Buffer; 320 char *Buffer;
321 char *pCharLine; 321 char *pCharLine;
@@ -558,7 +558,7 @@ A_STATUS AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat
558/********************/ 558/********************/
559 559
560 560
561A_STATUS GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer) 561int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer)
562{ 562{
563 unsigned char ch; 563 unsigned char ch;
564 564
@@ -579,7 +579,7 @@ A_STATUS GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * b
579 return A_OK; 579 return A_OK;
580} 580}
581 581
582A_STATUS AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen) 582int AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen)
583{ 583{
584 584
585 char Byte[3]; 585 char Byte[3];
@@ -659,9 +659,9 @@ A_STATUS AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen)
659 659
660 660
661/********************/ 661/********************/
662A_STATUS AthDoParsePS(A_UCHAR *srcbuffer, A_UINT32 srclen) 662int AthDoParsePS(A_UCHAR *srcbuffer, A_UINT32 srclen)
663{ 663{
664 A_STATUS status; 664 int status;
665 int i; 665 int i;
666 A_BOOL BDADDR_Present = A_ERROR; 666 A_BOOL BDADDR_Present = A_ERROR;
667 667
@@ -833,7 +833,7 @@ int AthCreateCommandList(PSCmdPacket **HciPacketList, A_UINT32 *numPackets)
833//////////////////////// 833////////////////////////
834 834
835///////////// 835/////////////
836static A_STATUS AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index) 836static int AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index)
837{ 837{
838 A_UCHAR *HCI_PS_Command; 838 A_UCHAR *HCI_PS_Command;
839 A_UINT32 Length; 839 A_UINT32 Length;
@@ -955,7 +955,7 @@ static A_STATUS AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacke
955 } 955 }
956 return A_OK; 956 return A_OK;
957} 957}
958A_STATUS AthFreeCommandList(PSCmdPacket **HciPacketList, A_UINT32 numPackets) 958int AthFreeCommandList(PSCmdPacket **HciPacketList, A_UINT32 numPackets)
959{ 959{
960 int i; 960 int i;
961 if(*HciPacketList == NULL) { 961 if(*HciPacketList == NULL) {
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
index 007b0eb950d..96c3e3f9030 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
@@ -104,10 +104,10 @@ typedef struct PSCmdPacket
104} PSCmdPacket; 104} PSCmdPacket;
105 105
106/* Parses a Patch information buffer and store it in global structure */ 106/* Parses a Patch information buffer and store it in global structure */
107A_STATUS AthDoParsePatch(A_UCHAR *, A_UINT32); 107int AthDoParsePatch(A_UCHAR *, A_UINT32);
108 108
109/* parses a PS information buffer and stores it in a global structure */ 109/* parses a PS information buffer and stores it in a global structure */
110A_STATUS AthDoParsePS(A_UCHAR *, A_UINT32); 110int AthDoParsePS(A_UCHAR *, A_UINT32);
111 111
112/* 112/*
113 * Uses the output of Both AthDoParsePS and AthDoParsePatch APIs to form HCI command array with 113 * Uses the output of Both AthDoParsePS and AthDoParsePatch APIs to form HCI command array with
@@ -123,5 +123,5 @@ A_STATUS AthDoParsePS(A_UCHAR *, A_UINT32);
123int AthCreateCommandList(PSCmdPacket **, A_UINT32 *); 123int AthCreateCommandList(PSCmdPacket **, A_UINT32 *);
124 124
125/* Cleanup the dynamically allicated HCI command list */ 125/* Cleanup the dynamically allicated HCI command list */
126A_STATUS AthFreeCommandList(PSCmdPacket **HciPacketList, A_UINT32 numPackets); 126int AthFreeCommandList(PSCmdPacket **HciPacketList, A_UINT32 numPackets);
127#endif /* __AR3KPSPARSER_H */ 127#endif /* __AR3KPSPARSER_H */
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 6754fde467d..2b5fe5bed85 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -83,9 +83,9 @@ static A_UINT8 custDataAR6003[AR6003_CUST_DATA_SIZE];
83#ifdef USE_4BYTE_REGISTER_ACCESS 83#ifdef USE_4BYTE_REGISTER_ACCESS
84 84
85 /* set the window address register (using 4-byte register access ). */ 85 /* set the window address register (using 4-byte register access ). */
86A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address) 86int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
87{ 87{
88 A_STATUS status; 88 int status;
89 A_UINT8 addrValue[4]; 89 A_UINT8 addrValue[4];
90 A_INT32 i; 90 A_INT32 i;
91 91
@@ -144,9 +144,9 @@ A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 Registe
144#else 144#else
145 145
146 /* set the window address register */ 146 /* set the window address register */
147A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address) 147int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
148{ 148{
149 A_STATUS status; 149 int status;
150 150
151 /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written 151 /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
152 * last to initiate the access cycle */ 152 * last to initiate the access cycle */
@@ -186,10 +186,10 @@ A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 Registe
186 * Read from the AR6000 through its diagnostic window. 186 * Read from the AR6000 through its diagnostic window.
187 * No cooperation from the Target is required for this. 187 * No cooperation from the Target is required for this.
188 */ 188 */
189A_STATUS 189int
190ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data) 190ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
191{ 191{
192 A_STATUS status; 192 int status;
193 193
194 /* set window register to start read cycle */ 194 /* set window register to start read cycle */
195 status = ar6000_SetAddressWindowRegister(hifDevice, 195 status = ar6000_SetAddressWindowRegister(hifDevice,
@@ -220,10 +220,10 @@ ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
220 * Write to the AR6000 through its diagnostic window. 220 * Write to the AR6000 through its diagnostic window.
221 * No cooperation from the Target is required for this. 221 * No cooperation from the Target is required for this.
222 */ 222 */
223A_STATUS 223int
224ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data) 224ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
225{ 225{
226 A_STATUS status; 226 int status;
227 227
228 /* set write data */ 228 /* set write data */
229 status = HIFReadWrite(hifDevice, 229 status = HIFReadWrite(hifDevice,
@@ -243,12 +243,12 @@ ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
243 *address); 243 *address);
244 } 244 }
245 245
246A_STATUS 246int
247ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 247ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
248 A_UCHAR *data, A_UINT32 length) 248 A_UCHAR *data, A_UINT32 length)
249{ 249{
250 A_UINT32 count; 250 A_UINT32 count;
251 A_STATUS status = A_OK; 251 int status = A_OK;
252 252
253 for (count = 0; count < length; count += 4, address += 4) { 253 for (count = 0; count < length; count += 4, address += 4) {
254 if ((status = ar6000_ReadRegDiag(hifDevice, &address, 254 if ((status = ar6000_ReadRegDiag(hifDevice, &address,
@@ -261,12 +261,12 @@ ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
261 return status; 261 return status;
262} 262}
263 263
264A_STATUS 264int
265ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 265ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
266 A_UCHAR *data, A_UINT32 length) 266 A_UCHAR *data, A_UINT32 length)
267{ 267{
268 A_UINT32 count; 268 A_UINT32 count;
269 A_STATUS status = A_OK; 269 int status = A_OK;
270 270
271 for (count = 0; count < length; count += 4, address += 4) { 271 for (count = 0; count < length; count += 4, address += 4) {
272 if ((status = ar6000_WriteRegDiag(hifDevice, &address, 272 if ((status = ar6000_WriteRegDiag(hifDevice, &address,
@@ -279,10 +279,10 @@ ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
279 return status; 279 return status;
280} 280}
281 281
282A_STATUS 282int
283ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval) 283ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval)
284{ 284{
285 A_STATUS status; 285 int status;
286 A_UCHAR vals[4]; 286 A_UCHAR vals[4];
287 A_UCHAR register_selection[4]; 287 A_UCHAR register_selection[4];
288 288
@@ -329,10 +329,10 @@ ar6k_FetchTargetRegs(HIF_DEVICE *hifDevice, A_UINT32 *targregs)
329} 329}
330 330
331#if 0 331#if 0
332static A_STATUS 332static int
333_do_write_diag(HIF_DEVICE *hifDevice, A_UINT32 addr, A_UINT32 value) 333_do_write_diag(HIF_DEVICE *hifDevice, A_UINT32 addr, A_UINT32 value)
334{ 334{
335 A_STATUS status; 335 int status;
336 336
337 status = ar6000_WriteRegDiag(hifDevice, &addr, &value); 337 status = ar6000_WriteRegDiag(hifDevice, &addr, &value);
338 if (status != A_OK) 338 if (status != A_OK)
@@ -357,7 +357,7 @@ _do_write_diag(HIF_DEVICE *hifDevice, A_UINT32 addr, A_UINT32 value)
357 * TBD: Might want to add special handling for AR6K_OPTION_BMI_DISABLE. 357 * TBD: Might want to add special handling for AR6K_OPTION_BMI_DISABLE.
358 */ 358 */
359#if 0 359#if 0
360static A_STATUS 360static int
361_delay_until_target_alive(HIF_DEVICE *hifDevice, A_INT32 wait_msecs, A_UINT32 TargetType) 361_delay_until_target_alive(HIF_DEVICE *hifDevice, A_INT32 wait_msecs, A_UINT32 TargetType)
362{ 362{
363 A_INT32 actual_wait; 363 A_INT32 actual_wait;
@@ -399,9 +399,9 @@ _delay_until_target_alive(HIF_DEVICE *hifDevice, A_INT32 wait_msecs, A_UINT32 Ta
399#define AR6002_RESET_CONTROL_ADDRESS 0x00004000 399#define AR6002_RESET_CONTROL_ADDRESS 0x00004000
400#define AR6003_RESET_CONTROL_ADDRESS 0x00004000 400#define AR6003_RESET_CONTROL_ADDRESS 0x00004000
401/* reset device */ 401/* reset device */
402A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType, A_BOOL waitForCompletion, A_BOOL coldReset) 402int ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType, A_BOOL waitForCompletion, A_BOOL coldReset)
403{ 403{
404 A_STATUS status = A_OK; 404 int status = A_OK;
405 A_UINT32 address; 405 A_UINT32 address;
406 A_UINT32 data; 406 A_UINT32 data;
407 407
@@ -557,7 +557,7 @@ void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
557{ 557{
558 A_UINT32 address; 558 A_UINT32 address;
559 A_UINT32 regDumpArea = 0; 559 A_UINT32 regDumpArea = 0;
560 A_STATUS status; 560 int status;
561 A_UINT32 regDumpValues[REGISTER_DUMP_LEN_MAX]; 561 A_UINT32 regDumpValues[REGISTER_DUMP_LEN_MAX];
562 A_UINT32 regDumpCount = 0; 562 A_UINT32 regDumpCount = 0;
563 A_UINT32 i; 563 A_UINT32 i;
@@ -625,12 +625,12 @@ void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
625 625
626/* set HTC/Mbox operational parameters, this can only be called when the target is in the 626/* set HTC/Mbox operational parameters, this can only be called when the target is in the
627 * BMI phase */ 627 * BMI phase */
628A_STATUS ar6000_set_htc_params(HIF_DEVICE *hifDevice, 628int ar6000_set_htc_params(HIF_DEVICE *hifDevice,
629 A_UINT32 TargetType, 629 A_UINT32 TargetType,
630 A_UINT32 MboxIsrYieldValue, 630 A_UINT32 MboxIsrYieldValue,
631 A_UINT8 HtcControlBuffers) 631 A_UINT8 HtcControlBuffers)
632{ 632{
633 A_STATUS status; 633 int status;
634 A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX]; 634 A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX];
635 635
636 do { 636 do {
@@ -685,18 +685,18 @@ A_STATUS ar6000_set_htc_params(HIF_DEVICE *hifDevice,
685} 685}
686 686
687 687
688static A_STATUS prepare_ar6002(HIF_DEVICE *hifDevice, A_UINT32 TargetVersion) 688static int prepare_ar6002(HIF_DEVICE *hifDevice, A_UINT32 TargetVersion)
689{ 689{
690 A_STATUS status = A_OK; 690 int status = A_OK;
691 691
692 /* placeholder */ 692 /* placeholder */
693 693
694 return status; 694 return status;
695} 695}
696 696
697static A_STATUS prepare_ar6003(HIF_DEVICE *hifDevice, A_UINT32 TargetVersion) 697static int prepare_ar6003(HIF_DEVICE *hifDevice, A_UINT32 TargetVersion)
698{ 698{
699 A_STATUS status = A_OK; 699 int status = A_OK;
700 700
701 /* placeholder */ 701 /* placeholder */
702 702
@@ -704,7 +704,7 @@ static A_STATUS prepare_ar6003(HIF_DEVICE *hifDevice, A_UINT32 TargetVersion)
704} 704}
705 705
706/* this function assumes the caller has already initialized the BMI APIs */ 706/* this function assumes the caller has already initialized the BMI APIs */
707A_STATUS ar6000_prepare_target(HIF_DEVICE *hifDevice, 707int ar6000_prepare_target(HIF_DEVICE *hifDevice,
708 A_UINT32 TargetType, 708 A_UINT32 TargetType,
709 A_UINT32 TargetVersion) 709 A_UINT32 TargetVersion)
710{ 710{
@@ -725,7 +725,7 @@ A_STATUS ar6000_prepare_target(HIF_DEVICE *hifDevice,
725 * THIS IS FOR USE ONLY WITH AR6002 REV 1.x. 725 * THIS IS FOR USE ONLY WITH AR6002 REV 1.x.
726 * TBDXXX: Remove this function when REV 1.x is desupported. 726 * TBDXXX: Remove this function when REV 1.x is desupported.
727 */ 727 */
728A_STATUS 728int
729ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice) 729ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice)
730{ 730{
731 A_INT32 i; 731 A_INT32 i;
@@ -735,7 +735,7 @@ ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice)
735 }; 735 };
736 struct forceROM_s *ForceROM; 736 struct forceROM_s *ForceROM;
737 A_INT32 szForceROM; 737 A_INT32 szForceROM;
738 A_STATUS status = A_OK; 738 int status = A_OK;
739 A_UINT32 address; 739 A_UINT32 address;
740 A_UINT32 data; 740 A_UINT32 data;
741 741
@@ -934,7 +934,7 @@ void a_dump_module_debug_info_by_name(A_CHAR *module_name)
934 934
935} 935}
936 936
937A_STATUS a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask) 937int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask)
938{ 938{
939 ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name); 939 ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
940 940
@@ -946,7 +946,7 @@ A_STATUS a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask)
946 return A_OK; 946 return A_OK;
947} 947}
948 948
949A_STATUS a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask) 949int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask)
950{ 950{
951 ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name); 951 ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
952 952
@@ -999,11 +999,11 @@ void a_module_debug_support_cleanup(void)
999} 999}
1000 1000
1001 /* can only be called during bmi init stage */ 1001 /* can only be called during bmi init stage */
1002A_STATUS ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice, 1002int ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice,
1003 A_UINT32 TargetType, 1003 A_UINT32 TargetType,
1004 A_UINT32 Flags) 1004 A_UINT32 Flags)
1005{ 1005{
1006 A_STATUS status = A_OK; 1006 int status = A_OK;
1007 1007
1008 do { 1008 do {
1009 1009
diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c
index 91316e0b109..3f7543d08ab 100644
--- a/drivers/staging/ath6kl/miscdrv/credit_dist.c
+++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c
@@ -393,7 +393,7 @@ static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
393} 393}
394 394
395/* initialize and setup credit distribution */ 395/* initialize and setup credit distribution */
396A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo) 396int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo)
397{ 397{
398 HTC_SERVICE_ID servicepriority[5]; 398 HTC_SERVICE_ID servicepriority[5];
399 399
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c
index dbde05f7ed1..88487ccb08e 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_android.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c
@@ -51,7 +51,7 @@ static int screen_is_off;
51static struct early_suspend ar6k_early_suspend; 51static struct early_suspend ar6k_early_suspend;
52#endif 52#endif
53 53
54static A_STATUS (*ar6000_avail_ev_p)(void *, void *); 54static int (*ar6000_avail_ev_p)(void *, void *);
55 55
56#if defined(CONFIG_ANDROID_LOGGER) && (!defined(CONFIG_MMC_MSM)) 56#if defined(CONFIG_ANDROID_LOGGER) && (!defined(CONFIG_MMC_MSM))
57int logger_write(const enum logidx index, 57int logger_write(const enum logidx index,
@@ -269,9 +269,9 @@ void android_release_firmware(const struct firmware *firmware)
269 } 269 }
270} 270}
271 271
272static A_STATUS ar6000_android_avail_ev(void *context, void *hif_handle) 272static int ar6000_android_avail_ev(void *context, void *hif_handle)
273{ 273{
274 A_STATUS ret; 274 int ret;
275 ar6000_enable_mmchost_detect_change(0); 275 ar6000_enable_mmchost_detect_change(0);
276 ret = ar6000_avail_ev_p(context, hif_handle); 276 ret = ar6000_avail_ev_p(context, hif_handle);
277 return ret; 277 return ret;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 126a36a2daa..c171be5a109 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -305,13 +305,13 @@ extern void android_module_exit(void);
305/* 305/*
306 * HTC service connection handlers 306 * HTC service connection handlers
307 */ 307 */
308static A_STATUS ar6000_avail_ev(void *context, void *hif_handle); 308static int ar6000_avail_ev(void *context, void *hif_handle);
309 309
310static A_STATUS ar6000_unavail_ev(void *context, void *hif_handle); 310static int ar6000_unavail_ev(void *context, void *hif_handle);
311 311
312A_STATUS ar6000_configure_target(AR_SOFTC_T *ar); 312int ar6000_configure_target(AR_SOFTC_T *ar);
313 313
314static void ar6000_target_failure(void *Instance, A_STATUS Status); 314static void ar6000_target_failure(void *Instance, int Status);
315 315
316static void ar6000_rx(void *Context, HTC_PACKET *pPacket); 316static void ar6000_rx(void *Context, HTC_PACKET *pPacket);
317 317
@@ -343,17 +343,17 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
343 struct bin_attribute *bin_attr, 343 struct bin_attribute *bin_attr,
344 char *buf, loff_t pos, size_t count); 344 char *buf, loff_t pos, size_t count);
345 345
346static A_STATUS 346static int
347ar6000_sysfs_bmi_init(AR_SOFTC_T *ar); 347ar6000_sysfs_bmi_init(AR_SOFTC_T *ar);
348 348
349/* HCI PAL callback function declarations */ 349/* HCI PAL callback function declarations */
350A_STATUS ar6k_setup_hci_pal(AR_SOFTC_T *ar); 350int ar6k_setup_hci_pal(AR_SOFTC_T *ar);
351void ar6k_cleanup_hci_pal(AR_SOFTC_T *ar); 351void ar6k_cleanup_hci_pal(AR_SOFTC_T *ar);
352 352
353static void 353static void
354ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar); 354ar6000_sysfs_bmi_deinit(AR_SOFTC_T *ar);
355 355
356A_STATUS 356int
357ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode); 357ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode);
358 358
359/* 359/*
@@ -370,7 +370,7 @@ static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie);
370static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar); 370static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar);
371 371
372#ifdef USER_KEYS 372#ifdef USER_KEYS
373static A_STATUS ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl); 373static int ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl);
374#endif 374#endif
375 375
376#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT 376#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
@@ -402,7 +402,7 @@ static struct net_device_ops ar6000_netdev_ops = {
402 */ 402 */
403#define REPORT_DEBUG_LOGS_TO_APP 403#define REPORT_DEBUG_LOGS_TO_APP
404 404
405A_STATUS 405int
406ar6000_set_host_app_area(AR_SOFTC_T *ar) 406ar6000_set_host_app_area(AR_SOFTC_T *ar)
407{ 407{
408 A_UINT32 address, data; 408 A_UINT32 address, data;
@@ -430,7 +430,7 @@ dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
430{ 430{
431 A_UINT32 param; 431 A_UINT32 param;
432 A_UINT32 address; 432 A_UINT32 address;
433 A_STATUS status; 433 int status;
434 434
435 address = TARG_VTOP(ar->arTargetType, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr)); 435 address = TARG_VTOP(ar->arTargetType, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr));
436 if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address, 436 if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address,
@@ -633,7 +633,7 @@ static int __init
633ar6000_init_module(void) 633ar6000_init_module(void)
634{ 634{
635 static int probed = 0; 635 static int probed = 0;
636 A_STATUS status; 636 int status;
637 OSDRV_CALLBACKS osdrvCallbacks; 637 OSDRV_CALLBACKS osdrvCallbacks;
638 638
639 a_module_debug_support_init(); 639 a_module_debug_support_init();
@@ -741,7 +741,7 @@ aptcTimerHandler(unsigned long arg)
741 A_UINT32 numbytes; 741 A_UINT32 numbytes;
742 A_UINT32 throughput; 742 A_UINT32 throughput;
743 AR_SOFTC_T *ar; 743 AR_SOFTC_T *ar;
744 A_STATUS status; 744 int status;
745 745
746 ar = (AR_SOFTC_T *)arg; 746 ar = (AR_SOFTC_T *)arg;
747 A_ASSERT(ar != NULL); 747 A_ASSERT(ar != NULL);
@@ -852,10 +852,10 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj,
852 return count; 852 return count;
853} 853}
854 854
855static A_STATUS 855static int
856ar6000_sysfs_bmi_init(AR_SOFTC_T *ar) 856ar6000_sysfs_bmi_init(AR_SOFTC_T *ar)
857{ 857{
858 A_STATUS status; 858 int status;
859 859
860 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Creating sysfs entry\n")); 860 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Creating sysfs entry\n"));
861 A_MEMZERO(&ar->osDevInfo, sizeof(HIF_DEVICE_OS_DEVICE_INFO)); 861 A_MEMZERO(&ar->osDevInfo, sizeof(HIF_DEVICE_OS_DEVICE_INFO));
@@ -993,10 +993,10 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
993} 993}
994#endif /* SOFTMAC_FILE_USED */ 994#endif /* SOFTMAC_FILE_USED */
995 995
996static A_STATUS 996static int
997ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A_BOOL compressed) 997ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A_BOOL compressed)
998{ 998{
999 A_STATUS status; 999 int status;
1000 const char *filename; 1000 const char *filename;
1001 const struct firmware *fw_entry; 1001 const struct firmware *fw_entry;
1002 A_UINT32 fw_entry_size; 1002 A_UINT32 fw_entry_size;
@@ -1157,7 +1157,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A
1157} 1157}
1158#endif /* INIT_MODE_DRV_ENABLED */ 1158#endif /* INIT_MODE_DRV_ENABLED */
1159 1159
1160A_STATUS 1160int
1161ar6000_update_bdaddr(AR_SOFTC_T *ar) 1161ar6000_update_bdaddr(AR_SOFTC_T *ar)
1162{ 1162{
1163 1163
@@ -1184,7 +1184,7 @@ ar6000_update_bdaddr(AR_SOFTC_T *ar)
1184return A_OK; 1184return A_OK;
1185} 1185}
1186 1186
1187A_STATUS 1187int
1188ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode) 1188ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode)
1189{ 1189{
1190 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n")); 1190 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n"));
@@ -1205,7 +1205,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode)
1205#ifdef INIT_MODE_DRV_ENABLED 1205#ifdef INIT_MODE_DRV_ENABLED
1206 } else { 1206 } else {
1207 /* The config is contained within the driver itself */ 1207 /* The config is contained within the driver itself */
1208 A_STATUS status; 1208 int status;
1209 A_UINT32 param, options, sleep, address; 1209 A_UINT32 param, options, sleep, address;
1210 1210
1211 /* Temporarily disable system sleep */ 1211 /* Temporarily disable system sleep */
@@ -1399,7 +1399,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode)
1399 return A_OK; 1399 return A_OK;
1400} 1400}
1401 1401
1402A_STATUS 1402int
1403ar6000_configure_target(AR_SOFTC_T *ar) 1403ar6000_configure_target(AR_SOFTC_T *ar)
1404{ 1404{
1405 A_UINT32 param; 1405 A_UINT32 param;
@@ -1595,7 +1595,7 @@ init_netdev(struct net_device *dev, char *name)
1595/* 1595/*
1596 * HTC Event handlers 1596 * HTC Event handlers
1597 */ 1597 */
1598static A_STATUS 1598static int
1599ar6000_avail_ev(void *context, void *hif_handle) 1599ar6000_avail_ev(void *context, void *hif_handle)
1600{ 1600{
1601 int i; 1601 int i;
@@ -1607,7 +1607,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
1607#ifdef ATH6K_CONFIG_CFG80211 1607#ifdef ATH6K_CONFIG_CFG80211
1608 struct wireless_dev *wdev; 1608 struct wireless_dev *wdev;
1609#endif /* ATH6K_CONFIG_CFG80211 */ 1609#endif /* ATH6K_CONFIG_CFG80211 */
1610 A_STATUS init_status = A_OK; 1610 int init_status = A_OK;
1611 1611
1612 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("ar6000_available\n")); 1612 AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("ar6000_available\n"));
1613 1613
@@ -1799,7 +1799,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
1799 if ((wlaninitmode == WLAN_INIT_MODE_UDEV) || 1799 if ((wlaninitmode == WLAN_INIT_MODE_UDEV) ||
1800 (wlaninitmode == WLAN_INIT_MODE_DRV)) 1800 (wlaninitmode == WLAN_INIT_MODE_DRV))
1801 { 1801 {
1802 A_STATUS status = A_OK; 1802 int status = A_OK;
1803 do { 1803 do {
1804 if ((status = ar6000_sysfs_bmi_get_config(ar, wlaninitmode)) != A_OK) 1804 if ((status = ar6000_sysfs_bmi_get_config(ar, wlaninitmode)) != A_OK)
1805 { 1805 {
@@ -1850,7 +1850,7 @@ avail_ev_failed :
1850 return init_status; 1850 return init_status;
1851} 1851}
1852 1852
1853static void ar6000_target_failure(void *Instance, A_STATUS Status) 1853static void ar6000_target_failure(void *Instance, int Status)
1854{ 1854{
1855 AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance; 1855 AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
1856 WMI_TARGET_ERROR_REPORT_EVENT errEvent; 1856 WMI_TARGET_ERROR_REPORT_EVENT errEvent;
@@ -1885,7 +1885,7 @@ static void ar6000_target_failure(void *Instance, A_STATUS Status)
1885 } 1885 }
1886} 1886}
1887 1887
1888static A_STATUS 1888static int
1889ar6000_unavail_ev(void *context, void *hif_handle) 1889ar6000_unavail_ev(void *context, void *hif_handle)
1890{ 1890{
1891 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 1891 AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
@@ -1899,7 +1899,7 @@ ar6000_unavail_ev(void *context, void *hif_handle)
1899void 1899void
1900ar6000_restart_endpoint(struct net_device *dev) 1900ar6000_restart_endpoint(struct net_device *dev)
1901{ 1901{
1902 A_STATUS status = A_OK; 1902 int status = A_OK;
1903 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1903 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
1904 1904
1905 BMIInit(); 1905 BMIInit();
@@ -2015,7 +2015,7 @@ ar6000_stop_endpoint(struct net_device *dev, A_BOOL keepprofile, A_BOOL getdbglo
2015 // FIXME: workaround to reset BT's UART baud rate to default 2015 // FIXME: workaround to reset BT's UART baud rate to default
2016 if (NULL != ar->exitCallback) { 2016 if (NULL != ar->exitCallback) {
2017 AR3K_CONFIG_INFO ar3kconfig; 2017 AR3K_CONFIG_INFO ar3kconfig;
2018 A_STATUS status; 2018 int status;
2019 2019
2020 A_MEMZERO(&ar3kconfig,sizeof(ar3kconfig)); 2020 A_MEMZERO(&ar3kconfig,sizeof(ar3kconfig));
2021 ar6000_set_default_ar3kconfig(ar, (void *)&ar3kconfig); 2021 ar6000_set_default_ar3kconfig(ar, (void *)&ar3kconfig);
@@ -2344,11 +2344,11 @@ ar6000_close(struct net_device *dev)
2344} 2344}
2345 2345
2346/* connect to a service */ 2346/* connect to a service */
2347static A_STATUS ar6000_connectservice(AR_SOFTC_T *ar, 2347static int ar6000_connectservice(AR_SOFTC_T *ar,
2348 HTC_SERVICE_CONNECT_REQ *pConnect, 2348 HTC_SERVICE_CONNECT_REQ *pConnect,
2349 char *pDesc) 2349 char *pDesc)
2350{ 2350{
2351 A_STATUS status; 2351 int status;
2352 HTC_SERVICE_CONNECT_RESP response; 2352 HTC_SERVICE_CONNECT_RESP response;
2353 2353
2354 do { 2354 do {
@@ -2433,7 +2433,7 @@ ar6000_endpoint_id2_ac(void * devt, HTC_ENDPOINT_ID ep )
2433int ar6000_init(struct net_device *dev) 2433int ar6000_init(struct net_device *dev)
2434{ 2434{
2435 AR_SOFTC_T *ar; 2435 AR_SOFTC_T *ar;
2436 A_STATUS status; 2436 int status;
2437 A_INT32 timeleft; 2437 A_INT32 timeleft;
2438 A_INT16 i; 2438 A_INT16 i;
2439 int ret = 0; 2439 int ret = 0;
@@ -2618,7 +2618,7 @@ int ar6000_init(struct net_device *dev)
2618 hciHandles.netDevice = ar->arNetDev; 2618 hciHandles.netDevice = ar->arNetDev;
2619 hciHandles.hifDevice = ar->arHifDevice; 2619 hciHandles.hifDevice = ar->arHifDevice;
2620 hciHandles.htcHandle = ar->arHtcTarget; 2620 hciHandles.htcHandle = ar->arHtcTarget;
2621 status = (A_STATUS)(ar6kHciTransCallbacks.setupTransport(&hciHandles)); 2621 status = (int)(ar6kHciTransCallbacks.setupTransport(&hciHandles));
2622 } 2622 }
2623#else 2623#else
2624 if (setuphci) { 2624 if (setuphci) {
@@ -3273,7 +3273,7 @@ applyAPTCHeuristics(AR_SOFTC_T *ar)
3273 A_UINT32 numbytes; 3273 A_UINT32 numbytes;
3274 A_UINT32 throughput; 3274 A_UINT32 throughput;
3275 struct timeval ts; 3275 struct timeval ts;
3276 A_STATUS status; 3276 int status;
3277 3277
3278 AR6000_SPIN_LOCK(&ar->arLock, 0); 3278 AR6000_SPIN_LOCK(&ar->arLock, 0);
3279 3279
@@ -3395,7 +3395,7 @@ ar6000_tx_complete(void *Context, HTC_PACKET_QUEUE *pPacketQueue)
3395{ 3395{
3396 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; 3396 AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
3397 A_UINT32 mapNo = 0; 3397 A_UINT32 mapNo = 0;
3398 A_STATUS status; 3398 int status;
3399 struct ar_cookie * ar_cookie; 3399 struct ar_cookie * ar_cookie;
3400 HTC_ENDPOINT_ID eid; 3400 HTC_ENDPOINT_ID eid;
3401 A_BOOL wakeEvent = FALSE; 3401 A_BOOL wakeEvent = FALSE;
@@ -3578,7 +3578,7 @@ ar6000_rx(void *Context, HTC_PACKET *pPacket)
3578 struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext; 3578 struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
3579 int minHdrLen; 3579 int minHdrLen;
3580 A_UINT8 containsDot11Hdr = 0; 3580 A_UINT8 containsDot11Hdr = 0;
3581 A_STATUS status = pPacket->Status; 3581 int status = pPacket->Status;
3582 HTC_ENDPOINT_ID ept = pPacket->Endpoint; 3582 HTC_ENDPOINT_ID ept = pPacket->Endpoint;
3583 3583
3584 A_ASSERT((status != A_OK) || 3584 A_ASSERT((status != A_OK) ||
@@ -4762,7 +4762,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd)
4762 void *osbuf = NULL; 4762 void *osbuf = NULL;
4763 A_INT8 i; 4763 A_INT8 i;
4764 A_UINT8 size, *buf; 4764 A_UINT8 size, *buf;
4765 A_STATUS ret = A_OK; 4765 int ret = A_OK;
4766 4766
4767 size = cmd->evt_buf_sz + 4; 4767 size = cmd->evt_buf_sz + 4;
4768 osbuf = A_NETBUF_ALLOC(size); 4768 osbuf = A_NETBUF_ALLOC(size);
@@ -4887,7 +4887,7 @@ ar6000_tkip_micerr_event(AR_SOFTC_T *ar, A_UINT8 keyid, A_BOOL ismcast)
4887} 4887}
4888 4888
4889void 4889void
4890ar6000_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status) 4890ar6000_scanComplete_event(AR_SOFTC_T *ar, int status)
4891{ 4891{
4892 4892
4893#ifdef ATH6K_CONFIG_CFG80211 4893#ifdef ATH6K_CONFIG_CFG80211
@@ -5267,11 +5267,11 @@ ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, A_UINT8 *datap, int len)
5267 5267
5268A_UINT32 wmiSendCmdNum; 5268A_UINT32 wmiSendCmdNum;
5269 5269
5270A_STATUS 5270int
5271ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid) 5271ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid)
5272{ 5272{
5273 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; 5273 AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
5274 A_STATUS status = A_OK; 5274 int status = A_OK;
5275 struct ar_cookie *cookie = NULL; 5275 struct ar_cookie *cookie = NULL;
5276 int i; 5276 int i;
5277#ifdef CONFIG_PM 5277#ifdef CONFIG_PM
@@ -5649,13 +5649,13 @@ a_copy_from_user(void *to, const void *from, A_UINT32 n)
5649} 5649}
5650 5650
5651 5651
5652A_STATUS 5652int
5653ar6000_get_driver_cfg(struct net_device *dev, 5653ar6000_get_driver_cfg(struct net_device *dev,
5654 A_UINT16 cfgParam, 5654 A_UINT16 cfgParam,
5655 void *result) 5655 void *result)
5656{ 5656{
5657 5657
5658 A_STATUS ret = 0; 5658 int ret = 0;
5659 5659
5660 switch(cfgParam) 5660 switch(cfgParam)
5661 { 5661 {
@@ -5958,11 +5958,11 @@ void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac)
5958#endif 5958#endif
5959 5959
5960#ifdef USER_KEYS 5960#ifdef USER_KEYS
5961static A_STATUS 5961static int
5962 5962
5963ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl) 5963ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl)
5964{ 5964{
5965 A_STATUS status = A_OK; 5965 int status = A_OK;
5966 struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik; 5966 struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
5967 struct ieee80211req_key *bik = &ar->user_saved_keys.bcast_ik; 5967 struct ieee80211req_key *bik = &ar->user_saved_keys.bcast_ik;
5968 CRYPTO_TYPE keyType = ar->user_saved_keys.keyType; 5968 CRYPTO_TYPE keyType = ar->user_saved_keys.keyType;
@@ -6102,7 +6102,7 @@ ar6000_ap_mode_profile_commit(struct ar6_softc *ar)
6102 return 0; 6102 return 0;
6103} 6103}
6104 6104
6105A_STATUS 6105int
6106ar6000_connect_to_ap(struct ar6_softc *ar) 6106ar6000_connect_to_ap(struct ar6_softc *ar)
6107{ 6107{
6108 /* The ssid length check prevents second "essid off" from the user, 6108 /* The ssid length check prevents second "essid off" from the user,
@@ -6110,7 +6110,7 @@ ar6000_connect_to_ap(struct ar6_softc *ar)
6110 */ 6110 */
6111 if((ar->arWmiReady == TRUE) && (ar->arSsidLen > 0) && ar->arNetworkType!=AP_NETWORK) 6111 if((ar->arWmiReady == TRUE) && (ar->arSsidLen > 0) && ar->arNetworkType!=AP_NETWORK)
6112 { 6112 {
6113 A_STATUS status; 6113 int status;
6114 if((ADHOC_NETWORK != ar->arNetworkType) && 6114 if((ADHOC_NETWORK != ar->arNetworkType) &&
6115 (NONE_AUTH==ar->arAuthMode) && 6115 (NONE_AUTH==ar->arAuthMode) &&
6116 (WEP_CRYPT==ar->arPairwiseCrypto)) { 6116 (WEP_CRYPT==ar->arPairwiseCrypto)) {
@@ -6173,7 +6173,7 @@ ar6000_connect_to_ap(struct ar6_softc *ar)
6173 return A_ERROR; 6173 return A_ERROR;
6174} 6174}
6175 6175
6176A_STATUS 6176int
6177ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie) 6177ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie)
6178{ 6178{
6179 sta_t *conn = NULL; 6179 sta_t *conn = NULL;
@@ -6189,7 +6189,7 @@ ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie
6189 return 0; 6189 return 0;
6190} 6190}
6191 6191
6192A_STATUS 6192int
6193is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd) 6193is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd)
6194{ 6194{
6195 if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) { 6195 if(cmd >= SIOCSIWCOMMIT && cmd <= SIOCGIWPOWER) {
@@ -6206,7 +6206,7 @@ is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd)
6206 return A_ENOTSUP; 6206 return A_ENOTSUP;
6207} 6207}
6208 6208
6209A_STATUS 6209int
6210is_xioctl_allowed(A_UINT8 mode, int cmd) 6210is_xioctl_allowed(A_UINT8 mode, int cmd)
6211{ 6211{
6212 if(sizeof(xioctl_filter)-1 < cmd) { 6212 if(sizeof(xioctl_filter)-1 < cmd) {
@@ -6224,7 +6224,7 @@ ap_set_wapi_key(struct ar6_softc *ar, void *ikey)
6224{ 6224{
6225 struct ieee80211req_key *ik = (struct ieee80211req_key *)ikey; 6225 struct ieee80211req_key *ik = (struct ieee80211req_key *)ikey;
6226 KEY_USAGE keyUsage = 0; 6226 KEY_USAGE keyUsage = 0;
6227 A_STATUS status; 6227 int status;
6228 6228
6229 if (A_MEMCMP(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) { 6229 if (A_MEMCMP(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) {
6230 keyUsage = GROUP_USAGE; 6230 keyUsage = GROUP_USAGE;
@@ -6345,7 +6345,7 @@ static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, st
6345 * AP mode. 6345 * AP mode.
6346 */ 6346 */
6347 6347
6348A_STATUS ar6000_start_ap_interface(AR_SOFTC_T *ar) 6348int ar6000_start_ap_interface(AR_SOFTC_T *ar)
6349{ 6349{
6350 AR_VIRTUAL_INTERFACE_T *arApDev; 6350 AR_VIRTUAL_INTERFACE_T *arApDev;
6351 6351
@@ -6356,7 +6356,7 @@ A_STATUS ar6000_start_ap_interface(AR_SOFTC_T *ar)
6356 return A_OK; 6356 return A_OK;
6357} 6357}
6358 6358
6359A_STATUS ar6000_stop_ap_interface(AR_SOFTC_T *ar) 6359int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
6360{ 6360{
6361 AR_VIRTUAL_INTERFACE_T *arApDev; 6361 AR_VIRTUAL_INTERFACE_T *arApDev;
6362 6362
@@ -6370,7 +6370,7 @@ A_STATUS ar6000_stop_ap_interface(AR_SOFTC_T *ar)
6370} 6370}
6371 6371
6372 6372
6373A_STATUS ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname) 6373int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6374{ 6374{
6375 struct net_device *dev; 6375 struct net_device *dev;
6376 AR_VIRTUAL_INTERFACE_T *arApDev; 6376 AR_VIRTUAL_INTERFACE_T *arApDev;
@@ -6403,7 +6403,7 @@ A_STATUS ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6403 return A_OK; 6403 return A_OK;
6404} 6404}
6405 6405
6406A_STATUS ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname) 6406int ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6407{ 6407{
6408 /* Interface already added, need not proceed further */ 6408 /* Interface already added, need not proceed further */
6409 if (ar->arApDev != NULL) { 6409 if (ar->arApDev != NULL) {
@@ -6420,7 +6420,7 @@ A_STATUS ar6000_add_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
6420 return ar6000_start_ap_interface(ar); 6420 return ar6000_start_ap_interface(ar);
6421} 6421}
6422 6422
6423A_STATUS ar6000_remove_ap_interface(AR_SOFTC_T *ar) 6423int ar6000_remove_ap_interface(AR_SOFTC_T *ar)
6424{ 6424{
6425 if (arApNetDev) { 6425 if (arApNetDev) {
6426 ar6000_stop_ap_interface(ar); 6426 ar6000_stop_ap_interface(ar);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index 13195d4c742..fbac26429d8 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -57,7 +57,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm,
57 57
58#endif /* DEBUG */ 58#endif /* DEBUG */
59 59
60A_STATUS ar6000_exit_cut_power_state(AR_SOFTC_T *ar); 60int ar6000_exit_cut_power_state(AR_SOFTC_T *ar);
61 61
62#ifdef CONFIG_PM 62#ifdef CONFIG_PM
63static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, A_BOOL asleep) 63static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, A_BOOL asleep)
@@ -122,7 +122,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar)
122 struct in_ifaddr *ifa = NULL; 122 struct in_ifaddr *ifa = NULL;
123 struct in_device *in_dev; 123 struct in_device *in_dev;
124 A_UINT8 macMask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; 124 A_UINT8 macMask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
125 A_STATUS status; 125 int status;
126 WMI_ADD_WOW_PATTERN_CMD addWowCmd = { .filter = { 0 } }; 126 WMI_ADD_WOW_PATTERN_CMD addWowCmd = { .filter = { 0 } };
127 WMI_DEL_WOW_PATTERN_CMD delWowCmd; 127 WMI_DEL_WOW_PATTERN_CMD delWowCmd;
128 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {FALSE, TRUE}; 128 WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {FALSE, TRUE};
@@ -211,9 +211,9 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar)
211 } 211 }
212} 212}
213 213
214A_STATUS ar6000_suspend_ev(void *context) 214int ar6000_suspend_ev(void *context)
215{ 215{
216 A_STATUS status = A_OK; 216 int status = A_OK;
217 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 217 AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
218 A_INT16 pmmode = ar->arSuspendConfig; 218 A_INT16 pmmode = ar->arSuspendConfig;
219wow_not_connected: 219wow_not_connected:
@@ -248,7 +248,7 @@ wow_not_connected:
248 return status; 248 return status;
249} 249}
250 250
251A_STATUS ar6000_resume_ev(void *context) 251int ar6000_resume_ev(void *context)
252{ 252{
253 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 253 AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
254 A_UINT16 powerState = ar->arWlanPowerState; 254 A_UINT16 powerState = ar->arWlanPowerState;
@@ -290,10 +290,10 @@ void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, A_BOOL isEvent
290 } 290 }
291} 291}
292 292
293A_STATUS ar6000_power_change_ev(void *context, A_UINT32 config) 293int ar6000_power_change_ev(void *context, A_UINT32 config)
294{ 294{
295 AR_SOFTC_T *ar = (AR_SOFTC_T *)context; 295 AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
296 A_STATUS status = A_OK; 296 int status = A_OK;
297 297
298 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config)); 298 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config));
299 switch (config) { 299 switch (config) {
@@ -342,10 +342,10 @@ static struct platform_driver ar6000_pm_device = {
342}; 342};
343#endif /* CONFIG_PM */ 343#endif /* CONFIG_PM */
344 344
345A_STATUS 345int
346ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) 346ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
347{ 347{
348 A_STATUS status = A_OK; 348 int status = A_OK;
349 HIF_DEVICE_POWER_CHANGE_TYPE config; 349 HIF_DEVICE_POWER_CHANGE_TYPE config;
350 350
351 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Cut power %d %d \n", __func__,state, ar->arWlanPowerState)); 351 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Cut power %d %d \n", __func__,state, ar->arWlanPowerState));
@@ -412,10 +412,10 @@ ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
412 return status; 412 return status;
413} 413}
414 414
415A_STATUS 415int
416ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) 416ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
417{ 417{
418 A_STATUS status = A_OK; 418 int status = A_OK;
419 419
420 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Deep sleep %d %d \n", __func__,state, ar->arWlanPowerState)); 420 AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Deep sleep %d %d \n", __func__,state, ar->arWlanPowerState));
421#ifdef CONFIG_PM 421#ifdef CONFIG_PM
@@ -536,10 +536,10 @@ ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
536 return status; 536 return status;
537} 537}
538 538
539A_STATUS 539int
540ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL pmEvent) 540ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL pmEvent)
541{ 541{
542 A_STATUS status = A_OK; 542 int status = A_OK;
543 A_UINT16 powerState, oldPowerState; 543 A_UINT16 powerState, oldPowerState;
544 AR6000_WLAN_STATE oldstate = ar->arWlanState; 544 AR6000_WLAN_STATE oldstate = ar->arWlanState;
545 A_BOOL wlanOff = ar->arWlanOff; 545 A_BOOL wlanOff = ar->arWlanOff;
@@ -650,12 +650,12 @@ ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BO
650 return status; 650 return status;
651} 651}
652 652
653A_STATUS 653int
654ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable) 654ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable)
655{ 655{
656#ifdef CONFIG_PM 656#ifdef CONFIG_PM
657 A_BOOL off = (enable == 0); 657 A_BOOL off = (enable == 0);
658 A_STATUS status; 658 int status;
659 if (ar->arBTOff == off) { 659 if (ar->arBTOff == off) {
660 return A_OK; 660 return A_OK;
661 } 661 }
@@ -667,10 +667,10 @@ ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable)
667#endif 667#endif
668} 668}
669 669
670A_STATUS 670int
671ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) 671ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
672{ 672{
673 A_STATUS status; 673 int status;
674 A_BOOL off = (state == WLAN_DISABLED); 674 A_BOOL off = (state == WLAN_DISABLED);
675 if (ar->arWlanOff == off) { 675 if (ar->arWlanOff == off) {
676 return A_OK; 676 return A_OK;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
index 6b8eeea475c..10f48851dc5 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
@@ -111,10 +111,10 @@ ar6000_htc_raw_write_cb(void *Context, HTC_PACKET *pPacket)
111} 111}
112 112
113/* connect to a service */ 113/* connect to a service */
114static A_STATUS ar6000_connect_raw_service(AR_SOFTC_T *ar, 114static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
115 HTC_RAW_STREAM_ID StreamID) 115 HTC_RAW_STREAM_ID StreamID)
116{ 116{
117 A_STATUS status; 117 int status;
118 HTC_SERVICE_CONNECT_RESP response; 118 HTC_SERVICE_CONNECT_RESP response;
119 A_UINT8 streamNo; 119 A_UINT8 streamNo;
120 HTC_SERVICE_CONNECT_REQ connect; 120 HTC_SERVICE_CONNECT_REQ connect;
@@ -168,7 +168,7 @@ static A_STATUS ar6000_connect_raw_service(AR_SOFTC_T *ar,
168 168
169int ar6000_htc_raw_open(AR_SOFTC_T *ar) 169int ar6000_htc_raw_open(AR_SOFTC_T *ar)
170{ 170{
171 A_STATUS status; 171 int status;
172 int streamID, endPt, count2; 172 int streamID, endPt, count2;
173 raw_htc_buffer *buffer; 173 raw_htc_buffer *buffer;
174 HTC_SERVICE_ID servicepriority; 174 HTC_SERVICE_ID servicepriority;
diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
index 6c98a8817ae..10ee89ef782 100644
--- a/drivers/staging/ath6kl/os/linux/ar6k_pal.c
+++ b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
@@ -120,7 +120,7 @@ static int btpal_send_frame(struct sk_buff *skb)
120 struct hci_dev *hdev = (struct hci_dev *)skb->dev; 120 struct hci_dev *hdev = (struct hci_dev *)skb->dev;
121 HCI_TRANSPORT_PACKET_TYPE type; 121 HCI_TRANSPORT_PACKET_TYPE type;
122 ar6k_hci_pal_info_t *pHciPalInfo; 122 ar6k_hci_pal_info_t *pHciPalInfo;
123 A_STATUS status = A_OK; 123 int status = A_OK;
124 struct sk_buff *txSkb = NULL; 124 struct sk_buff *txSkb = NULL;
125 AR_SOFTC_T *ar; 125 AR_SOFTC_T *ar;
126 126
@@ -269,9 +269,9 @@ static void bt_cleanup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo)
269/********************************************************* 269/*********************************************************
270 * Allocate HCI device and store in PAL private info structure. 270 * Allocate HCI device and store in PAL private info structure.
271 *********************************************************/ 271 *********************************************************/
272static A_STATUS bt_setup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo) 272static int bt_setup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo)
273{ 273{
274 A_STATUS status = A_OK; 274 int status = A_OK;
275 struct hci_dev *pHciDev = NULL; 275 struct hci_dev *pHciDev = NULL;
276 276
277 if (!setupbtdev) { 277 if (!setupbtdev) {
@@ -402,9 +402,9 @@ A_BOOL ar6k_pal_recv_pkt(void *pHciPal, void *osbuf)
402 * Registers a HCI device. 402 * Registers a HCI device.
403 * Registers packet receive callback function with ar6k 403 * Registers packet receive callback function with ar6k
404 **********************************************************/ 404 **********************************************************/
405A_STATUS ar6k_setup_hci_pal(void *ar_p) 405int ar6k_setup_hci_pal(void *ar_p)
406{ 406{
407 A_STATUS status = A_OK; 407 int status = A_OK;
408 ar6k_hci_pal_info_t *pHciPalInfo; 408 ar6k_hci_pal_info_t *pHciPalInfo;
409 ar6k_pal_config_t ar6k_pal_config; 409 ar6k_pal_config_t ar6k_pal_config;
410 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p; 410 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;
@@ -443,7 +443,7 @@ A_STATUS ar6k_setup_hci_pal(void *ar_p)
443 return status; 443 return status;
444} 444}
445#else /* AR6K_ENABLE_HCI_PAL */ 445#else /* AR6K_ENABLE_HCI_PAL */
446A_STATUS ar6k_setup_hci_pal(void *ar_p) 446int ar6k_setup_hci_pal(void *ar_p)
447{ 447{
448 return A_OK; 448 return A_OK;
449} 449}
@@ -457,7 +457,7 @@ void ar6k_cleanup_hci_pal(void *ar_p)
457 * Register init and callback function with ar6k 457 * Register init and callback function with ar6k
458 * when PAL driver is a separate kernel module. 458 * when PAL driver is a separate kernel module.
459 ****************************************************/ 459 ****************************************************/
460A_STATUS ar6k_register_hci_pal(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks); 460int ar6k_register_hci_pal(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks);
461static int __init pal_init_module(void) 461static int __init pal_init_module(void)
462{ 462{
463 HCI_TRANSPORT_CALLBACKS hciTransCallbacks; 463 HCI_TRANSPORT_CALLBACKS hciTransCallbacks;
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index cbd9d55a293..e3dc99ae07f 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -245,7 +245,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
245 struct cfg80211_connect_params *sme) 245 struct cfg80211_connect_params *sme)
246{ 246{
247 AR_SOFTC_T *ar = ar6k_priv(dev); 247 AR_SOFTC_T *ar = ar6k_priv(dev);
248 A_STATUS status; 248 int status;
249 249
250 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 250 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
251 251
@@ -780,7 +780,7 @@ ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
780} 780}
781 781
782void 782void
783ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status) 783ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status)
784{ 784{
785 785
786 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: status %d\n", __func__, status)); 786 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: status %d\n", __func__, status));
@@ -815,7 +815,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
815 struct ar_key *key = NULL; 815 struct ar_key *key = NULL;
816 A_UINT8 key_usage; 816 A_UINT8 key_usage;
817 A_UINT8 key_type; 817 A_UINT8 key_type;
818 A_STATUS status = 0; 818 int status = 0;
819 819
820 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s:\n", __func__)); 820 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s:\n", __func__));
821 821
@@ -982,7 +982,7 @@ ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev,
982{ 982{
983 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); 983 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
984 struct ar_key *key = NULL; 984 struct ar_key *key = NULL;
985 A_STATUS status = A_OK; 985 int status = A_OK;
986 986
987 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index)); 987 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
988 988
@@ -1269,7 +1269,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
1269 struct cfg80211_ibss_params *ibss_param) 1269 struct cfg80211_ibss_params *ibss_param)
1270{ 1270{
1271 AR_SOFTC_T *ar = ar6k_priv(dev); 1271 AR_SOFTC_T *ar = ar6k_priv(dev);
1272 A_STATUS status; 1272 int status;
1273 1273
1274 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__)); 1274 AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
1275 1275
diff --git a/drivers/staging/ath6kl/os/linux/export_hci_transport.c b/drivers/staging/ath6kl/os/linux/export_hci_transport.c
index ffbf3d229a5..03f4567eafc 100644
--- a/drivers/staging/ath6kl/os/linux/export_hci_transport.c
+++ b/drivers/staging/ath6kl/os/linux/export_hci_transport.c
@@ -38,20 +38,20 @@
38 38
39HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo); 39HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo);
40void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); 40void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans);
41A_STATUS (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); 41int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue);
42A_STATUS (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous); 42int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous);
43void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); 43void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans);
44A_STATUS (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); 44int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans);
45A_STATUS (*_HCI_TransportEnableDisableAsyncRecv)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 45int (*_HCI_TransportEnableDisableAsyncRecv)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
46A_STATUS (*_HCI_TransportRecvHCIEventSync)(HCI_TRANSPORT_HANDLE HciTrans, 46int (*_HCI_TransportRecvHCIEventSync)(HCI_TRANSPORT_HANDLE HciTrans,
47 HTC_PACKET *pPacket, 47 HTC_PACKET *pPacket,
48 int MaxPollMS); 48 int MaxPollMS);
49A_STATUS (*_HCI_TransportSetBaudRate)(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud); 49int (*_HCI_TransportSetBaudRate)(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud);
50A_STATUS (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 50int (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
51 51
52extern HCI_TRANSPORT_CALLBACKS ar6kHciTransCallbacks; 52extern HCI_TRANSPORT_CALLBACKS ar6kHciTransCallbacks;
53 53
54A_STATUS ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks) 54int ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks)
55{ 55{
56 ar6kHciTransCallbacks = *hciTransCallbacks; 56 ar6kHciTransCallbacks = *hciTransCallbacks;
57 57
@@ -69,10 +69,10 @@ A_STATUS ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallback
69 return A_OK; 69 return A_OK;
70} 70}
71 71
72A_STATUS 72int
73ar6000_get_hif_dev(HIF_DEVICE *device, void *config) 73ar6000_get_hif_dev(HIF_DEVICE *device, void *config)
74{ 74{
75 A_STATUS status; 75 int status;
76 76
77 status = HIFConfigureDevice(device, 77 status = HIFConfigureDevice(device,
78 HIF_DEVICE_GET_OS_DEVICE, 78 HIF_DEVICE_GET_OS_DEVICE,
@@ -81,13 +81,13 @@ ar6000_get_hif_dev(HIF_DEVICE *device, void *config)
81 return status; 81 return status;
82} 82}
83 83
84A_STATUS ar6000_set_uart_config(HIF_DEVICE *hifDevice, 84int ar6000_set_uart_config(HIF_DEVICE *hifDevice,
85 A_UINT32 scale, 85 A_UINT32 scale,
86 A_UINT32 step) 86 A_UINT32 step)
87{ 87{
88 A_UINT32 regAddress; 88 A_UINT32 regAddress;
89 A_UINT32 regVal; 89 A_UINT32 regVal;
90 A_STATUS status; 90 int status;
91 91
92 regAddress = WLAN_UART_BASE_ADDRESS | UART_CLKDIV_ADDRESS; 92 regAddress = WLAN_UART_BASE_ADDRESS | UART_CLKDIV_ADDRESS;
93 regVal = ((A_UINT32)scale << 16) | step; 93 regVal = ((A_UINT32)scale << 16) | step;
@@ -97,10 +97,10 @@ A_STATUS ar6000_set_uart_config(HIF_DEVICE *hifDevice,
97 return status; 97 return status;
98} 98}
99 99
100A_STATUS ar6000_get_core_clock_config(HIF_DEVICE *hifDevice, A_UINT32 *data) 100int ar6000_get_core_clock_config(HIF_DEVICE *hifDevice, A_UINT32 *data)
101{ 101{
102 A_UINT32 regAddress; 102 A_UINT32 regAddress;
103 A_STATUS status; 103 int status;
104 104
105 regAddress = WLAN_RTC_BASE_ADDRESS | WLAN_CPU_CLOCK_ADDRESS; 105 regAddress = WLAN_RTC_BASE_ADDRESS | WLAN_CPU_CLOCK_ADDRESS;
106 /* read CPU clock settings*/ 106 /* read CPU clock settings*/
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index 5cdc3b85a6f..c7e0b4e8731 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -106,9 +106,9 @@ AR3K_CONFIG_INFO ar3kconfig;
106AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo; 106AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo;
107#endif 107#endif
108 108
109static A_STATUS bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); 109static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
110static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); 110static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
111static A_STATUS bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); 111static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
112static A_BOOL bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, 112static A_BOOL bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
113 HCI_TRANSPORT_PACKET_TYPE Type, 113 HCI_TRANSPORT_PACKET_TYPE Type,
114 struct sk_buff *skb); 114 struct sk_buff *skb);
@@ -116,14 +116,14 @@ static struct sk_buff *bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Le
116static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb); 116static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb);
117 117
118#ifdef EXPORT_HCI_BRIDGE_INTERFACE 118#ifdef EXPORT_HCI_BRIDGE_INTERFACE
119A_STATUS ar6000_setup_hci(void *ar); 119int ar6000_setup_hci(void *ar);
120void ar6000_cleanup_hci(void *ar); 120void ar6000_cleanup_hci(void *ar);
121A_STATUS hci_test_send(void *ar, struct sk_buff *skb); 121int hci_test_send(void *ar, struct sk_buff *skb);
122#else 122#else
123A_STATUS ar6000_setup_hci(AR_SOFTC_T *ar); 123int ar6000_setup_hci(AR_SOFTC_T *ar);
124void ar6000_cleanup_hci(AR_SOFTC_T *ar); 124void ar6000_cleanup_hci(AR_SOFTC_T *ar);
125/* HCI bridge testing */ 125/* HCI bridge testing */
126A_STATUS hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb); 126int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
127#endif /* EXPORT_HCI_BRIDGE_INTERFACE */ 127#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
128 128
129#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock) 129#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock)
@@ -215,12 +215,12 @@ static void RefillRecvBuffers(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
215#define HOST_INTEREST_ITEM_ADDRESS(ar, item) \ 215#define HOST_INTEREST_ITEM_ADDRESS(ar, item) \
216 (((ar)->arTargetType == TARGET_TYPE_AR6002) ? AR6002_HOST_INTEREST_ITEM_ADDRESS(item) : \ 216 (((ar)->arTargetType == TARGET_TYPE_AR6002) ? AR6002_HOST_INTEREST_ITEM_ADDRESS(item) : \
217 (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0)) 217 (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
218static A_STATUS ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle, 218static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
219 HCI_TRANSPORT_PROPERTIES *pProps, 219 HCI_TRANSPORT_PROPERTIES *pProps,
220 void *pContext) 220 void *pContext)
221{ 221{
222 AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; 222 AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
223 A_STATUS status; 223 int status;
224 A_UINT32 address, hci_uart_pwr_mgmt_params; 224 A_UINT32 address, hci_uart_pwr_mgmt_params;
225// AR3K_CONFIG_INFO ar3kconfig; 225// AR3K_CONFIG_INFO ar3kconfig;
226 226
@@ -323,7 +323,7 @@ static A_STATUS ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
323 return status; 323 return status;
324} 324}
325 325
326static void ar6000_hci_transport_failure(void *pContext, A_STATUS Status) 326static void ar6000_hci_transport_failure(void *pContext, int Status)
327{ 327{
328 AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; 328 AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
329 329
@@ -464,13 +464,13 @@ static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, HTC_PACKET
464} 464}
465 465
466#ifdef EXPORT_HCI_BRIDGE_INTERFACE 466#ifdef EXPORT_HCI_BRIDGE_INTERFACE
467A_STATUS ar6000_setup_hci(void *ar) 467int ar6000_setup_hci(void *ar)
468#else 468#else
469A_STATUS ar6000_setup_hci(AR_SOFTC_T *ar) 469int ar6000_setup_hci(AR_SOFTC_T *ar)
470#endif 470#endif
471{ 471{
472 HCI_TRANSPORT_CONFIG_INFO config; 472 HCI_TRANSPORT_CONFIG_INFO config;
473 A_STATUS status = A_OK; 473 int status = A_OK;
474 int i; 474 int i;
475 HTC_PACKET *pPacket; 475 HTC_PACKET *pPacket;
476 AR6K_HCI_BRIDGE_INFO *pHcidevInfo; 476 AR6K_HCI_BRIDGE_INFO *pHcidevInfo;
@@ -596,9 +596,9 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar)
596} 596}
597 597
598#ifdef EXPORT_HCI_BRIDGE_INTERFACE 598#ifdef EXPORT_HCI_BRIDGE_INTERFACE
599A_STATUS hci_test_send(void *ar, struct sk_buff *skb) 599int hci_test_send(void *ar, struct sk_buff *skb)
600#else 600#else
601A_STATUS hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) 601int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
602#endif 602#endif
603{ 603{
604 int status = A_OK; 604 int status = A_OK;
@@ -712,7 +712,7 @@ static int bt_send_frame(struct sk_buff *skb)
712 HCI_TRANSPORT_PACKET_TYPE type; 712 HCI_TRANSPORT_PACKET_TYPE type;
713 AR6K_HCI_BRIDGE_INFO *pHcidevInfo; 713 AR6K_HCI_BRIDGE_INFO *pHcidevInfo;
714 HTC_PACKET *pPacket; 714 HTC_PACKET *pPacket;
715 A_STATUS status = A_OK; 715 int status = A_OK;
716 struct sk_buff *txSkb = NULL; 716 struct sk_buff *txSkb = NULL;
717 717
718 if (!hdev) { 718 if (!hdev) {
@@ -853,9 +853,9 @@ static void bt_destruct(struct hci_dev *hdev)
853 /* nothing to do here */ 853 /* nothing to do here */
854} 854}
855 855
856static A_STATUS bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) 856static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
857{ 857{
858 A_STATUS status = A_OK; 858 int status = A_OK;
859 struct hci_dev *pHciDev = NULL; 859 struct hci_dev *pHciDev = NULL;
860 HIF_DEVICE_OS_DEVICE_INFO osDevInfo; 860 HIF_DEVICE_OS_DEVICE_INFO osDevInfo;
861 861
@@ -935,10 +935,10 @@ static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
935 } 935 }
936} 936}
937 937
938static A_STATUS bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) 938static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
939{ 939{
940 int err; 940 int err;
941 A_STATUS status = A_OK; 941 int status = A_OK;
942 942
943 do { 943 do {
944 AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE, ("HCI Bridge: registering HCI... \n")); 944 AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE, ("HCI Bridge: registering HCI... \n"));
@@ -1041,7 +1041,7 @@ static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *sk
1041#else // { CONFIG_BLUEZ_HCI_BRIDGE 1041#else // { CONFIG_BLUEZ_HCI_BRIDGE
1042 1042
1043 /* stubs when we only want to test the HCI bridging Interface without the HT stack */ 1043 /* stubs when we only want to test the HCI bridging Interface without the HT stack */
1044static A_STATUS bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) 1044static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
1045{ 1045{
1046 return A_OK; 1046 return A_OK;
1047} 1047}
@@ -1049,7 +1049,7 @@ static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
1049{ 1049{
1050 1050
1051} 1051}
1052static A_STATUS bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) 1052static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
1053{ 1053{
1054 A_ASSERT(FALSE); 1054 A_ASSERT(FALSE);
1055 return A_ERROR; 1055 return A_ERROR;
@@ -1080,9 +1080,9 @@ static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *sk
1080 /* stubs when GMBOX support is not needed */ 1080 /* stubs when GMBOX support is not needed */
1081 1081
1082#ifdef EXPORT_HCI_BRIDGE_INTERFACE 1082#ifdef EXPORT_HCI_BRIDGE_INTERFACE
1083A_STATUS ar6000_setup_hci(void *ar) 1083int ar6000_setup_hci(void *ar)
1084#else 1084#else
1085A_STATUS ar6000_setup_hci(AR_SOFTC_T *ar) 1085int ar6000_setup_hci(AR_SOFTC_T *ar)
1086#endif 1086#endif
1087{ 1087{
1088 return A_OK; 1088 return A_OK;
@@ -1120,7 +1120,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
1120static int __init 1120static int __init
1121hcibridge_init_module(void) 1121hcibridge_init_module(void)
1122{ 1122{
1123 A_STATUS status; 1123 int status;
1124 HCI_TRANSPORT_CALLBACKS hciTransCallbacks; 1124 HCI_TRANSPORT_CALLBACKS hciTransCallbacks;
1125 1125
1126 hciTransCallbacks.setupTransport = ar6000_setup_hci; 1126 hciTransCallbacks.setupTransport = ar6000_setup_hci;
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index e6248830b7e..0dee74a1797 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -121,8 +121,8 @@ struct USER_SAVEDKEYS {
121#define DBG_DEFAULTS (DBG_ERROR|DBG_WARNING) 121#define DBG_DEFAULTS (DBG_ERROR|DBG_WARNING)
122 122
123 123
124A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 124int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
125A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 125int ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
126 126
127#ifdef __cplusplus 127#ifdef __cplusplus
128extern "C" { 128extern "C" {
@@ -737,12 +737,12 @@ remove_sta(AR_SOFTC_T *ar, A_UINT8 *mac, A_UINT16 reason);
737/* HCI support */ 737/* HCI support */
738 738
739#ifndef EXPORT_HCI_BRIDGE_INTERFACE 739#ifndef EXPORT_HCI_BRIDGE_INTERFACE
740A_STATUS ar6000_setup_hci(AR_SOFTC_T *ar); 740int ar6000_setup_hci(AR_SOFTC_T *ar);
741void ar6000_cleanup_hci(AR_SOFTC_T *ar); 741void ar6000_cleanup_hci(AR_SOFTC_T *ar);
742void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig); 742void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig);
743 743
744/* HCI bridge testing */ 744/* HCI bridge testing */
745A_STATUS hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb); 745int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
746#endif 746#endif
747 747
748ATH_DEBUG_DECLARE_EXTERN(htc); 748ATH_DEBUG_DECLARE_EXTERN(htc);
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
index ea2d181dcfe..29fac6bad83 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
@@ -31,7 +31,7 @@ struct ar6_softc;
31 31
32void ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap, 32void ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap,
33 A_UINT32 sw_ver, A_UINT32 abi_ver); 33 A_UINT32 sw_ver, A_UINT32 abi_ver);
34A_STATUS ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid); 34int ar6000_control_tx(void *devt, void *osbuf, HTC_ENDPOINT_ID eid);
35void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel, 35void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel,
36 A_UINT8 *bssid, A_UINT16 listenInterval, 36 A_UINT8 *bssid, A_UINT16 listenInterval,
37 A_UINT16 beaconInterval, NETWORK_TYPE networkType, 37 A_UINT16 beaconInterval, NETWORK_TYPE networkType,
@@ -50,7 +50,7 @@ void ar6000_keepalive_rx(void *devt, A_UINT8 configured);
50void ar6000_neighborReport_event(struct ar6_softc *ar, int numAps, 50void ar6000_neighborReport_event(struct ar6_softc *ar, int numAps,
51 WMI_NEIGHBOR_INFO *info); 51 WMI_NEIGHBOR_INFO *info);
52void ar6000_set_numdataendpts(struct ar6_softc *ar, A_UINT32 num); 52void ar6000_set_numdataendpts(struct ar6_softc *ar, A_UINT32 num);
53void ar6000_scanComplete_event(struct ar6_softc *ar, A_STATUS status); 53void ar6000_scanComplete_event(struct ar6_softc *ar, int status);
54void ar6000_targetStats_event(struct ar6_softc *ar, A_UINT8 *ptr, A_UINT32 len); 54void ar6000_targetStats_event(struct ar6_softc *ar, A_UINT8 *ptr, A_UINT32 len);
55void ar6000_rssiThreshold_event(struct ar6_softc *ar, 55void ar6000_rssiThreshold_event(struct ar6_softc *ar,
56 WMI_RSSI_THRESHOLD_VAL newThreshold, 56 WMI_RSSI_THRESHOLD_VAL newThreshold,
@@ -103,7 +103,7 @@ void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, A_UINT8
103 103
104void ar6000_ratemask_rx(void *devt, A_UINT32 ratemask); 104void ar6000_ratemask_rx(void *devt, A_UINT32 ratemask);
105 105
106A_STATUS ar6000_get_driver_cfg(struct net_device *dev, 106int ar6000_get_driver_cfg(struct net_device *dev,
107 A_UINT16 cfgParam, 107 A_UINT16 cfgParam,
108 void *result); 108 void *result);
109void ar6000_bssInfo_event_rx(struct ar6_softc *ar, A_UINT8 *data, int len); 109void ar6000_bssInfo_event_rx(struct ar6_softc *ar, A_UINT8 *data, int len);
@@ -149,12 +149,12 @@ A_UINT32 ar6000_getclkfreq (void);
149int ar6000_ap_mode_profile_commit(struct ar6_softc *ar); 149int ar6000_ap_mode_profile_commit(struct ar6_softc *ar);
150 150
151struct ieee80211req_wpaie; 151struct ieee80211req_wpaie;
152A_STATUS 152int
153ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie); 153ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie);
154 154
155A_STATUS is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd); 155int is_iwioctl_allowed(A_UINT8 mode, A_UINT16 cmd);
156 156
157A_STATUS is_xioctl_allowed(A_UINT8 mode, int cmd); 157int is_xioctl_allowed(A_UINT8 mode, int cmd);
158 158
159void ar6000_pspoll_event(struct ar6_softc *ar,A_UINT8 aid); 159void ar6000_pspoll_event(struct ar6_softc *ar,A_UINT8 aid);
160 160
@@ -170,15 +170,15 @@ int ap_set_wapi_key(struct ar6_softc *ar, void *ik);
170void ap_wapi_rekey_event(struct ar6_softc *ar, A_UINT8 type, A_UINT8 *mac); 170void ap_wapi_rekey_event(struct ar6_softc *ar, A_UINT8 type, A_UINT8 *mac);
171#endif 171#endif
172 172
173A_STATUS ar6000_connect_to_ap(struct ar6_softc *ar); 173int ar6000_connect_to_ap(struct ar6_softc *ar);
174A_STATUS ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL suspending); 174int ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL suspending);
175A_STATUS ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state); 175int ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state);
176A_STATUS ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 state); 176int ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 state);
177 177
178#ifdef CONFIG_PM 178#ifdef CONFIG_PM
179A_STATUS ar6000_suspend_ev(void *context); 179int ar6000_suspend_ev(void *context);
180A_STATUS ar6000_resume_ev(void *context); 180int ar6000_resume_ev(void *context);
181A_STATUS ar6000_power_change_ev(void *context, A_UINT32 config); 181int ar6000_power_change_ev(void *context, A_UINT32 config);
182void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, A_BOOL isEvent); 182void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, A_BOOL isEvent);
183#endif 183#endif
184 184
@@ -186,8 +186,8 @@ void ar6000_pm_init(void);
186void ar6000_pm_exit(void); 186void ar6000_pm_exit(void);
187 187
188#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT 188#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
189A_STATUS ar6000_add_ap_interface(struct ar6_softc *ar, char *ifname); 189int ar6000_add_ap_interface(struct ar6_softc *ar, char *ifname);
190A_STATUS ar6000_remove_ap_interface(struct ar6_softc *ar); 190int ar6000_remove_ap_interface(struct ar6_softc *ar);
191#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */ 191#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
192 192
193#ifdef __cplusplus 193#ifdef __cplusplus
diff --git a/drivers/staging/ath6kl/os/linux/include/cfg80211.h b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
index b60e8acf493..4494410972f 100644
--- a/drivers/staging/ath6kl/os/linux/include/cfg80211.h
+++ b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
@@ -27,7 +27,7 @@
27struct wireless_dev *ar6k_cfg80211_init(struct device *dev); 27struct wireless_dev *ar6k_cfg80211_init(struct device *dev);
28void ar6k_cfg80211_deinit(AR_SOFTC_T *ar); 28void ar6k_cfg80211_deinit(AR_SOFTC_T *ar);
29 29
30void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status); 30void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status);
31 31
32void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, 32void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
33 A_UINT8 *bssid, A_UINT16 listenInterval, 33 A_UINT8 *bssid, A_UINT16 listenInterval,
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 c1506805a4d..49a5d3fece4 100644
--- a/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+++ b/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
@@ -27,16 +27,16 @@
27 27
28extern HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo); 28extern HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo);
29extern void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans); 29extern void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans);
30extern A_STATUS (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue); 30extern int (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue);
31extern A_STATUS (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous); 31extern int (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, A_BOOL Synchronous);
32extern void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans); 32extern void (*_HCI_TransportStop)(HCI_TRANSPORT_HANDLE HciTrans);
33extern A_STATUS (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans); 33extern int (*_HCI_TransportStart)(HCI_TRANSPORT_HANDLE HciTrans);
34extern A_STATUS (*_HCI_TransportEnableDisableAsyncRecv)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 34extern int (*_HCI_TransportEnableDisableAsyncRecv)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
35extern A_STATUS (*_HCI_TransportRecvHCIEventSync)(HCI_TRANSPORT_HANDLE HciTrans, 35extern int (*_HCI_TransportRecvHCIEventSync)(HCI_TRANSPORT_HANDLE HciTrans,
36 HTC_PACKET *pPacket, 36 HTC_PACKET *pPacket,
37 int MaxPollMS); 37 int MaxPollMS);
38extern A_STATUS (*_HCI_TransportSetBaudRate)(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud); 38extern int (*_HCI_TransportSetBaudRate)(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud);
39extern A_STATUS (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable); 39extern int (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, A_BOOL Enable);
40 40
41 41
42#define HCI_TransportAttach(HTCHandle, pInfo) \ 42#define HCI_TransportAttach(HTCHandle, pInfo) \
@@ -61,11 +61,11 @@ extern A_STATUS (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTran
61 _HCI_TransportEnablePowerMgmt((HciTrans), (Enable)) 61 _HCI_TransportEnablePowerMgmt((HciTrans), (Enable))
62 62
63 63
64extern A_STATUS ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks); 64extern int ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks);
65 65
66extern A_STATUS ar6000_get_hif_dev(HIF_DEVICE *device, void *config); 66extern int ar6000_get_hif_dev(HIF_DEVICE *device, void *config);
67 67
68extern A_STATUS ar6000_set_uart_config(HIF_DEVICE *hifDevice, A_UINT32 scale, A_UINT32 step); 68extern int ar6000_set_uart_config(HIF_DEVICE *hifDevice, A_UINT32 scale, A_UINT32 step);
69 69
70/* get core clock register settings 70/* get core clock register settings
71 * data: 0 - 40/44MHz 71 * data: 0 - 40/44MHz
@@ -73,4 +73,4 @@ extern A_STATUS ar6000_set_uart_config(HIF_DEVICE *hifDevice, A_UINT32 scale, A_
73 * where (5G band/2.4G band) 73 * where (5G band/2.4G band)
74 * assume 2.4G band for now 74 * assume 2.4G band for now
75 */ 75 */
76extern A_STATUS ar6000_get_core_clock_config(HIF_DEVICE *hifDevice, A_UINT32 *data); 76extern int ar6000_get_core_clock_config(HIF_DEVICE *hifDevice, A_UINT32 *data);
diff --git a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
index fce6ceb73fa..a1dd0240400 100644
--- a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
@@ -307,15 +307,15 @@ void *a_netbuf_alloc_raw(int size);
307void a_netbuf_free(void *bufPtr); 307void a_netbuf_free(void *bufPtr);
308void *a_netbuf_to_data(void *bufPtr); 308void *a_netbuf_to_data(void *bufPtr);
309A_UINT32 a_netbuf_to_len(void *bufPtr); 309A_UINT32 a_netbuf_to_len(void *bufPtr);
310A_STATUS a_netbuf_push(void *bufPtr, A_INT32 len); 310int a_netbuf_push(void *bufPtr, A_INT32 len);
311A_STATUS a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len); 311int a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len);
312A_STATUS a_netbuf_put(void *bufPtr, A_INT32 len); 312int a_netbuf_put(void *bufPtr, A_INT32 len);
313A_STATUS a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len); 313int a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len);
314A_STATUS a_netbuf_pull(void *bufPtr, A_INT32 len); 314int a_netbuf_pull(void *bufPtr, A_INT32 len);
315A_STATUS a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len); 315int a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len);
316A_STATUS a_netbuf_trim(void *bufPtr, A_INT32 len); 316int a_netbuf_trim(void *bufPtr, A_INT32 len);
317A_STATUS a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len); 317int a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len);
318A_STATUS a_netbuf_setlen(void *bufPtr, A_INT32 len); 318int a_netbuf_setlen(void *bufPtr, A_INT32 len);
319A_INT32 a_netbuf_headroom(void *bufPtr); 319A_INT32 a_netbuf_headroom(void *bufPtr);
320void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt); 320void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt);
321void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt); 321void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt);
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index 0b10376fad2..a159ae59add 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -136,7 +136,7 @@ ar6000_ioctl_set_qos_supp(struct net_device *dev, struct ifreq *rq)
136{ 136{
137 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 137 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
138 WMI_SET_QOS_SUPP_CMD cmd; 138 WMI_SET_QOS_SUPP_CMD cmd;
139 A_STATUS ret; 139 int ret;
140 140
141 if ((dev->flags & IFF_UP) != IFF_UP) { 141 if ((dev->flags & IFF_UP) != IFF_UP) {
142 return -EIO; 142 return -EIO;
@@ -171,7 +171,7 @@ ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
171{ 171{
172 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 172 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
173 WMI_SET_WMM_CMD cmd; 173 WMI_SET_WMM_CMD cmd;
174 A_STATUS ret; 174 int ret;
175 175
176 if ((dev->flags & IFF_UP) != IFF_UP) { 176 if ((dev->flags & IFF_UP) != IFF_UP) {
177 return -EIO; 177 return -EIO;
@@ -212,7 +212,7 @@ ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
212{ 212{
213 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 213 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
214 WMI_SET_WMM_TXOP_CMD cmd; 214 WMI_SET_WMM_TXOP_CMD cmd;
215 A_STATUS ret; 215 int ret;
216 216
217 if ((dev->flags & IFF_UP) != IFF_UP) { 217 if ((dev->flags & IFF_UP) != IFF_UP) {
218 return -EIO; 218 return -EIO;
@@ -246,7 +246,7 @@ static int
246ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq) 246ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
247{ 247{
248 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 248 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
249 A_STATUS ret = 0; 249 int ret = 0;
250 250
251 if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == FALSE) { 251 if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == FALSE) {
252 return -EIO; 252 return -EIO;
@@ -264,7 +264,7 @@ ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
264{ 264{
265 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 265 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
266 WMI_AP_SET_COUNTRY_CMD cmd; 266 WMI_AP_SET_COUNTRY_CMD cmd;
267 A_STATUS ret; 267 int ret;
268 268
269 if ((dev->flags & IFF_UP) != IFF_UP) { 269 if ((dev->flags & IFF_UP) != IFF_UP) {
270 return -EIO; 270 return -EIO;
@@ -577,7 +577,7 @@ ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
577{ 577{
578 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 578 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
579 WMI_CREATE_PSTREAM_CMD cmd; 579 WMI_CREATE_PSTREAM_CMD cmd;
580 A_STATUS ret; 580 int ret;
581 581
582 if (ar->arWmiReady == FALSE) { 582 if (ar->arWmiReady == FALSE) {
583 return -EIO; 583 return -EIO;
@@ -662,7 +662,7 @@ ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
662} 662}
663 663
664#ifdef CONFIG_HOST_TCMD_SUPPORT 664#ifdef CONFIG_HOST_TCMD_SUPPORT
665static A_STATUS 665static int
666ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev, 666ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
667 struct ifreq *rq, A_UINT8 *data, A_UINT32 len) 667 struct ifreq *rq, A_UINT8 *data, A_UINT32 len)
668{ 668{
@@ -1386,7 +1386,7 @@ ar6000_gpio_ack_rx(void)
1386 wake_up(&arEvent); 1386 wake_up(&arEvent);
1387} 1387}
1388 1388
1389A_STATUS 1389int
1390ar6000_gpio_output_set(struct net_device *dev, 1390ar6000_gpio_output_set(struct net_device *dev,
1391 A_UINT32 set_mask, 1391 A_UINT32 set_mask,
1392 A_UINT32 clear_mask, 1392 A_UINT32 clear_mask,
@@ -1400,7 +1400,7 @@ ar6000_gpio_output_set(struct net_device *dev,
1400 set_mask, clear_mask, enable_mask, disable_mask); 1400 set_mask, clear_mask, enable_mask, disable_mask);
1401} 1401}
1402 1402
1403static A_STATUS 1403static int
1404ar6000_gpio_input_get(struct net_device *dev) 1404ar6000_gpio_input_get(struct net_device *dev)
1405{ 1405{
1406 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1406 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
@@ -1409,7 +1409,7 @@ ar6000_gpio_input_get(struct net_device *dev)
1409 return wmi_gpio_input_get(ar->arWmi); 1409 return wmi_gpio_input_get(ar->arWmi);
1410} 1410}
1411 1411
1412static A_STATUS 1412static int
1413ar6000_gpio_register_set(struct net_device *dev, 1413ar6000_gpio_register_set(struct net_device *dev,
1414 A_UINT32 gpioreg_id, 1414 A_UINT32 gpioreg_id,
1415 A_UINT32 value) 1415 A_UINT32 value)
@@ -1420,7 +1420,7 @@ ar6000_gpio_register_set(struct net_device *dev,
1420 return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value); 1420 return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
1421} 1421}
1422 1422
1423static A_STATUS 1423static int
1424ar6000_gpio_register_get(struct net_device *dev, 1424ar6000_gpio_register_get(struct net_device *dev,
1425 A_UINT32 gpioreg_id) 1425 A_UINT32 gpioreg_id)
1426{ 1426{
@@ -1430,7 +1430,7 @@ ar6000_gpio_register_get(struct net_device *dev,
1430 return wmi_gpio_register_get(ar->arWmi, gpioreg_id); 1430 return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
1431} 1431}
1432 1432
1433static A_STATUS 1433static int
1434ar6000_gpio_intr_ack(struct net_device *dev, 1434ar6000_gpio_intr_ack(struct net_device *dev,
1435 A_UINT32 ack_mask) 1435 A_UINT32 ack_mask)
1436{ 1436{
@@ -1445,7 +1445,7 @@ ar6000_gpio_intr_ack(struct net_device *dev,
1445static struct prof_count_s prof_count_results; 1445static struct prof_count_s prof_count_results;
1446static A_BOOL prof_count_available; /* Requested GPIO data available */ 1446static A_BOOL prof_count_available; /* Requested GPIO data available */
1447 1447
1448static A_STATUS 1448static int
1449prof_count_get(struct net_device *dev) 1449prof_count_get(struct net_device *dev)
1450{ 1450{
1451 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1451 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
@@ -1469,14 +1469,14 @@ prof_count_rx(A_UINT32 addr, A_UINT32 count)
1469#endif /* CONFIG_TARGET_PROFILE_SUPPORT */ 1469#endif /* CONFIG_TARGET_PROFILE_SUPPORT */
1470 1470
1471 1471
1472static A_STATUS 1472static int
1473ar6000_create_acl_data_osbuf(struct net_device *dev, A_UINT8 *userdata, void **p_osbuf) 1473ar6000_create_acl_data_osbuf(struct net_device *dev, A_UINT8 *userdata, void **p_osbuf)
1474{ 1474{
1475 void *osbuf = NULL; 1475 void *osbuf = NULL;
1476 A_UINT8 tmp_space[8]; 1476 A_UINT8 tmp_space[8];
1477 HCI_ACL_DATA_PKT *acl; 1477 HCI_ACL_DATA_PKT *acl;
1478 A_UINT8 hdr_size, *datap=NULL; 1478 A_UINT8 hdr_size, *datap=NULL;
1479 A_STATUS ret = A_OK; 1479 int ret = A_OK;
1480 1480
1481 /* ACL is in data path. There is a need to create pool 1481 /* ACL is in data path. There is a need to create pool
1482 * mechanism for allocating and freeing NETBUFs - ToDo later. 1482 * mechanism for allocating and freeing NETBUFs - ToDo later.
@@ -1739,7 +1739,7 @@ int
1739ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik) 1739ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
1740{ 1740{
1741 KEY_USAGE keyUsage; 1741 KEY_USAGE keyUsage;
1742 A_STATUS status; 1742 int status;
1743 CRYPTO_TYPE keyType = NONE_CRYPT; 1743 CRYPTO_TYPE keyType = NONE_CRYPT;
1744 1744
1745#ifdef USER_KEYS 1745#ifdef USER_KEYS
@@ -1885,7 +1885,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1885 goto ioctl_done; 1885 goto ioctl_done;
1886 } 1886 }
1887 } else { 1887 } else {
1888 A_STATUS ret = is_iwioctl_allowed(ar->arNextMode, cmd); 1888 int ret = is_iwioctl_allowed(ar->arNextMode, cmd);
1889 if(ret == A_ENOTSUP) { 1889 if(ret == A_ENOTSUP) {
1890 A_PRINTF("iwioctl: cmd=0x%x not allowed in this mode\n", cmd); 1890 A_PRINTF("iwioctl: cmd=0x%x not allowed in this mode\n", cmd);
1891 ret = -EOPNOTSUPP; 1891 ret = -EOPNOTSUPP;
@@ -1994,7 +1994,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1994 } else if (copy_from_user(&req, userdata, sizeof(struct ieee80211req_addpmkid))) { 1994 } else if (copy_from_user(&req, userdata, sizeof(struct ieee80211req_addpmkid))) {
1995 ret = -EFAULT; 1995 ret = -EFAULT;
1996 } else { 1996 } else {
1997 A_STATUS status; 1997 int status;
1998 1998
1999 AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("Add pmkid for %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x en=%d\n", 1999 AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("Add pmkid for %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x en=%d\n",
2000 req.pi_bssid[0], req.pi_bssid[1], req.pi_bssid[2], 2000 req.pi_bssid[0], req.pi_bssid[1], req.pi_bssid[2],
@@ -3365,7 +3365,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3365 case AR6000_XIOCTL_WMI_SETFIXRATES: 3365 case AR6000_XIOCTL_WMI_SETFIXRATES:
3366 { 3366 {
3367 WMI_FIX_RATES_CMD setFixRatesCmd; 3367 WMI_FIX_RATES_CMD setFixRatesCmd;
3368 A_STATUS returnStatus; 3368 int returnStatus;
3369 3369
3370 if (ar->arWmiReady == FALSE) { 3370 if (ar->arWmiReady == FALSE) {
3371 ret = -EIO; 3371 ret = -EIO;
diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c
index 15e5d047520..31848d74a21 100644
--- a/drivers/staging/ath6kl/os/linux/netbuf.c
+++ b/drivers/staging/ath6kl/os/linux/netbuf.c
@@ -105,7 +105,7 @@ a_netbuf_to_data(void *bufPtr)
105 * Add len # of bytes to the beginning of the network buffer 105 * Add len # of bytes to the beginning of the network buffer
106 * pointed to by bufPtr 106 * pointed to by bufPtr
107 */ 107 */
108A_STATUS 108int
109a_netbuf_push(void *bufPtr, A_INT32 len) 109a_netbuf_push(void *bufPtr, A_INT32 len)
110{ 110{
111 skb_push((struct sk_buff *)bufPtr, len); 111 skb_push((struct sk_buff *)bufPtr, len);
@@ -117,7 +117,7 @@ a_netbuf_push(void *bufPtr, A_INT32 len)
117 * Add len # of bytes to the beginning of the network buffer 117 * Add len # of bytes to the beginning of the network buffer
118 * pointed to by bufPtr and also fill with data 118 * pointed to by bufPtr and also fill with data
119 */ 119 */
120A_STATUS 120int
121a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len) 121a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len)
122{ 122{
123 skb_push((struct sk_buff *) bufPtr, len); 123 skb_push((struct sk_buff *) bufPtr, len);
@@ -130,7 +130,7 @@ a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len)
130 * Add len # of bytes to the end of the network buffer 130 * Add len # of bytes to the end of the network buffer
131 * pointed to by bufPtr 131 * pointed to by bufPtr
132 */ 132 */
133A_STATUS 133int
134a_netbuf_put(void *bufPtr, A_INT32 len) 134a_netbuf_put(void *bufPtr, A_INT32 len)
135{ 135{
136 skb_put((struct sk_buff *)bufPtr, len); 136 skb_put((struct sk_buff *)bufPtr, len);
@@ -142,7 +142,7 @@ a_netbuf_put(void *bufPtr, A_INT32 len)
142 * Add len # of bytes to the end of the network buffer 142 * Add len # of bytes to the end of the network buffer
143 * pointed to by bufPtr and also fill with data 143 * pointed to by bufPtr and also fill with data
144 */ 144 */
145A_STATUS 145int
146a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len) 146a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len)
147{ 147{
148 char *start = (char*)(((struct sk_buff *)bufPtr)->data + 148 char *start = (char*)(((struct sk_buff *)bufPtr)->data +
@@ -157,7 +157,7 @@ a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len)
157/* 157/*
158 * Trim the network buffer pointed to by bufPtr to len # of bytes 158 * Trim the network buffer pointed to by bufPtr to len # of bytes
159 */ 159 */
160A_STATUS 160int
161a_netbuf_setlen(void *bufPtr, A_INT32 len) 161a_netbuf_setlen(void *bufPtr, A_INT32 len)
162{ 162{
163 skb_trim((struct sk_buff *)bufPtr, len); 163 skb_trim((struct sk_buff *)bufPtr, len);
@@ -168,7 +168,7 @@ a_netbuf_setlen(void *bufPtr, A_INT32 len)
168/* 168/*
169 * Chop of len # of bytes from the end of the buffer. 169 * Chop of len # of bytes from the end of the buffer.
170 */ 170 */
171A_STATUS 171int
172a_netbuf_trim(void *bufPtr, A_INT32 len) 172a_netbuf_trim(void *bufPtr, A_INT32 len)
173{ 173{
174 skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len); 174 skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
@@ -179,7 +179,7 @@ a_netbuf_trim(void *bufPtr, A_INT32 len)
179/* 179/*
180 * Chop of len # of bytes from the end of the buffer and return the data. 180 * Chop of len # of bytes from the end of the buffer and return the data.
181 */ 181 */
182A_STATUS 182int
183a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len) 183a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len)
184{ 184{
185 char *start = (char*)(((struct sk_buff *)bufPtr)->data + 185 char *start = (char*)(((struct sk_buff *)bufPtr)->data +
@@ -204,7 +204,7 @@ a_netbuf_headroom(void *bufPtr)
204/* 204/*
205 * Removes specified number of bytes from the beginning of the buffer 205 * Removes specified number of bytes from the beginning of the buffer
206 */ 206 */
207A_STATUS 207int
208a_netbuf_pull(void *bufPtr, A_INT32 len) 208a_netbuf_pull(void *bufPtr, A_INT32 len)
209{ 209{
210 skb_pull((struct sk_buff *)bufPtr, len); 210 skb_pull((struct sk_buff *)bufPtr, len);
@@ -216,7 +216,7 @@ a_netbuf_pull(void *bufPtr, A_INT32 len)
216 * Removes specified number of bytes from the beginning of the buffer 216 * Removes specified number of bytes from the beginning of the buffer
217 * and return the data 217 * and return the data
218 */ 218 */
219A_STATUS 219int
220a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len) 220a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len)
221{ 221{
222 A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len); 222 A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index bb6de0f404f..dc32e2d4bb0 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -463,7 +463,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
463 struct iw_point *data, char *ssid) 463 struct iw_point *data, char *ssid)
464{ 464{
465 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 465 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
466 A_STATUS status; 466 int status;
467 A_UINT8 arNetworkType; 467 A_UINT8 arNetworkType;
468 A_UINT8 prevMode = ar->arNetworkType; 468 A_UINT8 prevMode = ar->arNetworkType;
469 469
@@ -1548,7 +1548,7 @@ ar6000_ioctl_siwpmksa(struct net_device *dev,
1548{ 1548{
1549 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); 1549 AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
1550 A_INT32 ret; 1550 A_INT32 ret;
1551 A_STATUS status; 1551 int status;
1552 struct iw_pmksa *pmksa; 1552 struct iw_pmksa *pmksa;
1553 1553
1554 pmksa = (struct iw_pmksa *)extra; 1554 pmksa = (struct iw_pmksa *)extra;
@@ -1599,7 +1599,7 @@ static int ar6000_set_wapi_key(struct net_device *dev,
1599 A_INT32 index; 1599 A_INT32 index;
1600 A_UINT32 *PN; 1600 A_UINT32 *PN;
1601 A_INT32 i; 1601 A_INT32 i;
1602 A_STATUS status; 1602 int status;
1603 A_UINT8 wapiKeyRsc[16]; 1603 A_UINT8 wapiKeyRsc[16];
1604 CRYPTO_TYPE keyType = WAPI_CRYPT; 1604 CRYPTO_TYPE keyType = WAPI_CRYPT;
1605 const A_UINT8 broadcastMac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 1605 const A_UINT8 broadcastMac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -1660,7 +1660,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev,
1660 A_INT32 keyLen; 1660 A_INT32 keyLen;
1661 A_UINT8 *keyData; 1661 A_UINT8 *keyData;
1662 A_UINT8 keyRsc[8]; 1662 A_UINT8 keyRsc[8];
1663 A_STATUS status; 1663 int status;
1664 CRYPTO_TYPE keyType; 1664 CRYPTO_TYPE keyType;
1665#ifdef USER_KEYS 1665#ifdef USER_KEYS
1666 struct ieee80211req_key ik; 1666 struct ieee80211req_key ik;
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c
index 092bb3007c5..d53ab15624d 100644
--- a/drivers/staging/ath6kl/reorder/rcv_aggr.c
+++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c
@@ -33,7 +33,7 @@
33#include "aggr_rx_internal.h" 33#include "aggr_rx_internal.h"
34#include "wmi.h" 34#include "wmi.h"
35 35
36extern A_STATUS 36extern int
37wmi_dot3_2_dix(void *osbuf); 37wmi_dot3_2_dix(void *osbuf);
38 38
39static void 39static void
@@ -57,7 +57,7 @@ aggr_init(ALLOC_NETBUFS netbuf_allocator)
57 AGGR_INFO *p_aggr = NULL; 57 AGGR_INFO *p_aggr = NULL;
58 RXTID *rxtid; 58 RXTID *rxtid;
59 A_UINT8 i; 59 A_UINT8 i;
60 A_STATUS status = A_OK; 60 int status = A_OK;
61 61
62 A_PRINTF("In aggr_init..\n"); 62 A_PRINTF("In aggr_init..\n");
63 63
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
index f4926f215bb..2743c4cf604 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
@@ -97,7 +97,7 @@ iswscoui(const A_UINT8 *frm)
97 return frm[1] > 3 && LE_READ_4(frm+2) == ((0x04<<24)|WPA_OUI); 97 return frm[1] > 3 && LE_READ_4(frm+2) == ((0x04<<24)|WPA_OUI);
98} 98}
99 99
100A_STATUS 100int
101wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie) 101wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
102{ 102{
103 A_UINT8 *frm, *efrm; 103 A_UINT8 *frm, *efrm;
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 7800778099b..1cf9e961b65 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -70,100 +70,100 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(wmi,
70#define A_DPRINTF AR_DEBUG_PRINTF 70#define A_DPRINTF AR_DEBUG_PRINTF
71#endif 71#endif
72 72
73static A_STATUS wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 73static int wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
74 74
75static A_STATUS wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 75static int wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
76 int len); 76 int len);
77static A_STATUS wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 77static int wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
78 int len); 78 int len);
79 79
80static A_STATUS wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 80static int wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
81 int len); 81 int len);
82static A_STATUS wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 82static int wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
83 int len); 83 int len);
84static A_STATUS wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 84static int wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
85 int len); 85 int len);
86static A_STATUS wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 86static int wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
87 int len); 87 int len);
88static A_STATUS wmi_sync_point(struct wmi_t *wmip); 88static int wmi_sync_point(struct wmi_t *wmip);
89 89
90static A_STATUS wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, 90static int wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
91 int len); 91 int len);
92static A_STATUS wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, 92static int wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
93 int len); 93 int len);
94static A_STATUS wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, 94static int wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
95 int len); 95 int len);
96static A_STATUS wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 96static int wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
97 int len); 97 int len);
98static A_STATUS wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 98static int wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
99static A_STATUS wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 99static int wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
100 int len); 100 int len);
101 101
102static A_STATUS wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, 102static int wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
103 int len); 103 int len);
104#ifdef CONFIG_HOST_DSET_SUPPORT 104#ifdef CONFIG_HOST_DSET_SUPPORT
105static A_STATUS wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 105static int wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
106static A_STATUS wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, 106static int wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
107 int len); 107 int len);
108#endif /* CONFIG_HOST_DSET_SUPPORT */ 108#endif /* CONFIG_HOST_DSET_SUPPORT */
109 109
110 110
111static A_STATUS wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, 111static int wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap,
112 int len); 112 int len);
113static A_STATUS wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 113static int wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
114static A_STATUS wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 114static int wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
115static A_STATUS wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 115static int wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
116static A_STATUS wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 116static int wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
117static A_STATUS wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 117static int wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
118static A_STATUS wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 118static int wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
119static A_STATUS wmi_channel_change_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 119static int wmi_channel_change_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
120static A_STATUS wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 120static int wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
121 int len); 121 int len);
122static A_STATUS wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 122static int wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
123 int len); 123 int len);
124static A_STATUS wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 124static int wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
125 int len); 125 int len);
126static A_STATUS 126static int
127wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len); 127wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
128 128
129static A_STATUS 129static int
130wmi_set_params_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len); 130wmi_set_params_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
131 131
132static A_STATUS 132static int
133wmi_acm_reject_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len); 133wmi_acm_reject_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
134 134
135#ifdef CONFIG_HOST_GPIO_SUPPORT 135#ifdef CONFIG_HOST_GPIO_SUPPORT
136static A_STATUS wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 136static int wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
137static A_STATUS wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 137static int wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
138static A_STATUS wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 138static int wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
139#endif /* CONFIG_HOST_GPIO_SUPPORT */ 139#endif /* CONFIG_HOST_GPIO_SUPPORT */
140 140
141#ifdef CONFIG_HOST_TCMD_SUPPORT 141#ifdef CONFIG_HOST_TCMD_SUPPORT
142static A_STATUS 142static int
143wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 143wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
144#endif 144#endif
145 145
146static A_STATUS 146static int
147wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 147wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
148 148
149static A_STATUS 149static int
150wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 150wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
151 151
152static A_STATUS 152static int
153wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 153wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
154 154
155static A_BOOL 155static A_BOOL
156wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_INT32 rateIndex); 156wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_INT32 rateIndex);
157 157
158static A_STATUS 158static int
159wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 159wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
160 160
161static A_STATUS 161static int
162wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 162wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
163 163
164static A_STATUS wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 164static int wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
165 165
166A_STATUS wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId, 166int wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId,
167 WMI_SYNC_FLAG syncflag); 167 WMI_SYNC_FLAG syncflag);
168 168
169A_UINT8 ar6000_get_upper_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, A_UINT32 size); 169A_UINT8 ar6000_get_upper_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, A_UINT32 size);
@@ -171,33 +171,33 @@ A_UINT8 ar6000_get_lower_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh,
171 171
172void wmi_cache_configure_rssithreshold(struct wmi_t *wmip, WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd); 172void wmi_cache_configure_rssithreshold(struct wmi_t *wmip, WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
173void wmi_cache_configure_snrthreshold(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); 173void wmi_cache_configure_snrthreshold(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
174static A_STATUS wmi_send_rssi_threshold_params(struct wmi_t *wmip, 174static int wmi_send_rssi_threshold_params(struct wmi_t *wmip,
175 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd); 175 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
176static A_STATUS wmi_send_snr_threshold_params(struct wmi_t *wmip, 176static int wmi_send_snr_threshold_params(struct wmi_t *wmip,
177 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); 177 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
178#if defined(CONFIG_TARGET_PROFILE_SUPPORT) 178#if defined(CONFIG_TARGET_PROFILE_SUPPORT)
179static A_STATUS 179static int
180wmi_prof_count_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 180wmi_prof_count_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
181#endif /* CONFIG_TARGET_PROFILE_SUPPORT */ 181#endif /* CONFIG_TARGET_PROFILE_SUPPORT */
182 182
183static A_STATUS wmi_pspoll_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 183static int wmi_pspoll_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
184 int len); 184 int len);
185static A_STATUS wmi_dtimexpiry_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 185static int wmi_dtimexpiry_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
186 int len); 186 int len);
187 187
188static A_STATUS wmi_peer_node_event_rx (struct wmi_t *wmip, A_UINT8 *datap, 188static int wmi_peer_node_event_rx (struct wmi_t *wmip, A_UINT8 *datap,
189 int len); 189 int len);
190#ifdef ATH_AR6K_11N_SUPPORT 190#ifdef ATH_AR6K_11N_SUPPORT
191static A_STATUS wmi_addba_req_event_rx(struct wmi_t *, A_UINT8 *, int); 191static int wmi_addba_req_event_rx(struct wmi_t *, A_UINT8 *, int);
192static A_STATUS wmi_addba_resp_event_rx(struct wmi_t *, A_UINT8 *, int); 192static int wmi_addba_resp_event_rx(struct wmi_t *, A_UINT8 *, int);
193static A_STATUS wmi_delba_req_event_rx(struct wmi_t *, A_UINT8 *, int); 193static int wmi_delba_req_event_rx(struct wmi_t *, A_UINT8 *, int);
194static A_STATUS wmi_btcoex_config_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 194static int wmi_btcoex_config_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
195static A_STATUS wmi_btcoex_stats_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len); 195static int wmi_btcoex_stats_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
196#endif 196#endif
197static A_STATUS wmi_hci_event_rx(struct wmi_t *, A_UINT8 *, int); 197static int wmi_hci_event_rx(struct wmi_t *, A_UINT8 *, int);
198 198
199#ifdef WAPI_ENABLE 199#ifdef WAPI_ENABLE
200static A_STATUS wmi_wapi_rekey_event_rx(struct wmi_t *wmip, A_UINT8 *datap, 200static int wmi_wapi_rekey_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
201 int len); 201 int len);
202#endif 202#endif
203 203
@@ -391,7 +391,7 @@ wmi_shutdown(struct wmi_t *wmip)
391 * Assumes the entire DIX header is contigous and that there is 391 * Assumes the entire DIX header is contigous and that there is
392 * enough room in the buffer for a 802.3 mac header and LLC+SNAP headers. 392 * enough room in the buffer for a 802.3 mac header and LLC+SNAP headers.
393 */ 393 */
394A_STATUS 394int
395wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf) 395wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
396{ 396{
397 A_UINT8 *datap; 397 A_UINT8 *datap;
@@ -449,7 +449,7 @@ wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
449 return (A_OK); 449 return (A_OK);
450} 450}
451 451
452A_STATUS wmi_meta_add(struct wmi_t *wmip, void *osbuf, A_UINT8 *pVersion,void *pTxMetaS) 452int wmi_meta_add(struct wmi_t *wmip, void *osbuf, A_UINT8 *pVersion,void *pTxMetaS)
453{ 453{
454 switch(*pVersion){ 454 switch(*pVersion){
455 case 0: 455 case 0:
@@ -494,13 +494,13 @@ A_STATUS wmi_meta_add(struct wmi_t *wmip, void *osbuf, A_UINT8 *pVersion,void *p
494} 494}
495 495
496/* Adds a WMI data header */ 496/* Adds a WMI data header */
497A_STATUS 497int
498wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType, A_BOOL bMoreData, 498wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType, A_BOOL bMoreData,
499 WMI_DATA_HDR_DATA_TYPE data_type,A_UINT8 metaVersion, void *pTxMetaS) 499 WMI_DATA_HDR_DATA_TYPE data_type,A_UINT8 metaVersion, void *pTxMetaS)
500{ 500{
501 WMI_DATA_HDR *dtHdr; 501 WMI_DATA_HDR *dtHdr;
502// A_UINT8 metaVersion = 0; 502// A_UINT8 metaVersion = 0;
503 A_STATUS status; 503 int status;
504 504
505 A_ASSERT(osbuf != NULL); 505 A_ASSERT(osbuf != NULL);
506 506
@@ -621,7 +621,7 @@ A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT32 la
621 return trafficClass; 621 return trafficClass;
622} 622}
623 623
624A_STATUS 624int
625wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode) 625wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode)
626{ 626{
627 A_UINT8 *datap; 627 A_UINT8 *datap;
@@ -713,7 +713,7 @@ AddDot11Hdr:
713 return (A_OK); 713 return (A_OK);
714} 714}
715 715
716A_STATUS 716int
717wmi_dot11_hdr_remove(struct wmi_t *wmip, void *osbuf) 717wmi_dot11_hdr_remove(struct wmi_t *wmip, void *osbuf)
718{ 718{
719 A_UINT8 *datap; 719 A_UINT8 *datap;
@@ -781,7 +781,7 @@ wmi_dot11_hdr_remove(struct wmi_t *wmip, void *osbuf)
781 * performs 802.3 to DIX encapsulation for received packets. 781 * performs 802.3 to DIX encapsulation for received packets.
782 * Assumes the entire 802.3 header is contigous. 782 * Assumes the entire 802.3 header is contigous.
783 */ 783 */
784A_STATUS 784int
785wmi_dot3_2_dix(void *osbuf) 785wmi_dot3_2_dix(void *osbuf)
786{ 786{
787 A_UINT8 *datap; 787 A_UINT8 *datap;
@@ -809,7 +809,7 @@ wmi_dot3_2_dix(void *osbuf)
809/* 809/*
810 * Removes a WMI data header 810 * Removes a WMI data header
811 */ 811 */
812A_STATUS 812int
813wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf) 813wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf)
814{ 814{
815 A_ASSERT(osbuf != NULL); 815 A_ASSERT(osbuf != NULL);
@@ -826,14 +826,14 @@ wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg)
826/* 826/*
827 * WMI Extended Event received from Target. 827 * WMI Extended Event received from Target.
828 */ 828 */
829A_STATUS 829int
830wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf) 830wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
831{ 831{
832 WMIX_CMD_HDR *cmd; 832 WMIX_CMD_HDR *cmd;
833 A_UINT16 id; 833 A_UINT16 id;
834 A_UINT8 *datap; 834 A_UINT8 *datap;
835 A_UINT32 len; 835 A_UINT32 len;
836 A_STATUS status = A_OK; 836 int status = A_OK;
837 837
838 if (A_NETBUF_LEN(osbuf) < sizeof(WMIX_CMD_HDR)) { 838 if (A_NETBUF_LEN(osbuf) < sizeof(WMIX_CMD_HDR)) {
839 A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG)); 839 A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
@@ -903,14 +903,14 @@ wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
903 */ 903 */
904A_UINT32 cmdRecvNum; 904A_UINT32 cmdRecvNum;
905 905
906A_STATUS 906int
907wmi_control_rx(struct wmi_t *wmip, void *osbuf) 907wmi_control_rx(struct wmi_t *wmip, void *osbuf)
908{ 908{
909 WMI_CMD_HDR *cmd; 909 WMI_CMD_HDR *cmd;
910 A_UINT16 id; 910 A_UINT16 id;
911 A_UINT8 *datap; 911 A_UINT8 *datap;
912 A_UINT32 len, i, loggingReq; 912 A_UINT32 len, i, loggingReq;
913 A_STATUS status = A_OK; 913 int status = A_OK;
914 914
915 A_ASSERT(osbuf != NULL); 915 A_ASSERT(osbuf != NULL);
916 if (A_NETBUF_LEN(osbuf) < sizeof(WMI_CMD_HDR)) { 916 if (A_NETBUF_LEN(osbuf) < sizeof(WMI_CMD_HDR)) {
@@ -1192,7 +1192,7 @@ wmi_control_rx(struct wmi_t *wmip, void *osbuf)
1192} 1192}
1193 1193
1194/* Send a "simple" wmi command -- one with no arguments */ 1194/* Send a "simple" wmi command -- one with no arguments */
1195static A_STATUS 1195static int
1196wmi_simple_cmd(struct wmi_t *wmip, WMI_COMMAND_ID cmdid) 1196wmi_simple_cmd(struct wmi_t *wmip, WMI_COMMAND_ID cmdid)
1197{ 1197{
1198 void *osbuf; 1198 void *osbuf;
@@ -1209,7 +1209,7 @@ wmi_simple_cmd(struct wmi_t *wmip, WMI_COMMAND_ID cmdid)
1209 Enabling this command only if GPIO or profiling support is enabled. 1209 Enabling this command only if GPIO or profiling support is enabled.
1210 This is to suppress warnings on some platforms */ 1210 This is to suppress warnings on some platforms */
1211#if defined(CONFIG_HOST_GPIO_SUPPORT) || defined(CONFIG_TARGET_PROFILE_SUPPORT) 1211#if defined(CONFIG_HOST_GPIO_SUPPORT) || defined(CONFIG_TARGET_PROFILE_SUPPORT)
1212static A_STATUS 1212static int
1213wmi_simple_cmd_xtnd(struct wmi_t *wmip, WMIX_COMMAND_ID cmdid) 1213wmi_simple_cmd_xtnd(struct wmi_t *wmip, WMIX_COMMAND_ID cmdid)
1214{ 1214{
1215 void *osbuf; 1215 void *osbuf;
@@ -1223,7 +1223,7 @@ wmi_simple_cmd_xtnd(struct wmi_t *wmip, WMIX_COMMAND_ID cmdid)
1223} 1223}
1224#endif 1224#endif
1225 1225
1226static A_STATUS 1226static int
1227wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1227wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1228{ 1228{
1229 WMI_READY_EVENT *ev = (WMI_READY_EVENT *)datap; 1229 WMI_READY_EVENT *ev = (WMI_READY_EVENT *)datap;
@@ -1257,7 +1257,7 @@ iswmmparam(const A_UINT8 *frm)
1257} 1257}
1258 1258
1259 1259
1260static A_STATUS 1260static int
1261wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1261wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1262{ 1262{
1263 WMI_CONNECT_EVENT *ev; 1263 WMI_CONNECT_EVENT *ev;
@@ -1317,7 +1317,7 @@ wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1317 return A_OK; 1317 return A_OK;
1318} 1318}
1319 1319
1320static A_STATUS 1320static int
1321wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1321wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1322{ 1322{
1323 WMI_REG_DOMAIN_EVENT *ev; 1323 WMI_REG_DOMAIN_EVENT *ev;
@@ -1332,7 +1332,7 @@ wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1332 return A_OK; 1332 return A_OK;
1333} 1333}
1334 1334
1335static A_STATUS 1335static int
1336wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1336wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1337{ 1337{
1338 WMI_NEIGHBOR_REPORT_EVENT *ev; 1338 WMI_NEIGHBOR_REPORT_EVENT *ev;
@@ -1353,7 +1353,7 @@ wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1353 return A_OK; 1353 return A_OK;
1354} 1354}
1355 1355
1356static A_STATUS 1356static int
1357wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1357wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1358{ 1358{
1359 WMI_DISCONNECT_EVENT *ev; 1359 WMI_DISCONNECT_EVENT *ev;
@@ -1378,7 +1378,7 @@ wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1378 return A_OK; 1378 return A_OK;
1379} 1379}
1380 1380
1381static A_STATUS 1381static int
1382wmi_peer_node_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1382wmi_peer_node_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1383{ 1383{
1384 WMI_PEER_NODE_EVENT *ev; 1384 WMI_PEER_NODE_EVENT *ev;
@@ -1398,7 +1398,7 @@ wmi_peer_node_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1398 return A_OK; 1398 return A_OK;
1399} 1399}
1400 1400
1401static A_STATUS 1401static int
1402wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1402wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1403{ 1403{
1404 WMI_TKIP_MICERR_EVENT *ev; 1404 WMI_TKIP_MICERR_EVENT *ev;
@@ -1414,7 +1414,7 @@ wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1414 return A_OK; 1414 return A_OK;
1415} 1415}
1416 1416
1417static A_STATUS 1417static int
1418wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1418wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1419{ 1419{
1420 bss_t *bss = NULL; 1420 bss_t *bss = NULL;
@@ -1578,7 +1578,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1578 return A_OK; 1578 return A_OK;
1579} 1579}
1580 1580
1581static A_STATUS 1581static int
1582wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1582wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1583{ 1583{
1584 bss_t *bss; 1584 bss_t *bss;
@@ -1623,7 +1623,7 @@ wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1623 /* This event indicates inactivity timeout of a fatpipe(pstream) 1623 /* This event indicates inactivity timeout of a fatpipe(pstream)
1624 * at the target 1624 * at the target
1625 */ 1625 */
1626static A_STATUS 1626static int
1627wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1627wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1628{ 1628{
1629 WMI_PSTREAM_TIMEOUT_EVENT *ev; 1629 WMI_PSTREAM_TIMEOUT_EVENT *ev;
@@ -1653,7 +1653,7 @@ wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1653 return A_OK; 1653 return A_OK;
1654} 1654}
1655 1655
1656static A_STATUS 1656static int
1657wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1657wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1658{ 1658{
1659 WMI_BIT_RATE_REPLY *reply; 1659 WMI_BIT_RATE_REPLY *reply;
@@ -1684,7 +1684,7 @@ wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1684 return A_OK; 1684 return A_OK;
1685} 1685}
1686 1686
1687static A_STATUS 1687static int
1688wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1688wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1689{ 1689{
1690 WMI_FIX_RATES_REPLY *reply; 1690 WMI_FIX_RATES_REPLY *reply;
@@ -1701,7 +1701,7 @@ wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1701 return A_OK; 1701 return A_OK;
1702} 1702}
1703 1703
1704static A_STATUS 1704static int
1705wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1705wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1706{ 1706{
1707 WMI_CHANNEL_LIST_REPLY *reply; 1707 WMI_CHANNEL_LIST_REPLY *reply;
@@ -1718,7 +1718,7 @@ wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1718 return A_OK; 1718 return A_OK;
1719} 1719}
1720 1720
1721static A_STATUS 1721static int
1722wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1722wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1723{ 1723{
1724 WMI_TX_PWR_REPLY *reply; 1724 WMI_TX_PWR_REPLY *reply;
@@ -1733,7 +1733,7 @@ wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1733 1733
1734 return A_OK; 1734 return A_OK;
1735} 1735}
1736static A_STATUS 1736static int
1737wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1737wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1738{ 1738{
1739 WMI_GET_KEEPALIVE_CMD *reply; 1739 WMI_GET_KEEPALIVE_CMD *reply;
@@ -1750,7 +1750,7 @@ wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1750} 1750}
1751 1751
1752 1752
1753static A_STATUS 1753static int
1754wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1754wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1755{ 1755{
1756 WMIX_DSETOPENREQ_EVENT *dsetopenreq; 1756 WMIX_DSETOPENREQ_EVENT *dsetopenreq;
@@ -1771,7 +1771,7 @@ wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1771} 1771}
1772 1772
1773#ifdef CONFIG_HOST_DSET_SUPPORT 1773#ifdef CONFIG_HOST_DSET_SUPPORT
1774static A_STATUS 1774static int
1775wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1775wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1776{ 1776{
1777 WMIX_DSETCLOSE_EVENT *dsetclose; 1777 WMIX_DSETCLOSE_EVENT *dsetclose;
@@ -1787,7 +1787,7 @@ wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1787 return A_OK; 1787 return A_OK;
1788} 1788}
1789 1789
1790static A_STATUS 1790static int
1791wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1791wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1792{ 1792{
1793 WMIX_DSETDATAREQ_EVENT *dsetdatareq; 1793 WMIX_DSETDATAREQ_EVENT *dsetdatareq;
@@ -1810,16 +1810,16 @@ wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1810} 1810}
1811#endif /* CONFIG_HOST_DSET_SUPPORT */ 1811#endif /* CONFIG_HOST_DSET_SUPPORT */
1812 1812
1813static A_STATUS 1813static int
1814wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1814wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1815{ 1815{
1816 WMI_SCAN_COMPLETE_EVENT *ev; 1816 WMI_SCAN_COMPLETE_EVENT *ev;
1817 1817
1818 ev = (WMI_SCAN_COMPLETE_EVENT *)datap; 1818 ev = (WMI_SCAN_COMPLETE_EVENT *)datap;
1819 if ((A_STATUS)ev->status == A_OK) { 1819 if ((int)ev->status == A_OK) {
1820 wlan_refresh_inactive_nodes(&wmip->wmi_scan_table); 1820 wlan_refresh_inactive_nodes(&wmip->wmi_scan_table);
1821 } 1821 }
1822 A_WMI_SCANCOMPLETE_EVENT(wmip->wmi_devt, (A_STATUS) ev->status); 1822 A_WMI_SCANCOMPLETE_EVENT(wmip->wmi_devt, (int) ev->status);
1823 is_probe_ssid = FALSE; 1823 is_probe_ssid = FALSE;
1824 1824
1825 return A_OK; 1825 return A_OK;
@@ -1832,7 +1832,7 @@ wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1832 * Behavior of target after wmi error event is undefined. 1832 * Behavior of target after wmi error event is undefined.
1833 * A reset is recommended. 1833 * A reset is recommended.
1834 */ 1834 */
1835static A_STATUS 1835static int
1836wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1836wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1837{ 1837{
1838 WMI_CMD_ERROR_EVENT *ev; 1838 WMI_CMD_ERROR_EVENT *ev;
@@ -1855,7 +1855,7 @@ wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1855} 1855}
1856 1856
1857 1857
1858static A_STATUS 1858static int
1859wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1859wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1860{ 1860{
1861 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 1861 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
@@ -1865,7 +1865,7 @@ wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1865 return A_OK; 1865 return A_OK;
1866} 1866}
1867 1867
1868static A_STATUS 1868static int
1869wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1869wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1870{ 1870{
1871 WMI_RSSI_THRESHOLD_EVENT *reply; 1871 WMI_RSSI_THRESHOLD_EVENT *reply;
@@ -1970,7 +1970,7 @@ wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1970} 1970}
1971 1971
1972 1972
1973static A_STATUS 1973static int
1974wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1974wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1975{ 1975{
1976 WMI_TARGET_ERROR_REPORT_EVENT *reply; 1976 WMI_TARGET_ERROR_REPORT_EVENT *reply;
@@ -1986,7 +1986,7 @@ wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1986 return A_OK; 1986 return A_OK;
1987} 1987}
1988 1988
1989static A_STATUS 1989static int
1990wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 1990wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
1991{ 1991{
1992 WMI_CAC_EVENT *reply; 1992 WMI_CAC_EVENT *reply;
@@ -2056,7 +2056,7 @@ wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2056 return A_OK; 2056 return A_OK;
2057} 2057}
2058 2058
2059static A_STATUS 2059static int
2060wmi_channel_change_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2060wmi_channel_change_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2061{ 2061{
2062 WMI_CHANNEL_CHANGE_EVENT *reply; 2062 WMI_CHANNEL_CHANGE_EVENT *reply;
@@ -2073,7 +2073,7 @@ wmi_channel_change_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2073 return A_OK; 2073 return A_OK;
2074} 2074}
2075 2075
2076static A_STATUS 2076static int
2077wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2077wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2078{ 2078{
2079 WMIX_HB_CHALLENGE_RESP_EVENT *reply; 2079 WMIX_HB_CHALLENGE_RESP_EVENT *reply;
@@ -2089,7 +2089,7 @@ wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2089 return A_OK; 2089 return A_OK;
2090} 2090}
2091 2091
2092static A_STATUS 2092static int
2093wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2093wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2094{ 2094{
2095 WMI_TARGET_ROAM_TBL *reply; 2095 WMI_TARGET_ROAM_TBL *reply;
@@ -2105,7 +2105,7 @@ wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2105 return A_OK; 2105 return A_OK;
2106} 2106}
2107 2107
2108static A_STATUS 2108static int
2109wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2109wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2110{ 2110{
2111 WMI_TARGET_ROAM_DATA *reply; 2111 WMI_TARGET_ROAM_DATA *reply;
@@ -2121,7 +2121,7 @@ wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2121 return A_OK; 2121 return A_OK;
2122} 2122}
2123 2123
2124static A_STATUS 2124static int
2125wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2125wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2126{ 2126{
2127 if (len < sizeof(WMI_TX_RETRY_ERR_EVENT)) { 2127 if (len < sizeof(WMI_TX_RETRY_ERR_EVENT)) {
@@ -2134,7 +2134,7 @@ wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2134 return A_OK; 2134 return A_OK;
2135} 2135}
2136 2136
2137static A_STATUS 2137static int
2138wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2138wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2139{ 2139{
2140 WMI_SNR_THRESHOLD_EVENT *reply; 2140 WMI_SNR_THRESHOLD_EVENT *reply;
@@ -2227,7 +2227,7 @@ wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2227 return A_OK; 2227 return A_OK;
2228} 2228}
2229 2229
2230static A_STATUS 2230static int
2231wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2231wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2232{ 2232{
2233 WMI_LQ_THRESHOLD_EVENT *reply; 2233 WMI_LQ_THRESHOLD_EVENT *reply;
@@ -2245,7 +2245,7 @@ wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2245 return A_OK; 2245 return A_OK;
2246} 2246}
2247 2247
2248static A_STATUS 2248static int
2249wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2249wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2250{ 2250{
2251 A_UINT16 ap_info_entry_size; 2251 A_UINT16 ap_info_entry_size;
@@ -2286,7 +2286,7 @@ wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2286 return A_OK; 2286 return A_OK;
2287} 2287}
2288 2288
2289static A_STATUS 2289static int
2290wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2290wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2291{ 2291{
2292 A_UINT32 dropped; 2292 A_UINT32 dropped;
@@ -2299,7 +2299,7 @@ wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2299} 2299}
2300 2300
2301#ifdef CONFIG_HOST_GPIO_SUPPORT 2301#ifdef CONFIG_HOST_GPIO_SUPPORT
2302static A_STATUS 2302static int
2303wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2303wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2304{ 2304{
2305 WMIX_GPIO_INTR_EVENT *gpio_intr = (WMIX_GPIO_INTR_EVENT *)datap; 2305 WMIX_GPIO_INTR_EVENT *gpio_intr = (WMIX_GPIO_INTR_EVENT *)datap;
@@ -2313,7 +2313,7 @@ wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2313 return A_OK; 2313 return A_OK;
2314} 2314}
2315 2315
2316static A_STATUS 2316static int
2317wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2317wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2318{ 2318{
2319 WMIX_GPIO_DATA_EVENT *gpio_data = (WMIX_GPIO_DATA_EVENT *)datap; 2319 WMIX_GPIO_DATA_EVENT *gpio_data = (WMIX_GPIO_DATA_EVENT *)datap;
@@ -2327,7 +2327,7 @@ wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2327 return A_OK; 2327 return A_OK;
2328} 2328}
2329 2329
2330static A_STATUS 2330static int
2331wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 2331wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2332{ 2332{
2333 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 2333 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
@@ -2342,11 +2342,11 @@ wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
2342 * Called to send a wmi command. Command specific data is already built 2342 * Called to send a wmi command. Command specific data is already built
2343 * on osbuf and current osbuf->data points to it. 2343 * on osbuf and current osbuf->data points to it.
2344 */ 2344 */
2345A_STATUS 2345int
2346wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId, 2346wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
2347 WMI_SYNC_FLAG syncflag) 2347 WMI_SYNC_FLAG syncflag)
2348{ 2348{
2349 A_STATUS status; 2349 int status;
2350#define IS_OPT_TX_CMD(cmdId) ((cmdId == WMI_OPT_TX_FRAME_CMDID)) 2350#define IS_OPT_TX_CMD(cmdId) ((cmdId == WMI_OPT_TX_FRAME_CMDID))
2351 WMI_CMD_HDR *cHdr; 2351 WMI_CMD_HDR *cHdr;
2352 HTC_ENDPOINT_ID eid = wmip->wmi_endpoint_id; 2352 HTC_ENDPOINT_ID eid = wmip->wmi_endpoint_id;
@@ -2398,7 +2398,7 @@ wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
2398#undef IS_OPT_TX_CMD 2398#undef IS_OPT_TX_CMD
2399} 2399}
2400 2400
2401A_STATUS 2401int
2402wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId, 2402wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId,
2403 WMI_SYNC_FLAG syncflag) 2403 WMI_SYNC_FLAG syncflag)
2404{ 2404{
@@ -2415,7 +2415,7 @@ wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId,
2415 return wmi_cmd_send(wmip, osbuf, WMI_EXTENSION_CMDID, syncflag); 2415 return wmi_cmd_send(wmip, osbuf, WMI_EXTENSION_CMDID, syncflag);
2416} 2416}
2417 2417
2418A_STATUS 2418int
2419wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType, 2419wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
2420 DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode, 2420 DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode,
2421 CRYPTO_TYPE pairwiseCrypto, A_UINT8 pairwiseCryptoLen, 2421 CRYPTO_TYPE pairwiseCrypto, A_UINT8 pairwiseCryptoLen,
@@ -2470,7 +2470,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
2470 return (wmi_cmd_send(wmip, osbuf, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG)); 2470 return (wmi_cmd_send(wmip, osbuf, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG));
2471} 2471}
2472 2472
2473A_STATUS 2473int
2474wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel) 2474wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel)
2475{ 2475{
2476 void *osbuf; 2476 void *osbuf;
@@ -2496,10 +2496,10 @@ wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel)
2496 return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG)); 2496 return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG));
2497} 2497}
2498 2498
2499A_STATUS 2499int
2500wmi_disconnect_cmd(struct wmi_t *wmip) 2500wmi_disconnect_cmd(struct wmi_t *wmip)
2501{ 2501{
2502 A_STATUS status; 2502 int status;
2503 wmip->wmi_traffic_class = 100; 2503 wmip->wmi_traffic_class = 100;
2504 2504
2505 /* Bug fix for 24817(elevator bug) - the disconnect command does not 2505 /* Bug fix for 24817(elevator bug) - the disconnect command does not
@@ -2509,7 +2509,7 @@ wmi_disconnect_cmd(struct wmi_t *wmip)
2509 return status; 2509 return status;
2510} 2510}
2511 2511
2512A_STATUS 2512int
2513wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, 2513wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
2514 A_BOOL forceFgScan, A_BOOL isLegacy, 2514 A_BOOL forceFgScan, A_BOOL isLegacy,
2515 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, 2515 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval,
@@ -2553,7 +2553,7 @@ wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
2553 return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG)); 2553 return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
2554} 2554}
2555 2555
2556A_STATUS 2556int
2557wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec, 2557wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
2558 A_UINT16 fg_end_sec, A_UINT16 bg_sec, 2558 A_UINT16 fg_end_sec, A_UINT16 bg_sec,
2559 A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec, 2559 A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec,
@@ -2588,7 +2588,7 @@ wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
2588 NO_SYNC_WMIFLAG)); 2588 NO_SYNC_WMIFLAG));
2589} 2589}
2590 2590
2591A_STATUS 2591int
2592wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask) 2592wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask)
2593{ 2593{
2594 void *osbuf; 2594 void *osbuf;
@@ -2614,7 +2614,7 @@ wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask)
2614 NO_SYNC_WMIFLAG)); 2614 NO_SYNC_WMIFLAG));
2615} 2615}
2616 2616
2617A_STATUS 2617int
2618wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag, 2618wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
2619 A_UINT8 ssidLength, A_UCHAR *ssid) 2619 A_UINT8 ssidLength, A_UCHAR *ssid)
2620{ 2620{
@@ -2656,7 +2656,7 @@ wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
2656 NO_SYNC_WMIFLAG)); 2656 NO_SYNC_WMIFLAG));
2657} 2657}
2658 2658
2659A_STATUS 2659int
2660wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons) 2660wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons)
2661{ 2661{
2662 void *osbuf; 2662 void *osbuf;
@@ -2678,7 +2678,7 @@ wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 lis
2678 NO_SYNC_WMIFLAG)); 2678 NO_SYNC_WMIFLAG));
2679} 2679}
2680 2680
2681A_STATUS 2681int
2682wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons) 2682wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons)
2683{ 2683{
2684 void *osbuf; 2684 void *osbuf;
@@ -2700,7 +2700,7 @@ wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons)
2700 NO_SYNC_WMIFLAG)); 2700 NO_SYNC_WMIFLAG));
2701} 2701}
2702 2702
2703A_STATUS 2703int
2704wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType, 2704wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
2705 A_UINT8 ieLen, A_UINT8 *ieInfo) 2705 A_UINT8 ieLen, A_UINT8 *ieInfo)
2706{ 2706{
@@ -2726,7 +2726,7 @@ wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
2726 NO_SYNC_WMIFLAG)); 2726 NO_SYNC_WMIFLAG));
2727} 2727}
2728 2728
2729A_STATUS 2729int
2730wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode) 2730wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode)
2731{ 2731{
2732 void *osbuf; 2732 void *osbuf;
@@ -2748,7 +2748,7 @@ wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode)
2748 NO_SYNC_WMIFLAG)); 2748 NO_SYNC_WMIFLAG));
2749} 2749}
2750 2750
2751A_STATUS 2751int
2752wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl, 2752wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
2753 A_UINT16 atim_windows, A_UINT16 timeout_value) 2753 A_UINT16 atim_windows, A_UINT16 timeout_value)
2754{ 2754{
@@ -2773,7 +2773,7 @@ wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
2773 NO_SYNC_WMIFLAG)); 2773 NO_SYNC_WMIFLAG));
2774} 2774}
2775 2775
2776A_STATUS 2776int
2777wmi_apps_cmd(struct wmi_t *wmip, A_UINT8 psType, A_UINT32 idle_time, 2777wmi_apps_cmd(struct wmi_t *wmip, A_UINT8 psType, A_UINT32 idle_time,
2778 A_UINT32 ps_period, A_UINT8 sleep_period) 2778 A_UINT32 ps_period, A_UINT8 sleep_period)
2779{ 2779{
@@ -2798,7 +2798,7 @@ wmi_apps_cmd(struct wmi_t *wmip, A_UINT8 psType, A_UINT32 idle_time,
2798 NO_SYNC_WMIFLAG)); 2798 NO_SYNC_WMIFLAG));
2799} 2799}
2800 2800
2801A_STATUS 2801int
2802wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod, 2802wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
2803 A_UINT16 psPollNum, A_UINT16 dtimPolicy, 2803 A_UINT16 psPollNum, A_UINT16 dtimPolicy,
2804 A_UINT16 tx_wakeup_policy, A_UINT16 num_tx_to_wakeup, 2804 A_UINT16 tx_wakeup_policy, A_UINT16 num_tx_to_wakeup,
@@ -2827,7 +2827,7 @@ wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
2827 NO_SYNC_WMIFLAG)); 2827 NO_SYNC_WMIFLAG));
2828} 2828}
2829 2829
2830A_STATUS 2830int
2831wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout) 2831wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout)
2832{ 2832{
2833 void *osbuf; 2833 void *osbuf;
@@ -2848,7 +2848,7 @@ wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout)
2848 NO_SYNC_WMIFLAG)); 2848 NO_SYNC_WMIFLAG));
2849} 2849}
2850 2850
2851A_STATUS 2851int
2852wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType, 2852wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType,
2853 A_UINT8 keyUsage, A_UINT8 keyLength, A_UINT8 *keyRSC, 2853 A_UINT8 keyUsage, A_UINT8 keyLength, A_UINT8 *keyRSC,
2854 A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl, A_UINT8 *macAddr, 2854 A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl, A_UINT8 *macAddr,
@@ -2897,7 +2897,7 @@ wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType,
2897 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag)); 2897 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag));
2898} 2898}
2899 2899
2900A_STATUS 2900int
2901wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk) 2901wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk)
2902{ 2902{
2903 void *osbuf; 2903 void *osbuf;
@@ -2917,13 +2917,13 @@ wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk)
2917 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG)); 2917 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG));
2918} 2918}
2919 2919
2920A_STATUS 2920int
2921wmi_delete_krk_cmd(struct wmi_t *wmip) 2921wmi_delete_krk_cmd(struct wmi_t *wmip)
2922{ 2922{
2923 return wmi_simple_cmd(wmip, WMI_DELETE_KRK_CMDID); 2923 return wmi_simple_cmd(wmip, WMI_DELETE_KRK_CMDID);
2924} 2924}
2925 2925
2926A_STATUS 2926int
2927wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex) 2927wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex)
2928{ 2928{
2929 void *osbuf; 2929 void *osbuf;
@@ -2948,7 +2948,7 @@ wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex)
2948 NO_SYNC_WMIFLAG)); 2948 NO_SYNC_WMIFLAG));
2949} 2949}
2950 2950
2951A_STATUS 2951int
2952wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId, 2952wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
2953 A_BOOL set) 2953 A_BOOL set)
2954{ 2954{
@@ -2983,7 +2983,7 @@ wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
2983 return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_CMDID, NO_SYNC_WMIFLAG)); 2983 return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_CMDID, NO_SYNC_WMIFLAG));
2984} 2984}
2985 2985
2986A_STATUS 2986int
2987wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en) 2987wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en)
2988{ 2988{
2989 void *osbuf; 2989 void *osbuf;
@@ -3003,7 +3003,7 @@ wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en)
3003 NO_SYNC_WMIFLAG)); 3003 NO_SYNC_WMIFLAG));
3004} 3004}
3005 3005
3006A_STATUS 3006int
3007wmi_set_akmp_params_cmd(struct wmi_t *wmip, 3007wmi_set_akmp_params_cmd(struct wmi_t *wmip,
3008 WMI_SET_AKMP_PARAMS_CMD *akmpParams) 3008 WMI_SET_AKMP_PARAMS_CMD *akmpParams)
3009{ 3009{
@@ -3023,7 +3023,7 @@ wmi_set_akmp_params_cmd(struct wmi_t *wmip,
3023 NO_SYNC_WMIFLAG)); 3023 NO_SYNC_WMIFLAG));
3024} 3024}
3025 3025
3026A_STATUS 3026int
3027wmi_set_pmkid_list_cmd(struct wmi_t *wmip, 3027wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
3028 WMI_SET_PMKID_LIST_CMD *pmkInfo) 3028 WMI_SET_PMKID_LIST_CMD *pmkInfo)
3029{ 3029{
@@ -3053,13 +3053,13 @@ wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
3053 NO_SYNC_WMIFLAG)); 3053 NO_SYNC_WMIFLAG));
3054} 3054}
3055 3055
3056A_STATUS 3056int
3057wmi_get_pmkid_list_cmd(struct wmi_t *wmip) 3057wmi_get_pmkid_list_cmd(struct wmi_t *wmip)
3058{ 3058{
3059 return wmi_simple_cmd(wmip, WMI_GET_PMKID_LIST_CMDID); 3059 return wmi_simple_cmd(wmip, WMI_GET_PMKID_LIST_CMDID);
3060} 3060}
3061 3061
3062A_STATUS 3062int
3063wmi_dataSync_send(struct wmi_t *wmip, void *osbuf, HTC_ENDPOINT_ID eid) 3063wmi_dataSync_send(struct wmi_t *wmip, void *osbuf, HTC_ENDPOINT_ID eid)
3064{ 3064{
3065 WMI_DATA_HDR *dtHdr; 3065 WMI_DATA_HDR *dtHdr;
@@ -3085,14 +3085,14 @@ typedef struct _WMI_DATA_SYNC_BUFS {
3085 void *osbuf; 3085 void *osbuf;
3086}WMI_DATA_SYNC_BUFS; 3086}WMI_DATA_SYNC_BUFS;
3087 3087
3088static A_STATUS 3088static int
3089wmi_sync_point(struct wmi_t *wmip) 3089wmi_sync_point(struct wmi_t *wmip)
3090{ 3090{
3091 void *cmd_osbuf; 3091 void *cmd_osbuf;
3092 WMI_SYNC_CMD *cmd; 3092 WMI_SYNC_CMD *cmd;
3093 WMI_DATA_SYNC_BUFS dataSyncBufs[WMM_NUM_AC]; 3093 WMI_DATA_SYNC_BUFS dataSyncBufs[WMM_NUM_AC];
3094 A_UINT8 i,numPriStreams=0; 3094 A_UINT8 i,numPriStreams=0;
3095 A_STATUS status = A_OK; 3095 int status = A_OK;
3096 3096
3097 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 3097 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
3098 3098
@@ -3195,7 +3195,7 @@ wmi_sync_point(struct wmi_t *wmip)
3195 return (status); 3195 return (status);
3196} 3196}
3197 3197
3198A_STATUS 3198int
3199wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params) 3199wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
3200{ 3200{
3201 void *osbuf; 3201 void *osbuf;
@@ -3291,12 +3291,12 @@ wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
3291 NO_SYNC_WMIFLAG)); 3291 NO_SYNC_WMIFLAG));
3292} 3292}
3293 3293
3294A_STATUS 3294int
3295wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid) 3295wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid)
3296{ 3296{
3297 void *osbuf; 3297 void *osbuf;
3298 WMI_DELETE_PSTREAM_CMD *cmd; 3298 WMI_DELETE_PSTREAM_CMD *cmd;
3299 A_STATUS status; 3299 int status;
3300 A_UINT16 activeTsids=0; 3300 A_UINT16 activeTsids=0;
3301 3301
3302 /* validate the parameters */ 3302 /* validate the parameters */
@@ -3355,7 +3355,7 @@ wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid)
3355 return status; 3355 return status;
3356} 3356}
3357 3357
3358A_STATUS 3358int
3359wmi_set_framerate_cmd(struct wmi_t *wmip, A_UINT8 bEnable, A_UINT8 type, A_UINT8 subType, A_UINT16 rateMask) 3359wmi_set_framerate_cmd(struct wmi_t *wmip, A_UINT8 bEnable, A_UINT8 type, A_UINT8 subType, A_UINT16 rateMask)
3360{ 3360{
3361 void *osbuf; 3361 void *osbuf;
@@ -3394,7 +3394,7 @@ wmi_set_framerate_cmd(struct wmi_t *wmip, A_UINT8 bEnable, A_UINT8 type, A_UINT8
3394 * used to set the bit rate. rate is in Kbps. If rate == -1 3394 * used to set the bit rate. rate is in Kbps. If rate == -1
3395 * then auto selection is used. 3395 * then auto selection is used.
3396 */ 3396 */
3397A_STATUS 3397int
3398wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate) 3398wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_INT32 ctlRate)
3399{ 3399{
3400 void *osbuf; 3400 void *osbuf;
@@ -3444,7 +3444,7 @@ wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 dataRate, A_INT32 mgmtRate, A_IN
3444 return (wmi_cmd_send(wmip, osbuf, WMI_SET_BITRATE_CMDID, NO_SYNC_WMIFLAG)); 3444 return (wmi_cmd_send(wmip, osbuf, WMI_SET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
3445} 3445}
3446 3446
3447A_STATUS 3447int
3448wmi_get_bitrate_cmd(struct wmi_t *wmip) 3448wmi_get_bitrate_cmd(struct wmi_t *wmip)
3449{ 3449{
3450 return wmi_simple_cmd(wmip, WMI_GET_BITRATE_CMDID); 3450 return wmi_simple_cmd(wmip, WMI_GET_BITRATE_CMDID);
@@ -3532,7 +3532,7 @@ wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate, A_INT8 *rate_idx)
3532 return A_OK; 3532 return A_OK;
3533} 3533}
3534 3534
3535A_STATUS 3535int
3536wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask) 3536wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask)
3537{ 3537{
3538 void *osbuf; 3538 void *osbuf;
@@ -3572,13 +3572,13 @@ wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask)
3572 return (wmi_cmd_send(wmip, osbuf, WMI_SET_FIXRATES_CMDID, NO_SYNC_WMIFLAG)); 3572 return (wmi_cmd_send(wmip, osbuf, WMI_SET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
3573} 3573}
3574 3574
3575A_STATUS 3575int
3576wmi_get_ratemask_cmd(struct wmi_t *wmip) 3576wmi_get_ratemask_cmd(struct wmi_t *wmip)
3577{ 3577{
3578 return wmi_simple_cmd(wmip, WMI_GET_FIXRATES_CMDID); 3578 return wmi_simple_cmd(wmip, WMI_GET_FIXRATES_CMDID);
3579} 3579}
3580 3580
3581A_STATUS 3581int
3582wmi_get_channelList_cmd(struct wmi_t *wmip) 3582wmi_get_channelList_cmd(struct wmi_t *wmip)
3583{ 3583{
3584 return wmi_simple_cmd(wmip, WMI_GET_CHANNEL_LIST_CMDID); 3584 return wmi_simple_cmd(wmip, WMI_GET_CHANNEL_LIST_CMDID);
@@ -3594,7 +3594,7 @@ wmi_get_channelList_cmd(struct wmi_t *wmip)
3594 * should limit its operation to. It should be NULL if numChan == 0. Size of 3594 * should limit its operation to. It should be NULL if numChan == 0. Size of
3595 * array should correspond to numChan entries. 3595 * array should correspond to numChan entries.
3596 */ 3596 */
3597A_STATUS 3597int
3598wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam, 3598wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
3599 WMI_PHY_MODE mode, A_INT8 numChan, 3599 WMI_PHY_MODE mode, A_INT8 numChan,
3600 A_UINT16 *channelList) 3600 A_UINT16 *channelList)
@@ -3681,7 +3681,7 @@ wmi_cache_configure_rssithreshold(struct wmi_t *wmip, WMI_RSSI_THRESHOLD_PARAMS_
3681} 3681}
3682} 3682}
3683 3683
3684A_STATUS 3684int
3685wmi_set_rssi_threshold_params(struct wmi_t *wmip, 3685wmi_set_rssi_threshold_params(struct wmi_t *wmip,
3686 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd) 3686 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd)
3687{ 3687{
@@ -3706,7 +3706,7 @@ wmi_set_rssi_threshold_params(struct wmi_t *wmip,
3706 return (wmi_send_rssi_threshold_params(wmip, rssiCmd)); 3706 return (wmi_send_rssi_threshold_params(wmip, rssiCmd));
3707} 3707}
3708 3708
3709A_STATUS 3709int
3710wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *ipCmd) 3710wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *ipCmd)
3711{ 3711{
3712 void *osbuf; 3712 void *osbuf;
@@ -3731,7 +3731,7 @@ wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *ipCmd)
3731 NO_SYNC_WMIFLAG)); 3731 NO_SYNC_WMIFLAG));
3732} 3732}
3733 3733
3734A_STATUS 3734int
3735wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, 3735wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
3736 WMI_SET_HOST_SLEEP_MODE_CMD *hostModeCmd) 3736 WMI_SET_HOST_SLEEP_MODE_CMD *hostModeCmd)
3737{ 3737{
@@ -3793,7 +3793,7 @@ wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
3793 NO_SYNC_WMIFLAG)); 3793 NO_SYNC_WMIFLAG));
3794} 3794}
3795 3795
3796A_STATUS 3796int
3797wmi_set_wow_mode_cmd(struct wmi_t *wmip, 3797wmi_set_wow_mode_cmd(struct wmi_t *wmip,
3798 WMI_SET_WOW_MODE_CMD *wowModeCmd) 3798 WMI_SET_WOW_MODE_CMD *wowModeCmd)
3799{ 3799{
@@ -3819,7 +3819,7 @@ wmi_set_wow_mode_cmd(struct wmi_t *wmip,
3819 3819
3820} 3820}
3821 3821
3822A_STATUS 3822int
3823wmi_get_wow_list_cmd(struct wmi_t *wmip, 3823wmi_get_wow_list_cmd(struct wmi_t *wmip,
3824 WMI_GET_WOW_LIST_CMD *wowListCmd) 3824 WMI_GET_WOW_LIST_CMD *wowListCmd)
3825{ 3825{
@@ -3845,7 +3845,7 @@ wmi_get_wow_list_cmd(struct wmi_t *wmip,
3845 3845
3846} 3846}
3847 3847
3848static A_STATUS 3848static int
3849wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 3849wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
3850{ 3850{
3851 WMI_GET_WOW_LIST_REPLY *reply; 3851 WMI_GET_WOW_LIST_REPLY *reply;
@@ -3861,7 +3861,7 @@ wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
3861 return A_OK; 3861 return A_OK;
3862} 3862}
3863 3863
3864A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip, 3864int wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
3865 WMI_ADD_WOW_PATTERN_CMD *addWowCmd, 3865 WMI_ADD_WOW_PATTERN_CMD *addWowCmd,
3866 A_UINT8* pattern, A_UINT8* mask, 3866 A_UINT8* pattern, A_UINT8* mask,
3867 A_UINT8 pattern_size) 3867 A_UINT8 pattern_size)
@@ -3896,7 +3896,7 @@ A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
3896 NO_SYNC_WMIFLAG)); 3896 NO_SYNC_WMIFLAG));
3897} 3897}
3898 3898
3899A_STATUS 3899int
3900wmi_del_wow_pattern_cmd(struct wmi_t *wmip, 3900wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
3901 WMI_DEL_WOW_PATTERN_CMD *delWowCmd) 3901 WMI_DEL_WOW_PATTERN_CMD *delWowCmd)
3902{ 3902{
@@ -3967,7 +3967,7 @@ wmi_cache_configure_snrthreshold(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CM
3967 } 3967 }
3968 3968
3969} 3969}
3970A_STATUS 3970int
3971wmi_set_snr_threshold_params(struct wmi_t *wmip, 3971wmi_set_snr_threshold_params(struct wmi_t *wmip,
3972 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd) 3972 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd)
3973{ 3973{
@@ -3984,7 +3984,7 @@ wmi_set_snr_threshold_params(struct wmi_t *wmip,
3984 return (wmi_send_snr_threshold_params(wmip, snrCmd)); 3984 return (wmi_send_snr_threshold_params(wmip, snrCmd));
3985} 3985}
3986 3986
3987A_STATUS 3987int
3988wmi_clr_rssi_snr(struct wmi_t *wmip) 3988wmi_clr_rssi_snr(struct wmi_t *wmip)
3989{ 3989{
3990 void *osbuf; 3990 void *osbuf;
@@ -3998,7 +3998,7 @@ wmi_clr_rssi_snr(struct wmi_t *wmip)
3998 NO_SYNC_WMIFLAG)); 3998 NO_SYNC_WMIFLAG));
3999} 3999}
4000 4000
4001A_STATUS 4001int
4002wmi_set_lq_threshold_params(struct wmi_t *wmip, 4002wmi_set_lq_threshold_params(struct wmi_t *wmip,
4003 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd) 4003 WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd)
4004{ 4004{
@@ -4033,7 +4033,7 @@ wmi_set_lq_threshold_params(struct wmi_t *wmip,
4033 NO_SYNC_WMIFLAG)); 4033 NO_SYNC_WMIFLAG));
4034} 4034}
4035 4035
4036A_STATUS 4036int
4037wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask) 4037wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask)
4038{ 4038{
4039 void *osbuf; 4039 void *osbuf;
@@ -4058,7 +4058,7 @@ wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask)
4058 NO_SYNC_WMIFLAG)); 4058 NO_SYNC_WMIFLAG));
4059} 4059}
4060 4060
4061A_STATUS 4061int
4062wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source) 4062wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
4063{ 4063{
4064 void *osbuf; 4064 void *osbuf;
@@ -4079,7 +4079,7 @@ wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
4079 NO_SYNC_WMIFLAG)); 4079 NO_SYNC_WMIFLAG));
4080} 4080}
4081 4081
4082A_STATUS 4082int
4083wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask, 4083wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
4084 A_UINT16 tsr, A_BOOL rep, A_UINT16 size, 4084 A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
4085 A_UINT32 valid) 4085 A_UINT32 valid)
@@ -4105,13 +4105,13 @@ wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
4105 NO_SYNC_WMIFLAG)); 4105 NO_SYNC_WMIFLAG));
4106} 4106}
4107 4107
4108A_STATUS 4108int
4109wmi_get_stats_cmd(struct wmi_t *wmip) 4109wmi_get_stats_cmd(struct wmi_t *wmip)
4110{ 4110{
4111 return wmi_simple_cmd(wmip, WMI_GET_STATISTICS_CMDID); 4111 return wmi_simple_cmd(wmip, WMI_GET_STATISTICS_CMDID);
4112} 4112}
4113 4113
4114A_STATUS 4114int
4115wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid) 4115wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid)
4116{ 4116{
4117 void *osbuf; 4117 void *osbuf;
@@ -4135,7 +4135,7 @@ wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid)
4135 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, SYNC_BEFORE_WMIFLAG)); 4135 return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, SYNC_BEFORE_WMIFLAG));
4136} 4136}
4137 4137
4138A_STATUS 4138int
4139wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex) 4139wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex)
4140{ 4140{
4141 void *osbuf; 4141 void *osbuf;
@@ -4159,13 +4159,13 @@ wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex)
4159 NO_SYNC_WMIFLAG)); 4159 NO_SYNC_WMIFLAG));
4160} 4160}
4161 4161
4162A_STATUS 4162int
4163wmi_abort_scan_cmd(struct wmi_t *wmip) 4163wmi_abort_scan_cmd(struct wmi_t *wmip)
4164{ 4164{
4165 return wmi_simple_cmd(wmip, WMI_ABORT_SCAN_CMDID); 4165 return wmi_simple_cmd(wmip, WMI_ABORT_SCAN_CMDID);
4166} 4166}
4167 4167
4168A_STATUS 4168int
4169wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM) 4169wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM)
4170{ 4170{
4171 void *osbuf; 4171 void *osbuf;
@@ -4184,7 +4184,7 @@ wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM)
4184 return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_PWR_CMDID, NO_SYNC_WMIFLAG)); 4184 return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
4185} 4185}
4186 4186
4187A_STATUS 4187int
4188wmi_get_txPwr_cmd(struct wmi_t *wmip) 4188wmi_get_txPwr_cmd(struct wmi_t *wmip)
4189{ 4189{
4190 return wmi_simple_cmd(wmip, WMI_GET_TX_PWR_CMDID); 4190 return wmi_simple_cmd(wmip, WMI_GET_TX_PWR_CMDID);
@@ -4202,13 +4202,13 @@ wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
4202 return activeTsids; 4202 return activeTsids;
4203} 4203}
4204 4204
4205A_STATUS 4205int
4206wmi_get_roam_tbl_cmd(struct wmi_t *wmip) 4206wmi_get_roam_tbl_cmd(struct wmi_t *wmip)
4207{ 4207{
4208 return wmi_simple_cmd(wmip, WMI_GET_ROAM_TBL_CMDID); 4208 return wmi_simple_cmd(wmip, WMI_GET_ROAM_TBL_CMDID);
4209} 4209}
4210 4210
4211A_STATUS 4211int
4212wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType) 4212wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType)
4213{ 4213{
4214 void *osbuf; 4214 void *osbuf;
@@ -4229,7 +4229,7 @@ wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType)
4229 NO_SYNC_WMIFLAG)); 4229 NO_SYNC_WMIFLAG));
4230} 4230}
4231 4231
4232A_STATUS 4232int
4233wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p, 4233wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
4234 A_UINT8 size) 4234 A_UINT8 size)
4235{ 4235{
@@ -4252,7 +4252,7 @@ wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
4252 NO_SYNC_WMIFLAG)); 4252 NO_SYNC_WMIFLAG));
4253} 4253}
4254 4254
4255A_STATUS 4255int
4256wmi_set_powersave_timers_cmd(struct wmi_t *wmip, 4256wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
4257 WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd, 4257 WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
4258 A_UINT8 size) 4258 A_UINT8 size)
@@ -4286,7 +4286,7 @@ wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
4286 4286
4287#ifdef CONFIG_HOST_GPIO_SUPPORT 4287#ifdef CONFIG_HOST_GPIO_SUPPORT
4288/* Send a command to Target to change GPIO output pins. */ 4288/* Send a command to Target to change GPIO output pins. */
4289A_STATUS 4289int
4290wmi_gpio_output_set(struct wmi_t *wmip, 4290wmi_gpio_output_set(struct wmi_t *wmip,
4291 A_UINT32 set_mask, 4291 A_UINT32 set_mask,
4292 A_UINT32 clear_mask, 4292 A_UINT32 clear_mask,
@@ -4320,7 +4320,7 @@ wmi_gpio_output_set(struct wmi_t *wmip,
4320} 4320}
4321 4321
4322/* Send a command to the Target requesting state of the GPIO input pins */ 4322/* Send a command to the Target requesting state of the GPIO input pins */
4323A_STATUS 4323int
4324wmi_gpio_input_get(struct wmi_t *wmip) 4324wmi_gpio_input_get(struct wmi_t *wmip)
4325{ 4325{
4326 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 4326 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
@@ -4329,7 +4329,7 @@ wmi_gpio_input_get(struct wmi_t *wmip)
4329} 4329}
4330 4330
4331/* Send a command to the Target that changes the value of a GPIO register. */ 4331/* Send a command to the Target that changes the value of a GPIO register. */
4332A_STATUS 4332int
4333wmi_gpio_register_set(struct wmi_t *wmip, 4333wmi_gpio_register_set(struct wmi_t *wmip,
4334 A_UINT32 gpioreg_id, 4334 A_UINT32 gpioreg_id,
4335 A_UINT32 value) 4335 A_UINT32 value)
@@ -4358,7 +4358,7 @@ wmi_gpio_register_set(struct wmi_t *wmip,
4358} 4358}
4359 4359
4360/* Send a command to the Target to fetch the value of a GPIO register. */ 4360/* Send a command to the Target to fetch the value of a GPIO register. */
4361A_STATUS 4361int
4362wmi_gpio_register_get(struct wmi_t *wmip, 4362wmi_gpio_register_get(struct wmi_t *wmip,
4363 A_UINT32 gpioreg_id) 4363 A_UINT32 gpioreg_id)
4364{ 4364{
@@ -4384,7 +4384,7 @@ wmi_gpio_register_get(struct wmi_t *wmip,
4384} 4384}
4385 4385
4386/* Send a command to the Target acknowledging some GPIO interrupts. */ 4386/* Send a command to the Target acknowledging some GPIO interrupts. */
4387A_STATUS 4387int
4388wmi_gpio_intr_ack(struct wmi_t *wmip, 4388wmi_gpio_intr_ack(struct wmi_t *wmip,
4389 A_UINT32 ack_mask) 4389 A_UINT32 ack_mask)
4390{ 4390{
@@ -4410,7 +4410,7 @@ wmi_gpio_intr_ack(struct wmi_t *wmip,
4410} 4410}
4411#endif /* CONFIG_HOST_GPIO_SUPPORT */ 4411#endif /* CONFIG_HOST_GPIO_SUPPORT */
4412 4412
4413A_STATUS 4413int
4414wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT8 ac, A_UINT16 txop, A_UINT8 eCWmin, 4414wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT8 ac, A_UINT16 txop, A_UINT8 eCWmin,
4415 A_UINT8 eCWmax, A_UINT8 aifsn) 4415 A_UINT8 eCWmax, A_UINT8 aifsn)
4416{ 4416{
@@ -4441,7 +4441,7 @@ wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT8 ac, A_UINT16 txop, A_UINT
4441 NO_SYNC_WMIFLAG)); 4441 NO_SYNC_WMIFLAG));
4442} 4442}
4443 4443
4444A_STATUS 4444int
4445wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType, 4445wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
4446 A_UINT8 trafficClass, A_UINT8 maxRetries, 4446 A_UINT8 trafficClass, A_UINT8 maxRetries,
4447 A_UINT8 enableNotify) 4447 A_UINT8 enableNotify)
@@ -4488,7 +4488,7 @@ wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid)
4488 } 4488 }
4489} 4489}
4490 4490
4491A_STATUS 4491int
4492wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode) 4492wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode)
4493{ 4493{
4494 void *osbuf; 4494 void *osbuf;
@@ -4509,7 +4509,7 @@ wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode)
4509 SYNC_BOTH_WMIFLAG)); 4509 SYNC_BOTH_WMIFLAG));
4510} 4510}
4511 4511
4512A_STATUS 4512int
4513wmi_opt_tx_frame_cmd(struct wmi_t *wmip, 4513wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
4514 A_UINT8 frmType, 4514 A_UINT8 frmType,
4515 A_UINT8 *dstMacAddr, 4515 A_UINT8 *dstMacAddr,
@@ -4540,7 +4540,7 @@ wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
4540 NO_SYNC_WMIFLAG)); 4540 NO_SYNC_WMIFLAG));
4541} 4541}
4542 4542
4543A_STATUS 4543int
4544wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl) 4544wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
4545{ 4545{
4546 void *osbuf; 4546 void *osbuf;
@@ -4562,7 +4562,7 @@ wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
4562} 4562}
4563 4563
4564 4564
4565A_STATUS 4565int
4566wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize) 4566wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize)
4567{ 4567{
4568 void *osbuf; 4568 void *osbuf;
@@ -4584,7 +4584,7 @@ wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize)
4584} 4584}
4585 4585
4586 4586
4587A_STATUS 4587int
4588wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSPLen) 4588wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSPLen)
4589{ 4589{
4590 void *osbuf; 4590 void *osbuf;
@@ -4649,10 +4649,10 @@ wmi_get_power_mode_cmd(struct wmi_t *wmip)
4649 return wmip->wmi_powerMode; 4649 return wmip->wmi_powerMode;
4650} 4650}
4651 4651
4652A_STATUS 4652int
4653wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance) 4653wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance)
4654{ 4654{
4655 A_STATUS ret = A_OK; 4655 int ret = A_OK;
4656 4656
4657#define TSPEC_SUSPENSION_INTERVAL_ATHEROS_DEF (~0) 4657#define TSPEC_SUSPENSION_INTERVAL_ATHEROS_DEF (~0)
4658#define TSPEC_SERVICE_START_TIME_ATHEROS_DEF 0 4658#define TSPEC_SERVICE_START_TIME_ATHEROS_DEF 0
@@ -4682,7 +4682,7 @@ wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance)
4682} 4682}
4683 4683
4684#ifdef CONFIG_HOST_TCMD_SUPPORT 4684#ifdef CONFIG_HOST_TCMD_SUPPORT
4685static A_STATUS 4685static int
4686wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 4686wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
4687{ 4687{
4688 4688
@@ -4695,7 +4695,7 @@ wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
4695 4695
4696#endif /* CONFIG_HOST_TCMD_SUPPORT*/ 4696#endif /* CONFIG_HOST_TCMD_SUPPORT*/
4697 4697
4698A_STATUS 4698int
4699wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode) 4699wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
4700{ 4700{
4701 void *osbuf; 4701 void *osbuf;
@@ -4716,7 +4716,7 @@ wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
4716 NO_SYNC_WMIFLAG)); 4716 NO_SYNC_WMIFLAG));
4717} 4717}
4718 4718
4719A_STATUS 4719int
4720wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode) 4720wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
4721{ 4721{
4722 void *osbuf; 4722 void *osbuf;
@@ -4737,7 +4737,7 @@ wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
4737 NO_SYNC_WMIFLAG)); 4737 NO_SYNC_WMIFLAG));
4738} 4738}
4739 4739
4740A_STATUS 4740int
4741wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status, A_UINT8 preamblePolicy) 4741wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status, A_UINT8 preamblePolicy)
4742{ 4742{
4743 void *osbuf; 4743 void *osbuf;
@@ -4759,7 +4759,7 @@ wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status, A_UINT8 preamblePolicy
4759 NO_SYNC_WMIFLAG)); 4759 NO_SYNC_WMIFLAG));
4760} 4760}
4761 4761
4762A_STATUS 4762int
4763wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold) 4763wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold)
4764{ 4764{
4765 void *osbuf; 4765 void *osbuf;
@@ -4780,7 +4780,7 @@ wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold)
4780 NO_SYNC_WMIFLAG)); 4780 NO_SYNC_WMIFLAG));
4781} 4781}
4782 4782
4783A_STATUS 4783int
4784wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status) 4784wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status)
4785{ 4785{
4786 void *osbuf; 4786 void *osbuf;
@@ -4802,7 +4802,7 @@ wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status)
4802 4802
4803} 4803}
4804 4804
4805A_STATUS 4805int
4806wmi_set_qos_supp_cmd(struct wmi_t *wmip, A_UINT8 status) 4806wmi_set_qos_supp_cmd(struct wmi_t *wmip, A_UINT8 status)
4807{ 4807{
4808 void *osbuf; 4808 void *osbuf;
@@ -4823,7 +4823,7 @@ wmi_set_qos_supp_cmd(struct wmi_t *wmip, A_UINT8 status)
4823} 4823}
4824 4824
4825 4825
4826A_STATUS 4826int
4827wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg) 4827wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
4828{ 4828{
4829 void *osbuf; 4829 void *osbuf;
@@ -4848,7 +4848,7 @@ wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
4848 4848
4849} 4849}
4850 4850
4851A_STATUS 4851int
4852wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode) 4852wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode)
4853{ 4853{
4854 void *osbuf; 4854 void *osbuf;
@@ -4874,7 +4874,7 @@ wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode)
4874 This would be beneficial for customers like Qualcomm, who might 4874 This would be beneficial for customers like Qualcomm, who might
4875 have different test command requirements from differnt manufacturers 4875 have different test command requirements from differnt manufacturers
4876 */ 4876 */
4877A_STATUS 4877int
4878wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32 len) 4878wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32 len)
4879{ 4879{
4880 void *osbuf; 4880 void *osbuf;
@@ -4897,7 +4897,7 @@ wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32 len)
4897 4897
4898#endif 4898#endif
4899 4899
4900A_STATUS 4900int
4901wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status) 4901wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status)
4902{ 4902{
4903 void *osbuf; 4903 void *osbuf;
@@ -4921,7 +4921,7 @@ wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status)
4921 NO_SYNC_WMIFLAG)); 4921 NO_SYNC_WMIFLAG));
4922} 4922}
4923 4923
4924A_STATUS 4924int
4925wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd) 4925wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
4926{ 4926{
4927 void *osbuf; 4927 void *osbuf;
@@ -4983,7 +4983,7 @@ wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
4983 NO_SYNC_WMIFLAG)); 4983 NO_SYNC_WMIFLAG));
4984} 4984}
4985 4985
4986A_STATUS 4986int
4987wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd) 4987wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd)
4988{ 4988{
4989 void *osbuf; 4989 void *osbuf;
@@ -5003,7 +5003,7 @@ wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd)
5003} 5003}
5004 5004
5005 5005
5006A_STATUS 5006int
5007wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip, 5007wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip,
5008 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD * cmd) 5008 WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD * cmd)
5009{ 5009{
@@ -5024,7 +5024,7 @@ wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip,
5024 5024
5025} 5025}
5026 5026
5027A_STATUS 5027int
5028wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip, 5028wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip,
5029 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD* cmd) 5029 WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD* cmd)
5030{ 5030{
@@ -5044,7 +5044,7 @@ wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip,
5044 5044
5045} 5045}
5046 5046
5047A_STATUS 5047int
5048wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip, 5048wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip,
5049 WMI_SET_BTCOEX_SCO_CONFIG_CMD * cmd) 5049 WMI_SET_BTCOEX_SCO_CONFIG_CMD * cmd)
5050{ 5050{
@@ -5064,7 +5064,7 @@ wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip,
5064 5064
5065} 5065}
5066 5066
5067A_STATUS 5067int
5068wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip, 5068wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip,
5069 WMI_SET_BTCOEX_A2DP_CONFIG_CMD * cmd) 5069 WMI_SET_BTCOEX_A2DP_CONFIG_CMD * cmd)
5070{ 5070{
@@ -5084,7 +5084,7 @@ wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip,
5084 5084
5085} 5085}
5086 5086
5087A_STATUS 5087int
5088wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip, 5088wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip,
5089 WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD * cmd) 5089 WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD * cmd)
5090{ 5090{
@@ -5104,7 +5104,7 @@ wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip,
5104 5104
5105} 5105}
5106 5106
5107A_STATUS 5107int
5108wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd) 5108wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd)
5109{ 5109{
5110 void *osbuf; 5110 void *osbuf;
@@ -5123,7 +5123,7 @@ wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd)
5123 5123
5124} 5124}
5125 5125
5126A_STATUS 5126int
5127wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip, 5127wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip,
5128 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD * cmd) 5128 WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD * cmd)
5129{ 5129{
@@ -5143,7 +5143,7 @@ wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip,
5143 5143
5144} 5144}
5145 5145
5146A_STATUS 5146int
5147wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd) 5147wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd)
5148{ 5148{
5149 void *osbuf; 5149 void *osbuf;
@@ -5162,7 +5162,7 @@ wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd)
5162 5162
5163} 5163}
5164 5164
5165A_STATUS 5165int
5166wmi_get_btcoex_stats_cmd(struct wmi_t *wmip) 5166wmi_get_btcoex_stats_cmd(struct wmi_t *wmip)
5167{ 5167{
5168 5168
@@ -5170,7 +5170,7 @@ wmi_get_btcoex_stats_cmd(struct wmi_t *wmip)
5170 5170
5171} 5171}
5172 5172
5173A_STATUS 5173int
5174wmi_get_keepalive_configured(struct wmi_t *wmip) 5174wmi_get_keepalive_configured(struct wmi_t *wmip)
5175{ 5175{
5176 void *osbuf; 5176 void *osbuf;
@@ -5192,7 +5192,7 @@ wmi_get_keepalive_cmd(struct wmi_t *wmip)
5192 return wmip->wmi_keepaliveInterval; 5192 return wmip->wmi_keepaliveInterval;
5193} 5193}
5194 5194
5195A_STATUS 5195int
5196wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval) 5196wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
5197{ 5197{
5198 void *osbuf; 5198 void *osbuf;
@@ -5214,7 +5214,7 @@ wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
5214 NO_SYNC_WMIFLAG)); 5214 NO_SYNC_WMIFLAG));
5215} 5215}
5216 5216
5217A_STATUS 5217int
5218wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer) 5218wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer)
5219{ 5219{
5220 void *osbuf; 5220 void *osbuf;
@@ -5238,7 +5238,7 @@ wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR*
5238} 5238}
5239 5239
5240 5240
5241A_STATUS 5241int
5242wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4) 5242wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4)
5243{ 5243{
5244 void *osbuf; 5244 void *osbuf;
@@ -5264,7 +5264,7 @@ wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8
5264} 5264}
5265 5265
5266 5266
5267A_STATUS 5267int
5268wmi_del_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4) 5268wmi_del_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4)
5269{ 5269{
5270 void *osbuf; 5270 void *osbuf;
@@ -5289,7 +5289,7 @@ wmi_del_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8
5289 NO_SYNC_WMIFLAG)); 5289 NO_SYNC_WMIFLAG));
5290} 5290}
5291 5291
5292A_STATUS 5292int
5293wmi_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 enable) 5293wmi_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 enable)
5294{ 5294{
5295 void *osbuf; 5295 void *osbuf;
@@ -5309,7 +5309,7 @@ wmi_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 enable)
5309 NO_SYNC_WMIFLAG)); 5309 NO_SYNC_WMIFLAG));
5310} 5310}
5311 5311
5312A_STATUS 5312int
5313wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen, 5313wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen,
5314 A_UINT8 *ieInfo) 5314 A_UINT8 *ieInfo)
5315{ 5315{
@@ -5335,7 +5335,7 @@ wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen,
5335 return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG)); 5335 return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG));
5336} 5336}
5337 5337
5338A_STATUS 5338int
5339wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen) 5339wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen)
5340{ 5340{
5341 void *osbuf; 5341 void *osbuf;
@@ -5426,7 +5426,7 @@ wmi_free_node(struct wmi_t *wmip, const A_UINT8 *macaddr)
5426 return; 5426 return;
5427} 5427}
5428 5428
5429A_STATUS 5429int
5430wmi_dset_open_reply(struct wmi_t *wmip, 5430wmi_dset_open_reply(struct wmi_t *wmip,
5431 A_UINT32 status, 5431 A_UINT32 status,
5432 A_UINT32 access_cookie, 5432 A_UINT32 access_cookie,
@@ -5461,7 +5461,7 @@ wmi_dset_open_reply(struct wmi_t *wmip,
5461 NO_SYNC_WMIFLAG)); 5461 NO_SYNC_WMIFLAG));
5462} 5462}
5463 5463
5464static A_STATUS 5464static int
5465wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len) 5465wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5466{ 5466{
5467 WMI_PMKID_LIST_REPLY *reply; 5467 WMI_PMKID_LIST_REPLY *reply;
@@ -5484,7 +5484,7 @@ wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5484} 5484}
5485 5485
5486 5486
5487static A_STATUS 5487static int
5488wmi_set_params_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len) 5488wmi_set_params_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5489{ 5489{
5490 WMI_SET_PARAMS_REPLY *reply; 5490 WMI_SET_PARAMS_REPLY *reply;
@@ -5508,7 +5508,7 @@ wmi_set_params_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5508 5508
5509 5509
5510 5510
5511static A_STATUS 5511static int
5512wmi_acm_reject_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len) 5512wmi_acm_reject_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5513{ 5513{
5514 WMI_ACM_REJECT_EVENT *ev; 5514 WMI_ACM_REJECT_EVENT *ev;
@@ -5521,7 +5521,7 @@ wmi_acm_reject_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
5521 5521
5522 5522
5523#ifdef CONFIG_HOST_DSET_SUPPORT 5523#ifdef CONFIG_HOST_DSET_SUPPORT
5524A_STATUS 5524int
5525wmi_dset_data_reply(struct wmi_t *wmip, 5525wmi_dset_data_reply(struct wmi_t *wmip,
5526 A_UINT32 status, 5526 A_UINT32 status,
5527 A_UINT8 *user_buf, 5527 A_UINT8 *user_buf,
@@ -5568,7 +5568,7 @@ wmi_dset_data_reply(struct wmi_t *wmip,
5568} 5568}
5569#endif /* CONFIG_HOST_DSET_SUPPORT */ 5569#endif /* CONFIG_HOST_DSET_SUPPORT */
5570 5570
5571A_STATUS 5571int
5572wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status) 5572wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status)
5573{ 5573{
5574 void *osbuf; 5574 void *osbuf;
@@ -5592,7 +5592,7 @@ wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status)
5592} 5592}
5593 5593
5594#if defined(CONFIG_TARGET_PROFILE_SUPPORT) 5594#if defined(CONFIG_TARGET_PROFILE_SUPPORT)
5595A_STATUS 5595int
5596wmi_prof_cfg_cmd(struct wmi_t *wmip, 5596wmi_prof_cfg_cmd(struct wmi_t *wmip,
5597 A_UINT32 period, 5597 A_UINT32 period,
5598 A_UINT32 nbins) 5598 A_UINT32 nbins)
@@ -5615,7 +5615,7 @@ wmi_prof_cfg_cmd(struct wmi_t *wmip,
5615 return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_PROF_CFG_CMDID, NO_SYNC_WMIFLAG)); 5615 return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_PROF_CFG_CMDID, NO_SYNC_WMIFLAG));
5616} 5616}
5617 5617
5618A_STATUS 5618int
5619wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr) 5619wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr)
5620{ 5620{
5621 void *osbuf; 5621 void *osbuf;
@@ -5635,26 +5635,26 @@ wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr)
5635 return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_PROF_ADDR_SET_CMDID, NO_SYNC_WMIFLAG)); 5635 return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_PROF_ADDR_SET_CMDID, NO_SYNC_WMIFLAG));
5636} 5636}
5637 5637
5638A_STATUS 5638int
5639wmi_prof_start_cmd(struct wmi_t *wmip) 5639wmi_prof_start_cmd(struct wmi_t *wmip)
5640{ 5640{
5641 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_START_CMDID); 5641 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_START_CMDID);
5642} 5642}
5643 5643
5644A_STATUS 5644int
5645wmi_prof_stop_cmd(struct wmi_t *wmip) 5645wmi_prof_stop_cmd(struct wmi_t *wmip)
5646{ 5646{
5647 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_STOP_CMDID); 5647 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_STOP_CMDID);
5648} 5648}
5649 5649
5650A_STATUS 5650int
5651wmi_prof_count_get_cmd(struct wmi_t *wmip) 5651wmi_prof_count_get_cmd(struct wmi_t *wmip)
5652{ 5652{
5653 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_COUNT_GET_CMDID); 5653 return wmi_simple_cmd_xtnd(wmip, WMIX_PROF_COUNT_GET_CMDID);
5654} 5654}
5655 5655
5656/* Called to handle WMIX_PROF_CONT_EVENTID */ 5656/* Called to handle WMIX_PROF_CONT_EVENTID */
5657static A_STATUS 5657static int
5658wmi_prof_count_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 5658wmi_prof_count_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
5659{ 5659{
5660 WMIX_PROF_COUNT_EVENT *prof_data = (WMIX_PROF_COUNT_EVENT *)datap; 5660 WMIX_PROF_COUNT_EVENT *prof_data = (WMIX_PROF_COUNT_EVENT *)datap;
@@ -5923,7 +5923,7 @@ ar6000_get_lower_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh,
5923 5923
5924 return threshold; 5924 return threshold;
5925} 5925}
5926static A_STATUS 5926static int
5927wmi_send_rssi_threshold_params(struct wmi_t *wmip, 5927wmi_send_rssi_threshold_params(struct wmi_t *wmip,
5928 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd) 5928 WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd)
5929{ 5929{
@@ -5947,7 +5947,7 @@ wmi_send_rssi_threshold_params(struct wmi_t *wmip,
5947 return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID, 5947 return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID,
5948 NO_SYNC_WMIFLAG)); 5948 NO_SYNC_WMIFLAG));
5949} 5949}
5950static A_STATUS 5950static int
5951wmi_send_snr_threshold_params(struct wmi_t *wmip, 5951wmi_send_snr_threshold_params(struct wmi_t *wmip,
5952 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd) 5952 WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd)
5953{ 5953{
@@ -5971,7 +5971,7 @@ wmi_send_snr_threshold_params(struct wmi_t *wmip,
5971 NO_SYNC_WMIFLAG)); 5971 NO_SYNC_WMIFLAG));
5972} 5972}
5973 5973
5974A_STATUS 5974int
5975wmi_set_target_event_report_cmd(struct wmi_t *wmip, WMI_SET_TARGET_EVENT_REPORT_CMD* cmd) 5975wmi_set_target_event_report_cmd(struct wmi_t *wmip, WMI_SET_TARGET_EVENT_REPORT_CMD* cmd)
5976{ 5976{
5977 void *osbuf; 5977 void *osbuf;
@@ -5998,14 +5998,14 @@ bss_t *wmi_rm_current_bss (struct wmi_t *wmip, A_UINT8 *id)
5998 return wlan_node_remove (&wmip->wmi_scan_table, id); 5998 return wlan_node_remove (&wmip->wmi_scan_table, id);
5999} 5999}
6000 6000
6001A_STATUS wmi_add_current_bss (struct wmi_t *wmip, A_UINT8 *id, bss_t *bss) 6001int wmi_add_current_bss (struct wmi_t *wmip, A_UINT8 *id, bss_t *bss)
6002{ 6002{
6003 wlan_setup_node (&wmip->wmi_scan_table, bss, id); 6003 wlan_setup_node (&wmip->wmi_scan_table, bss, id);
6004 return A_OK; 6004 return A_OK;
6005} 6005}
6006 6006
6007#ifdef ATH_AR6K_11N_SUPPORT 6007#ifdef ATH_AR6K_11N_SUPPORT
6008static A_STATUS 6008static int
6009wmi_addba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6009wmi_addba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6010{ 6010{
6011 WMI_ADDBA_REQ_EVENT *cmd = (WMI_ADDBA_REQ_EVENT *)datap; 6011 WMI_ADDBA_REQ_EVENT *cmd = (WMI_ADDBA_REQ_EVENT *)datap;
@@ -6016,7 +6016,7 @@ wmi_addba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6016} 6016}
6017 6017
6018 6018
6019static A_STATUS 6019static int
6020wmi_addba_resp_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6020wmi_addba_resp_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6021{ 6021{
6022 WMI_ADDBA_RESP_EVENT *cmd = (WMI_ADDBA_RESP_EVENT *)datap; 6022 WMI_ADDBA_RESP_EVENT *cmd = (WMI_ADDBA_RESP_EVENT *)datap;
@@ -6026,7 +6026,7 @@ wmi_addba_resp_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6026 return A_OK; 6026 return A_OK;
6027} 6027}
6028 6028
6029static A_STATUS 6029static int
6030wmi_delba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6030wmi_delba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6031{ 6031{
6032 WMI_DELBA_EVENT *cmd = (WMI_DELBA_EVENT *)datap; 6032 WMI_DELBA_EVENT *cmd = (WMI_DELBA_EVENT *)datap;
@@ -6036,7 +6036,7 @@ wmi_delba_req_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6036 return A_OK; 6036 return A_OK;
6037} 6037}
6038 6038
6039A_STATUS 6039int
6040wmi_btcoex_config_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6040wmi_btcoex_config_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6041{ 6041{
6042 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 6042 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
@@ -6047,7 +6047,7 @@ wmi_btcoex_config_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6047} 6047}
6048 6048
6049 6049
6050A_STATUS 6050int
6051wmi_btcoex_stats_event_rx(struct wmi_t * wmip,A_UINT8 * datap,int len) 6051wmi_btcoex_stats_event_rx(struct wmi_t * wmip,A_UINT8 * datap,int len)
6052{ 6052{
6053 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG)); 6053 A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
@@ -6059,7 +6059,7 @@ wmi_btcoex_stats_event_rx(struct wmi_t * wmip,A_UINT8 * datap,int len)
6059} 6059}
6060#endif 6060#endif
6061 6061
6062static A_STATUS 6062static int
6063wmi_hci_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6063wmi_hci_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6064{ 6064{
6065 WMI_HCI_EVENT *cmd = (WMI_HCI_EVENT *)datap; 6065 WMI_HCI_EVENT *cmd = (WMI_HCI_EVENT *)datap;
@@ -6083,7 +6083,7 @@ wmi_hci_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6083 * commit cmd will not be sent to target. Without calling this IOCTL 6083 * commit cmd will not be sent to target. Without calling this IOCTL
6084 * the changes will not take effect. 6084 * the changes will not take effect.
6085 */ 6085 */
6086A_STATUS 6086int
6087wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p) 6087wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p)
6088{ 6088{
6089 void *osbuf; 6089 void *osbuf;
@@ -6109,7 +6109,7 @@ wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p)
6109 * This command will be used to enable/disable hidden ssid functioanlity of 6109 * This command will be used to enable/disable hidden ssid functioanlity of
6110 * beacon. If it is enabled, ssid will be NULL in beacon. 6110 * beacon. If it is enabled, ssid will be NULL in beacon.
6111 */ 6111 */
6112A_STATUS 6112int
6113wmi_ap_set_hidden_ssid(struct wmi_t *wmip, A_UINT8 hidden_ssid) 6113wmi_ap_set_hidden_ssid(struct wmi_t *wmip, A_UINT8 hidden_ssid)
6114{ 6114{
6115 void *osbuf; 6115 void *osbuf;
@@ -6138,7 +6138,7 @@ wmi_ap_set_hidden_ssid(struct wmi_t *wmip, A_UINT8 hidden_ssid)
6138 * is max num of STA supported by AP). Value was already validated 6138 * is max num of STA supported by AP). Value was already validated
6139 * in ioctl.c 6139 * in ioctl.c
6140 */ 6140 */
6141A_STATUS 6141int
6142wmi_ap_set_num_sta(struct wmi_t *wmip, A_UINT8 num_sta) 6142wmi_ap_set_num_sta(struct wmi_t *wmip, A_UINT8 num_sta)
6143{ 6143{
6144 void *osbuf; 6144 void *osbuf;
@@ -6166,7 +6166,7 @@ wmi_ap_set_num_sta(struct wmi_t *wmip, A_UINT8 num_sta)
6166 * be allowed to connect with this AP. When this list is empty 6166 * be allowed to connect with this AP. When this list is empty
6167 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA. 6167 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA.
6168 */ 6168 */
6169A_STATUS 6169int
6170wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *acl) 6170wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *acl)
6171{ 6171{
6172 void *osbuf; 6172 void *osbuf;
@@ -6192,7 +6192,7 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *acl)
6192 * be allowed to connect with this AP. When this list is empty 6192 * be allowed to connect with this AP. When this list is empty
6193 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA. 6193 * firware will allow all STAs till the count reaches AP_MAX_NUM_STA.
6194 */ 6194 */
6195A_STATUS 6195int
6196wmi_ap_set_mlme(struct wmi_t *wmip, A_UINT8 cmd, A_UINT8 *mac, A_UINT16 reason) 6196wmi_ap_set_mlme(struct wmi_t *wmip, A_UINT8 cmd, A_UINT8 *mac, A_UINT16 reason)
6197{ 6197{
6198 void *osbuf; 6198 void *osbuf;
@@ -6214,7 +6214,7 @@ wmi_ap_set_mlme(struct wmi_t *wmip, A_UINT8 cmd, A_UINT8 *mac, A_UINT16 reason)
6214 return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_MLME_CMDID, NO_SYNC_WMIFLAG)); 6214 return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_MLME_CMDID, NO_SYNC_WMIFLAG));
6215} 6215}
6216 6216
6217static A_STATUS 6217static int
6218wmi_pspoll_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) 6218wmi_pspoll_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6219{ 6219{
6220 WMI_PSPOLL_EVENT *ev; 6220 WMI_PSPOLL_EVENT *ev;
@@ -6228,7 +6228,7 @@ wmi_pspoll_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
6228 return A_OK; 6228 return A_OK;
6229} 6229}
6230 6230
6231static A_STATUS 6231static int
6232wmi_dtimexpiry_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len) 6232wmi_dtimexpiry_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len)
6233{ 6233{
6234 A_WMI_DTIMEXPIRY_EVENT(wmip->wmi_devt); 6234 A_WMI_DTIMEXPIRY_EVENT(wmip->wmi_devt);
@@ -6236,7 +6236,7 @@ wmi_dtimexpiry_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len)
6236} 6236}
6237 6237
6238#ifdef WAPI_ENABLE 6238#ifdef WAPI_ENABLE
6239static A_STATUS 6239static int
6240wmi_wapi_rekey_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len) 6240wmi_wapi_rekey_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len)
6241{ 6241{
6242 A_UINT8 *ev; 6242 A_UINT8 *ev;
@@ -6251,7 +6251,7 @@ wmi_wapi_rekey_event_rx(struct wmi_t *wmip, A_UINT8 *datap,int len)
6251} 6251}
6252#endif 6252#endif
6253 6253
6254A_STATUS 6254int
6255wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, A_BOOL flag) 6255wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, A_BOOL flag)
6256{ 6256{
6257 WMI_AP_SET_PVB_CMD *cmd; 6257 WMI_AP_SET_PVB_CMD *cmd;
@@ -6272,7 +6272,7 @@ wmi_set_pvb_cmd(struct wmi_t *wmip, A_UINT16 aid, A_BOOL flag)
6272 return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_PVB_CMDID, NO_SYNC_WMIFLAG)); 6272 return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_PVB_CMDID, NO_SYNC_WMIFLAG));
6273} 6273}
6274 6274
6275A_STATUS 6275int
6276wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period) 6276wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period)
6277{ 6277{
6278 WMI_AP_CONN_INACT_CMD *cmd; 6278 WMI_AP_CONN_INACT_CMD *cmd;
@@ -6292,7 +6292,7 @@ wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period)
6292 return (wmi_cmd_send(wmip, osbuf, WMI_AP_CONN_INACT_CMDID, NO_SYNC_WMIFLAG)); 6292 return (wmi_cmd_send(wmip, osbuf, WMI_AP_CONN_INACT_CMDID, NO_SYNC_WMIFLAG));
6293} 6293}
6294 6294
6295A_STATUS 6295int
6296wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell) 6296wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell)
6297{ 6297{
6298 WMI_AP_PROT_SCAN_TIME_CMD *cmd; 6298 WMI_AP_PROT_SCAN_TIME_CMD *cmd;
@@ -6313,7 +6313,7 @@ wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell)
6313 return (wmi_cmd_send(wmip, osbuf, WMI_AP_PROT_SCAN_TIME_CMDID, NO_SYNC_WMIFLAG)); 6313 return (wmi_cmd_send(wmip, osbuf, WMI_AP_PROT_SCAN_TIME_CMDID, NO_SYNC_WMIFLAG));
6314} 6314}
6315 6315
6316A_STATUS 6316int
6317wmi_ap_set_dtim(struct wmi_t *wmip, A_UINT8 dtim) 6317wmi_ap_set_dtim(struct wmi_t *wmip, A_UINT8 dtim)
6318{ 6318{
6319 WMI_AP_SET_DTIM_CMD *cmd; 6319 WMI_AP_SET_DTIM_CMD *cmd;
@@ -6341,7 +6341,7 @@ wmi_ap_set_dtim(struct wmi_t *wmip, A_UINT8 dtim)
6341 * OR with AP_ACL_RETAIN_LIST_MASK, else the existing list will be cleared. 6341 * OR with AP_ACL_RETAIN_LIST_MASK, else the existing list will be cleared.
6342 * If there is no chage in policy, the list will be intact. 6342 * If there is no chage in policy, the list will be intact.
6343 */ 6343 */
6344A_STATUS 6344int
6345wmi_ap_set_acl_policy(struct wmi_t *wmip, A_UINT8 policy) 6345wmi_ap_set_acl_policy(struct wmi_t *wmip, A_UINT8 policy)
6346{ 6346{
6347 void *osbuf; 6347 void *osbuf;
@@ -6361,7 +6361,7 @@ wmi_ap_set_acl_policy(struct wmi_t *wmip, A_UINT8 policy)
6361 return (wmi_cmd_send(wmip, osbuf, WMI_AP_ACL_POLICY_CMDID, NO_SYNC_WMIFLAG)); 6361 return (wmi_cmd_send(wmip, osbuf, WMI_AP_ACL_POLICY_CMDID, NO_SYNC_WMIFLAG));
6362} 6362}
6363 6363
6364A_STATUS 6364int
6365wmi_ap_set_rateset(struct wmi_t *wmip, A_UINT8 rateset) 6365wmi_ap_set_rateset(struct wmi_t *wmip, A_UINT8 rateset)
6366{ 6366{
6367 void *osbuf; 6367 void *osbuf;
@@ -6382,7 +6382,7 @@ wmi_ap_set_rateset(struct wmi_t *wmip, A_UINT8 rateset)
6382} 6382}
6383 6383
6384#ifdef ATH_AR6K_11N_SUPPORT 6384#ifdef ATH_AR6K_11N_SUPPORT
6385A_STATUS 6385int
6386wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd) 6386wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd)
6387{ 6387{
6388 void *osbuf; 6388 void *osbuf;
@@ -6407,7 +6407,7 @@ wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd)
6407 NO_SYNC_WMIFLAG)); 6407 NO_SYNC_WMIFLAG));
6408} 6408}
6409 6409
6410A_STATUS 6410int
6411wmi_set_ht_op_cmd(struct wmi_t *wmip, A_UINT8 sta_chan_width) 6411wmi_set_ht_op_cmd(struct wmi_t *wmip, A_UINT8 sta_chan_width)
6412{ 6412{
6413 void *osbuf; 6413 void *osbuf;
@@ -6429,7 +6429,7 @@ wmi_set_ht_op_cmd(struct wmi_t *wmip, A_UINT8 sta_chan_width)
6429} 6429}
6430#endif 6430#endif
6431 6431
6432A_STATUS 6432int
6433wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray) 6433wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray)
6434{ 6434{
6435 void *osbuf; 6435 void *osbuf;
@@ -6450,7 +6450,7 @@ wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray)
6450} 6450}
6451 6451
6452 6452
6453A_STATUS 6453int
6454wmi_send_hci_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT16 sz) 6454wmi_send_hci_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT16 sz)
6455{ 6455{
6456 void *osbuf; 6456 void *osbuf;
@@ -6470,7 +6470,7 @@ wmi_send_hci_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT16 sz)
6470} 6470}
6471 6471
6472#ifdef ATH_AR6K_11N_SUPPORT 6472#ifdef ATH_AR6K_11N_SUPPORT
6473A_STATUS 6473int
6474wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask) 6474wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask)
6475{ 6475{
6476 void *osbuf; 6476 void *osbuf;
@@ -6490,7 +6490,7 @@ wmi_allow_aggr_cmd(struct wmi_t *wmip, A_UINT16 tx_tidmask, A_UINT16 rx_tidmask)
6490 return (wmi_cmd_send(wmip, osbuf, WMI_ALLOW_AGGR_CMDID, NO_SYNC_WMIFLAG)); 6490 return (wmi_cmd_send(wmip, osbuf, WMI_ALLOW_AGGR_CMDID, NO_SYNC_WMIFLAG));
6491} 6491}
6492 6492
6493A_STATUS 6493int
6494wmi_setup_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid) 6494wmi_setup_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid)
6495{ 6495{
6496 void *osbuf; 6496 void *osbuf;
@@ -6509,7 +6509,7 @@ wmi_setup_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid)
6509 return (wmi_cmd_send(wmip, osbuf, WMI_ADDBA_REQ_CMDID, NO_SYNC_WMIFLAG)); 6509 return (wmi_cmd_send(wmip, osbuf, WMI_ADDBA_REQ_CMDID, NO_SYNC_WMIFLAG));
6510} 6510}
6511 6511
6512A_STATUS 6512int
6513wmi_delete_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid, A_BOOL uplink) 6513wmi_delete_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid, A_BOOL uplink)
6514{ 6514{
6515 void *osbuf; 6515 void *osbuf;
@@ -6531,7 +6531,7 @@ wmi_delete_aggr_cmd(struct wmi_t *wmip, A_UINT8 tid, A_BOOL uplink)
6531} 6531}
6532#endif 6532#endif
6533 6533
6534A_STATUS 6534int
6535wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, A_UINT8 rxMetaVersion, 6535wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, A_UINT8 rxMetaVersion,
6536 A_BOOL rxDot11Hdr, A_BOOL defragOnHost) 6536 A_BOOL rxDot11Hdr, A_BOOL defragOnHost)
6537{ 6537{
@@ -6555,7 +6555,7 @@ wmi_set_rx_frame_format_cmd(struct wmi_t *wmip, A_UINT8 rxMetaVersion,
6555} 6555}
6556 6556
6557 6557
6558A_STATUS 6558int
6559wmi_set_thin_mode_cmd(struct wmi_t *wmip, A_BOOL bThinMode) 6559wmi_set_thin_mode_cmd(struct wmi_t *wmip, A_BOOL bThinMode)
6560{ 6560{
6561 void *osbuf; 6561 void *osbuf;
@@ -6576,7 +6576,7 @@ wmi_set_thin_mode_cmd(struct wmi_t *wmip, A_BOOL bThinMode)
6576} 6576}
6577 6577
6578 6578
6579A_STATUS 6579int
6580wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE precedence) 6580wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE precedence)
6581{ 6581{
6582 void *osbuf; 6582 void *osbuf;
@@ -6597,7 +6597,7 @@ wmi_set_wlan_conn_precedence_cmd(struct wmi_t *wmip, BT_WLAN_CONN_PRECEDENCE pre
6597 NO_SYNC_WMIFLAG)); 6597 NO_SYNC_WMIFLAG));
6598} 6598}
6599 6599
6600A_STATUS 6600int
6601wmi_set_pmk_cmd(struct wmi_t *wmip, A_UINT8 *pmk) 6601wmi_set_pmk_cmd(struct wmi_t *wmip, A_UINT8 *pmk)
6602{ 6602{
6603 void *osbuf; 6603 void *osbuf;
@@ -6618,7 +6618,7 @@ wmi_set_pmk_cmd(struct wmi_t *wmip, A_UINT8 *pmk)
6618 return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMK_CMDID, NO_SYNC_WMIFLAG)); 6618 return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMK_CMDID, NO_SYNC_WMIFLAG));
6619} 6619}
6620 6620
6621A_STATUS 6621int
6622wmi_SGI_cmd(struct wmi_t *wmip, A_UINT32 sgiMask, A_UINT8 sgiPERThreshold) 6622wmi_SGI_cmd(struct wmi_t *wmip, A_UINT32 sgiMask, A_UINT8 sgiPERThreshold)
6623{ 6623{
6624 void *osbuf; 6624 void *osbuf;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 19:26:59 -0400