aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ath6kl/include
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-02-02 17:05:51 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-02 17:34:50 -0500
commite1ce2a3afe041c36ae397abf73f8059eb599e36e (patch)
treeb7e883d91a26f2081a73454f4f389f0ad89a86f6 /drivers/staging/ath6kl/include
parent4853ac05cff7745979830c52fe6fb46a7be6fa94 (diff)
staging: ath6kl: Convert A_UINT32 to u32
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/include')
-rw-r--r--drivers/staging/ath6kl/include/a_debug.h10
-rw-r--r--drivers/staging/ath6kl/include/ar3kconfig.h6
-rw-r--r--drivers/staging/ath6kl/include/ar6000_diag.h16
-rw-r--r--drivers/staging/ath6kl/include/bmi.h54
-rw-r--r--drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h34
-rw-r--r--drivers/staging/ath6kl/include/common/AR6002/addrs.h6
-rw-r--r--drivers/staging/ath6kl/include/common/a_hci.h18
-rw-r--r--drivers/staging/ath6kl/include/common/bmi_msg.h86
-rw-r--r--drivers/staging/ath6kl/include/common/btcoexGpio.h4
-rw-r--r--drivers/staging/ath6kl/include/common/dbglog.h24
-rw-r--r--drivers/staging/ath6kl/include/common/dset_internal.h2
-rw-r--r--drivers/staging/ath6kl/include/common/dsetid.h12
-rw-r--r--drivers/staging/ath6kl/include/common/epping_test.h4
-rw-r--r--drivers/staging/ath6kl/include/common/htc.h2
-rw-r--r--drivers/staging/ath6kl/include/common/ini_dset.h2
-rw-r--r--drivers/staging/ath6kl/include/common/regdump.h8
-rw-r--r--drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h44
-rw-r--r--drivers/staging/ath6kl/include/common/targaddrs.h96
-rw-r--r--drivers/staging/ath6kl/include/common/testcmd.h48
-rw-r--r--drivers/staging/ath6kl/include/common/wmi.h462
-rw-r--r--drivers/staging/ath6kl/include/common/wmi_thin.h30
-rw-r--r--drivers/staging/ath6kl/include/common/wmix.h86
-rw-r--r--drivers/staging/ath6kl/include/common_drv.h34
-rw-r--r--drivers/staging/ath6kl/include/dset_api.h24
-rw-r--r--drivers/staging/ath6kl/include/gpio_api.h16
-rw-r--r--drivers/staging/ath6kl/include/hci_transport_api.h2
-rw-r--r--drivers/staging/ath6kl/include/hif.h38
-rw-r--r--drivers/staging/ath6kl/include/htc_api.h50
-rw-r--r--drivers/staging/ath6kl/include/htc_packet.h10
-rw-r--r--drivers/staging/ath6kl/include/target_reg_table.h84
-rw-r--r--drivers/staging/ath6kl/include/wlan_api.h18
-rw-r--r--drivers/staging/ath6kl/include/wmi_api.h57
32 files changed, 693 insertions, 694 deletions
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h
index dbba3f85616..57472cfb7e9 100644
--- a/drivers/staging/ath6kl/include/a_debug.h
+++ b/drivers/staging/ath6kl/include/a_debug.h
@@ -119,7 +119,7 @@ void DebugDumpBytes(A_UCHAR *buffer, u16 length, char *pDescription);
119#define ATH_DEBUG_MAX_MOD_DESC_LENGTH 64 119#define ATH_DEBUG_MAX_MOD_DESC_LENGTH 64
120 120
121typedef struct { 121typedef struct {
122 A_UINT32 Mask; 122 u32 Mask;
123 char Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH]; 123 char Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH];
124} ATH_DEBUG_MASK_DESCRIPTION; 124} ATH_DEBUG_MASK_DESCRIPTION;
125 125
@@ -129,8 +129,8 @@ typedef struct _ATH_DEBUG_MODULE_DBG_INFO{
129 struct _ATH_DEBUG_MODULE_DBG_INFO *pNext; 129 struct _ATH_DEBUG_MODULE_DBG_INFO *pNext;
130 char ModuleName[16]; 130 char ModuleName[16];
131 char ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH]; 131 char ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH];
132 A_UINT32 Flags; 132 u32 Flags;
133 A_UINT32 CurrentMask; 133 u32 CurrentMask;
134 int MaxDescriptions; 134 int MaxDescriptions;
135 ATH_DEBUG_MASK_DESCRIPTION *pMaskDescriptions; /* pointer to array of descriptions */ 135 ATH_DEBUG_MASK_DESCRIPTION *pMaskDescriptions; /* pointer to array of descriptions */
136} ATH_DEBUG_MODULE_DBG_INFO; 136} ATH_DEBUG_MODULE_DBG_INFO;
@@ -181,8 +181,8 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo);
181 181
182#endif 182#endif
183 183
184int a_get_module_mask(char *module_name, A_UINT32 *pMask); 184int a_get_module_mask(char *module_name, u32 *pMask);
185int a_set_module_mask(char *module_name, A_UINT32 Mask); 185int a_set_module_mask(char *module_name, u32 Mask);
186void a_dump_module_debug_info_by_name(char *module_name); 186void a_dump_module_debug_info_by_name(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 b7c503975c1..4d732019cf2 100644
--- a/drivers/staging/ath6kl/include/ar3kconfig.h
+++ b/drivers/staging/ath6kl/include/ar3kconfig.h
@@ -39,16 +39,16 @@ extern "C" {
39 39
40 40
41typedef struct { 41typedef struct {
42 A_UINT32 Flags; /* config flags */ 42 u32 Flags; /* config flags */
43 void *pHCIDev; /* HCI bridge device */ 43 void *pHCIDev; /* HCI bridge device */
44 HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */ 44 HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */
45 HIF_DEVICE *pHIFDevice; /* HIF layer device */ 45 HIF_DEVICE *pHIFDevice; /* HIF layer device */
46 46
47 A_UINT32 AR3KBaudRate; /* AR3K operational baud rate */ 47 u32 AR3KBaudRate; /* AR3K operational baud rate */
48 u16 AR6KScale; /* AR6K UART scale value */ 48 u16 AR6KScale; /* AR6K UART scale value */
49 u16 AR6KStep; /* AR6K UART step value */ 49 u16 AR6KStep; /* AR6K UART step value */
50 struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ 50 struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */
51 A_UINT32 PwrMgmtEnabled; /* TLPM enabled? */ 51 u32 PwrMgmtEnabled; /* TLPM enabled? */
52 u16 IdleTimeout; /* TLPM idle timeout */ 52 u16 IdleTimeout; /* TLPM idle timeout */
53 u16 WakeupTimeout; /* TLPM wakeup timeout */ 53 u16 WakeupTimeout; /* TLPM wakeup timeout */
54 u8 bdaddr[6]; /* Bluetooth device address */ 54 u8 bdaddr[6]; /* Bluetooth device address */
diff --git a/drivers/staging/ath6kl/include/ar6000_diag.h b/drivers/staging/ath6kl/include/ar6000_diag.h
index 1470d207098..78ac59721dc 100644
--- a/drivers/staging/ath6kl/include/ar6000_diag.h
+++ b/drivers/staging/ath6kl/include/ar6000_diag.h
@@ -26,23 +26,23 @@
26 26
27 27
28int 28int
29ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 29ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
30 30
31int 31int
32ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 32ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
33 33
34int 34int
35ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 35ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, u32 address,
36 A_UCHAR *data, A_UINT32 length); 36 A_UCHAR *data, u32 length);
37 37
38int 38int
39ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, 39ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, u32 address,
40 A_UCHAR *data, A_UINT32 length); 40 A_UCHAR *data, u32 length);
41 41
42int 42int
43ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval); 43ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, u32 *regval);
44 44
45void 45void
46ar6k_FetchTargetRegs(HIF_DEVICE *hifDevice, A_UINT32 *targregs); 46ar6k_FetchTargetRegs(HIF_DEVICE *hifDevice, u32 *targregs);
47 47
48#endif /*AR6000_DIAG_H_*/ 48#endif /*AR6000_DIAG_H_*/
diff --git a/drivers/staging/ath6kl/include/bmi.h b/drivers/staging/ath6kl/include/bmi.h
index 931ac408e3a..788f9af29fc 100644
--- a/drivers/staging/ath6kl/include/bmi.h
+++ b/drivers/staging/ath6kl/include/bmi.h
@@ -51,81 +51,81 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
51 51
52int 52int
53BMIReadMemory(HIF_DEVICE *device, 53BMIReadMemory(HIF_DEVICE *device,
54 A_UINT32 address, 54 u32 address,
55 A_UCHAR *buffer, 55 A_UCHAR *buffer,
56 A_UINT32 length); 56 u32 length);
57 57
58int 58int
59BMIWriteMemory(HIF_DEVICE *device, 59BMIWriteMemory(HIF_DEVICE *device,
60 A_UINT32 address, 60 u32 address,
61 A_UCHAR *buffer, 61 A_UCHAR *buffer,
62 A_UINT32 length); 62 u32 length);
63 63
64int 64int
65BMIExecute(HIF_DEVICE *device, 65BMIExecute(HIF_DEVICE *device,
66 A_UINT32 address, 66 u32 address,
67 A_UINT32 *param); 67 u32 *param);
68 68
69int 69int
70BMISetAppStart(HIF_DEVICE *device, 70BMISetAppStart(HIF_DEVICE *device,
71 A_UINT32 address); 71 u32 address);
72 72
73int 73int
74BMIReadSOCRegister(HIF_DEVICE *device, 74BMIReadSOCRegister(HIF_DEVICE *device,
75 A_UINT32 address, 75 u32 address,
76 A_UINT32 *param); 76 u32 *param);
77 77
78int 78int
79BMIWriteSOCRegister(HIF_DEVICE *device, 79BMIWriteSOCRegister(HIF_DEVICE *device,
80 A_UINT32 address, 80 u32 address,
81 A_UINT32 param); 81 u32 param);
82 82
83int 83int
84BMIrompatchInstall(HIF_DEVICE *device, 84BMIrompatchInstall(HIF_DEVICE *device,
85 A_UINT32 ROM_addr, 85 u32 ROM_addr,
86 A_UINT32 RAM_addr, 86 u32 RAM_addr,
87 A_UINT32 nbytes, 87 u32 nbytes,
88 A_UINT32 do_activate, 88 u32 do_activate,
89 A_UINT32 *patch_id); 89 u32 *patch_id);
90 90
91int 91int
92BMIrompatchUninstall(HIF_DEVICE *device, 92BMIrompatchUninstall(HIF_DEVICE *device,
93 A_UINT32 rompatch_id); 93 u32 rompatch_id);
94 94
95int 95int
96BMIrompatchActivate(HIF_DEVICE *device, 96BMIrompatchActivate(HIF_DEVICE *device,
97 A_UINT32 rompatch_count, 97 u32 rompatch_count,
98 A_UINT32 *rompatch_list); 98 u32 *rompatch_list);
99 99
100int 100int
101BMIrompatchDeactivate(HIF_DEVICE *device, 101BMIrompatchDeactivate(HIF_DEVICE *device,
102 A_UINT32 rompatch_count, 102 u32 rompatch_count,
103 A_UINT32 *rompatch_list); 103 u32 *rompatch_list);
104 104
105int 105int
106BMILZStreamStart(HIF_DEVICE *device, 106BMILZStreamStart(HIF_DEVICE *device,
107 A_UINT32 address); 107 u32 address);
108 108
109int 109int
110BMILZData(HIF_DEVICE *device, 110BMILZData(HIF_DEVICE *device,
111 A_UCHAR *buffer, 111 A_UCHAR *buffer,
112 A_UINT32 length); 112 u32 length);
113 113
114int 114int
115BMIFastDownload(HIF_DEVICE *device, 115BMIFastDownload(HIF_DEVICE *device,
116 A_UINT32 address, 116 u32 address,
117 A_UCHAR *buffer, 117 A_UCHAR *buffer,
118 A_UINT32 length); 118 u32 length);
119 119
120int 120int
121BMIRawWrite(HIF_DEVICE *device, 121BMIRawWrite(HIF_DEVICE *device,
122 A_UCHAR *buffer, 122 A_UCHAR *buffer,
123 A_UINT32 length); 123 u32 length);
124 124
125int 125int
126BMIRawRead(HIF_DEVICE *device, 126BMIRawRead(HIF_DEVICE *device,
127 A_UCHAR *buffer, 127 A_UCHAR *buffer,
128 A_UINT32 length, 128 u32 length,
129 bool want_timeout); 129 bool want_timeout);
130 130
131#ifdef __cplusplus 131#ifdef __cplusplus
diff --git a/drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h b/drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h
index e3291cf4dbd..4a9b275d68b 100644
--- a/drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h
+++ b/drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h
@@ -29,28 +29,28 @@
29 * This must match the state saved by the target exception handler. 29 * This must match the state saved by the target exception handler.
30 */ 30 */
31struct XTensa_exception_frame_s { 31struct XTensa_exception_frame_s {
32 A_UINT32 xt_pc; 32 u32 xt_pc;
33 A_UINT32 xt_ps; 33 u32 xt_ps;
34 A_UINT32 xt_sar; 34 u32 xt_sar;
35 A_UINT32 xt_vpri; 35 u32 xt_vpri;
36 A_UINT32 xt_a2; 36 u32 xt_a2;
37 A_UINT32 xt_a3; 37 u32 xt_a3;
38 A_UINT32 xt_a4; 38 u32 xt_a4;
39 A_UINT32 xt_a5; 39 u32 xt_a5;
40 A_UINT32 xt_exccause; 40 u32 xt_exccause;
41 A_UINT32 xt_lcount; 41 u32 xt_lcount;
42 A_UINT32 xt_lbeg; 42 u32 xt_lbeg;
43 A_UINT32 xt_lend; 43 u32 xt_lend;
44 44
45 A_UINT32 epc1, epc2, epc3, epc4; 45 u32 epc1, epc2, epc3, epc4;
46 46
47 /* Extra info to simplify post-mortem stack walkback */ 47 /* Extra info to simplify post-mortem stack walkback */
48#define AR6002_REGDUMP_FRAMES 10 48#define AR6002_REGDUMP_FRAMES 10
49 struct { 49 struct {
50 A_UINT32 a0; /* pc */ 50 u32 a0; /* pc */
51 A_UINT32 a1; /* sp */ 51 u32 a1; /* sp */
52 A_UINT32 a2; 52 u32 a2;
53 A_UINT32 a3; 53 u32 a3;
54 } wb[AR6002_REGDUMP_FRAMES]; 54 } wb[AR6002_REGDUMP_FRAMES];
55}; 55};
56typedef struct XTensa_exception_frame_s CPU_exception_frame_t; 56typedef struct XTensa_exception_frame_s CPU_exception_frame_t;
diff --git a/drivers/staging/ath6kl/include/common/AR6002/addrs.h b/drivers/staging/ath6kl/include/common/AR6002/addrs.h
index eaaccf4cad7..bbf8d42828c 100644
--- a/drivers/staging/ath6kl/include/common/AR6002/addrs.h
+++ b/drivers/staging/ath6kl/include/common/AR6002/addrs.h
@@ -29,13 +29,13 @@
29 29
30#if defined(AR6002_REV2) 30#if defined(AR6002_REV2)
31#define AR6K_RAM_START 0x00500000 31#define AR6K_RAM_START 0x00500000
32#define TARG_RAM_OFFSET(vaddr) ((A_UINT32)(vaddr) & 0xfffff) 32#define TARG_RAM_OFFSET(vaddr) ((u32)(vaddr) & 0xfffff)
33#define TARG_RAM_SZ (184*1024) 33#define TARG_RAM_SZ (184*1024)
34#define TARG_ROM_SZ (80*1024) 34#define TARG_ROM_SZ (80*1024)
35#endif 35#endif
36#if defined(AR6002_REV4) || defined(AR6003) 36#if defined(AR6002_REV4) || defined(AR6003)
37#define AR6K_RAM_START 0x00540000 37#define AR6K_RAM_START 0x00540000
38#define TARG_RAM_OFFSET(vaddr) (((A_UINT32)(vaddr) & 0xfffff) - 0x40000) 38#define TARG_RAM_OFFSET(vaddr) (((u32)(vaddr) & 0xfffff) - 0x40000)
39#define TARG_RAM_SZ (256*1024) 39#define TARG_RAM_SZ (256*1024)
40#define TARG_ROM_SZ (256*1024) 40#define TARG_ROM_SZ (256*1024)
41#endif 41#endif
@@ -49,7 +49,7 @@
49#define TARG_RAM_ADDRS(byte_offset) AR6K_RAM_ADDR(byte_offset) 49#define TARG_RAM_ADDRS(byte_offset) AR6K_RAM_ADDR(byte_offset)
50 50
51#define AR6K_ROM_START 0x004e0000 51#define AR6K_ROM_START 0x004e0000
52#define TARG_ROM_OFFSET(vaddr) (((A_UINT32)(vaddr) & 0x1fffff) - 0xe0000) 52#define TARG_ROM_OFFSET(vaddr) (((u32)(vaddr) & 0x1fffff) - 0xe0000)
53#define AR6K_ROM_ADDR(byte_offset) (AR6K_ROM_START+(byte_offset)) 53#define AR6K_ROM_ADDR(byte_offset) (AR6K_ROM_START+(byte_offset))
54#define TARG_ROM_ADDRS(byte_offset) AR6K_ROM_ADDR(byte_offset) 54#define TARG_ROM_ADDRS(byte_offset) AR6K_ROM_ADDR(byte_offset)
55 55
diff --git a/drivers/staging/ath6kl/include/common/a_hci.h b/drivers/staging/ath6kl/include/common/a_hci.h
index 317ea57ba87..3734662d614 100644
--- a/drivers/staging/ath6kl/include/common/a_hci.h
+++ b/drivers/staging/ath6kl/include/common/a_hci.h
@@ -351,9 +351,9 @@ typedef struct flow_spec_t {
351 u8 id; 351 u8 id;
352 u8 service_type; 352 u8 service_type;
353 u16 max_sdu; 353 u16 max_sdu;
354 A_UINT32 sdu_inter_arrival_time; 354 u32 sdu_inter_arrival_time;
355 A_UINT32 access_latency; 355 u32 access_latency;
356 A_UINT32 flush_timeout; 356 u32 flush_timeout;
357} POSTPACK FLOW_SPEC; 357} POSTPACK FLOW_SPEC;
358 358
359 359
@@ -559,15 +559,15 @@ typedef struct hci_event_amp_status_change_t{
559typedef struct local_amp_info_resp_t { 559typedef struct local_amp_info_resp_t {
560 u8 status; 560 u8 status;
561 u8 amp_status; 561 u8 amp_status;
562 A_UINT32 total_bw; /* kbps */ 562 u32 total_bw; /* kbps */
563 A_UINT32 max_guranteed_bw; /* kbps */ 563 u32 max_guranteed_bw; /* kbps */
564 A_UINT32 min_latency; 564 u32 min_latency;
565 A_UINT32 max_pdu_size; 565 u32 max_pdu_size;
566 u8 amp_type; 566 u8 amp_type;
567 u16 pal_capabilities; 567 u16 pal_capabilities;
568 u16 amp_assoc_len; 568 u16 amp_assoc_len;
569 A_UINT32 max_flush_timeout; /* in ms */ 569 u32 max_flush_timeout; /* in ms */
570 A_UINT32 be_flush_timeout; /* in ms */ 570 u32 be_flush_timeout; /* in ms */
571} POSTPACK LOCAL_AMP_INFO; 571} POSTPACK LOCAL_AMP_INFO;
572 572
573typedef struct amp_assoc_cmd_resp_t{ 573typedef struct amp_assoc_cmd_resp_t{
diff --git a/drivers/staging/ath6kl/include/common/bmi_msg.h b/drivers/staging/ath6kl/include/common/bmi_msg.h
index 171bf378baa..e76624c5915 100644
--- a/drivers/staging/ath6kl/include/common/bmi_msg.h
+++ b/drivers/staging/ath6kl/include/common/bmi_msg.h
@@ -65,7 +65,7 @@
65 /* 65 /*
66 * Semantics: Host is done using BMI 66 * Semantics: Host is done using BMI
67 * Request format: 67 * Request format:
68 * A_UINT32 command (BMI_DONE) 68 * u32 command (BMI_DONE)
69 * Response format: none 69 * Response format: none
70 */ 70 */
71 71
@@ -73,9 +73,9 @@
73 /* 73 /*
74 * Semantics: Host reads AR6K memory 74 * Semantics: Host reads AR6K memory
75 * Request format: 75 * Request format:
76 * A_UINT32 command (BMI_READ_MEMORY) 76 * u32 command (BMI_READ_MEMORY)
77 * A_UINT32 address 77 * u32 address
78 * A_UINT32 length, at most BMI_DATASZ_MAX 78 * u32 length, at most BMI_DATASZ_MAX
79 * Response format: 79 * Response format:
80 * u8 data[length] 80 * u8 data[length]
81 */ 81 */
@@ -84,9 +84,9 @@
84 /* 84 /*
85 * Semantics: Host writes AR6K memory 85 * Semantics: Host writes AR6K memory
86 * Request format: 86 * Request format:
87 * A_UINT32 command (BMI_WRITE_MEMORY) 87 * u32 command (BMI_WRITE_MEMORY)
88 * A_UINT32 address 88 * u32 address
89 * A_UINT32 length, at most BMI_DATASZ_MAX 89 * u32 length, at most BMI_DATASZ_MAX
90 * u8 data[length] 90 * u8 data[length]
91 * Response format: none 91 * Response format: none
92 */ 92 */
@@ -95,19 +95,19 @@
95 /* 95 /*
96 * Semantics: Causes AR6K to execute code 96 * Semantics: Causes AR6K to execute code
97 * Request format: 97 * Request format:
98 * A_UINT32 command (BMI_EXECUTE) 98 * u32 command (BMI_EXECUTE)
99 * A_UINT32 address 99 * u32 address
100 * A_UINT32 parameter 100 * u32 parameter
101 * Response format: 101 * Response format:
102 * A_UINT32 return value 102 * u32 return value
103 */ 103 */
104 104
105#define BMI_SET_APP_START 5 105#define BMI_SET_APP_START 5
106 /* 106 /*
107 * Semantics: Set Target application starting address 107 * Semantics: Set Target application starting address
108 * Request format: 108 * Request format:
109 * A_UINT32 command (BMI_SET_APP_START) 109 * u32 command (BMI_SET_APP_START)
110 * A_UINT32 address 110 * u32 address
111 * Response format: none 111 * Response format: none
112 */ 112 */
113 113
@@ -115,19 +115,19 @@
115 /* 115 /*
116 * Semantics: Read a 32-bit Target SOC register. 116 * Semantics: Read a 32-bit Target SOC register.
117 * Request format: 117 * Request format:
118 * A_UINT32 command (BMI_READ_REGISTER) 118 * u32 command (BMI_READ_REGISTER)
119 * A_UINT32 address 119 * u32 address
120 * Response format: 120 * Response format:
121 * A_UINT32 value 121 * u32 value
122 */ 122 */
123 123
124#define BMI_WRITE_SOC_REGISTER 7 124#define BMI_WRITE_SOC_REGISTER 7
125 /* 125 /*
126 * Semantics: Write a 32-bit Target SOC register. 126 * Semantics: Write a 32-bit Target SOC register.
127 * Request format: 127 * Request format:
128 * A_UINT32 command (BMI_WRITE_REGISTER) 128 * u32 command (BMI_WRITE_REGISTER)
129 * A_UINT32 address 129 * u32 address
130 * A_UINT32 value 130 * u32 value
131 * 131 *
132 * Response format: none 132 * Response format: none
133 */ 133 */
@@ -137,18 +137,18 @@
137 /* 137 /*
138 * Semantics: Fetch the 4-byte Target information 138 * Semantics: Fetch the 4-byte Target information
139 * Request format: 139 * Request format:
140 * A_UINT32 command (BMI_GET_TARGET_ID/INFO) 140 * u32 command (BMI_GET_TARGET_ID/INFO)
141 * Response format1 (old firmware): 141 * Response format1 (old firmware):
142 * A_UINT32 TargetVersionID 142 * u32 TargetVersionID
143 * Response format2 (newer firmware): 143 * Response format2 (newer firmware):
144 * A_UINT32 TARGET_VERSION_SENTINAL 144 * u32 TARGET_VERSION_SENTINAL
145 * struct bmi_target_info; 145 * struct bmi_target_info;
146 */ 146 */
147 147
148PREPACK struct bmi_target_info { 148PREPACK struct bmi_target_info {
149 A_UINT32 target_info_byte_count; /* size of this structure */ 149 u32 target_info_byte_count; /* size of this structure */
150 A_UINT32 target_ver; /* Target Version ID */ 150 u32 target_ver; /* Target Version ID */
151 A_UINT32 target_type; /* Target type */ 151 u32 target_type; /* Target type */
152} POSTPACK; 152} POSTPACK;
153#define TARGET_VERSION_SENTINAL 0xffffffff 153#define TARGET_VERSION_SENTINAL 0xffffffff
154#define TARGET_TYPE_AR6001 1 154#define TARGET_TYPE_AR6001 1
@@ -160,14 +160,14 @@ PREPACK struct bmi_target_info {
160 /* 160 /*
161 * Semantics: Install a ROM Patch. 161 * Semantics: Install a ROM Patch.
162 * Request format: 162 * Request format:
163 * A_UINT32 command (BMI_ROMPATCH_INSTALL) 163 * u32 command (BMI_ROMPATCH_INSTALL)
164 * A_UINT32 Target ROM Address 164 * u32 Target ROM Address
165 * A_UINT32 Target RAM Address or Value (depending on Target Type) 165 * u32 Target RAM Address or Value (depending on Target Type)
166 * A_UINT32 Size, in bytes 166 * u32 Size, in bytes
167 * A_UINT32 Activate? 1-->activate; 167 * u32 Activate? 1-->activate;
168 * 0-->install but do not activate 168 * 0-->install but do not activate
169 * Response format: 169 * Response format:
170 * A_UINT32 PatchID 170 * u32 PatchID
171 */ 171 */
172 172
173#define BMI_ROMPATCH_UNINSTALL 10 173#define BMI_ROMPATCH_UNINSTALL 10
@@ -175,8 +175,8 @@ PREPACK struct bmi_target_info {
175 * Semantics: Uninstall a previously-installed ROM Patch, 175 * Semantics: Uninstall a previously-installed ROM Patch,
176 * automatically deactivating, if necessary. 176 * automatically deactivating, if necessary.
177 * Request format: 177 * Request format:
178 * A_UINT32 command (BMI_ROMPATCH_UNINSTALL) 178 * u32 command (BMI_ROMPATCH_UNINSTALL)
179 * A_UINT32 PatchID 179 * u32 PatchID
180 * 180 *
181 * Response format: none 181 * Response format: none
182 */ 182 */
@@ -185,9 +185,9 @@ PREPACK struct bmi_target_info {
185 /* 185 /*
186 * Semantics: Activate a list of previously-installed ROM Patches. 186 * Semantics: Activate a list of previously-installed ROM Patches.
187 * Request format: 187 * Request format:
188 * A_UINT32 command (BMI_ROMPATCH_ACTIVATE) 188 * u32 command (BMI_ROMPATCH_ACTIVATE)
189 * A_UINT32 rompatch_count 189 * u32 rompatch_count
190 * A_UINT32 PatchID[rompatch_count] 190 * u32 PatchID[rompatch_count]
191 * 191 *
192 * Response format: none 192 * Response format: none
193 */ 193 */
@@ -196,9 +196,9 @@ PREPACK struct bmi_target_info {
196 /* 196 /*
197 * Semantics: Deactivate a list of active ROM Patches. 197 * Semantics: Deactivate a list of active ROM Patches.
198 * Request format: 198 * Request format:
199 * A_UINT32 command (BMI_ROMPATCH_DEACTIVATE) 199 * u32 command (BMI_ROMPATCH_DEACTIVATE)
200 * A_UINT32 rompatch_count 200 * u32 rompatch_count
201 * A_UINT32 PatchID[rompatch_count] 201 * u32 PatchID[rompatch_count]
202 * 202 *
203 * Response format: none 203 * Response format: none
204 */ 204 */
@@ -213,8 +213,8 @@ PREPACK struct bmi_target_info {
213 * output from the compressed input stream. This BMI 213 * output from the compressed input stream. This BMI
214 * command should be followed by a series of 1 or more 214 * command should be followed by a series of 1 or more
215 * BMI_LZ_DATA commands. 215 * BMI_LZ_DATA commands.
216 * A_UINT32 command (BMI_LZ_STREAM_START) 216 * u32 command (BMI_LZ_STREAM_START)
217 * A_UINT32 address 217 * u32 address
218 * Note: Not supported on all versions of ROM firmware. 218 * Note: Not supported on all versions of ROM firmware.
219 */ 219 */
220 220
@@ -226,8 +226,8 @@ PREPACK struct bmi_target_info {
226 * of BMI_LZ_DATA commands are considered part of a single 226 * of BMI_LZ_DATA commands are considered part of a single
227 * input stream until another BMI_LZ_STREAM_START is issued. 227 * input stream until another BMI_LZ_STREAM_START is issued.
228 * Request format: 228 * Request format:
229 * A_UINT32 command (BMI_LZ_DATA) 229 * u32 command (BMI_LZ_DATA)
230 * A_UINT32 length (of compressed data), 230 * u32 length (of compressed data),
231 * at most BMI_DATASZ_MAX 231 * at most BMI_DATASZ_MAX
232 * u8 CompressedData[length] 232 * u8 CompressedData[length]
233 * Response format: none 233 * Response format: none
diff --git a/drivers/staging/ath6kl/include/common/btcoexGpio.h b/drivers/staging/ath6kl/include/common/btcoexGpio.h
index bc067f557ea..9d5a239f1fb 100644
--- a/drivers/staging/ath6kl/include/common/btcoexGpio.h
+++ b/drivers/staging/ath6kl/include/common/btcoexGpio.h
@@ -71,8 +71,8 @@
71 71
72 72
73 73
74extern void btcoexDbgPulseWord(A_UINT32 gpioPinMask); 74extern void btcoexDbgPulseWord(u32 gpioPinMask);
75extern void btcoexDbgPulse(A_UINT32 pin); 75extern void btcoexDbgPulse(u32 pin);
76 76
77#ifdef CONFIG_BTCOEX_ENABLE_GPIO_DEBUG 77#ifdef CONFIG_BTCOEX_ENABLE_GPIO_DEBUG
78#define BTCOEX_DBG_PULSE_WORD(gpioPinMask) (btcoexDbgPulseWord(gpioPinMask)) 78#define BTCOEX_DBG_PULSE_WORD(gpioPinMask) (btcoexDbgPulseWord(gpioPinMask))
diff --git a/drivers/staging/ath6kl/include/common/dbglog.h b/drivers/staging/ath6kl/include/common/dbglog.h
index 060a6b16c19..3a3d00da0b8 100644
--- a/drivers/staging/ath6kl/include/common/dbglog.h
+++ b/drivers/staging/ath6kl/include/common/dbglog.h
@@ -90,30 +90,30 @@ extern "C" {
90PREPACK struct dbglog_buf_s { 90PREPACK struct dbglog_buf_s {
91 struct dbglog_buf_s *next; 91 struct dbglog_buf_s *next;
92 u8 *buffer; 92 u8 *buffer;
93 A_UINT32 bufsize; 93 u32 bufsize;
94 A_UINT32 length; 94 u32 length;
95 A_UINT32 count; 95 u32 count;
96 A_UINT32 free; 96 u32 free;
97} POSTPACK; 97} POSTPACK;
98 98
99PREPACK struct dbglog_hdr_s { 99PREPACK struct dbglog_hdr_s {
100 struct dbglog_buf_s *dbuf; 100 struct dbglog_buf_s *dbuf;
101 A_UINT32 dropped; 101 u32 dropped;
102} POSTPACK; 102} POSTPACK;
103 103
104PREPACK struct dbglog_config_s { 104PREPACK struct dbglog_config_s {
105 A_UINT32 cfgvalid; /* Mask with valid config bits */ 105 u32 cfgvalid; /* Mask with valid config bits */
106 union { 106 union {
107 /* TODO: Take care of endianness */ 107 /* TODO: Take care of endianness */
108 struct { 108 struct {
109 A_UINT32 mmask:16; /* Mask of modules with logging on */ 109 u32 mmask:16; /* Mask of modules with logging on */
110 A_UINT32 rep:1; /* Reporting enabled or not */ 110 u32 rep:1; /* Reporting enabled or not */
111 A_UINT32 tsr:3; /* Time stamp resolution. Def: 1 ms */ 111 u32 tsr:3; /* Time stamp resolution. Def: 1 ms */
112 A_UINT32 size:10; /* Report size in number of messages */ 112 u32 size:10; /* Report size in number of messages */
113 A_UINT32 reserved:2; 113 u32 reserved:2;
114 } dbglog_config; 114 } dbglog_config;
115 115
116 A_UINT32 value; 116 u32 value;
117 } u; 117 } u;
118} POSTPACK; 118} POSTPACK;
119 119
diff --git a/drivers/staging/ath6kl/include/common/dset_internal.h b/drivers/staging/ath6kl/include/common/dset_internal.h
index 74914f9cb3c..69475331eab 100644
--- a/drivers/staging/ath6kl/include/common/dset_internal.h
+++ b/drivers/staging/ath6kl/include/common/dset_internal.h
@@ -48,7 +48,7 @@ typedef PREPACK struct dset_descriptor_s {
48 DataSet or pointer to original 48 DataSet or pointer to original
49 dset_descriptor for patched 49 dset_descriptor for patched
50 DataSet */ 50 DataSet */
51 A_UINT32 data_type; /* DSET_TYPE_*, above */ 51 u32 data_type; /* DSET_TYPE_*, above */
52 52
53 void *AuxPtr; /* Additional data that might 53 void *AuxPtr; /* Additional data that might
54 needed for data_type. For 54 needed for data_type. For
diff --git a/drivers/staging/ath6kl/include/common/dsetid.h b/drivers/staging/ath6kl/include/common/dsetid.h
index d08fdeb39ec..090e3096792 100644
--- a/drivers/staging/ath6kl/include/common/dsetid.h
+++ b/drivers/staging/ath6kl/include/common/dsetid.h
@@ -81,8 +81,8 @@
81 * This allows for patches to be stored in flash. 81 * This allows for patches to be stored in flash.
82 */ 82 */
83PREPACK struct patch_s { 83PREPACK struct patch_s {
84 A_UINT32 *address; 84 u32 *address;
85 A_UINT32 data; 85 u32 data;
86} POSTPACK ; 86} POSTPACK ;
87 87
88/* 88/*
@@ -92,23 +92,23 @@ PREPACK struct patch_s {
92 * patch code. The "data" in a PATCH_SKIP tells how many 92 * patch code. The "data" in a PATCH_SKIP tells how many
93 * bytes of length "patch_s" to skip. 93 * bytes of length "patch_s" to skip.
94 */ 94 */
95#define PATCH_SKIP ((A_UINT32 *)0x00000000) 95#define PATCH_SKIP ((u32 *)0x00000000)
96 96
97/* 97/*
98 * Execute code at the address specified by "data". 98 * Execute code at the address specified by "data".
99 * The address of the patch structure is passed as 99 * The address of the patch structure is passed as
100 * the one parameter. 100 * the one parameter.
101 */ 101 */
102#define PATCH_CODE_ABS ((A_UINT32 *)0x00000001) 102#define PATCH_CODE_ABS ((u32 *)0x00000001)
103 103
104/* 104/*
105 * Same as PATCH_CODE_ABS, but treat "data" as an 105 * Same as PATCH_CODE_ABS, but treat "data" as an
106 * offset from the start of the patch word. 106 * offset from the start of the patch word.
107 */ 107 */
108#define PATCH_CODE_REL ((A_UINT32 *)0x00000002) 108#define PATCH_CODE_REL ((u32 *)0x00000002)
109 109
110/* Mark the end of this patch DataSet. */ 110/* Mark the end of this patch DataSet. */
111#define PATCH_END ((A_UINT32 *)0xffffffff) 111#define PATCH_END ((u32 *)0xffffffff)
112 112
113/* 113/*
114 * A DataSet which contains a Binary Patch to some other DataSet 114 * A DataSet which contains a Binary Patch to some other DataSet
diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h
index 45f82dd7923..2cd43c46c14 100644
--- a/drivers/staging/ath6kl/include/common/epping_test.h
+++ b/drivers/staging/ath6kl/include/common/epping_test.h
@@ -54,8 +54,8 @@ typedef PREPACK struct {
54 54
55 u8 _pad[2]; /* padding for alignment */ 55 u8 _pad[2]; /* padding for alignment */
56 u8 TimeStamp[8]; /* timestamp of packet (host or target) */ 56 u8 TimeStamp[8]; /* timestamp of packet (host or target) */
57 A_UINT32 HostContext_h; /* 4 byte host context, target echos this back */ 57 u32 HostContext_h; /* 4 byte host context, target echos this back */
58 A_UINT32 SeqNo; /* sequence number (set by host or target) */ 58 u32 SeqNo; /* sequence number (set by host or target) */
59 u16 Cmd_h; /* ping command (filled by host) */ 59 u16 Cmd_h; /* ping command (filled by host) */
60 u16 CmdFlags_h; /* optional flags */ 60 u16 CmdFlags_h; /* optional flags */
61 u8 CmdBuffer_h[8]; /* buffer for command (host -> target) */ 61 u8 CmdBuffer_h[8]; /* buffer for command (host -> target) */
diff --git a/drivers/staging/ath6kl/include/common/htc.h b/drivers/staging/ath6kl/include/common/htc.h
index 6c85bebd994..bed8e26abc3 100644
--- a/drivers/staging/ath6kl/include/common/htc.h
+++ b/drivers/staging/ath6kl/include/common/htc.h
@@ -181,7 +181,7 @@ typedef PREPACK struct {
181 /* extended setup completion message */ 181 /* extended setup completion message */
182typedef PREPACK struct { 182typedef PREPACK struct {
183 u16 MessageID; 183 u16 MessageID;
184 A_UINT32 SetupFlags; 184 u32 SetupFlags;
185 u8 MaxMsgsPerBundledRecv; 185 u8 MaxMsgsPerBundledRecv;
186 u8 Rsvd[3]; 186 u8 Rsvd[3];
187} POSTPACK HTC_SETUP_COMPLETE_EX_MSG; 187} POSTPACK HTC_SETUP_COMPLETE_EX_MSG;
diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h
index d6f2301f571..8bfc75940c8 100644
--- a/drivers/staging/ath6kl/include/common/ini_dset.h
+++ b/drivers/staging/ath6kl/include/common/ini_dset.h
@@ -76,7 +76,7 @@ typedef enum {
76typedef PREPACK struct { 76typedef PREPACK struct {
77 u16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common 77 u16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common
78 u16 offset; 78 u16 offset;
79 A_UINT32 newValue; 79 u32 newValue;
80} POSTPACK INI_DSET_REG_OVERRIDE; 80} POSTPACK INI_DSET_REG_OVERRIDE;
81 81
82#endif 82#endif
diff --git a/drivers/staging/ath6kl/include/common/regdump.h b/drivers/staging/ath6kl/include/common/regdump.h
index ff79b4846e6..aa64821617e 100644
--- a/drivers/staging/ath6kl/include/common/regdump.h
+++ b/drivers/staging/ath6kl/include/common/regdump.h
@@ -42,10 +42,10 @@
42 * the diagnostic window. 42 * the diagnostic window.
43 */ 43 */
44PREPACK struct register_dump_s { 44PREPACK struct register_dump_s {
45 A_UINT32 target_id; /* Target ID */ 45 u32 target_id; /* Target ID */
46 A_UINT32 assline; /* Line number (if assertion failure) */ 46 u32 assline; /* Line number (if assertion failure) */
47 A_UINT32 pc; /* Program Counter at time of exception */ 47 u32 pc; /* Program Counter at time of exception */
48 A_UINT32 badvaddr; /* Virtual address causing exception */ 48 u32 badvaddr; /* Virtual address causing exception */
49 CPU_exception_frame_t exc_frame; /* CPU-specific exception info */ 49 CPU_exception_frame_t exc_frame; /* CPU-specific exception info */
50 50
51 /* Could copy top of stack here, too.... */ 51 /* Could copy top of stack here, too.... */
diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
index 36e266fe02d..93d7c0b64fd 100644
--- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
+++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
@@ -145,22 +145,22 @@ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structure
145#define BMZERO {0,0} /* BMLEN zeros */ 145#define BMZERO {0,0} /* BMLEN zeros */
146 146
147#define BM(_fa, _fb, _fc, _fd, _fe, _ff, _fg, _fh) \ 147#define BM(_fa, _fb, _fc, _fd, _fe, _ff, _fg, _fh) \
148 {((((_fa >= 0) && (_fa < 32)) ? (((A_UINT32) 1) << _fa) : 0) | \ 148 {((((_fa >= 0) && (_fa < 32)) ? (((u32) 1) << _fa) : 0) | \
149 (((_fb >= 0) && (_fb < 32)) ? (((A_UINT32) 1) << _fb) : 0) | \ 149 (((_fb >= 0) && (_fb < 32)) ? (((u32) 1) << _fb) : 0) | \
150 (((_fc >= 0) && (_fc < 32)) ? (((A_UINT32) 1) << _fc) : 0) | \ 150 (((_fc >= 0) && (_fc < 32)) ? (((u32) 1) << _fc) : 0) | \
151 (((_fd >= 0) && (_fd < 32)) ? (((A_UINT32) 1) << _fd) : 0) | \ 151 (((_fd >= 0) && (_fd < 32)) ? (((u32) 1) << _fd) : 0) | \
152 (((_fe >= 0) && (_fe < 32)) ? (((A_UINT32) 1) << _fe) : 0) | \ 152 (((_fe >= 0) && (_fe < 32)) ? (((u32) 1) << _fe) : 0) | \
153 (((_ff >= 0) && (_ff < 32)) ? (((A_UINT32) 1) << _ff) : 0) | \ 153 (((_ff >= 0) && (_ff < 32)) ? (((u32) 1) << _ff) : 0) | \
154 (((_fg >= 0) && (_fg < 32)) ? (((A_UINT32) 1) << _fg) : 0) | \ 154 (((_fg >= 0) && (_fg < 32)) ? (((u32) 1) << _fg) : 0) | \
155 (((_fh >= 0) && (_fh < 32)) ? (((A_UINT32) 1) << _fh) : 0)), \ 155 (((_fh >= 0) && (_fh < 32)) ? (((u32) 1) << _fh) : 0)), \
156 ((((_fa > 31) && (_fa < 64)) ? (((A_UINT32) 1) << (_fa - 32)) : 0) | \ 156 ((((_fa > 31) && (_fa < 64)) ? (((u32) 1) << (_fa - 32)) : 0) | \
157 (((_fb > 31) && (_fb < 64)) ? (((A_UINT32) 1) << (_fb - 32)) : 0) | \ 157 (((_fb > 31) && (_fb < 64)) ? (((u32) 1) << (_fb - 32)) : 0) | \
158 (((_fc > 31) && (_fc < 64)) ? (((A_UINT32) 1) << (_fc - 32)) : 0) | \ 158 (((_fc > 31) && (_fc < 64)) ? (((u32) 1) << (_fc - 32)) : 0) | \
159 (((_fd > 31) && (_fd < 64)) ? (((A_UINT32) 1) << (_fd - 32)) : 0) | \ 159 (((_fd > 31) && (_fd < 64)) ? (((u32) 1) << (_fd - 32)) : 0) | \
160 (((_fe > 31) && (_fe < 64)) ? (((A_UINT32) 1) << (_fe - 32)) : 0) | \ 160 (((_fe > 31) && (_fe < 64)) ? (((u32) 1) << (_fe - 32)) : 0) | \
161 (((_ff > 31) && (_ff < 64)) ? (((A_UINT32) 1) << (_ff - 32)) : 0) | \ 161 (((_ff > 31) && (_ff < 64)) ? (((u32) 1) << (_ff - 32)) : 0) | \
162 (((_fg > 31) && (_fg < 64)) ? (((A_UINT32) 1) << (_fg - 32)) : 0) | \ 162 (((_fg > 31) && (_fg < 64)) ? (((u32) 1) << (_fg - 32)) : 0) | \
163 (((_fh > 31) && (_fh < 64)) ? (((A_UINT32) 1) << (_fh - 32)) : 0))} 163 (((_fh > 31) && (_fh < 64)) ? (((u32) 1) << (_fh - 32)) : 0))}
164 164
165 165
166/* 166/*
@@ -174,7 +174,7 @@ typedef PREPACK struct reg_dmn_pair_mapping {
174 u16 regDmn2GHz; /* 2GHz reg domain */ 174 u16 regDmn2GHz; /* 2GHz reg domain */
175 u8 flags5GHz; /* Requirements flags (AdHoc disallow etc) */ 175 u8 flags5GHz; /* Requirements flags (AdHoc disallow etc) */
176 u8 flags2GHz; /* Requirements flags (AdHoc disallow etc) */ 176 u8 flags2GHz; /* Requirements flags (AdHoc disallow etc) */
177 A_UINT32 pscanMask; /* Passive Scan flags which can override unitary domain passive scan 177 u32 pscanMask; /* Passive Scan flags which can override unitary domain passive scan
178 flags. This value is used as a mask on the unitary flags*/ 178 flags. This value is used as a mask on the unitary flags*/
179} POSTPACK REG_DMN_PAIR_MAPPING; 179} POSTPACK REG_DMN_PAIR_MAPPING;
180 180
@@ -215,8 +215,8 @@ typedef PREPACK struct RegDmnFreqBand {
215 u8 channelSep; /* Channel separation within the band */ 215 u8 channelSep; /* Channel separation within the band */
216 u8 useDfs; /* Use DFS in the RegDomain if corresponding bit is set */ 216 u8 useDfs; /* Use DFS in the RegDomain if corresponding bit is set */
217 u8 mode; /* Mode of operation */ 217 u8 mode; /* Mode of operation */
218 A_UINT32 usePassScan; /* Use Passive Scan in the RegDomain if corresponding bit is set */ 218 u32 usePassScan; /* Use Passive Scan in the RegDomain if corresponding bit is set */
219 A_UINT32 ht40ChanMask; /* lower 16 bits: indicate which frequencies in the block is HT40 capable 219 u32 ht40ChanMask; /* lower 16 bits: indicate which frequencies in the block is HT40 capable
220 upper 16 bits: what rate (half/quarter) the channel is */ 220 upper 16 bits: what rate (half/quarter) the channel is */
221} POSTPACK REG_DMN_FREQ_BAND; 221} POSTPACK REG_DMN_FREQ_BAND;
222 222
@@ -229,9 +229,9 @@ typedef PREPACK struct regDomain {
229 u8 dfsMask; /* DFS bitmask for 5Ghz tables */ 229 u8 dfsMask; /* DFS bitmask for 5Ghz tables */
230 u8 flags; /* Requirement flags (AdHoc disallow etc) */ 230 u8 flags; /* Requirement flags (AdHoc disallow etc) */
231 u16 reserved; /* for alignment */ 231 u16 reserved; /* for alignment */
232 A_UINT32 pscan; /* Bitmask for passive scan */ 232 u32 pscan; /* Bitmask for passive scan */
233 A_UINT32 chan11a[BMLEN]; /* 64 bit bitmask for channel/band selection */ 233 u32 chan11a[BMLEN]; /* 64 bit bitmask for channel/band selection */
234 A_UINT32 chan11bg[BMLEN];/* 64 bit bitmask for channel/band selection */ 234 u32 chan11bg[BMLEN];/* 64 bit bitmask for channel/band selection */
235} POSTPACK REG_DOMAIN; 235} POSTPACK REG_DOMAIN;
236 236
237#endif /* __REG_DBSCHEMA_H__ */ 237#endif /* __REG_DBSCHEMA_H__ */
diff --git a/drivers/staging/ath6kl/include/common/targaddrs.h b/drivers/staging/ath6kl/include/common/targaddrs.h
index e8cf70354d2..794ae2182a7 100644
--- a/drivers/staging/ath6kl/include/common/targaddrs.h
+++ b/drivers/staging/ath6kl/include/common/targaddrs.h
@@ -83,13 +83,13 @@ PREPACK struct host_interest_s {
83 * Pointer to application-defined area, if any. 83 * Pointer to application-defined area, if any.
84 * Set by Target application during startup. 84 * Set by Target application during startup.
85 */ 85 */
86 A_UINT32 hi_app_host_interest; /* 0x00 */ 86 u32 hi_app_host_interest; /* 0x00 */
87 87
88 /* Pointer to register dump area, valid after Target crash. */ 88 /* Pointer to register dump area, valid after Target crash. */
89 A_UINT32 hi_failure_state; /* 0x04 */ 89 u32 hi_failure_state; /* 0x04 */
90 90
91 /* Pointer to debug logging header */ 91 /* Pointer to debug logging header */
92 A_UINT32 hi_dbglog_hdr; /* 0x08 */ 92 u32 hi_dbglog_hdr; /* 0x08 */
93 93
94 /* Indicates whether or not flash is present on Target. 94 /* Indicates whether or not flash is present on Target.
95 * NB: flash_is_present indicator is here not just 95 * NB: flash_is_present indicator is here not just
@@ -99,36 +99,36 @@ PREPACK struct host_interest_s {
99 * so that it doesn't get reinitialized with the rest 99 * so that it doesn't get reinitialized with the rest
100 * of data. 100 * of data.
101 */ 101 */
102 A_UINT32 hi_flash_is_present; /* 0x0c */ 102 u32 hi_flash_is_present; /* 0x0c */
103 103
104 /* 104 /*
105 * General-purpose flag bits, similar to AR6000_OPTION_* flags. 105 * General-purpose flag bits, similar to AR6000_OPTION_* flags.
106 * Can be used by application rather than by OS. 106 * Can be used by application rather than by OS.
107 */ 107 */
108 A_UINT32 hi_option_flag; /* 0x10 */ 108 u32 hi_option_flag; /* 0x10 */
109 109
110 /* 110 /*
111 * Boolean that determines whether or not to 111 * Boolean that determines whether or not to
112 * display messages on the serial port. 112 * display messages on the serial port.
113 */ 113 */
114 A_UINT32 hi_serial_enable; /* 0x14 */ 114 u32 hi_serial_enable; /* 0x14 */
115 115
116 /* Start address of Flash DataSet index, if any */ 116 /* Start address of Flash DataSet index, if any */
117 A_UINT32 hi_dset_list_head; /* 0x18 */ 117 u32 hi_dset_list_head; /* 0x18 */
118 118
119 /* Override Target application start address */ 119 /* Override Target application start address */
120 A_UINT32 hi_app_start; /* 0x1c */ 120 u32 hi_app_start; /* 0x1c */
121 121
122 /* Clock and voltage tuning */ 122 /* Clock and voltage tuning */
123 A_UINT32 hi_skip_clock_init; /* 0x20 */ 123 u32 hi_skip_clock_init; /* 0x20 */
124 A_UINT32 hi_core_clock_setting; /* 0x24 */ 124 u32 hi_core_clock_setting; /* 0x24 */
125 A_UINT32 hi_cpu_clock_setting; /* 0x28 */ 125 u32 hi_cpu_clock_setting; /* 0x28 */
126 A_UINT32 hi_system_sleep_setting; /* 0x2c */ 126 u32 hi_system_sleep_setting; /* 0x2c */
127 A_UINT32 hi_xtal_control_setting; /* 0x30 */ 127 u32 hi_xtal_control_setting; /* 0x30 */
128 A_UINT32 hi_pll_ctrl_setting_24ghz; /* 0x34 */ 128 u32 hi_pll_ctrl_setting_24ghz; /* 0x34 */
129 A_UINT32 hi_pll_ctrl_setting_5ghz; /* 0x38 */ 129 u32 hi_pll_ctrl_setting_5ghz; /* 0x38 */
130 A_UINT32 hi_ref_voltage_trim_setting; /* 0x3c */ 130 u32 hi_ref_voltage_trim_setting; /* 0x3c */
131 A_UINT32 hi_clock_info; /* 0x40 */ 131 u32 hi_clock_info; /* 0x40 */
132 132
133 /* 133 /*
134 * Flash configuration overrides, used only 134 * Flash configuration overrides, used only
@@ -136,49 +136,49 @@ PREPACK struct host_interest_s {
136 * (When using flash, modify the global variables 136 * (When using flash, modify the global variables
137 * with equivalent names.) 137 * with equivalent names.)
138 */ 138 */
139 A_UINT32 hi_bank0_addr_value; /* 0x44 */ 139 u32 hi_bank0_addr_value; /* 0x44 */
140 A_UINT32 hi_bank0_read_value; /* 0x48 */ 140 u32 hi_bank0_read_value; /* 0x48 */
141 A_UINT32 hi_bank0_write_value; /* 0x4c */ 141 u32 hi_bank0_write_value; /* 0x4c */
142 A_UINT32 hi_bank0_config_value; /* 0x50 */ 142 u32 hi_bank0_config_value; /* 0x50 */
143 143
144 /* Pointer to Board Data */ 144 /* Pointer to Board Data */
145 A_UINT32 hi_board_data; /* 0x54 */ 145 u32 hi_board_data; /* 0x54 */
146 A_UINT32 hi_board_data_initialized; /* 0x58 */ 146 u32 hi_board_data_initialized; /* 0x58 */
147 147
148 A_UINT32 hi_dset_RAM_index_table; /* 0x5c */ 148 u32 hi_dset_RAM_index_table; /* 0x5c */
149 149
150 A_UINT32 hi_desired_baud_rate; /* 0x60 */ 150 u32 hi_desired_baud_rate; /* 0x60 */
151 A_UINT32 hi_dbglog_config; /* 0x64 */ 151 u32 hi_dbglog_config; /* 0x64 */
152 A_UINT32 hi_end_RAM_reserve_sz; /* 0x68 */ 152 u32 hi_end_RAM_reserve_sz; /* 0x68 */
153 A_UINT32 hi_mbox_io_block_sz; /* 0x6c */ 153 u32 hi_mbox_io_block_sz; /* 0x6c */
154 154
155 A_UINT32 hi_num_bpatch_streams; /* 0x70 -- unused */ 155 u32 hi_num_bpatch_streams; /* 0x70 -- unused */
156 A_UINT32 hi_mbox_isr_yield_limit; /* 0x74 */ 156 u32 hi_mbox_isr_yield_limit; /* 0x74 */
157 157
158 A_UINT32 hi_refclk_hz; /* 0x78 */ 158 u32 hi_refclk_hz; /* 0x78 */
159 A_UINT32 hi_ext_clk_detected; /* 0x7c */ 159 u32 hi_ext_clk_detected; /* 0x7c */
160 A_UINT32 hi_dbg_uart_txpin; /* 0x80 */ 160 u32 hi_dbg_uart_txpin; /* 0x80 */
161 A_UINT32 hi_dbg_uart_rxpin; /* 0x84 */ 161 u32 hi_dbg_uart_rxpin; /* 0x84 */
162 A_UINT32 hi_hci_uart_baud; /* 0x88 */ 162 u32 hi_hci_uart_baud; /* 0x88 */
163 A_UINT32 hi_hci_uart_pin_assignments; /* 0x8C */ 163 u32 hi_hci_uart_pin_assignments; /* 0x8C */
164 /* NOTE: byte [0] = tx pin, [1] = rx pin, [2] = rts pin, [3] = cts pin */ 164 /* NOTE: byte [0] = tx pin, [1] = rx pin, [2] = rts pin, [3] = cts pin */
165 A_UINT32 hi_hci_uart_baud_scale_val; /* 0x90 */ 165 u32 hi_hci_uart_baud_scale_val; /* 0x90 */
166 A_UINT32 hi_hci_uart_baud_step_val; /* 0x94 */ 166 u32 hi_hci_uart_baud_step_val; /* 0x94 */
167 167
168 A_UINT32 hi_allocram_start; /* 0x98 */ 168 u32 hi_allocram_start; /* 0x98 */
169 A_UINT32 hi_allocram_sz; /* 0x9c */ 169 u32 hi_allocram_sz; /* 0x9c */
170 A_UINT32 hi_hci_bridge_flags; /* 0xa0 */ 170 u32 hi_hci_bridge_flags; /* 0xa0 */
171 A_UINT32 hi_hci_uart_support_pins; /* 0xa4 */ 171 u32 hi_hci_uart_support_pins; /* 0xa4 */
172 /* NOTE: byte [0] = RESET pin (bit 7 is polarity), bytes[1]..bytes[3] are for future use */ 172 /* NOTE: byte [0] = RESET pin (bit 7 is polarity), bytes[1]..bytes[3] are for future use */
173 A_UINT32 hi_hci_uart_pwr_mgmt_params; /* 0xa8 */ 173 u32 hi_hci_uart_pwr_mgmt_params; /* 0xa8 */
174 /* 0xa8 - [0]: 1 = enable, 0 = disable 174 /* 0xa8 - [0]: 1 = enable, 0 = disable
175 * [1]: 0 = UART FC active low, 1 = UART FC active high 175 * [1]: 0 = UART FC active low, 1 = UART FC active high
176 * 0xa9 - [7:0]: wakeup timeout in ms 176 * 0xa9 - [7:0]: wakeup timeout in ms
177 * 0xaa, 0xab - [15:0]: idle timeout in ms 177 * 0xaa, 0xab - [15:0]: idle timeout in ms
178 */ 178 */
179 /* Pointer to extended board Data */ 179 /* Pointer to extended board Data */
180 A_UINT32 hi_board_ext_data; /* 0xac */ 180 u32 hi_board_ext_data; /* 0xac */
181 A_UINT32 hi_board_ext_data_initialized; /* 0xb0 */ 181 u32 hi_board_ext_data_initialized; /* 0xb0 */
182} POSTPACK; 182} POSTPACK;
183 183
184/* Bits defined in hi_option_flag */ 184/* Bits defined in hi_option_flag */
@@ -207,10 +207,10 @@ PREPACK struct host_interest_s {
207 * Example: target_addr = AR6002_HOST_INTEREST_ITEM_ADDRESS(hi_board_data); 207 * Example: target_addr = AR6002_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
208 */ 208 */
209#define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \ 209#define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \
210 (A_UINT32)((unsigned long)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item))) 210 (u32)((unsigned long)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
211 211
212#define AR6003_HOST_INTEREST_ITEM_ADDRESS(item) \ 212#define AR6003_HOST_INTEREST_ITEM_ADDRESS(item) \
213 (A_UINT32)((unsigned long)&((((struct host_interest_s *)(AR6003_HOST_INTEREST_ADDRESS))->item))) 213 (u32)((unsigned long)&((((struct host_interest_s *)(AR6003_HOST_INTEREST_ADDRESS))->item)))
214 214
215#define HOST_INTEREST_DBGLOG_IS_ENABLED() \ 215#define HOST_INTEREST_DBGLOG_IS_ENABLED() \
216 (!(HOST_INTEREST->hi_option_flag & HI_OPTION_DISABLE_DBGLOG)) 216 (!(HOST_INTEREST->hi_option_flag & HI_OPTION_DISABLE_DBGLOG))
@@ -233,7 +233,7 @@ PREPACK struct host_interest_s {
233#define AR6003_BOARD_EXT_DATA_ADDRESS 0x57E600 233#define AR6003_BOARD_EXT_DATA_ADDRESS 0x57E600
234 234
235 235
236/* # of A_UINT32 entries in targregs, used by DIAG_FETCH_TARG_REGS */ 236/* # of u32 entries in targregs, used by DIAG_FETCH_TARG_REGS */
237#define AR6003_FETCH_TARG_REGS_COUNT 64 237#define AR6003_FETCH_TARG_REGS_COUNT 64
238 238
239#endif /* !__ASSEMBLER__ */ 239#endif /* !__ASSEMBLER__ */
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h
index 4138c1d13d1..49861e2058f 100644
--- a/drivers/staging/ath6kl/include/common/testcmd.h
+++ b/drivers/staging/ath6kl/include/common/testcmd.h
@@ -82,20 +82,20 @@ typedef enum {
82} TCMD_WLAN_MODE; 82} TCMD_WLAN_MODE;
83 83
84typedef PREPACK struct { 84typedef PREPACK struct {
85 A_UINT32 testCmdId; 85 u32 testCmdId;
86 A_UINT32 mode; 86 u32 mode;
87 A_UINT32 freq; 87 u32 freq;
88 A_UINT32 dataRate; 88 u32 dataRate;
89 A_INT32 txPwr; 89 A_INT32 txPwr;
90 A_UINT32 antenna; 90 u32 antenna;
91 A_UINT32 enANI; 91 u32 enANI;
92 A_UINT32 scramblerOff; 92 u32 scramblerOff;
93 A_UINT32 aifsn; 93 u32 aifsn;
94 u16 pktSz; 94 u16 pktSz;
95 u16 txPattern; 95 u16 txPattern;
96 A_UINT32 shortGuard; 96 u32 shortGuard;
97 A_UINT32 numPackets; 97 u32 numPackets;
98 A_UINT32 wlanMode; 98 u32 wlanMode;
99} POSTPACK TCMD_CONT_TX; 99} POSTPACK TCMD_CONT_TX;
100 100
101#define TCMD_TXPATTERN_ZERONE 0x1 101#define TCMD_TXPATTERN_ZERONE 0x1
@@ -124,20 +124,20 @@ typedef enum {
124} TCMD_CONT_RX_ACT; 124} TCMD_CONT_RX_ACT;
125 125
126typedef PREPACK struct { 126typedef PREPACK struct {
127 A_UINT32 testCmdId; 127 u32 testCmdId;
128 A_UINT32 act; 128 u32 act;
129 A_UINT32 enANI; 129 u32 enANI;
130 PREPACK union { 130 PREPACK union {
131 struct PREPACK TCMD_CONT_RX_PARA { 131 struct PREPACK TCMD_CONT_RX_PARA {
132 A_UINT32 freq; 132 u32 freq;
133 A_UINT32 antenna; 133 u32 antenna;
134 A_UINT32 wlanMode; 134 u32 wlanMode;
135 } POSTPACK para; 135 } POSTPACK para;
136 struct PREPACK TCMD_CONT_RX_REPORT { 136 struct PREPACK TCMD_CONT_RX_REPORT {
137 A_UINT32 totalPkt; 137 u32 totalPkt;
138 A_INT32 rssiInDBm; 138 A_INT32 rssiInDBm;
139 A_UINT32 crcErrPkt; 139 u32 crcErrPkt;
140 A_UINT32 secErrPkt; 140 u32 secErrPkt;
141 u16 rateCnt[TCMD_MAX_RATES]; 141 u16 rateCnt[TCMD_MAX_RATES];
142 u16 rateCntShortGuard[TCMD_MAX_RATES]; 142 u16 rateCntShortGuard[TCMD_MAX_RATES];
143 } POSTPACK report; 143 } POSTPACK report;
@@ -145,8 +145,8 @@ typedef PREPACK struct {
145 A_UCHAR addr[ATH_MAC_LEN]; 145 A_UCHAR addr[ATH_MAC_LEN];
146 } POSTPACK mac; 146 } POSTPACK mac;
147 struct PREPACK TCMD_CONT_RX_ANT_SWITCH_TABLE { 147 struct PREPACK TCMD_CONT_RX_ANT_SWITCH_TABLE {
148 A_UINT32 antswitch1; 148 u32 antswitch1;
149 A_UINT32 antswitch2; 149 u32 antswitch2;
150 }POSTPACK antswitchtable; 150 }POSTPACK antswitchtable;
151 } POSTPACK u; 151 } POSTPACK u;
152} POSTPACK TCMD_CONT_RX; 152} POSTPACK TCMD_CONT_RX;
@@ -162,8 +162,8 @@ typedef enum {
162} TCMD_PM_MODE; 162} TCMD_PM_MODE;
163 163
164typedef PREPACK struct { 164typedef PREPACK struct {
165 A_UINT32 testCmdId; 165 u32 testCmdId;
166 A_UINT32 mode; 166 u32 mode;
167} POSTPACK TCMD_PM; 167} POSTPACK TCMD_PM;
168 168
169typedef enum { 169typedef enum {
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h
index d4f8d404b6e..1f90975aac6 100644
--- a/drivers/staging/ath6kl/include/common/wmi.h
+++ b/drivers/staging/ath6kl/include/common/wmi.h
@@ -70,7 +70,7 @@ extern "C" {
70#endif 70#endif
71 71
72PREPACK struct host_app_area_s { 72PREPACK struct host_app_area_s {
73 A_UINT32 wmi_protocol_ver; 73 u32 wmi_protocol_ver;
74} POSTPACK; 74} POSTPACK;
75 75
76/* 76/*
@@ -533,7 +533,7 @@ typedef PREPACK struct {
533 A_UCHAR ssid[WMI_MAX_SSID_LEN]; 533 A_UCHAR ssid[WMI_MAX_SSID_LEN];
534 u16 channel; 534 u16 channel;
535 u8 bssid[ATH_MAC_LEN]; 535 u8 bssid[ATH_MAC_LEN];
536 A_UINT32 ctrl_flags; 536 u32 ctrl_flags;
537} POSTPACK WMI_CONNECT_CMD; 537} POSTPACK WMI_CONNECT_CMD;
538 538
539/* 539/*
@@ -637,8 +637,8 @@ typedef enum {
637typedef PREPACK struct { 637typedef PREPACK struct {
638 u32 forceFgScan; 638 u32 forceFgScan;
639 u32 isLegacy; /* For Legacy Cisco AP compatibility */ 639 u32 isLegacy; /* For Legacy Cisco AP compatibility */
640 A_UINT32 homeDwellTime; /* Maximum duration in the home channel(milliseconds) */ 640 u32 homeDwellTime; /* Maximum duration in the home channel(milliseconds) */
641 A_UINT32 forceScanInterval; /* Time interval between scans (milliseconds)*/ 641 u32 forceScanInterval; /* Time interval between scans (milliseconds)*/
642 u8 scanType; /* WMI_SCAN_TYPE */ 642 u8 scanType; /* WMI_SCAN_TYPE */
643 u8 numChannels; /* how many channels follow */ 643 u8 numChannels; /* how many channels follow */
644 u16 channelList[1]; /* channels in Mhz */ 644 u16 channelList[1]; /* channels in Mhz */
@@ -685,7 +685,7 @@ typedef PREPACK struct {
685 u8 scanCtrlFlags; 685 u8 scanCtrlFlags;
686 u16 minact_chdwell_time; /* msec */ 686 u16 minact_chdwell_time; /* msec */
687 u16 maxact_scan_per_ssid; /* max active scans per ssid */ 687 u16 maxact_scan_per_ssid; /* max active scans per ssid */
688 A_UINT32 max_dfsch_act_time; /* msecs */ 688 u32 max_dfsch_act_time; /* msecs */
689} POSTPACK WMI_SCAN_PARAMS_CMD; 689} POSTPACK WMI_SCAN_PARAMS_CMD;
690 690
691/* 691/*
@@ -706,7 +706,7 @@ typedef PREPACK struct {
706 u8 bssFilter; /* see WMI_BSS_FILTER */ 706 u8 bssFilter; /* see WMI_BSS_FILTER */
707 u8 reserved1; /* For alignment */ 707 u8 reserved1; /* For alignment */
708 u16 reserved2; /* For alignment */ 708 u16 reserved2; /* For alignment */
709 A_UINT32 ieMask; 709 u32 ieMask;
710} POSTPACK WMI_BSS_FILTER_CMD; 710} POSTPACK WMI_BSS_FILTER_CMD;
711 711
712/* 712/*
@@ -780,8 +780,8 @@ typedef PREPACK struct {
780} POSTPACK WMI_SET_PARAMS_REPLY; 780} POSTPACK WMI_SET_PARAMS_REPLY;
781 781
782typedef PREPACK struct { 782typedef PREPACK struct {
783 A_UINT32 opcode; 783 u32 opcode;
784 A_UINT32 length; 784 u32 length;
785 char buffer[1]; /* WMI_SET_PARAMS */ 785 char buffer[1]; /* WMI_SET_PARAMS */
786} POSTPACK WMI_SET_PARAMS_CMD; 786} POSTPACK WMI_SET_PARAMS_CMD;
787 787
@@ -849,8 +849,8 @@ typedef enum {
849} WMI_AP_PS_TYPE; 849} WMI_AP_PS_TYPE;
850 850
851typedef PREPACK struct { 851typedef PREPACK struct {
852 A_UINT32 idle_time; /* in msec */ 852 u32 idle_time; /* in msec */
853 A_UINT32 ps_period; /* in usec */ 853 u32 ps_period; /* in usec */
854 u8 sleep_period; /* in ps periods */ 854 u8 sleep_period; /* in ps periods */
855 u8 psType; 855 u8 psType;
856} POSTPACK WMI_AP_PS_CMD; 856} POSTPACK WMI_AP_PS_CMD;
@@ -868,8 +868,8 @@ typedef enum {
868typedef PREPACK struct { 868typedef PREPACK struct {
869 u16 psPollTimeout; /* msec */ 869 u16 psPollTimeout; /* msec */
870 u16 triggerTimeout; /* msec */ 870 u16 triggerTimeout; /* msec */
871 A_UINT32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */ 871 u32 apsdTimPolicy; /* TIM behavior with ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
872 A_UINT32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */ 872 u32 simulatedAPSDTimPolicy; /* TIM behavior with simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
873} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD; 873} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
874 874
875/* 875/*
@@ -928,19 +928,19 @@ typedef PREPACK struct {
928 * WMI_CREATE_PSTREAM_CMDID 928 * WMI_CREATE_PSTREAM_CMDID
929 */ 929 */
930typedef PREPACK struct { 930typedef PREPACK struct {
931 A_UINT32 minServiceInt; /* in milli-sec */ 931 u32 minServiceInt; /* in milli-sec */
932 A_UINT32 maxServiceInt; /* in milli-sec */ 932 u32 maxServiceInt; /* in milli-sec */
933 A_UINT32 inactivityInt; /* in milli-sec */ 933 u32 inactivityInt; /* in milli-sec */
934 A_UINT32 suspensionInt; /* in milli-sec */ 934 u32 suspensionInt; /* in milli-sec */
935 A_UINT32 serviceStartTime; 935 u32 serviceStartTime;
936 A_UINT32 minDataRate; /* in bps */ 936 u32 minDataRate; /* in bps */
937 A_UINT32 meanDataRate; /* in bps */ 937 u32 meanDataRate; /* in bps */
938 A_UINT32 peakDataRate; /* in bps */ 938 u32 peakDataRate; /* in bps */
939 A_UINT32 maxBurstSize; 939 u32 maxBurstSize;
940 A_UINT32 delayBound; 940 u32 delayBound;
941 A_UINT32 minPhyRate; /* in bps */ 941 u32 minPhyRate; /* in bps */
942 A_UINT32 sba; 942 u32 sba;
943 A_UINT32 mediumTime; 943 u32 mediumTime;
944 u16 nominalMSDU; /* in octects */ 944 u16 nominalMSDU; /* in octects */
945 u16 maxMSDU; /* in octects */ 945 u16 maxMSDU; /* in octects */
946 u8 trafficClass; 946 u8 trafficClass;
@@ -995,7 +995,7 @@ typedef PREPACK struct {
995 */ 995 */
996 996
997typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{ 997typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
998 A_UINT32 pollTime; /* Polling time as a factor of LI */ 998 u32 pollTime; /* Polling time as a factor of LI */
999 A_INT16 thresholdAbove1_Val; /* lowest of upper */ 999 A_INT16 thresholdAbove1_Val; /* lowest of upper */
1000 A_INT16 thresholdAbove2_Val; 1000 A_INT16 thresholdAbove2_Val;
1001 A_INT16 thresholdAbove3_Val; 1001 A_INT16 thresholdAbove3_Val;
@@ -1018,7 +1018,7 @@ typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
1018 */ 1018 */
1019 1019
1020typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{ 1020typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{
1021 A_UINT32 pollTime; /* Polling time as a factor of LI */ 1021 u32 pollTime; /* Polling time as a factor of LI */
1022 u8 weight; /* "alpha" */ 1022 u8 weight; /* "alpha" */
1023 u8 thresholdAbove1_Val; /* lowest of uppper*/ 1023 u8 thresholdAbove1_Val; /* lowest of uppper*/
1024 u8 thresholdAbove2_Val; 1024 u8 thresholdAbove2_Val;
@@ -1073,7 +1073,7 @@ typedef PREPACK struct {
1073 * via event, unless the bitmask is set again. 1073 * via event, unless the bitmask is set again.
1074 */ 1074 */
1075typedef PREPACK struct { 1075typedef PREPACK struct {
1076 A_UINT32 bitmask; 1076 u32 bitmask;
1077} POSTPACK WMI_TARGET_ERROR_REPORT_BITMASK; 1077} POSTPACK WMI_TARGET_ERROR_REPORT_BITMASK;
1078 1078
1079/* 1079/*
@@ -1252,7 +1252,7 @@ typedef PREPACK struct {
1252} POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD; 1252} POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD;
1253 1253
1254typedef PREPACK struct { 1254typedef PREPACK struct {
1255 A_UINT32 frequency; 1255 u32 frequency;
1256 u8 threshold; 1256 u8 threshold;
1257} POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD; 1257} POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD;
1258/*---------------------- BTCOEX RELATED -------------------------------------*/ 1258/*---------------------- BTCOEX RELATED -------------------------------------*/
@@ -1329,13 +1329,13 @@ typedef enum {
1329#define BT_SCO_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16) 1329#define BT_SCO_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16)
1330 1330
1331typedef PREPACK struct { 1331typedef PREPACK struct {
1332 A_UINT32 numScoCyclesForceTrigger; /* Number SCO cycles after which 1332 u32 numScoCyclesForceTrigger; /* Number SCO cycles after which
1333 force a pspoll. default = 10 */ 1333 force a pspoll. default = 10 */
1334 A_UINT32 dataResponseTimeout; /* Timeout Waiting for Downlink pkt 1334 u32 dataResponseTimeout; /* Timeout Waiting for Downlink pkt
1335 in response for ps-poll, 1335 in response for ps-poll,
1336 default = 10 msecs */ 1336 default = 10 msecs */
1337 A_UINT32 stompScoRules; 1337 u32 stompScoRules;
1338 A_UINT32 scoOptFlags; /* SCO Options Flags : 1338 u32 scoOptFlags; /* SCO Options Flags :
1339 bits: meaning: 1339 bits: meaning:
1340 0 Allow Close Range Optimization 1340 0 Allow Close Range Optimization
1341 1 Force awake during close range 1341 1 Force awake during close range
@@ -1377,13 +1377,13 @@ typedef PREPACK struct {
1377#define BT_A2DP_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16) 1377#define BT_A2DP_SET_MAX_LOW_RATE_CNT(flags,val) (flags) |= (((val) & 0xFF) << 16)
1378 1378
1379typedef PREPACK struct { 1379typedef PREPACK struct {
1380 A_UINT32 a2dpWlanUsageLimit; /* MAX time firmware uses the medium for 1380 u32 a2dpWlanUsageLimit; /* MAX time firmware uses the medium for
1381 wlan, after it identifies the idle time 1381 wlan, after it identifies the idle time
1382 default (30 msecs) */ 1382 default (30 msecs) */
1383 A_UINT32 a2dpBurstCntMin; /* Minimum number of bluetooth data frames 1383 u32 a2dpBurstCntMin; /* Minimum number of bluetooth data frames
1384 to replenish Wlan Usage limit (default 3) */ 1384 to replenish Wlan Usage limit (default 3) */
1385 A_UINT32 a2dpDataRespTimeout; 1385 u32 a2dpDataRespTimeout;
1386 A_UINT32 a2dpOptFlags; /* A2DP Option flags: 1386 u32 a2dpOptFlags; /* A2DP Option flags:
1387 bits: meaning: 1387 bits: meaning:
1388 0 Allow Close Range Optimization 1388 0 Allow Close Range Optimization
1389 1 Force awake during close range 1389 1 Force awake during close range
@@ -1402,14 +1402,14 @@ typedef PREPACK struct {
1402/* During BT ftp/ BT OPP or any another data based acl profile on bluetooth 1402/* During BT ftp/ BT OPP or any another data based acl profile on bluetooth
1403 (non a2dp).*/ 1403 (non a2dp).*/
1404typedef PREPACK struct { 1404typedef PREPACK struct {
1405 A_UINT32 aclWlanMediumUsageTime; /* Wlan usage time during Acl (non-a2dp) 1405 u32 aclWlanMediumUsageTime; /* Wlan usage time during Acl (non-a2dp)
1406 coexistence (default 30 msecs) */ 1406 coexistence (default 30 msecs) */
1407 A_UINT32 aclBtMediumUsageTime; /* Bt usage time during acl coexistence 1407 u32 aclBtMediumUsageTime; /* Bt usage time during acl coexistence
1408 (default 30 msecs)*/ 1408 (default 30 msecs)*/
1409 A_UINT32 aclDataRespTimeout; 1409 u32 aclDataRespTimeout;
1410 A_UINT32 aclDetectTimeout; /* ACL coexistence enabled if we get 1410 u32 aclDetectTimeout; /* ACL coexistence enabled if we get
1411 10 Pkts in X msec(default 100 msecs) */ 1411 10 Pkts in X msec(default 100 msecs) */
1412 A_UINT32 aclmaxPktCnt; /* No of ACL pkts to receive before 1412 u32 aclmaxPktCnt; /* No of ACL pkts to receive before
1413 enabling ACL coex */ 1413 enabling ACL coex */
1414 1414
1415}POSTPACK BT_PARAMS_ACLCOEX; 1415}POSTPACK BT_PARAMS_ACLCOEX;
@@ -1478,20 +1478,20 @@ typedef PREPACK struct {
1478 * During this the station will be power-save mode. 1478 * During this the station will be power-save mode.
1479 */ 1479 */
1480typedef PREPACK struct { 1480typedef PREPACK struct {
1481 A_UINT32 btInquiryDataFetchFrequency;/* The frequency of querying the AP for data 1481 u32 btInquiryDataFetchFrequency;/* The frequency of querying the AP for data
1482 (via pspoll) is configured by this parameter. 1482 (via pspoll) is configured by this parameter.
1483 "default = 10 ms" */ 1483 "default = 10 ms" */
1484 1484
1485 A_UINT32 protectBmissDurPostBtInquiry;/* The firmware will continue to be in inquiry state 1485 u32 protectBmissDurPostBtInquiry;/* The firmware will continue to be in inquiry state
1486 for configured duration, after inquiry completion 1486 for configured duration, after inquiry completion
1487 . This is to ensure other bluetooth transactions 1487 . This is to ensure other bluetooth transactions
1488 (RDP, SDP profiles, link key exchange ...etc) 1488 (RDP, SDP profiles, link key exchange ...etc)
1489 goes through smoothly without wifi stomping. 1489 goes through smoothly without wifi stomping.
1490 default = 10 secs*/ 1490 default = 10 secs*/
1491 1491
1492 A_UINT32 maxpageStomp; /*Applicable only for STE-BT interface. Currently not 1492 u32 maxpageStomp; /*Applicable only for STE-BT interface. Currently not
1493 used */ 1493 used */
1494 A_UINT32 btInquiryPageFlag; /* Not used */ 1494 u32 btInquiryPageFlag; /* Not used */
1495}POSTPACK WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD; 1495}POSTPACK WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD;
1496 1496
1497/*---------------------WMI_SET_BTCOEX_SCO_CONFIG_CMDID ---------------*/ 1497/*---------------------WMI_SET_BTCOEX_SCO_CONFIG_CMDID ---------------*/
@@ -1509,14 +1509,14 @@ typedef PREPACK struct {
1509#define WMI_SCO_CONFIG_FLAG_IS_BT_MASTER (1 << 2) 1509#define WMI_SCO_CONFIG_FLAG_IS_BT_MASTER (1 << 2)
1510#define WMI_SCO_CONFIG_FLAG_FW_DETECT_OF_PER (1 << 3) 1510#define WMI_SCO_CONFIG_FLAG_FW_DETECT_OF_PER (1 << 3)
1511typedef PREPACK struct { 1511typedef PREPACK struct {
1512 A_UINT32 scoSlots; /* Number of SCO Tx/Rx slots. 1512 u32 scoSlots; /* Number of SCO Tx/Rx slots.
1513 HVx, EV3, 2EV3 = 2 */ 1513 HVx, EV3, 2EV3 = 2 */
1514 A_UINT32 scoIdleSlots; /* Number of Bluetooth idle slots between 1514 u32 scoIdleSlots; /* Number of Bluetooth idle slots between
1515 consecutive SCO Tx/Rx slots 1515 consecutive SCO Tx/Rx slots
1516 HVx, EV3 = 4 1516 HVx, EV3 = 4
1517 2EV3 = 10 1517 2EV3 = 10
1518 */ 1518 */
1519 A_UINT32 scoFlags; /* SCO Options Flags : 1519 u32 scoFlags; /* SCO Options Flags :
1520 bits: meaning: 1520 bits: meaning:
1521 0 Allow Close Range Optimization 1521 0 Allow Close Range Optimization
1522 1 Is EDR capable or Not 1522 1 Is EDR capable or Not
@@ -1524,21 +1524,21 @@ typedef PREPACK struct {
1524 3 Firmware determines the periodicity of SCO. 1524 3 Firmware determines the periodicity of SCO.
1525 */ 1525 */
1526 1526
1527 A_UINT32 linkId; /* applicable to STE-BT - not used */ 1527 u32 linkId; /* applicable to STE-BT - not used */
1528}POSTPACK BTCOEX_SCO_CONFIG; 1528}POSTPACK BTCOEX_SCO_CONFIG;
1529 1529
1530typedef PREPACK struct { 1530typedef PREPACK struct {
1531 A_UINT32 scoCyclesForceTrigger; /* Number SCO cycles after which 1531 u32 scoCyclesForceTrigger; /* Number SCO cycles after which
1532 force a pspoll. default = 10 */ 1532 force a pspoll. default = 10 */
1533 A_UINT32 scoDataResponseTimeout; /* Timeout Waiting for Downlink pkt 1533 u32 scoDataResponseTimeout; /* Timeout Waiting for Downlink pkt
1534 in response for ps-poll, 1534 in response for ps-poll,
1535 default = 20 msecs */ 1535 default = 20 msecs */
1536 1536
1537 A_UINT32 scoStompDutyCyleVal; /* not implemented */ 1537 u32 scoStompDutyCyleVal; /* not implemented */
1538 1538
1539 A_UINT32 scoStompDutyCyleMaxVal; /*Not implemented */ 1539 u32 scoStompDutyCyleMaxVal; /*Not implemented */
1540 1540
1541 A_UINT32 scoPsPollLatencyFraction; /* Fraction of idle 1541 u32 scoPsPollLatencyFraction; /* Fraction of idle
1542 period, within which 1542 period, within which
1543 additional ps-polls can be queued 1543 additional ps-polls can be queued
1544 1 - 1/4 of idle duration 1544 1 - 1/4 of idle duration
@@ -1549,29 +1549,29 @@ typedef PREPACK struct {
1549}POSTPACK BTCOEX_PSPOLLMODE_SCO_CONFIG; 1549}POSTPACK BTCOEX_PSPOLLMODE_SCO_CONFIG;
1550 1550
1551typedef PREPACK struct { 1551typedef PREPACK struct {
1552 A_UINT32 scoStompCntIn100ms;/*max number of SCO stomp in 100ms allowed in 1552 u32 scoStompCntIn100ms;/*max number of SCO stomp in 100ms allowed in
1553 opt mode. If exceeds the configured value, 1553 opt mode. If exceeds the configured value,
1554 switch to ps-poll mode 1554 switch to ps-poll mode
1555 default = 3 */ 1555 default = 3 */
1556 1556
1557 A_UINT32 scoContStompMax; /* max number of continous stomp allowed in opt mode. 1557 u32 scoContStompMax; /* max number of continous stomp allowed in opt mode.
1558 if excedded switch to pspoll mode 1558 if excedded switch to pspoll mode
1559 default = 3 */ 1559 default = 3 */
1560 1560
1561 A_UINT32 scoMinlowRateMbps; /* Low rate threshold */ 1561 u32 scoMinlowRateMbps; /* Low rate threshold */
1562 1562
1563 A_UINT32 scoLowRateCnt; /* number of low rate pkts (< scoMinlowRateMbps) allowed in 100 ms. 1563 u32 scoLowRateCnt; /* number of low rate pkts (< scoMinlowRateMbps) allowed in 100 ms.
1564 If exceeded switch/stay to ps-poll mode, lower stay in opt mode. 1564 If exceeded switch/stay to ps-poll mode, lower stay in opt mode.
1565 default = 36 1565 default = 36
1566 */ 1566 */
1567 1567
1568 A_UINT32 scoHighPktRatio; /*(Total Rx pkts in 100 ms + 1)/ 1568 u32 scoHighPktRatio; /*(Total Rx pkts in 100 ms + 1)/
1569 ((Total tx pkts in 100 ms - No of high rate pkts in 100 ms) + 1) in 100 ms, 1569 ((Total tx pkts in 100 ms - No of high rate pkts in 100 ms) + 1) in 100 ms,
1570 if exceeded switch/stay in opt mode and if lower switch/stay in pspoll mode. 1570 if exceeded switch/stay in opt mode and if lower switch/stay in pspoll mode.
1571 default = 5 (80% of high rates) 1571 default = 5 (80% of high rates)
1572 */ 1572 */
1573 1573
1574 A_UINT32 scoMaxAggrSize; /* Max number of Rx subframes allowed in this mode. (Firmware re-negogiates 1574 u32 scoMaxAggrSize; /* Max number of Rx subframes allowed in this mode. (Firmware re-negogiates
1575 max number of aggregates if it was negogiated to higher value 1575 max number of aggregates if it was negogiated to higher value
1576 default = 1 1576 default = 1
1577 Recommended value Basic rate headsets = 1, EDR (2-EV3) =4. 1577 Recommended value Basic rate headsets = 1, EDR (2-EV3) =4.
@@ -1579,8 +1579,8 @@ typedef PREPACK struct {
1579}POSTPACK BTCOEX_OPTMODE_SCO_CONFIG; 1579}POSTPACK BTCOEX_OPTMODE_SCO_CONFIG;
1580 1580
1581typedef PREPACK struct { 1581typedef PREPACK struct {
1582 A_UINT32 scanInterval; 1582 u32 scanInterval;
1583 A_UINT32 maxScanStompCnt; 1583 u32 maxScanStompCnt;
1584}POSTPACK BTCOEX_WLANSCAN_SCO_CONFIG; 1584}POSTPACK BTCOEX_WLANSCAN_SCO_CONFIG;
1585 1585
1586typedef PREPACK struct { 1586typedef PREPACK struct {
@@ -1608,7 +1608,7 @@ typedef PREPACK struct {
1608#define WMI_A2DP_CONFIG_FLAG_FIND_BT_ROLE (1 << 4) 1608#define WMI_A2DP_CONFIG_FLAG_FIND_BT_ROLE (1 << 4)
1609 1609
1610typedef PREPACK struct { 1610typedef PREPACK struct {
1611 A_UINT32 a2dpFlags; /* A2DP Option flags: 1611 u32 a2dpFlags; /* A2DP Option flags:
1612 bits: meaning: 1612 bits: meaning:
1613 0 Allow Close Range Optimization 1613 0 Allow Close Range Optimization
1614 1 IS EDR capable 1614 1 IS EDR capable
@@ -1616,19 +1616,19 @@ typedef PREPACK struct {
1616 3 a2dp traffic is high priority 1616 3 a2dp traffic is high priority
1617 4 Fw detect the role of bluetooth. 1617 4 Fw detect the role of bluetooth.
1618 */ 1618 */
1619 A_UINT32 linkId; /* Applicable only to STE-BT - not used */ 1619 u32 linkId; /* Applicable only to STE-BT - not used */
1620 1620
1621}POSTPACK BTCOEX_A2DP_CONFIG; 1621}POSTPACK BTCOEX_A2DP_CONFIG;
1622 1622
1623typedef PREPACK struct { 1623typedef PREPACK struct {
1624 A_UINT32 a2dpWlanMaxDur; /* MAX time firmware uses the medium for 1624 u32 a2dpWlanMaxDur; /* MAX time firmware uses the medium for
1625 wlan, after it identifies the idle time 1625 wlan, after it identifies the idle time
1626 default (30 msecs) */ 1626 default (30 msecs) */
1627 1627
1628 A_UINT32 a2dpMinBurstCnt; /* Minimum number of bluetooth data frames 1628 u32 a2dpMinBurstCnt; /* Minimum number of bluetooth data frames
1629 to replenish Wlan Usage limit (default 3) */ 1629 to replenish Wlan Usage limit (default 3) */
1630 1630
1631 A_UINT32 a2dpDataRespTimeout; /* Max duration firmware waits for downlink 1631 u32 a2dpDataRespTimeout; /* Max duration firmware waits for downlink
1632 by stomping on bluetooth 1632 by stomping on bluetooth
1633 after ps-poll is acknowledged. 1633 after ps-poll is acknowledged.
1634 default = 20 ms 1634 default = 20 ms
@@ -1636,25 +1636,25 @@ typedef PREPACK struct {
1636}POSTPACK BTCOEX_PSPOLLMODE_A2DP_CONFIG; 1636}POSTPACK BTCOEX_PSPOLLMODE_A2DP_CONFIG;
1637 1637
1638typedef PREPACK struct { 1638typedef PREPACK struct {
1639 A_UINT32 a2dpMinlowRateMbps; /* Low rate threshold */ 1639 u32 a2dpMinlowRateMbps; /* Low rate threshold */
1640 1640
1641 A_UINT32 a2dpLowRateCnt; /* number of low rate pkts (< a2dpMinlowRateMbps) allowed in 100 ms. 1641 u32 a2dpLowRateCnt; /* number of low rate pkts (< a2dpMinlowRateMbps) allowed in 100 ms.
1642 If exceeded switch/stay to ps-poll mode, lower stay in opt mode. 1642 If exceeded switch/stay to ps-poll mode, lower stay in opt mode.
1643 default = 36 1643 default = 36
1644 */ 1644 */
1645 1645
1646 A_UINT32 a2dpHighPktRatio; /*(Total Rx pkts in 100 ms + 1)/ 1646 u32 a2dpHighPktRatio; /*(Total Rx pkts in 100 ms + 1)/
1647 ((Total tx pkts in 100 ms - No of high rate pkts in 100 ms) + 1) in 100 ms, 1647 ((Total tx pkts in 100 ms - No of high rate pkts in 100 ms) + 1) in 100 ms,
1648 if exceeded switch/stay in opt mode and if lower switch/stay in pspoll mode. 1648 if exceeded switch/stay in opt mode and if lower switch/stay in pspoll mode.
1649 default = 5 (80% of high rates) 1649 default = 5 (80% of high rates)
1650 */ 1650 */
1651 1651
1652 A_UINT32 a2dpMaxAggrSize; /* Max number of Rx subframes allowed in this mode. (Firmware re-negogiates 1652 u32 a2dpMaxAggrSize; /* Max number of Rx subframes allowed in this mode. (Firmware re-negogiates
1653 max number of aggregates if it was negogiated to higher value 1653 max number of aggregates if it was negogiated to higher value
1654 default = 1 1654 default = 1
1655 Recommended value Basic rate headsets = 1, EDR (2-EV3) =8. 1655 Recommended value Basic rate headsets = 1, EDR (2-EV3) =8.
1656 */ 1656 */
1657 A_UINT32 a2dpPktStompCnt; /*number of a2dp pkts that can be stomped per burst. 1657 u32 a2dpPktStompCnt; /*number of a2dp pkts that can be stomped per burst.
1658 default = 6*/ 1658 default = 6*/
1659 1659
1660}POSTPACK BTCOEX_OPTMODE_A2DP_CONFIG; 1660}POSTPACK BTCOEX_OPTMODE_A2DP_CONFIG;
@@ -1683,15 +1683,15 @@ typedef PREPACK struct {
1683#define WMI_ACLCOEX_FLAGS_DISABLE_FW_DETECTION (1 << 1) 1683#define WMI_ACLCOEX_FLAGS_DISABLE_FW_DETECTION (1 << 1)
1684 1684
1685typedef PREPACK struct { 1685typedef PREPACK struct {
1686 A_UINT32 aclWlanMediumDur; /* Wlan usage time during Acl (non-a2dp) 1686 u32 aclWlanMediumDur; /* Wlan usage time during Acl (non-a2dp)
1687 coexistence (default 30 msecs) 1687 coexistence (default 30 msecs)
1688 */ 1688 */
1689 1689
1690 A_UINT32 aclBtMediumDur; /* Bt usage time during acl coexistence 1690 u32 aclBtMediumDur; /* Bt usage time during acl coexistence
1691 (default 30 msecs) 1691 (default 30 msecs)
1692 */ 1692 */
1693 1693
1694 A_UINT32 aclDetectTimeout; /* BT activity observation time limit. 1694 u32 aclDetectTimeout; /* BT activity observation time limit.
1695 In this time duration, number of bt pkts are counted. 1695 In this time duration, number of bt pkts are counted.
1696 If the Cnt reaches "aclPktCntLowerLimit" value 1696 If the Cnt reaches "aclPktCntLowerLimit" value
1697 for "aclIterToEnableCoex" iteration continuously, 1697 for "aclIterToEnableCoex" iteration continuously,
@@ -1703,7 +1703,7 @@ typedef PREPACK struct {
1703 -default 100 msecs 1703 -default 100 msecs
1704 */ 1704 */
1705 1705
1706 A_UINT32 aclPktCntLowerLimit; /* Acl Pkt Cnt to be received in duration of 1706 u32 aclPktCntLowerLimit; /* Acl Pkt Cnt to be received in duration of
1707 "aclDetectTimeout" for 1707 "aclDetectTimeout" for
1708 "aclIterForEnDis" times to enabling ACL coex. 1708 "aclIterForEnDis" times to enabling ACL coex.
1709 Similar logic is used to disable acl coexistence. 1709 Similar logic is used to disable acl coexistence.
@@ -1713,28 +1713,28 @@ typedef PREPACK struct {
1713 default = 10 1713 default = 10
1714 */ 1714 */
1715 1715
1716 A_UINT32 aclIterForEnDis; /* number of Iteration of "aclPktCntLowerLimit" for Enabling and 1716 u32 aclIterForEnDis; /* number of Iteration of "aclPktCntLowerLimit" for Enabling and
1717 Disabling Acl Coexistence. 1717 Disabling Acl Coexistence.
1718 default = 3 1718 default = 3
1719 */ 1719 */
1720 1720
1721 A_UINT32 aclPktCntUpperLimit; /* This is upperBound limit, if there is more than 1721 u32 aclPktCntUpperLimit; /* This is upperBound limit, if there is more than
1722 "aclPktCntUpperLimit" seen in "aclDetectTimeout", 1722 "aclPktCntUpperLimit" seen in "aclDetectTimeout",
1723 ACL coexistence is enabled right away. 1723 ACL coexistence is enabled right away.
1724 - default 15*/ 1724 - default 15*/
1725 1725
1726 A_UINT32 aclCoexFlags; /* A2DP Option flags: 1726 u32 aclCoexFlags; /* A2DP Option flags:
1727 bits: meaning: 1727 bits: meaning:
1728 0 Allow Close Range Optimization 1728 0 Allow Close Range Optimization
1729 1 disable Firmware detection 1729 1 disable Firmware detection
1730 (Currently supported configuration is aclCoexFlags =0) 1730 (Currently supported configuration is aclCoexFlags =0)
1731 */ 1731 */
1732 A_UINT32 linkId; /* Applicable only for STE-BT - not used */ 1732 u32 linkId; /* Applicable only for STE-BT - not used */
1733 1733
1734}POSTPACK BTCOEX_ACLCOEX_CONFIG; 1734}POSTPACK BTCOEX_ACLCOEX_CONFIG;
1735 1735
1736typedef PREPACK struct { 1736typedef PREPACK struct {
1737 A_UINT32 aclDataRespTimeout; /* Max duration firmware waits for downlink 1737 u32 aclDataRespTimeout; /* Max duration firmware waits for downlink
1738 by stomping on bluetooth 1738 by stomping on bluetooth
1739 after ps-poll is acknowledged. 1739 after ps-poll is acknowledged.
1740 default = 20 ms */ 1740 default = 20 ms */
@@ -1744,11 +1744,11 @@ typedef PREPACK struct {
1744 1744
1745/* Not implemented yet*/ 1745/* Not implemented yet*/
1746typedef PREPACK struct { 1746typedef PREPACK struct {
1747 A_UINT32 aclCoexMinlowRateMbps; 1747 u32 aclCoexMinlowRateMbps;
1748 A_UINT32 aclCoexLowRateCnt; 1748 u32 aclCoexLowRateCnt;
1749 A_UINT32 aclCoexHighPktRatio; 1749 u32 aclCoexHighPktRatio;
1750 A_UINT32 aclCoexMaxAggrSize; 1750 u32 aclCoexMaxAggrSize;
1751 A_UINT32 aclPktStompCnt; 1751 u32 aclPktStompCnt;
1752}POSTPACK BTCOEX_OPTMODE_ACLCOEX_CONFIG; 1752}POSTPACK BTCOEX_OPTMODE_ACLCOEX_CONFIG;
1753 1753
1754typedef PREPACK struct { 1754typedef PREPACK struct {
@@ -1766,39 +1766,39 @@ typedef enum {
1766}WMI_BTCOEX_BT_PROFILE; 1766}WMI_BTCOEX_BT_PROFILE;
1767 1767
1768typedef PREPACK struct { 1768typedef PREPACK struct {
1769 A_UINT32 btProfileType; 1769 u32 btProfileType;
1770 A_UINT32 btOperatingStatus; 1770 u32 btOperatingStatus;
1771 A_UINT32 btLinkId; 1771 u32 btLinkId;
1772}WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD; 1772}WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD;
1773 1773
1774/*--------------------- WMI_SET_BTCOEX_DEBUG_CMDID ---------------------*/ 1774/*--------------------- WMI_SET_BTCOEX_DEBUG_CMDID ---------------------*/
1775/* Used for firmware development and debugging */ 1775/* Used for firmware development and debugging */
1776typedef PREPACK struct { 1776typedef PREPACK struct {
1777 A_UINT32 btcoexDbgParam1; 1777 u32 btcoexDbgParam1;
1778 A_UINT32 btcoexDbgParam2; 1778 u32 btcoexDbgParam2;
1779 A_UINT32 btcoexDbgParam3; 1779 u32 btcoexDbgParam3;
1780 A_UINT32 btcoexDbgParam4; 1780 u32 btcoexDbgParam4;
1781 A_UINT32 btcoexDbgParam5; 1781 u32 btcoexDbgParam5;
1782}WMI_SET_BTCOEX_DEBUG_CMD; 1782}WMI_SET_BTCOEX_DEBUG_CMD;
1783 1783
1784/*---------------------WMI_GET_BTCOEX_CONFIG_CMDID --------------------- */ 1784/*---------------------WMI_GET_BTCOEX_CONFIG_CMDID --------------------- */
1785/* Command to firmware to get configuration parameters of the bt profile 1785/* Command to firmware to get configuration parameters of the bt profile
1786 * reported via WMI_BTCOEX_CONFIG_EVENTID */ 1786 * reported via WMI_BTCOEX_CONFIG_EVENTID */
1787typedef PREPACK struct { 1787typedef PREPACK struct {
1788 A_UINT32 btProfileType; /* 1 - SCO 1788 u32 btProfileType; /* 1 - SCO
1789 2 - A2DP 1789 2 - A2DP
1790 3 - INQUIRY_PAGE 1790 3 - INQUIRY_PAGE
1791 4 - ACLCOEX 1791 4 - ACLCOEX
1792 */ 1792 */
1793 A_UINT32 linkId; /* not used */ 1793 u32 linkId; /* not used */
1794}WMI_GET_BTCOEX_CONFIG_CMD; 1794}WMI_GET_BTCOEX_CONFIG_CMD;
1795 1795
1796/*------------------WMI_REPORT_BTCOEX_CONFIG_EVENTID------------------- */ 1796/*------------------WMI_REPORT_BTCOEX_CONFIG_EVENTID------------------- */
1797/* Event from firmware to host, sent in response to WMI_GET_BTCOEX_CONFIG_CMDID 1797/* Event from firmware to host, sent in response to WMI_GET_BTCOEX_CONFIG_CMDID
1798 * */ 1798 * */
1799typedef PREPACK struct { 1799typedef PREPACK struct {
1800 A_UINT32 btProfileType; 1800 u32 btProfileType;
1801 A_UINT32 linkId; /* not used */ 1801 u32 linkId; /* not used */
1802 PREPACK union { 1802 PREPACK union {
1803 WMI_SET_BTCOEX_SCO_CONFIG_CMD scoConfigCmd; 1803 WMI_SET_BTCOEX_SCO_CONFIG_CMD scoConfigCmd;
1804 WMI_SET_BTCOEX_A2DP_CONFIG_CMD a2dpConfigCmd; 1804 WMI_SET_BTCOEX_A2DP_CONFIG_CMD a2dpConfigCmd;
@@ -1810,32 +1810,32 @@ typedef PREPACK struct {
1810/*------------- WMI_REPORT_BTCOEX_BTCOEX_STATS_EVENTID--------------------*/ 1810/*------------- WMI_REPORT_BTCOEX_BTCOEX_STATS_EVENTID--------------------*/
1811/* Used for firmware development and debugging*/ 1811/* Used for firmware development and debugging*/
1812typedef PREPACK struct { 1812typedef PREPACK struct {
1813 A_UINT32 highRatePktCnt; 1813 u32 highRatePktCnt;
1814 A_UINT32 firstBmissCnt; 1814 u32 firstBmissCnt;
1815 A_UINT32 psPollFailureCnt; 1815 u32 psPollFailureCnt;
1816 A_UINT32 nullFrameFailureCnt; 1816 u32 nullFrameFailureCnt;
1817 A_UINT32 optModeTransitionCnt; 1817 u32 optModeTransitionCnt;
1818}BTCOEX_GENERAL_STATS; 1818}BTCOEX_GENERAL_STATS;
1819 1819
1820typedef PREPACK struct { 1820typedef PREPACK struct {
1821 A_UINT32 scoStompCntAvg; 1821 u32 scoStompCntAvg;
1822 A_UINT32 scoStompIn100ms; 1822 u32 scoStompIn100ms;
1823 A_UINT32 scoMaxContStomp; 1823 u32 scoMaxContStomp;
1824 A_UINT32 scoAvgNoRetries; 1824 u32 scoAvgNoRetries;
1825 A_UINT32 scoMaxNoRetriesIn100ms; 1825 u32 scoMaxNoRetriesIn100ms;
1826}BTCOEX_SCO_STATS; 1826}BTCOEX_SCO_STATS;
1827 1827
1828typedef PREPACK struct { 1828typedef PREPACK struct {
1829 A_UINT32 a2dpBurstCnt; 1829 u32 a2dpBurstCnt;
1830 A_UINT32 a2dpMaxBurstCnt; 1830 u32 a2dpMaxBurstCnt;
1831 A_UINT32 a2dpAvgIdletimeIn100ms; 1831 u32 a2dpAvgIdletimeIn100ms;
1832 A_UINT32 a2dpAvgStompCnt; 1832 u32 a2dpAvgStompCnt;
1833}BTCOEX_A2DP_STATS; 1833}BTCOEX_A2DP_STATS;
1834 1834
1835typedef PREPACK struct { 1835typedef PREPACK struct {
1836 A_UINT32 aclPktCntInBtTime; 1836 u32 aclPktCntInBtTime;
1837 A_UINT32 aclStompCntInWlanTime; 1837 u32 aclStompCntInWlanTime;
1838 A_UINT32 aclPktCntIn100ms; 1838 u32 aclPktCntIn100ms;
1839}BTCOEX_ACLCOEX_STATS; 1839}BTCOEX_ACLCOEX_STATS;
1840 1840
1841typedef PREPACK struct { 1841typedef PREPACK struct {
@@ -1848,7 +1848,7 @@ typedef PREPACK struct {
1848 1848
1849/*--------------------------END OF BTCOEX -------------------------------------*/ 1849/*--------------------------END OF BTCOEX -------------------------------------*/
1850typedef PREPACK struct { 1850typedef PREPACK struct {
1851 A_UINT32 sleepState; 1851 u32 sleepState;
1852}WMI_REPORT_SLEEP_STATE_EVENT; 1852}WMI_REPORT_SLEEP_STATE_EVENT;
1853 1853
1854typedef enum { 1854typedef enum {
@@ -1861,7 +1861,7 @@ typedef enum {
1861} TARGET_EVENT_REPORT_CONFIG; 1861} TARGET_EVENT_REPORT_CONFIG;
1862 1862
1863typedef PREPACK struct { 1863typedef PREPACK struct {
1864 A_UINT32 evtConfig; 1864 u32 evtConfig;
1865} POSTPACK WMI_SET_TARGET_EVENT_REPORT_CMD; 1865} POSTPACK WMI_SET_TARGET_EVENT_REPORT_CMD;
1866 1866
1867 1867
@@ -1981,8 +1981,8 @@ typedef PREPACK struct {
1981} POSTPACK WMI_READY_EVENT_1; 1981} POSTPACK WMI_READY_EVENT_1;
1982 1982
1983typedef PREPACK struct { 1983typedef PREPACK struct {
1984 A_UINT32 sw_version; 1984 u32 sw_version;
1985 A_UINT32 abi_version; 1985 u32 abi_version;
1986 u8 macaddr[ATH_MAC_LEN]; 1986 u8 macaddr[ATH_MAC_LEN];
1987 u8 phyCapability; /* WMI_PHY_CAPABILITY */ 1987 u8 phyCapability; /* WMI_PHY_CAPABILITY */
1988} POSTPACK WMI_READY_EVENT_2; 1988} POSTPACK WMI_READY_EVENT_2;
@@ -2006,7 +2006,7 @@ typedef PREPACK struct {
2006 u8 bssid[ATH_MAC_LEN]; 2006 u8 bssid[ATH_MAC_LEN];
2007 u16 listenInterval; 2007 u16 listenInterval;
2008 u16 beaconInterval; 2008 u16 beaconInterval;
2009 A_UINT32 networkType; 2009 u32 networkType;
2010 u8 beaconIeLen; 2010 u8 beaconIeLen;
2011 u8 assocReqLen; 2011 u8 assocReqLen;
2012 u8 assocRespLen; 2012 u8 assocRespLen;
@@ -2064,7 +2064,7 @@ typedef PREPACK struct {
2064 u8 snr; 2064 u8 snr;
2065 A_INT16 rssi; 2065 A_INT16 rssi;
2066 u8 bssid[ATH_MAC_LEN]; 2066 u8 bssid[ATH_MAC_LEN];
2067 A_UINT32 ieMask; 2067 u32 ieMask;
2068} POSTPACK WMI_BSS_INFO_HDR; 2068} POSTPACK WMI_BSS_INFO_HDR;
2069 2069
2070/* 2070/*
@@ -2101,7 +2101,7 @@ typedef PREPACK struct {
2101 * New Regulatory Domain Event 2101 * New Regulatory Domain Event
2102 */ 2102 */
2103typedef PREPACK struct { 2103typedef PREPACK struct {
2104 A_UINT32 regDomain; 2104 u32 regDomain;
2105} POSTPACK WMI_REG_DOMAIN_EVENT; 2105} POSTPACK WMI_REG_DOMAIN_EVENT;
2106 2106
2107typedef PREPACK struct { 2107typedef PREPACK struct {
@@ -2216,56 +2216,56 @@ typedef PREPACK struct {
2216 * Reporting statistics. 2216 * Reporting statistics.
2217 */ 2217 */
2218typedef PREPACK struct { 2218typedef PREPACK struct {
2219 A_UINT32 tx_packets; 2219 u32 tx_packets;
2220 A_UINT32 tx_bytes; 2220 u32 tx_bytes;
2221 A_UINT32 tx_unicast_pkts; 2221 u32 tx_unicast_pkts;
2222 A_UINT32 tx_unicast_bytes; 2222 u32 tx_unicast_bytes;
2223 A_UINT32 tx_multicast_pkts; 2223 u32 tx_multicast_pkts;
2224 A_UINT32 tx_multicast_bytes; 2224 u32 tx_multicast_bytes;
2225 A_UINT32 tx_broadcast_pkts; 2225 u32 tx_broadcast_pkts;
2226 A_UINT32 tx_broadcast_bytes; 2226 u32 tx_broadcast_bytes;
2227 A_UINT32 tx_rts_success_cnt; 2227 u32 tx_rts_success_cnt;
2228 A_UINT32 tx_packet_per_ac[4]; 2228 u32 tx_packet_per_ac[4];
2229 A_UINT32 tx_errors_per_ac[4]; 2229 u32 tx_errors_per_ac[4];
2230 2230
2231 A_UINT32 tx_errors; 2231 u32 tx_errors;
2232 A_UINT32 tx_failed_cnt; 2232 u32 tx_failed_cnt;
2233 A_UINT32 tx_retry_cnt; 2233 u32 tx_retry_cnt;
2234 A_UINT32 tx_mult_retry_cnt; 2234 u32 tx_mult_retry_cnt;
2235 A_UINT32 tx_rts_fail_cnt; 2235 u32 tx_rts_fail_cnt;
2236 A_INT32 tx_unicast_rate; 2236 A_INT32 tx_unicast_rate;
2237}POSTPACK tx_stats_t; 2237}POSTPACK tx_stats_t;
2238 2238
2239typedef PREPACK struct { 2239typedef PREPACK struct {
2240 A_UINT32 rx_packets; 2240 u32 rx_packets;
2241 A_UINT32 rx_bytes; 2241 u32 rx_bytes;
2242 A_UINT32 rx_unicast_pkts; 2242 u32 rx_unicast_pkts;
2243 A_UINT32 rx_unicast_bytes; 2243 u32 rx_unicast_bytes;
2244 A_UINT32 rx_multicast_pkts; 2244 u32 rx_multicast_pkts;
2245 A_UINT32 rx_multicast_bytes; 2245 u32 rx_multicast_bytes;
2246 A_UINT32 rx_broadcast_pkts; 2246 u32 rx_broadcast_pkts;
2247 A_UINT32 rx_broadcast_bytes; 2247 u32 rx_broadcast_bytes;
2248 A_UINT32 rx_fragment_pkt; 2248 u32 rx_fragment_pkt;
2249 2249
2250 A_UINT32 rx_errors; 2250 u32 rx_errors;
2251 A_UINT32 rx_crcerr; 2251 u32 rx_crcerr;
2252 A_UINT32 rx_key_cache_miss; 2252 u32 rx_key_cache_miss;
2253 A_UINT32 rx_decrypt_err; 2253 u32 rx_decrypt_err;
2254 A_UINT32 rx_duplicate_frames; 2254 u32 rx_duplicate_frames;
2255 A_INT32 rx_unicast_rate; 2255 A_INT32 rx_unicast_rate;
2256}POSTPACK rx_stats_t; 2256}POSTPACK rx_stats_t;
2257 2257
2258typedef PREPACK struct { 2258typedef PREPACK struct {
2259 A_UINT32 tkip_local_mic_failure; 2259 u32 tkip_local_mic_failure;
2260 A_UINT32 tkip_counter_measures_invoked; 2260 u32 tkip_counter_measures_invoked;
2261 A_UINT32 tkip_replays; 2261 u32 tkip_replays;
2262 A_UINT32 tkip_format_errors; 2262 u32 tkip_format_errors;
2263 A_UINT32 ccmp_format_errors; 2263 u32 ccmp_format_errors;
2264 A_UINT32 ccmp_replays; 2264 u32 ccmp_replays;
2265}POSTPACK tkip_ccmp_stats_t; 2265}POSTPACK tkip_ccmp_stats_t;
2266 2266
2267typedef PREPACK struct { 2267typedef PREPACK struct {
2268 A_UINT32 power_save_failure_cnt; 2268 u32 power_save_failure_cnt;
2269 u16 stop_tx_failure_cnt; 2269 u16 stop_tx_failure_cnt;
2270 u16 atim_tx_failure_cnt; 2270 u16 atim_tx_failure_cnt;
2271 u16 atim_rx_failure_cnt; 2271 u16 atim_rx_failure_cnt;
@@ -2273,8 +2273,8 @@ typedef PREPACK struct {
2273}POSTPACK pm_stats_t; 2273}POSTPACK pm_stats_t;
2274 2274
2275typedef PREPACK struct { 2275typedef PREPACK struct {
2276 A_UINT32 cs_bmiss_cnt; 2276 u32 cs_bmiss_cnt;
2277 A_UINT32 cs_lowRssi_cnt; 2277 u32 cs_lowRssi_cnt;
2278 u16 cs_connect_cnt; 2278 u16 cs_connect_cnt;
2279 u16 cs_disconnect_cnt; 2279 u16 cs_disconnect_cnt;
2280 A_INT16 cs_aveBeacon_rssi; 2280 A_INT16 cs_aveBeacon_rssi;
@@ -2292,20 +2292,20 @@ typedef PREPACK struct {
2292}POSTPACK wlan_net_stats_t; 2292}POSTPACK wlan_net_stats_t;
2293 2293
2294typedef PREPACK struct { 2294typedef PREPACK struct {
2295 A_UINT32 arp_received; 2295 u32 arp_received;
2296 A_UINT32 arp_matched; 2296 u32 arp_matched;
2297 A_UINT32 arp_replied; 2297 u32 arp_replied;
2298} POSTPACK arp_stats_t; 2298} POSTPACK arp_stats_t;
2299 2299
2300typedef PREPACK struct { 2300typedef PREPACK struct {
2301 A_UINT32 wow_num_pkts_dropped; 2301 u32 wow_num_pkts_dropped;
2302 u16 wow_num_events_discarded; 2302 u16 wow_num_events_discarded;
2303 u8 wow_num_host_pkt_wakeups; 2303 u8 wow_num_host_pkt_wakeups;
2304 u8 wow_num_host_event_wakeups; 2304 u8 wow_num_host_event_wakeups;
2305} POSTPACK wlan_wow_stats_t; 2305} POSTPACK wlan_wow_stats_t;
2306 2306
2307typedef PREPACK struct { 2307typedef PREPACK struct {
2308 A_UINT32 lqVal; 2308 u32 lqVal;
2309 A_INT32 noise_floor_calibation; 2309 A_INT32 noise_floor_calibation;
2310 pm_stats_t pmStats; 2310 pm_stats_t pmStats;
2311 wlan_net_stats_t txrxStats; 2311 wlan_net_stats_t txrxStats;
@@ -2353,7 +2353,7 @@ typedef enum{
2353} WMI_TARGET_ERROR_VAL; 2353} WMI_TARGET_ERROR_VAL;
2354 2354
2355typedef PREPACK struct { 2355typedef PREPACK struct {
2356 A_UINT32 errorVal; 2356 u32 errorVal;
2357}POSTPACK WMI_TARGET_ERROR_REPORT_EVENT; 2357}POSTPACK WMI_TARGET_ERROR_REPORT_EVENT;
2358 2358
2359typedef PREPACK struct { 2359typedef PREPACK struct {
@@ -2522,43 +2522,43 @@ typedef PREPACK struct {
2522 * 2522 *
2523 * Get fix rates cmd uses same definition as set fix rates cmd 2523 * Get fix rates cmd uses same definition as set fix rates cmd
2524 */ 2524 */
2525#define FIX_RATE_1Mb ((A_UINT32)0x1) 2525#define FIX_RATE_1Mb ((u32)0x1)
2526#define FIX_RATE_2Mb ((A_UINT32)0x2) 2526#define FIX_RATE_2Mb ((u32)0x2)
2527#define FIX_RATE_5_5Mb ((A_UINT32)0x4) 2527#define FIX_RATE_5_5Mb ((u32)0x4)
2528#define FIX_RATE_11Mb ((A_UINT32)0x8) 2528#define FIX_RATE_11Mb ((u32)0x8)
2529#define FIX_RATE_6Mb ((A_UINT32)0x10) 2529#define FIX_RATE_6Mb ((u32)0x10)
2530#define FIX_RATE_9Mb ((A_UINT32)0x20) 2530#define FIX_RATE_9Mb ((u32)0x20)
2531#define FIX_RATE_12Mb ((A_UINT32)0x40) 2531#define FIX_RATE_12Mb ((u32)0x40)
2532#define FIX_RATE_18Mb ((A_UINT32)0x80) 2532#define FIX_RATE_18Mb ((u32)0x80)
2533#define FIX_RATE_24Mb ((A_UINT32)0x100) 2533#define FIX_RATE_24Mb ((u32)0x100)
2534#define FIX_RATE_36Mb ((A_UINT32)0x200) 2534#define FIX_RATE_36Mb ((u32)0x200)
2535#define FIX_RATE_48Mb ((A_UINT32)0x400) 2535#define FIX_RATE_48Mb ((u32)0x400)
2536#define FIX_RATE_54Mb ((A_UINT32)0x800) 2536#define FIX_RATE_54Mb ((u32)0x800)
2537#define FIX_RATE_MCS_0_20 ((A_UINT32)0x1000) 2537#define FIX_RATE_MCS_0_20 ((u32)0x1000)
2538#define FIX_RATE_MCS_1_20 ((A_UINT32)0x2000) 2538#define FIX_RATE_MCS_1_20 ((u32)0x2000)
2539#define FIX_RATE_MCS_2_20 ((A_UINT32)0x4000) 2539#define FIX_RATE_MCS_2_20 ((u32)0x4000)
2540#define FIX_RATE_MCS_3_20 ((A_UINT32)0x8000) 2540#define FIX_RATE_MCS_3_20 ((u32)0x8000)
2541#define FIX_RATE_MCS_4_20 ((A_UINT32)0x10000) 2541#define FIX_RATE_MCS_4_20 ((u32)0x10000)
2542#define FIX_RATE_MCS_5_20 ((A_UINT32)0x20000) 2542#define FIX_RATE_MCS_5_20 ((u32)0x20000)
2543#define FIX_RATE_MCS_6_20 ((A_UINT32)0x40000) 2543#define FIX_RATE_MCS_6_20 ((u32)0x40000)
2544#define FIX_RATE_MCS_7_20 ((A_UINT32)0x80000) 2544#define FIX_RATE_MCS_7_20 ((u32)0x80000)
2545#define FIX_RATE_MCS_0_40 ((A_UINT32)0x100000) 2545#define FIX_RATE_MCS_0_40 ((u32)0x100000)
2546#define FIX_RATE_MCS_1_40 ((A_UINT32)0x200000) 2546#define FIX_RATE_MCS_1_40 ((u32)0x200000)
2547#define FIX_RATE_MCS_2_40 ((A_UINT32)0x400000) 2547#define FIX_RATE_MCS_2_40 ((u32)0x400000)
2548#define FIX_RATE_MCS_3_40 ((A_UINT32)0x800000) 2548#define FIX_RATE_MCS_3_40 ((u32)0x800000)
2549#define FIX_RATE_MCS_4_40 ((A_UINT32)0x1000000) 2549#define FIX_RATE_MCS_4_40 ((u32)0x1000000)
2550#define FIX_RATE_MCS_5_40 ((A_UINT32)0x2000000) 2550#define FIX_RATE_MCS_5_40 ((u32)0x2000000)
2551#define FIX_RATE_MCS_6_40 ((A_UINT32)0x4000000) 2551#define FIX_RATE_MCS_6_40 ((u32)0x4000000)
2552#define FIX_RATE_MCS_7_40 ((A_UINT32)0x8000000) 2552#define FIX_RATE_MCS_7_40 ((u32)0x8000000)
2553 2553
2554typedef PREPACK struct { 2554typedef PREPACK struct {
2555 A_UINT32 fixRateMask; /* see WMI_BIT_RATE */ 2555 u32 fixRateMask; /* see WMI_BIT_RATE */
2556} POSTPACK WMI_FIX_RATES_CMD, WMI_FIX_RATES_REPLY; 2556} POSTPACK WMI_FIX_RATES_CMD, WMI_FIX_RATES_REPLY;
2557 2557
2558typedef PREPACK struct { 2558typedef PREPACK struct {
2559 u8 bEnableMask; 2559 u8 bEnableMask;
2560 u8 frameType; /*type and subtype*/ 2560 u8 frameType; /*type and subtype*/
2561 A_UINT32 frameRateMask; /* see WMI_BIT_RATE */ 2561 u32 frameRateMask; /* see WMI_BIT_RATE */
2562} POSTPACK WMI_FRAME_RATES_CMD, WMI_FRAME_RATES_REPLY; 2562} POSTPACK WMI_FRAME_RATES_CMD, WMI_FRAME_RATES_REPLY;
2563 2563
2564/* 2564/*
@@ -2594,10 +2594,10 @@ typedef enum {
2594} ROAM_DATA_TYPE; 2594} ROAM_DATA_TYPE;
2595 2595
2596typedef PREPACK struct { 2596typedef PREPACK struct {
2597 A_UINT32 disassoc_time; 2597 u32 disassoc_time;
2598 A_UINT32 no_txrx_time; 2598 u32 no_txrx_time;
2599 A_UINT32 assoc_time; 2599 u32 assoc_time;
2600 A_UINT32 allow_txrx_time; 2600 u32 allow_txrx_time;
2601 u8 disassoc_bssid[ATH_MAC_LEN]; 2601 u8 disassoc_bssid[ATH_MAC_LEN];
2602 A_INT8 disassoc_bss_rssi; 2602 A_INT8 disassoc_bss_rssi;
2603 u8 assoc_bssid[ATH_MAC_LEN]; 2603 u8 assoc_bssid[ATH_MAC_LEN];
@@ -2713,7 +2713,7 @@ typedef PREPACK struct {
2713 2713
2714#define MAX_IP_ADDRS 2 2714#define MAX_IP_ADDRS 2
2715typedef PREPACK struct { 2715typedef PREPACK struct {
2716 A_UINT32 ips[MAX_IP_ADDRS]; /* IP in Network Byte Order */ 2716 u32 ips[MAX_IP_ADDRS]; /* IP in Network Byte Order */
2717} POSTPACK WMI_SET_IP_CMD; 2717} POSTPACK WMI_SET_IP_CMD;
2718 2718
2719typedef PREPACK struct { 2719typedef PREPACK struct {
@@ -2769,7 +2769,7 @@ typedef PREPACK struct {
2769#define WMI_AKMP_MULTI_PMKID_EN 0x000001 2769#define WMI_AKMP_MULTI_PMKID_EN 0x000001
2770 2770
2771typedef PREPACK struct { 2771typedef PREPACK struct {
2772 A_UINT32 akmpInfo; 2772 u32 akmpInfo;
2773} POSTPACK WMI_SET_AKMP_PARAMS_CMD; 2773} POSTPACK WMI_SET_AKMP_PARAMS_CMD;
2774 2774
2775typedef PREPACK struct { 2775typedef PREPACK struct {
@@ -2782,7 +2782,7 @@ typedef PREPACK struct {
2782#define WMI_MAX_PMKID_CACHE 8 2782#define WMI_MAX_PMKID_CACHE 8
2783 2783
2784typedef PREPACK struct { 2784typedef PREPACK struct {
2785 A_UINT32 numPMKID; 2785 u32 numPMKID;
2786 WMI_PMKID pmkidList[WMI_MAX_PMKID_CACHE]; 2786 WMI_PMKID pmkidList[WMI_MAX_PMKID_CACHE];
2787} POSTPACK WMI_SET_PMKID_LIST_CMD; 2787} POSTPACK WMI_SET_PMKID_LIST_CMD;
2788 2788
@@ -2791,18 +2791,18 @@ typedef PREPACK struct {
2791 * Following the Number of PMKIDs is the list of PMKIDs 2791 * Following the Number of PMKIDs is the list of PMKIDs
2792 */ 2792 */
2793typedef PREPACK struct { 2793typedef PREPACK struct {
2794 A_UINT32 numPMKID; 2794 u32 numPMKID;
2795 u8 bssidList[ATH_MAC_LEN][1]; 2795 u8 bssidList[ATH_MAC_LEN][1];
2796 WMI_PMKID pmkidList[1]; 2796 WMI_PMKID pmkidList[1];
2797} POSTPACK WMI_PMKID_LIST_REPLY; 2797} POSTPACK WMI_PMKID_LIST_REPLY;
2798 2798
2799typedef PREPACK struct { 2799typedef PREPACK struct {
2800 u16 oldChannel; 2800 u16 oldChannel;
2801 A_UINT32 newChannel; 2801 u32 newChannel;
2802} POSTPACK WMI_CHANNEL_CHANGE_EVENT; 2802} POSTPACK WMI_CHANNEL_CHANGE_EVENT;
2803 2803
2804typedef PREPACK struct { 2804typedef PREPACK struct {
2805 A_UINT32 version; 2805 u32 version;
2806} POSTPACK WMI_WLAN_VERSION_EVENT; 2806} POSTPACK WMI_WLAN_VERSION_EVENT;
2807 2807
2808 2808
@@ -2898,8 +2898,8 @@ typedef PREPACK struct {
2898 u8 rateIdx; /* rate index on successful transmission */ 2898 u8 rateIdx; /* rate index on successful transmission */
2899 u8 ackFailures; /* number of ACK failures in tx attempt */ 2899 u8 ackFailures; /* number of ACK failures in tx attempt */
2900#if 0 /* optional params currently ommitted. */ 2900#if 0 /* optional params currently ommitted. */
2901 A_UINT32 queueDelay; // usec delay measured Tx Start time - host delivery time 2901 u32 queueDelay; // usec delay measured Tx Start time - host delivery time
2902 A_UINT32 mediaDelay; // usec delay measured ACK rx time - host delivery time 2902 u32 mediaDelay; // usec delay measured ACK rx time - host delivery time
2903#endif 2903#endif
2904} POSTPACK TX_COMPLETE_MSG_V1; /* version 1 of tx complete msg */ 2904} POSTPACK TX_COMPLETE_MSG_V1; /* version 1 of tx complete msg */
2905 2905
@@ -3001,12 +3001,12 @@ typedef PREPACK struct {
3001} POSTPACK WMI_AP_SET_MLME_CMD; 3001} POSTPACK WMI_AP_SET_MLME_CMD;
3002 3002
3003typedef PREPACK struct { 3003typedef PREPACK struct {
3004 A_UINT32 period; 3004 u32 period;
3005} POSTPACK WMI_AP_CONN_INACT_CMD; 3005} POSTPACK WMI_AP_CONN_INACT_CMD;
3006 3006
3007typedef PREPACK struct { 3007typedef PREPACK struct {
3008 A_UINT32 period_min; 3008 u32 period_min;
3009 A_UINT32 dwell_ms; 3009 u32 dwell_ms;
3010} POSTPACK WMI_AP_PROT_SCAN_TIME_CMD; 3010} POSTPACK WMI_AP_PROT_SCAN_TIME_CMD;
3011 3011
3012typedef PREPACK struct { 3012typedef PREPACK struct {
@@ -3039,11 +3039,11 @@ typedef PREPACK struct {
3039} POSTPACK WMI_SET_HT_OP_CMD; 3039} POSTPACK WMI_SET_HT_OP_CMD;
3040 3040
3041typedef PREPACK struct { 3041typedef PREPACK struct {
3042 A_UINT32 rateMasks[8]; 3042 u32 rateMasks[8];
3043} POSTPACK WMI_SET_TX_SELECT_RATES_CMD; 3043} POSTPACK WMI_SET_TX_SELECT_RATES_CMD;
3044 3044
3045typedef PREPACK struct { 3045typedef PREPACK struct {
3046 A_UINT32 sgiMask; 3046 u32 sgiMask;
3047 u8 sgiPERThreshold; 3047 u8 sgiPERThreshold;
3048} POSTPACK WMI_SET_TX_SGI_PARAM_CMD; 3048} POSTPACK WMI_SET_TX_SGI_PARAM_CMD;
3049 3049
@@ -3051,7 +3051,7 @@ typedef PREPACK struct {
3051#define DEFAULT_SGI_PER 10 3051#define DEFAULT_SGI_PER 10
3052 3052
3053typedef PREPACK struct { 3053typedef PREPACK struct {
3054 A_UINT32 rateField; /* 1 bit per rate corresponding to index */ 3054 u32 rateField; /* 1 bit per rate corresponding to index */
3055 u8 id; 3055 u8 id;
3056 u8 shortTrys; 3056 u8 shortTrys;
3057 u8 longTrys; 3057 u8 longTrys;
@@ -3078,25 +3078,25 @@ typedef PREPACK struct {
3078} POSTPACK WMI_PSPOLL_EVENT; 3078} POSTPACK WMI_PSPOLL_EVENT;
3079 3079
3080typedef PREPACK struct { 3080typedef PREPACK struct {
3081 A_UINT32 tx_bytes; 3081 u32 tx_bytes;
3082 A_UINT32 tx_pkts; 3082 u32 tx_pkts;
3083 A_UINT32 tx_error; 3083 u32 tx_error;
3084 A_UINT32 tx_discard; 3084 u32 tx_discard;
3085 A_UINT32 rx_bytes; 3085 u32 rx_bytes;
3086 A_UINT32 rx_pkts; 3086 u32 rx_pkts;
3087 A_UINT32 rx_error; 3087 u32 rx_error;
3088 A_UINT32 rx_discard; 3088 u32 rx_discard;
3089 A_UINT32 aid; 3089 u32 aid;
3090} POSTPACK WMI_PER_STA_STAT; 3090} POSTPACK WMI_PER_STA_STAT;
3091 3091
3092#define AP_GET_STATS 0 3092#define AP_GET_STATS 0
3093#define AP_CLEAR_STATS 1 3093#define AP_CLEAR_STATS 1
3094 3094
3095typedef PREPACK struct { 3095typedef PREPACK struct {
3096 A_UINT32 action; 3096 u32 action;
3097 WMI_PER_STA_STAT sta[AP_MAX_NUM_STA+1]; 3097 WMI_PER_STA_STAT sta[AP_MAX_NUM_STA+1];
3098} POSTPACK WMI_AP_MODE_STAT; 3098} POSTPACK WMI_AP_MODE_STAT;
3099#define WMI_AP_MODE_STAT_SIZE(numSta) (sizeof(A_UINT32) + ((numSta + 1) * sizeof(WMI_PER_STA_STAT))) 3099#define WMI_AP_MODE_STAT_SIZE(numSta) (sizeof(u32) + ((numSta + 1) * sizeof(WMI_PER_STA_STAT)))
3100 3100
3101#define AP_11BG_RATESET1 1 3101#define AP_11BG_RATESET1 1
3102#define AP_11BG_RATESET2 2 3102#define AP_11BG_RATESET2 2
diff --git a/drivers/staging/ath6kl/include/common/wmi_thin.h b/drivers/staging/ath6kl/include/common/wmi_thin.h
index dee5e8aae42..41f2b9ba102 100644
--- a/drivers/staging/ath6kl/include/common/wmi_thin.h
+++ b/drivers/staging/ath6kl/include/common/wmi_thin.h
@@ -119,14 +119,14 @@ typedef PREPACK struct {
119 * frames that require partial MAC header construction. These rules 119 * frames that require partial MAC header construction. These rules
120 * are used by the target to indicate which fields need to be written. */ 120 * are used by the target to indicate which fields need to be written. */
121typedef PREPACK struct { 121typedef PREPACK struct {
122 A_UINT32 rules; /* combination of WMI_WRT_... values */ 122 u32 rules; /* combination of WMI_WRT_... values */
123} POSTPACK WMI_THIN_CONFIG_TX_MAC_RULES; 123} POSTPACK WMI_THIN_CONFIG_TX_MAC_RULES;
124 124
125/* WMI_THIN_CONFIG_RX_FILTER_RULES -- Used to configure behavior for received 125/* WMI_THIN_CONFIG_RX_FILTER_RULES -- Used to configure behavior for received
126 * frames as to which frames should get forwarded to the host and which 126 * frames as to which frames should get forwarded to the host and which
127 * should get processed internally. */ 127 * should get processed internally. */
128typedef PREPACK struct { 128typedef PREPACK struct {
129 A_UINT32 rules; /* combination of WMI_FILT_... values */ 129 u32 rules; /* combination of WMI_FILT_... values */
130} POSTPACK WMI_THIN_CONFIG_RX_FILTER_RULES; 130} POSTPACK WMI_THIN_CONFIG_RX_FILTER_RULES;
131 131
132/* WMI_THIN_CONFIG_CMD -- Used to contain some combination of the above 132/* WMI_THIN_CONFIG_CMD -- Used to contain some combination of the above
@@ -138,7 +138,7 @@ typedef PREPACK struct {
138#define WMI_THIN_CFG_DECRYPT 0x00000002 138#define WMI_THIN_CFG_DECRYPT 0x00000002
139#define WMI_THIN_CFG_MAC_RULES 0x00000004 139#define WMI_THIN_CFG_MAC_RULES 0x00000004
140#define WMI_THIN_CFG_FILTER_RULES 0x00000008 140#define WMI_THIN_CFG_FILTER_RULES 0x00000008
141 A_UINT32 cfgField; /* combination of WMI_THIN_CFG_... describes contents of config command */ 141 u32 cfgField; /* combination of WMI_THIN_CFG_... describes contents of config command */
142 u16 length; /* length in bytes of appended sub-commands */ 142 u16 length; /* length in bytes of appended sub-commands */
143 u8 reserved[2]; /* align padding */ 143 u8 reserved[2]; /* align padding */
144} POSTPACK WMI_THIN_CONFIG_CMD; 144} POSTPACK WMI_THIN_CONFIG_CMD;
@@ -180,7 +180,7 @@ typedef PREPACK struct {
180} POSTPACK WMI_THIN_MIB_STA_MAC; 180} POSTPACK WMI_THIN_MIB_STA_MAC;
181 181
182typedef PREPACK struct { 182typedef PREPACK struct {
183 A_UINT32 time; // units == msec 183 u32 time; // units == msec
184} POSTPACK WMI_THIN_MIB_RX_LIFE_TIME; 184} POSTPACK WMI_THIN_MIB_RX_LIFE_TIME;
185 185
186typedef PREPACK struct { 186typedef PREPACK struct {
@@ -188,7 +188,7 @@ typedef PREPACK struct {
188} POSTPACK WMI_THIN_MIB_CTS_TO_SELF; 188} POSTPACK WMI_THIN_MIB_CTS_TO_SELF;
189 189
190typedef PREPACK struct { 190typedef PREPACK struct {
191 A_UINT32 time; // units == usec 191 u32 time; // units == usec
192} POSTPACK WMI_THIN_MIB_SLOT_TIME; 192} POSTPACK WMI_THIN_MIB_SLOT_TIME;
193 193
194typedef PREPACK struct { 194typedef PREPACK struct {
@@ -204,7 +204,7 @@ typedef PREPACK struct {
204typedef PREPACK struct { 204typedef PREPACK struct {
205#define FRAME_FILTER_PROMISCUOUS 0x00000001 205#define FRAME_FILTER_PROMISCUOUS 0x00000001
206#define FRAME_FILTER_BSSID 0x00000002 206#define FRAME_FILTER_BSSID 0x00000002
207 A_UINT32 filterMask; 207 u32 filterMask;
208} POSTPACK WMI_THIN_MIB_RXFRAME_FILTER; 208} POSTPACK WMI_THIN_MIB_RXFRAME_FILTER;
209 209
210 210
@@ -231,13 +231,13 @@ typedef PREPACK struct {
231} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_HEADER; 231} POSTPACK WMI_THIN_MIB_BEACON_FILTER_TABLE_HEADER;
232 232
233typedef PREPACK struct { 233typedef PREPACK struct {
234 A_UINT32 count; /* num beacons between deliveries */ 234 u32 count; /* num beacons between deliveries */
235 u8 enable; 235 u8 enable;
236 u8 reserved[3]; 236 u8 reserved[3];
237} POSTPACK WMI_THIN_MIB_BEACON_FILTER; 237} POSTPACK WMI_THIN_MIB_BEACON_FILTER;
238 238
239typedef PREPACK struct { 239typedef PREPACK struct {
240 A_UINT32 count; /* num consec lost beacons after which send event */ 240 u32 count; /* num consec lost beacons after which send event */
241} POSTPACK WMI_THIN_MIB_BEACON_LOST_COUNT; 241} POSTPACK WMI_THIN_MIB_BEACON_LOST_COUNT;
242 242
243typedef PREPACK struct { 243typedef PREPACK struct {
@@ -249,9 +249,9 @@ typedef PREPACK struct {
249 249
250 250
251typedef PREPACK struct { 251typedef PREPACK struct {
252 A_UINT32 cap; 252 u32 cap;
253 A_UINT32 rxRateField; 253 u32 rxRateField;
254 A_UINT32 beamForming; 254 u32 beamForming;
255 u8 addr[ATH_MAC_LEN]; 255 u8 addr[ATH_MAC_LEN];
256 u8 enable; 256 u8 enable;
257 u8 stbc; 257 u8 stbc;
@@ -262,8 +262,8 @@ typedef PREPACK struct {
262} POSTPACK WMI_THIN_MIB_HT_CAP; 262} POSTPACK WMI_THIN_MIB_HT_CAP;
263 263
264typedef PREPACK struct { 264typedef PREPACK struct {
265 A_UINT32 infoField; 265 u32 infoField;
266 A_UINT32 basicRateField; 266 u32 basicRateField;
267 u8 protection; 267 u8 protection;
268 u8 secondChanneloffset; 268 u8 secondChanneloffset;
269 u8 channelWidth; 269 u8 channelWidth;
@@ -301,8 +301,8 @@ typedef PREPACK struct {
301} POSTPACK WMI_THIN_GET_MIB_CMD; 301} POSTPACK WMI_THIN_GET_MIB_CMD;
302 302
303typedef PREPACK struct { 303typedef PREPACK struct {
304 A_UINT32 basicRateMask; /* bit mask of basic rates */ 304 u32 basicRateMask; /* bit mask of basic rates */
305 A_UINT32 beaconIntval; /* TUs */ 305 u32 beaconIntval; /* TUs */
306 u16 atimWindow; /* TUs */ 306 u16 atimWindow; /* TUs */
307 u16 channel; /* frequency in Mhz */ 307 u16 channel; /* frequency in Mhz */
308 u8 networkType; /* INFRA_NETWORK | ADHOC_NETWORK */ 308 u8 networkType; /* INFRA_NETWORK | ADHOC_NETWORK */
diff --git a/drivers/staging/ath6kl/include/common/wmix.h b/drivers/staging/ath6kl/include/common/wmix.h
index 7dd5434136a..5ebb8285d13 100644
--- a/drivers/staging/ath6kl/include/common/wmix.h
+++ b/drivers/staging/ath6kl/include/common/wmix.h
@@ -55,7 +55,7 @@ extern "C" {
55 * WMI_EVENT_ID=WMI_EXTENSION_EVENTID. 55 * WMI_EVENT_ID=WMI_EXTENSION_EVENTID.
56 */ 56 */
57typedef PREPACK struct { 57typedef PREPACK struct {
58 A_UINT32 commandId; 58 u32 commandId;
59} POSTPACK WMIX_CMD_HDR; 59} POSTPACK WMIX_CMD_HDR;
60 60
61typedef enum { 61typedef enum {
@@ -96,10 +96,10 @@ typedef enum {
96 * DataSet Open Request Event 96 * DataSet Open Request Event
97 */ 97 */
98typedef PREPACK struct { 98typedef PREPACK struct {
99 A_UINT32 dset_id; 99 u32 dset_id;
100 A_UINT32 targ_dset_handle; /* echo'ed, not used by Host, */ 100 u32 targ_dset_handle; /* echo'ed, not used by Host, */
101 A_UINT32 targ_reply_fn; /* echo'ed, not used by Host, */ 101 u32 targ_reply_fn; /* echo'ed, not used by Host, */
102 A_UINT32 targ_reply_arg; /* echo'ed, not used by Host, */ 102 u32 targ_reply_arg; /* echo'ed, not used by Host, */
103} POSTPACK WMIX_DSETOPENREQ_EVENT; 103} POSTPACK WMIX_DSETOPENREQ_EVENT;
104 104
105/* 105/*
@@ -107,7 +107,7 @@ typedef PREPACK struct {
107 * DataSet Close Event 107 * DataSet Close Event
108 */ 108 */
109typedef PREPACK struct { 109typedef PREPACK struct {
110 A_UINT32 access_cookie; 110 u32 access_cookie;
111} POSTPACK WMIX_DSETCLOSE_EVENT; 111} POSTPACK WMIX_DSETCLOSE_EVENT;
112 112
113/* 113/*
@@ -115,30 +115,30 @@ typedef PREPACK struct {
115 * DataSet Data Request Event 115 * DataSet Data Request Event
116 */ 116 */
117typedef PREPACK struct { 117typedef PREPACK struct {
118 A_UINT32 access_cookie; 118 u32 access_cookie;
119 A_UINT32 offset; 119 u32 offset;
120 A_UINT32 length; 120 u32 length;
121 A_UINT32 targ_buf; /* echo'ed, not used by Host, */ 121 u32 targ_buf; /* echo'ed, not used by Host, */
122 A_UINT32 targ_reply_fn; /* echo'ed, not used by Host, */ 122 u32 targ_reply_fn; /* echo'ed, not used by Host, */
123 A_UINT32 targ_reply_arg; /* echo'ed, not used by Host, */ 123 u32 targ_reply_arg; /* echo'ed, not used by Host, */
124} POSTPACK WMIX_DSETDATAREQ_EVENT; 124} POSTPACK WMIX_DSETDATAREQ_EVENT;
125 125
126typedef PREPACK struct { 126typedef PREPACK struct {
127 A_UINT32 status; 127 u32 status;
128 A_UINT32 targ_dset_handle; 128 u32 targ_dset_handle;
129 A_UINT32 targ_reply_fn; 129 u32 targ_reply_fn;
130 A_UINT32 targ_reply_arg; 130 u32 targ_reply_arg;
131 A_UINT32 access_cookie; 131 u32 access_cookie;
132 A_UINT32 size; 132 u32 size;
133 A_UINT32 version; 133 u32 version;
134} POSTPACK WMIX_DSETOPEN_REPLY_CMD; 134} POSTPACK WMIX_DSETOPEN_REPLY_CMD;
135 135
136typedef PREPACK struct { 136typedef PREPACK struct {
137 A_UINT32 status; 137 u32 status;
138 A_UINT32 targ_buf; 138 u32 targ_buf;
139 A_UINT32 targ_reply_fn; 139 u32 targ_reply_fn;
140 A_UINT32 targ_reply_arg; 140 u32 targ_reply_arg;
141 A_UINT32 length; 141 u32 length;
142 u8 buf[1]; 142 u8 buf[1];
143} POSTPACK WMIX_DSETDATA_REPLY_CMD; 143} POSTPACK WMIX_DSETDATA_REPLY_CMD;
144 144
@@ -160,10 +160,10 @@ typedef PREPACK struct {
160 * clear/disable or disable/enable, results are undefined. 160 * clear/disable or disable/enable, results are undefined.
161 */ 161 */
162typedef PREPACK struct { 162typedef PREPACK struct {
163 A_UINT32 set_mask; /* pins to set */ 163 u32 set_mask; /* pins to set */
164 A_UINT32 clear_mask; /* pins to clear */ 164 u32 clear_mask; /* pins to clear */
165 A_UINT32 enable_mask; /* pins to enable for output */ 165 u32 enable_mask; /* pins to enable for output */
166 A_UINT32 disable_mask; /* pins to disable/tristate */ 166 u32 disable_mask; /* pins to disable/tristate */
167} POSTPACK WMIX_GPIO_OUTPUT_SET_CMD; 167} POSTPACK WMIX_GPIO_OUTPUT_SET_CMD;
168 168
169/* 169/*
@@ -172,13 +172,13 @@ typedef PREPACK struct {
172 * platform-dependent header. 172 * platform-dependent header.
173 */ 173 */
174typedef PREPACK struct { 174typedef PREPACK struct {
175 A_UINT32 gpioreg_id; /* GPIO register ID */ 175 u32 gpioreg_id; /* GPIO register ID */
176 A_UINT32 value; /* value to write */ 176 u32 value; /* value to write */
177} POSTPACK WMIX_GPIO_REGISTER_SET_CMD; 177} POSTPACK WMIX_GPIO_REGISTER_SET_CMD;
178 178
179/* Get a GPIO register. For debug/exceptional cases. */ 179/* Get a GPIO register. For debug/exceptional cases. */
180typedef PREPACK struct { 180typedef PREPACK struct {
181 A_UINT32 gpioreg_id; /* GPIO register to read */ 181 u32 gpioreg_id; /* GPIO register to read */
182} POSTPACK WMIX_GPIO_REGISTER_GET_CMD; 182} POSTPACK WMIX_GPIO_REGISTER_GET_CMD;
183 183
184/* 184/*
@@ -187,7 +187,7 @@ typedef PREPACK struct {
187 * were delivered in an earlier WMIX_GPIO_INTR_EVENT message. 187 * were delivered in an earlier WMIX_GPIO_INTR_EVENT message.
188 */ 188 */
189typedef PREPACK struct { 189typedef PREPACK struct {
190 A_UINT32 ack_mask; /* interrupts to acknowledge */ 190 u32 ack_mask; /* interrupts to acknowledge */
191} POSTPACK WMIX_GPIO_INTR_ACK_CMD; 191} POSTPACK WMIX_GPIO_INTR_ACK_CMD;
192 192
193/* 193/*
@@ -197,8 +197,8 @@ typedef PREPACK struct {
197 * use of a GPIO interrupt as a Data Valid signal for other GPIO pins. 197 * use of a GPIO interrupt as a Data Valid signal for other GPIO pins.
198 */ 198 */
199typedef PREPACK struct { 199typedef PREPACK struct {
200 A_UINT32 intr_mask; /* pending GPIO interrupts */ 200 u32 intr_mask; /* pending GPIO interrupts */
201 A_UINT32 input_values; /* recent GPIO input values */ 201 u32 input_values; /* recent GPIO input values */
202} POSTPACK WMIX_GPIO_INTR_EVENT; 202} POSTPACK WMIX_GPIO_INTR_EVENT;
203 203
204/* 204/*
@@ -217,8 +217,8 @@ typedef PREPACK struct {
217 * simplify Host GPIO support. 217 * simplify Host GPIO support.
218 */ 218 */
219typedef PREPACK struct { 219typedef PREPACK struct {
220 A_UINT32 value; 220 u32 value;
221 A_UINT32 reg_id; 221 u32 reg_id;
222} POSTPACK WMIX_GPIO_DATA_EVENT; 222} POSTPACK WMIX_GPIO_DATA_EVENT;
223 223
224/* 224/*
@@ -230,8 +230,8 @@ typedef PREPACK struct {
230 * Heartbeat Challenge Response command 230 * Heartbeat Challenge Response command
231 */ 231 */
232typedef PREPACK struct { 232typedef PREPACK struct {
233 A_UINT32 cookie; 233 u32 cookie;
234 A_UINT32 source; 234 u32 source;
235} POSTPACK WMIX_HB_CHALLENGE_RESP_CMD; 235} POSTPACK WMIX_HB_CHALLENGE_RESP_CMD;
236 236
237/* 237/*
@@ -249,12 +249,12 @@ typedef PREPACK struct {
249 */ 249 */
250 250
251typedef PREPACK struct { 251typedef PREPACK struct {
252 A_UINT32 period; /* Time (in 30.5us ticks) between samples */ 252 u32 period; /* Time (in 30.5us ticks) between samples */
253 A_UINT32 nbins; 253 u32 nbins;
254} POSTPACK WMIX_PROF_CFG_CMD; 254} POSTPACK WMIX_PROF_CFG_CMD;
255 255
256typedef PREPACK struct { 256typedef PREPACK struct {
257 A_UINT32 addr; 257 u32 addr;
258} POSTPACK WMIX_PROF_ADDR_SET_CMD; 258} POSTPACK WMIX_PROF_ADDR_SET_CMD;
259 259
260/* 260/*
@@ -264,8 +264,8 @@ typedef PREPACK struct {
264 * count set to the corresponding count 264 * count set to the corresponding count
265 */ 265 */
266typedef PREPACK struct { 266typedef PREPACK struct {
267 A_UINT32 addr; 267 u32 addr;
268 A_UINT32 count; 268 u32 count;
269} POSTPACK WMIX_PROF_COUNT_EVENT; 269} POSTPACK WMIX_PROF_COUNT_EVENT;
270 270
271#ifndef ATH_TARGET 271#ifndef ATH_TARGET
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h
index 0d2902db817..f5152eb86c5 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -66,40 +66,40 @@ extern "C" {
66/* OS-independent APIs */ 66/* OS-independent APIs */
67int 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
69int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 69int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
70 70
71int ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); 71int ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
72 72
73int ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, A_UCHAR *data, A_UINT32 length); 73int ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, u32 address, A_UCHAR *data, u32 length);
74 74
75int ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType, bool waitForCompletion, bool coldReset); 75int ar6000_reset_device(HIF_DEVICE *hifDevice, u32 TargetType, bool waitForCompletion, 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, u32 TargetType);
78 78
79int ar6000_set_htc_params(HIF_DEVICE *hifDevice, 79int ar6000_set_htc_params(HIF_DEVICE *hifDevice,
80 A_UINT32 TargetType, 80 u32 TargetType,
81 A_UINT32 MboxIsrYieldValue, 81 u32 MboxIsrYieldValue,
82 u8 HtcControlBuffers); 82 u8 HtcControlBuffers);
83 83
84int ar6000_prepare_target(HIF_DEVICE *hifDevice, 84int ar6000_prepare_target(HIF_DEVICE *hifDevice,
85 A_UINT32 TargetType, 85 u32 TargetType,
86 A_UINT32 TargetVersion); 86 u32 TargetVersion);
87 87
88int ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice, 88int ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice,
89 A_UINT32 TargetType, 89 u32 TargetType,
90 A_UINT32 Flags); 90 u32 Flags);
91 91
92void ar6000_copy_cust_data_from_target(HIF_DEVICE *hifDevice, A_UINT32 TargetType); 92void ar6000_copy_cust_data_from_target(HIF_DEVICE *hifDevice, u32 TargetType);
93 93
94u8 *ar6000_get_cust_data_buffer(A_UINT32 TargetType); 94u8 *ar6000_get_cust_data_buffer(u32 TargetType);
95 95
96int ar6000_setBTState(void *context, u8 *pInBuf, A_UINT32 InBufSize); 96int ar6000_setBTState(void *context, u8 *pInBuf, u32 InBufSize);
97 97
98int ar6000_setDevicePowerState(void *context, u8 *pInBuf, A_UINT32 InBufSize); 98int ar6000_setDevicePowerState(void *context, u8 *pInBuf, u32 InBufSize);
99 99
100int ar6000_setWowMode(void *context, u8 *pInBuf, A_UINT32 InBufSize); 100int ar6000_setWowMode(void *context, u8 *pInBuf, u32 InBufSize);
101 101
102int ar6000_setHostMode(void *context, u8 *pInBuf, A_UINT32 InBufSize); 102int ar6000_setHostMode(void *context, u8 *pInBuf, u32 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 7ebc588f51c..fe901ba40ec 100644
--- a/drivers/staging/ath6kl/include/dset_api.h
+++ b/drivers/staging/ath6kl/include/dset_api.h
@@ -40,22 +40,22 @@ extern "C" {
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. */
42int wmi_dset_open_reply(struct wmi_t *wmip, 42int wmi_dset_open_reply(struct wmi_t *wmip,
43 A_UINT32 status, 43 u32 status,
44 A_UINT32 access_cookie, 44 u32 access_cookie,
45 A_UINT32 size, 45 u32 size,
46 A_UINT32 version, 46 u32 version,
47 A_UINT32 targ_handle, 47 u32 targ_handle,
48 A_UINT32 targ_reply_fn, 48 u32 targ_reply_fn,
49 A_UINT32 targ_reply_arg); 49 u32 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. */
52int wmi_dset_data_reply(struct wmi_t *wmip, 52int wmi_dset_data_reply(struct wmi_t *wmip,
53 A_UINT32 status, 53 u32 status,
54 u8 *host_buf, 54 u8 *host_buf,
55 A_UINT32 length, 55 u32 length,
56 A_UINT32 targ_buf, 56 u32 targ_buf,
57 A_UINT32 targ_reply_fn, 57 u32 targ_reply_fn,
58 A_UINT32 targ_reply_arg); 58 u32 targ_reply_arg);
59 59
60#ifdef __cplusplus 60#ifdef __cplusplus
61} 61}
diff --git a/drivers/staging/ath6kl/include/gpio_api.h b/drivers/staging/ath6kl/include/gpio_api.h
index 81c228dd16a..6b4c547432e 100644
--- a/drivers/staging/ath6kl/include/gpio_api.h
+++ b/drivers/staging/ath6kl/include/gpio_api.h
@@ -29,10 +29,10 @@
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 */
31int wmi_gpio_output_set(struct wmi_t *wmip, 31int wmi_gpio_output_set(struct wmi_t *wmip,
32 A_UINT32 set_mask, 32 u32 set_mask,
33 A_UINT32 clear_mask, 33 u32 clear_mask,
34 A_UINT32 enable_mask, 34 u32 enable_mask,
35 A_UINT32 disable_mask); 35 u32 disable_mask);
36 36
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.
@@ -43,17 +43,17 @@ int wmi_gpio_input_get(struct wmi_t *wmip);
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 */
45int wmi_gpio_register_set(struct wmi_t *wmip, 45int wmi_gpio_register_set(struct wmi_t *wmip,
46 A_UINT32 gpioreg_id, 46 u32 gpioreg_id,
47 A_UINT32 value); 47 u32 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 */
52int wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id); 52int wmi_gpio_register_get(struct wmi_t *wmip, u32 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 */
57int wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask); 57int wmi_gpio_intr_ack(struct wmi_t *wmip, u32 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 9b8b9aa3977..47d0db97ab5 100644
--- a/drivers/staging/ath6kl/include/hci_transport_api.h
+++ b/drivers/staging/ath6kl/include/hci_transport_api.h
@@ -237,7 +237,7 @@ int HCI_TransportRecvHCIEventSync(HCI_TRANSPORT_HANDLE HciTrans,
237 @example: 237 @example:
238 @see also: 238 @see also:
239+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 239+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
240int HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, A_UINT32 Baud); 240int HCI_TransportSetBaudRate(HCI_TRANSPORT_HANDLE HciTrans, u32 Baud);
241 241
242/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 242/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
243 @desc: Enable/Disable HCI Transport Power Management 243 @desc: Enable/Disable HCI Transport Power Management
diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h
index 06ddb688392..3906780d020 100644
--- a/drivers/staging/ath6kl/include/hif.h
+++ b/drivers/staging/ath6kl/include/hif.h
@@ -224,8 +224,8 @@ typedef enum {
224 */ 224 */
225 225
226typedef struct { 226typedef struct {
227 A_UINT32 ExtendedAddress; /* extended address for larger writes */ 227 u32 ExtendedAddress; /* extended address for larger writes */
228 A_UINT32 ExtendedSize; 228 u32 ExtendedSize;
229} HIF_MBOX_PROPERTIES; 229} HIF_MBOX_PROPERTIES;
230 230
231#define HIF_MBOX_FLAG_NO_BUNDLING (1 << 0) /* do not allow bundling over the mailbox */ 231#define HIF_MBOX_FLAG_NO_BUNDLING (1 << 0) /* do not allow bundling over the mailbox */
@@ -236,16 +236,16 @@ typedef enum _MBOX_BUF_IF_TYPE {
236} MBOX_BUF_IF_TYPE; 236} MBOX_BUF_IF_TYPE;
237 237
238typedef struct { 238typedef struct {
239 A_UINT32 MboxAddresses[4]; /* must be first element for legacy HIFs that return the address in 239 u32 MboxAddresses[4]; /* must be first element for legacy HIFs that return the address in
240 and ARRAY of 32-bit words */ 240 and ARRAY of 32-bit words */
241 241
242 /* the following describe extended mailbox properties */ 242 /* the following describe extended mailbox properties */
243 HIF_MBOX_PROPERTIES MboxProp[4]; 243 HIF_MBOX_PROPERTIES MboxProp[4];
244 /* if the HIF supports the GMbox extended address region it can report it 244 /* if the HIF supports the GMbox extended address region it can report it
245 * here, some interfaces cannot support the GMBOX address range and not set this */ 245 * here, some interfaces cannot support the GMBOX address range and not set this */
246 A_UINT32 GMboxAddress; 246 u32 GMboxAddress;
247 A_UINT32 GMboxSize; 247 u32 GMboxSize;
248 A_UINT32 Flags; /* flags to describe mbox behavior or usage */ 248 u32 Flags; /* flags to describe mbox behavior or usage */
249 MBOX_BUF_IF_TYPE MboxBusIFType; /* mailbox bus interface type */ 249 MBOX_BUF_IF_TYPE MboxBusIFType; /* mailbox bus interface type */
250} HIF_DEVICE_MBOX_INFO; 250} HIF_DEVICE_MBOX_INFO;
251 251
@@ -288,10 +288,10 @@ typedef enum _HIF_SCATTER_METHOD {
288 288
289typedef struct _HIF_SCATTER_REQ { 289typedef struct _HIF_SCATTER_REQ {
290 DL_LIST ListLink; /* link management */ 290 DL_LIST ListLink; /* link management */
291 A_UINT32 Address; /* address for the read/write operation */ 291 u32 Address; /* address for the read/write operation */
292 A_UINT32 Request; /* request flags */ 292 u32 Request; /* request flags */
293 A_UINT32 TotalLength; /* total length of entire transfer */ 293 u32 TotalLength; /* total length of entire transfer */
294 A_UINT32 CallerFlags; /* caller specific flags can be stored here */ 294 u32 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 int 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 */
@@ -344,12 +344,12 @@ typedef struct osdrv_callbacks {
344#define HIF_RECV_MSG_AVAIL (1 << 1) /* pending recv packet */ 344#define HIF_RECV_MSG_AVAIL (1 << 1) /* pending recv packet */
345 345
346typedef struct _HIF_PENDING_EVENTS_INFO { 346typedef struct _HIF_PENDING_EVENTS_INFO {
347 A_UINT32 Events; 347 u32 Events;
348 A_UINT32 LookAhead; 348 u32 LookAhead;
349 A_UINT32 AvailableRecvBytes; 349 u32 AvailableRecvBytes;
350#ifdef THREAD_X 350#ifdef THREAD_X
351 A_UINT32 Polling; 351 u32 Polling;
352 A_UINT32 INT_CAUSE_REG; 352 u32 INT_CAUSE_REG;
353#endif 353#endif
354} HIF_PENDING_EVENTS_INFO; 354} HIF_PENDING_EVENTS_INFO;
355 355
@@ -400,10 +400,10 @@ void HIFDetachHTC(HIF_DEVICE *device);
400 */ 400 */
401int 401int
402HIFReadWrite(HIF_DEVICE *device, 402HIFReadWrite(HIF_DEVICE *device,
403 A_UINT32 address, 403 u32 address,
404 A_UCHAR *buffer, 404 A_UCHAR *buffer,
405 A_UINT32 length, 405 u32 length,
406 A_UINT32 request, 406 u32 request,
407 void *context); 407 void *context);
408 408
409/* 409/*
@@ -443,7 +443,7 @@ int HIFRWCompleteEventNotify(void);
443 443
444int 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, u32 configLen);
447 447
448/* 448/*
449 * This API wait for the remaining MBOX messages to be drained 449 * This API wait for the remaining MBOX messages to be drained
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index 27d8fa281c9..3cfa9f2c8e0 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -146,7 +146,7 @@ typedef struct _HTC_SERVICE_CONNECT_REQ {
146 u8 MetaDataLength; /* optional meta data length */ 146 u8 MetaDataLength; /* optional meta data length */
147 HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */ 147 HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */
148 int MaxSendQueueDepth; /* maximum depth of any send queue */ 148 int MaxSendQueueDepth; /* maximum depth of any send queue */
149 A_UINT32 LocalConnectionFlags; /* HTC flags for the host-side (local) connection */ 149 u32 LocalConnectionFlags; /* HTC flags for the host-side (local) connection */
150 unsigned int MaxSendMsgSize; /* override max message size in send direction */ 150 unsigned int MaxSendMsgSize; /* override max message size in send direction */
151} HTC_SERVICE_CONNECT_REQ; 151} HTC_SERVICE_CONNECT_REQ;
152 152
@@ -168,7 +168,7 @@ typedef struct _HTC_ENDPOINT_CREDIT_DIST {
168 struct _HTC_ENDPOINT_CREDIT_DIST *pPrev; 168 struct _HTC_ENDPOINT_CREDIT_DIST *pPrev;
169 HTC_SERVICE_ID ServiceID; /* Service ID (set by HTC) */ 169 HTC_SERVICE_ID ServiceID; /* Service ID (set by HTC) */
170 HTC_ENDPOINT_ID Endpoint; /* endpoint for this distribution struct (set by HTC) */ 170 HTC_ENDPOINT_ID Endpoint; /* endpoint for this distribution struct (set by HTC) */
171 A_UINT32 DistFlags; /* distribution flags, distribution function can 171 u32 DistFlags; /* distribution flags, distribution function can
172 set default activity using SET_EP_ACTIVE() macro */ 172 set default activity using SET_EP_ACTIVE() macro */
173 int TxCreditsNorm; /* credits for normal operation, anything above this 173 int TxCreditsNorm; /* credits for normal operation, anything above this
174 indicates the endpoint is over-subscribed, this field 174 indicates the endpoint is over-subscribed, this field
@@ -197,7 +197,7 @@ typedef struct _HTC_ENDPOINT_CREDIT_DIST {
197 */ 197 */
198} HTC_ENDPOINT_CREDIT_DIST; 198} HTC_ENDPOINT_CREDIT_DIST;
199 199
200#define HTC_EP_ACTIVE ((A_UINT32) (1u << 31)) 200#define HTC_EP_ACTIVE ((u32) (1u << 31))
201 201
202/* macro to check if an endpoint has gone active, useful for credit 202/* macro to check if an endpoint has gone active, useful for credit
203 * distributions */ 203 * distributions */
@@ -232,29 +232,29 @@ typedef enum _HTC_ENDPOINT_STAT_ACTION {
232 232
233 /* endpoint statistics */ 233 /* endpoint statistics */
234typedef struct _HTC_ENDPOINT_STATS { 234typedef struct _HTC_ENDPOINT_STATS {
235 A_UINT32 TxCreditLowIndications; /* number of times the host set the credit-low flag in a send message on 235 u32 TxCreditLowIndications; /* number of times the host set the credit-low flag in a send message on
236 this endpoint */ 236 this endpoint */
237 A_UINT32 TxIssued; /* running count of total TX packets issued */ 237 u32 TxIssued; /* running count of total TX packets issued */
238 A_UINT32 TxPacketsBundled; /* running count of TX packets that were issued in bundles */ 238 u32 TxPacketsBundled; /* running count of TX packets that were issued in bundles */
239 A_UINT32 TxBundles; /* running count of TX bundles that were issued */ 239 u32 TxBundles; /* running count of TX bundles that were issued */
240 A_UINT32 TxDropped; /* tx packets that were dropped */ 240 u32 TxDropped; /* tx packets that were dropped */
241 A_UINT32 TxCreditRpts; /* running count of total credit reports received for this endpoint */ 241 u32 TxCreditRpts; /* running count of total credit reports received for this endpoint */
242 A_UINT32 TxCreditRptsFromRx; /* credit reports received from this endpoint's RX packets */ 242 u32 TxCreditRptsFromRx; /* credit reports received from this endpoint's RX packets */
243 A_UINT32 TxCreditRptsFromOther; /* credit reports received from RX packets of other endpoints */ 243 u32 TxCreditRptsFromOther; /* credit reports received from RX packets of other endpoints */
244 A_UINT32 TxCreditRptsFromEp0; /* credit reports received from endpoint 0 RX packets */ 244 u32 TxCreditRptsFromEp0; /* credit reports received from endpoint 0 RX packets */
245 A_UINT32 TxCreditsFromRx; /* count of credits received via Rx packets on this endpoint */ 245 u32 TxCreditsFromRx; /* count of credits received via Rx packets on this endpoint */
246 A_UINT32 TxCreditsFromOther; /* count of credits received via another endpoint */ 246 u32 TxCreditsFromOther; /* count of credits received via another endpoint */
247 A_UINT32 TxCreditsFromEp0; /* count of credits received via another endpoint */ 247 u32 TxCreditsFromEp0; /* count of credits received via another endpoint */
248 A_UINT32 TxCreditsConsummed; /* count of consummed credits */ 248 u32 TxCreditsConsummed; /* count of consummed credits */
249 A_UINT32 TxCreditsReturned; /* count of credits returned */ 249 u32 TxCreditsReturned; /* count of credits returned */
250 A_UINT32 RxReceived; /* count of RX packets received */ 250 u32 RxReceived; /* count of RX packets received */
251 A_UINT32 RxLookAheads; /* count of lookahead records 251 u32 RxLookAheads; /* count of lookahead records
252 found in messages received on this endpoint */ 252 found in messages received on this endpoint */
253 A_UINT32 RxPacketsBundled; /* count of recv packets received in a bundle */ 253 u32 RxPacketsBundled; /* count of recv packets received in a bundle */
254 A_UINT32 RxBundleLookAheads; /* count of number of bundled lookaheads */ 254 u32 RxBundleLookAheads; /* count of number of bundled lookaheads */
255 A_UINT32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */ 255 u32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */
256 A_UINT32 RxAllocThreshHit; /* count of the number of times the recv allocation threshhold was hit */ 256 u32 RxAllocThreshHit; /* count of the number of times the recv allocation threshhold was hit */
257 A_UINT32 RxAllocThreshBytes; /* total number of bytes */ 257 u32 RxAllocThreshBytes; /* total number of bytes */
258} HTC_ENDPOINT_STATS; 258} HTC_ENDPOINT_STATS;
259 259
260/* ------ Function Prototypes ------ */ 260/* ------ Function Prototypes ------ */
@@ -565,7 +565,7 @@ int HTCGetNumRecvBuffers(HTC_HANDLE HTCHandle,
565void HTCEnableRecv(HTC_HANDLE HTCHandle); 565void HTCEnableRecv(HTC_HANDLE HTCHandle);
566void HTCDisableRecv(HTC_HANDLE HTCHandle); 566void HTCDisableRecv(HTC_HANDLE HTCHandle);
567int HTCWaitForPendingRecv(HTC_HANDLE HTCHandle, 567int HTCWaitForPendingRecv(HTC_HANDLE HTCHandle,
568 A_UINT32 TimeoutInMs, 568 u32 TimeoutInMs,
569 bool *pbIsRecvPending); 569 bool *pbIsRecvPending);
570 570
571#ifdef __cplusplus 571#ifdef __cplusplus
diff --git a/drivers/staging/ath6kl/include/htc_packet.h b/drivers/staging/ath6kl/include/htc_packet.h
index bbf33d1564d..fcf0a0c3bed 100644
--- a/drivers/staging/ath6kl/include/htc_packet.h
+++ b/drivers/staging/ath6kl/include/htc_packet.h
@@ -60,9 +60,9 @@ typedef struct _HTC_TX_PACKET_INFO {
60#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) /* user-defined tags start here */ 60#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) /* user-defined tags start here */
61 61
62typedef struct _HTC_RX_PACKET_INFO { 62typedef struct _HTC_RX_PACKET_INFO {
63 A_UINT32 ExpectedHdr; /* HTC internal use */ 63 u32 ExpectedHdr; /* HTC internal use */
64 A_UINT32 HTCRxFlags; /* HTC internal use */ 64 u32 HTCRxFlags; /* HTC internal use */
65 A_UINT32 IndicationFlags; /* indication flags set on each RX packet indication */ 65 u32 IndicationFlags; /* indication flags set on each RX packet indication */
66} HTC_RX_PACKET_INFO; 66} HTC_RX_PACKET_INFO;
67 67
68#define HTC_RX_FLAGS_INDICATE_MORE_PKTS (1 << 0) /* more packets on this endpoint are being fetched */ 68#define HTC_RX_FLAGS_INDICATE_MORE_PKTS (1 << 0) /* more packets on this endpoint are being fetched */
@@ -86,8 +86,8 @@ typedef struct _HTC_PACKET {
86 * to the caller points to the start of the payload 86 * to the caller points to the start of the payload
87 */ 87 */
88 u8 *pBuffer; /* payload start (RX/TX) */ 88 u8 *pBuffer; /* payload start (RX/TX) */
89 A_UINT32 BufferLength; /* length of buffer */ 89 u32 BufferLength; /* length of buffer */
90 A_UINT32 ActualLength; /* actual length of payload */ 90 u32 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 int Status; /* completion status */ 92 int Status; /* completion status */
93 union { 93 union {
diff --git a/drivers/staging/ath6kl/include/target_reg_table.h b/drivers/staging/ath6kl/include/target_reg_table.h
index 901f923bee3..e2225d59dd8 100644
--- a/drivers/staging/ath6kl/include/target_reg_table.h
+++ b/drivers/staging/ath6kl/include/target_reg_table.h
@@ -30,48 +30,48 @@
30 30
31/*** WARNING : Add to the end of the TABLE! do not change the order ****/ 31/*** WARNING : Add to the end of the TABLE! do not change the order ****/
32typedef struct targetdef_s { 32typedef struct targetdef_s {
33 A_UINT32 d_RTC_BASE_ADDRESS; 33 u32 d_RTC_BASE_ADDRESS;
34 A_UINT32 d_SYSTEM_SLEEP_OFFSET; 34 u32 d_SYSTEM_SLEEP_OFFSET;
35 A_UINT32 d_SYSTEM_SLEEP_DISABLE_LSB; 35 u32 d_SYSTEM_SLEEP_DISABLE_LSB;
36 A_UINT32 d_SYSTEM_SLEEP_DISABLE_MASK; 36 u32 d_SYSTEM_SLEEP_DISABLE_MASK;
37 A_UINT32 d_CLOCK_CONTROL_OFFSET; 37 u32 d_CLOCK_CONTROL_OFFSET;
38 A_UINT32 d_CLOCK_CONTROL_SI0_CLK_MASK; 38 u32 d_CLOCK_CONTROL_SI0_CLK_MASK;
39 A_UINT32 d_RESET_CONTROL_OFFSET; 39 u32 d_RESET_CONTROL_OFFSET;
40 A_UINT32 d_RESET_CONTROL_SI0_RST_MASK; 40 u32 d_RESET_CONTROL_SI0_RST_MASK;
41 A_UINT32 d_GPIO_BASE_ADDRESS; 41 u32 d_GPIO_BASE_ADDRESS;
42 A_UINT32 d_GPIO_PIN0_OFFSET; 42 u32 d_GPIO_PIN0_OFFSET;
43 A_UINT32 d_GPIO_PIN1_OFFSET; 43 u32 d_GPIO_PIN1_OFFSET;
44 A_UINT32 d_GPIO_PIN0_CONFIG_MASK; 44 u32 d_GPIO_PIN0_CONFIG_MASK;
45 A_UINT32 d_GPIO_PIN1_CONFIG_MASK; 45 u32 d_GPIO_PIN1_CONFIG_MASK;
46 A_UINT32 d_SI_CONFIG_BIDIR_OD_DATA_LSB; 46 u32 d_SI_CONFIG_BIDIR_OD_DATA_LSB;
47 A_UINT32 d_SI_CONFIG_BIDIR_OD_DATA_MASK; 47 u32 d_SI_CONFIG_BIDIR_OD_DATA_MASK;
48 A_UINT32 d_SI_CONFIG_I2C_LSB; 48 u32 d_SI_CONFIG_I2C_LSB;
49 A_UINT32 d_SI_CONFIG_I2C_MASK; 49 u32 d_SI_CONFIG_I2C_MASK;
50 A_UINT32 d_SI_CONFIG_POS_SAMPLE_LSB; 50 u32 d_SI_CONFIG_POS_SAMPLE_LSB;
51 A_UINT32 d_SI_CONFIG_POS_SAMPLE_MASK; 51 u32 d_SI_CONFIG_POS_SAMPLE_MASK;
52 A_UINT32 d_SI_CONFIG_INACTIVE_CLK_LSB; 52 u32 d_SI_CONFIG_INACTIVE_CLK_LSB;
53 A_UINT32 d_SI_CONFIG_INACTIVE_CLK_MASK; 53 u32 d_SI_CONFIG_INACTIVE_CLK_MASK;
54 A_UINT32 d_SI_CONFIG_INACTIVE_DATA_LSB; 54 u32 d_SI_CONFIG_INACTIVE_DATA_LSB;
55 A_UINT32 d_SI_CONFIG_INACTIVE_DATA_MASK; 55 u32 d_SI_CONFIG_INACTIVE_DATA_MASK;
56 A_UINT32 d_SI_CONFIG_DIVIDER_LSB; 56 u32 d_SI_CONFIG_DIVIDER_LSB;
57 A_UINT32 d_SI_CONFIG_DIVIDER_MASK; 57 u32 d_SI_CONFIG_DIVIDER_MASK;
58 A_UINT32 d_SI_BASE_ADDRESS; 58 u32 d_SI_BASE_ADDRESS;
59 A_UINT32 d_SI_CONFIG_OFFSET; 59 u32 d_SI_CONFIG_OFFSET;
60 A_UINT32 d_SI_TX_DATA0_OFFSET; 60 u32 d_SI_TX_DATA0_OFFSET;
61 A_UINT32 d_SI_TX_DATA1_OFFSET; 61 u32 d_SI_TX_DATA1_OFFSET;
62 A_UINT32 d_SI_RX_DATA0_OFFSET; 62 u32 d_SI_RX_DATA0_OFFSET;
63 A_UINT32 d_SI_RX_DATA1_OFFSET; 63 u32 d_SI_RX_DATA1_OFFSET;
64 A_UINT32 d_SI_CS_OFFSET; 64 u32 d_SI_CS_OFFSET;
65 A_UINT32 d_SI_CS_DONE_ERR_MASK; 65 u32 d_SI_CS_DONE_ERR_MASK;
66 A_UINT32 d_SI_CS_DONE_INT_MASK; 66 u32 d_SI_CS_DONE_INT_MASK;
67 A_UINT32 d_SI_CS_START_LSB; 67 u32 d_SI_CS_START_LSB;
68 A_UINT32 d_SI_CS_START_MASK; 68 u32 d_SI_CS_START_MASK;
69 A_UINT32 d_SI_CS_RX_CNT_LSB; 69 u32 d_SI_CS_RX_CNT_LSB;
70 A_UINT32 d_SI_CS_RX_CNT_MASK; 70 u32 d_SI_CS_RX_CNT_MASK;
71 A_UINT32 d_SI_CS_TX_CNT_LSB; 71 u32 d_SI_CS_TX_CNT_LSB;
72 A_UINT32 d_SI_CS_TX_CNT_MASK; 72 u32 d_SI_CS_TX_CNT_MASK;
73 A_UINT32 d_BOARD_DATA_SZ; 73 u32 d_BOARD_DATA_SZ;
74 A_UINT32 d_BOARD_EXT_DATA_SZ; 74 u32 d_BOARD_EXT_DATA_SZ;
75} TARGET_REGISTER_TABLE; 75} TARGET_REGISTER_TABLE;
76 76
77#define BOARD_DATA_SZ_MAX 2048 77#define BOARD_DATA_SZ_MAX 2048
diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h
index 8fe804d6a21..ce799683725 100644
--- a/drivers/staging/ath6kl/include/wlan_api.h
+++ b/drivers/staging/ath6kl/include/wlan_api.h
@@ -70,13 +70,13 @@ typedef struct bss {
70 u8 *ni_buf; 70 u8 *ni_buf;
71 u16 ni_framelen; 71 u16 ni_framelen;
72 struct ieee80211_node_table *ni_table; 72 struct ieee80211_node_table *ni_table;
73 A_UINT32 ni_refcnt; 73 u32 ni_refcnt;
74 int ni_scangen; 74 int ni_scangen;
75 75
76 A_UINT32 ni_tstamp; 76 u32 ni_tstamp;
77 A_UINT32 ni_actcnt; 77 u32 ni_actcnt;
78#ifdef OS_ROAM_MANAGEMENT 78#ifdef OS_ROAM_MANAGEMENT
79 A_UINT32 ni_si_gen; 79 u32 ni_si_gen;
80#endif 80#endif
81} bss_t; 81} bss_t;
82 82
@@ -100,16 +100,16 @@ int wlan_parse_beacon(u8 *buf, int framelen,
100 struct ieee80211_common_ie *cie); 100 struct ieee80211_common_ie *cie);
101 101
102u16 wlan_ieee2freq(int chan); 102u16 wlan_ieee2freq(int chan);
103A_UINT32 wlan_freq2ieee(u16 freq); 103u32 wlan_freq2ieee(u16 freq);
104 104
105void wlan_set_nodeage(struct ieee80211_node_table *nt, A_UINT32 nodeAge); 105void wlan_set_nodeage(struct ieee80211_node_table *nt, u32 nodeAge);
106 106
107void 107void
108wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt); 108wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt);
109 109
110bss_t * 110bss_t *
111wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid, 111wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
112 A_UINT32 ssidLength, bool bIsWPA2, bool bMatchSSID); 112 u32 ssidLength, bool bIsWPA2, bool bMatchSSID);
113 113
114void 114void
115wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni); 115wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni);
@@ -118,8 +118,8 @@ bss_t *wlan_node_remove(struct ieee80211_node_table *nt, u8 *bssid);
118 118
119bss_t * 119bss_t *
120wlan_find_matching_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid, 120wlan_find_matching_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
121 A_UINT32 ssidLength, A_UINT32 dot11AuthMode, A_UINT32 authMode, 121 u32 ssidLength, u32 dot11AuthMode, u32 authMode,
122 A_UINT32 pairwiseCryptoType, A_UINT32 grpwiseCryptoTyp); 122 u32 pairwiseCryptoType, u32 grpwiseCryptoTyp);
123 123
124#ifdef __cplusplus 124#ifdef __cplusplus
125} 125}
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h
index a0310b66106..04f809c3051 100644
--- a/drivers/staging/ath6kl/include/wmi_api.h
+++ b/drivers/staging/ath6kl/include/wmi_api.h
@@ -80,9 +80,9 @@ int wmi_dot11_hdr_add(struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode);
80int wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf); 80int wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf);
81int wmi_syncpoint(struct wmi_t *wmip); 81int wmi_syncpoint(struct wmi_t *wmip);
82int wmi_syncpoint_reset(struct wmi_t *wmip); 82int wmi_syncpoint_reset(struct wmi_t *wmip);
83u8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT32 layer2Priority, bool wmmEnabled); 83u8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, u32 layer2Priority, bool wmmEnabled);
84 84
85u8 wmi_determine_userPriority (u8 *pkt, A_UINT32 layer2Pri); 85u8 wmi_determine_userPriority (u8 *pkt, u32 layer2Pri);
86 86
87int 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);
@@ -114,7 +114,7 @@ int wmi_connect_cmd(struct wmi_t *wmip,
114 A_UCHAR *ssid, 114 A_UCHAR *ssid,
115 u8 *bssid, 115 u8 *bssid,
116 u16 channel, 116 u16 channel,
117 A_UINT32 ctrl_flags); 117 u32 ctrl_flags);
118 118
119int wmi_reconnect_cmd(struct wmi_t *wmip, 119int wmi_reconnect_cmd(struct wmi_t *wmip,
120 u8 *bssid, 120 u8 *bssid,
@@ -123,16 +123,16 @@ int wmi_disconnect_cmd(struct wmi_t *wmip);
123int wmi_getrev_cmd(struct wmi_t *wmip); 123int wmi_getrev_cmd(struct wmi_t *wmip);
124int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType, 124int wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
125 u32 forceFgScan, u32 isLegacy, 125 u32 forceFgScan, u32 isLegacy,
126 A_UINT32 homeDwellTime, A_UINT32 forceScanInterval, 126 u32 homeDwellTime, u32 forceScanInterval,
127 A_INT8 numChan, u16 *channelList); 127 A_INT8 numChan, u16 *channelList);
128int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec, 128int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec,
129 u16 fg_end_sec, u16 bg_sec, 129 u16 fg_end_sec, u16 bg_sec,
130 u16 minact_chdw_msec, 130 u16 minact_chdw_msec,
131 u16 maxact_chdw_msec, u16 pas_chdw_msec, 131 u16 maxact_chdw_msec, u16 pas_chdw_msec,
132 u8 shScanRatio, u8 scanCtrlFlags, 132 u8 shScanRatio, u8 scanCtrlFlags,
133 A_UINT32 max_dfsch_act_time, 133 u32 max_dfsch_act_time,
134 u16 maxact_scan_per_ssid); 134 u16 maxact_scan_per_ssid);
135int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, A_UINT32 ieMask); 135int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, u32 ieMask);
136int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, 136int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag,
137 u8 ssidLength, A_UCHAR *ssid); 137 u8 ssidLength, A_UCHAR *ssid);
138int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons); 138int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons);
@@ -142,8 +142,8 @@ int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType,
142int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode); 142int wmi_powermode_cmd(struct wmi_t *wmip, u8 powerMode);
143int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl, 143int wmi_ibsspmcaps_cmd(struct wmi_t *wmip, u8 pmEnable, u8 ttl,
144 u16 atim_windows, u16 timeout_value); 144 u16 atim_windows, u16 timeout_value);
145int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, A_UINT32 idle_time, 145int wmi_apps_cmd(struct wmi_t *wmip, u8 psType, u32 idle_time,
146 A_UINT32 ps_period, u8 sleep_period); 146 u32 ps_period, u8 sleep_period);
147int wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod, 147int wmi_pmparams_cmd(struct wmi_t *wmip, u16 idlePeriod,
148 u16 psPollNum, u16 dtimPolicy, 148 u16 psPollNum, u16 dtimPolicy,
149 u16 wakup_tx_policy, u16 num_tx_to_wakeup, 149 u16 wakup_tx_policy, u16 num_tx_to_wakeup,
@@ -172,14 +172,14 @@ int wmi_set_lq_threshold_params(struct wmi_t *wmip,
172int wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold); 172int wmi_set_rts_cmd(struct wmi_t *wmip, u16 threshold);
173int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy); 173int wmi_set_lpreamble_cmd(struct wmi_t *wmip, u8 status, u8 preamblePolicy);
174 174
175int wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask); 175int wmi_set_error_report_bitmask(struct wmi_t *wmip, u32 bitmask);
176 176
177int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, 177int wmi_get_challenge_resp_cmd(struct wmi_t *wmip, u32 cookie,
178 A_UINT32 source); 178 u32 source);
179 179
180int wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask, 180int wmi_config_debug_module_cmd(struct wmi_t *wmip, u16 mmask,
181 u16 tsr, bool rep, u16 size, 181 u16 tsr, bool rep, u16 size,
182 A_UINT32 valid); 182 u32 valid);
183 183
184int wmi_get_stats_cmd(struct wmi_t *wmip); 184int wmi_get_stats_cmd(struct wmi_t *wmip);
185 185
@@ -237,7 +237,7 @@ u8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
237int wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, int tspecCompliance); 237int wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, int tspecCompliance);
238 238
239#ifdef CONFIG_HOST_TCMD_SUPPORT 239#ifdef CONFIG_HOST_TCMD_SUPPORT
240int wmi_test_cmd(struct wmi_t *wmip, u8 *buf, A_UINT32 len); 240int wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len);
241#endif 241#endif
242 242
243int wmi_set_bt_status_cmd(struct wmi_t *wmip, u8 streamType, u8 status); 243int wmi_set_bt_status_cmd(struct wmi_t *wmip, u8 streamType, u8 status);
@@ -269,12 +269,12 @@ int wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * c
269 269
270int wmi_get_btcoex_stats_cmd(struct wmi_t * wmip); 270int wmi_get_btcoex_stats_cmd(struct wmi_t * wmip);
271 271
272int wmi_SGI_cmd(struct wmi_t *wmip, A_UINT32 sgiMask, u8 sgiPERThreshold); 272int wmi_SGI_cmd(struct wmi_t *wmip, u32 sgiMask, u8 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 */
277int wmi_set_fixrates_cmd(struct wmi_t *wmip, A_UINT32 fixRatesMask); 277int wmi_set_fixrates_cmd(struct wmi_t *wmip, u32 fixRatesMask);
278int wmi_get_ratemask_cmd(struct wmi_t *wmip); 278int wmi_get_ratemask_cmd(struct wmi_t *wmip);
279 279
280int wmi_set_authmode_cmd(struct wmi_t *wmip, u8 mode); 280int wmi_set_authmode_cmd(struct wmi_t *wmip, u8 mode);
@@ -307,10 +307,10 @@ int wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
307 WMI_ADD_WOW_PATTERN_CMD *cmd, u8 *pattern, u8 *mask, u8 pattern_size); 307 WMI_ADD_WOW_PATTERN_CMD *cmd, u8 *pattern, u8 *mask, u8 pattern_size);
308int 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);
310int wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status); 310int wmi_set_wsc_status_cmd(struct wmi_t *wmip, u32 status);
311 311
312int 312int
313wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, char *buffer); 313wmi_set_params_cmd(struct wmi_t *wmip, u32 opcode, u32 length, char *buffer);
314 314
315int 315int
316wmi_set_mcast_filter_cmd(struct wmi_t *wmip, u8 dot1, u8 dot2, u8 dot3, u8 dot4); 316wmi_set_mcast_filter_cmd(struct wmi_t *wmip, u8 dot1, u8 dot2, u8 dot3, u8 dot4);
@@ -323,18 +323,18 @@ wmi_mcast_filter_cmd(struct wmi_t *wmip, u8 enable);
323 323
324bss_t * 324bss_t *
325wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, 325wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
326 A_UINT32 ssidLength, bool bIsWPA2, bool bMatchSSID); 326 u32 ssidLength, bool bIsWPA2, bool bMatchSSID);
327 327
328 328
329void 329void
330wmi_node_return (struct wmi_t *wmip, bss_t *bss); 330wmi_node_return (struct wmi_t *wmip, bss_t *bss);
331 331
332void 332void
333wmi_set_nodeage(struct wmi_t *wmip, A_UINT32 nodeAge); 333wmi_set_nodeage(struct wmi_t *wmip, u32 nodeAge);
334 334
335#if defined(CONFIG_TARGET_PROFILE_SUPPORT) 335#if defined(CONFIG_TARGET_PROFILE_SUPPORT)
336int wmi_prof_cfg_cmd(struct wmi_t *wmip, A_UINT32 period, A_UINT32 nbins); 336int wmi_prof_cfg_cmd(struct wmi_t *wmip, u32 period, u32 nbins);
337int wmi_prof_addr_set_cmd(struct wmi_t *wmip, A_UINT32 addr); 337int wmi_prof_addr_set_cmd(struct wmi_t *wmip, u32 addr);
338int wmi_prof_start_cmd(struct wmi_t *wmip); 338int wmi_prof_start_cmd(struct wmi_t *wmip);
339int wmi_prof_stop_cmd(struct wmi_t *wmip); 339int wmi_prof_stop_cmd(struct wmi_t *wmip);
340int wmi_prof_count_get_cmd(struct wmi_t *wmip); 340int wmi_prof_count_get_cmd(struct wmi_t *wmip);
@@ -377,10 +377,10 @@ int
377wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag); 377wmi_set_pvb_cmd(struct wmi_t *wmip, u16 aid, bool flag);
378 378
379int 379int
380wmi_ap_conn_inact_time(struct wmi_t *wmip, A_UINT32 period); 380wmi_ap_conn_inact_time(struct wmi_t *wmip, u32 period);
381 381
382int 382int
383wmi_ap_bgscan_time(struct wmi_t *wmip, A_UINT32 period, A_UINT32 dwell); 383wmi_ap_bgscan_time(struct wmi_t *wmip, u32 period, u32 dwell);
384 384
385int 385int
386wmi_ap_set_dtim(struct wmi_t *wmip, u8 dtim); 386wmi_ap_set_dtim(struct wmi_t *wmip, u8 dtim);
@@ -398,7 +398,7 @@ int
398wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz); 398wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz);
399 399
400int 400int
401wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, A_UINT32 *pMaskArray); 401wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, u32 *pMaskArray);
402 402
403int 403int
404wmi_setup_aggr_cmd(struct wmi_t *wmip, u8 tid); 404wmi_setup_aggr_cmd(struct wmi_t *wmip, u8 tid);
@@ -423,14 +423,13 @@ wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk);
423 423
424u16 wmi_ieee2freq (int chan); 424u16 wmi_ieee2freq (int chan);
425 425
426A_UINT32 426u32 wmi_freq2ieee (u16 freq);
427wmi_freq2ieee (u16 freq);
428 427
429bss_t * 428bss_t *
430wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid, 429wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
431 A_UINT32 ssidLength, 430 u32 ssidLength,
432 A_UINT32 dot11AuthMode, A_UINT32 authMode, 431 u32 dot11AuthMode, u32 authMode,
433 A_UINT32 pairwiseCryptoType, A_UINT32 grpwiseCryptoTyp); 432 u32 pairwiseCryptoType, u32 grpwiseCryptoTyp);
434 433
435#ifdef __cplusplus 434#ifdef __cplusplus
436} 435}
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 12:55:27 -0400