diff options
Diffstat (limited to 'drivers')
23 files changed, 0 insertions, 357 deletions
diff --git a/drivers/staging/ath6kl/Makefile b/drivers/staging/ath6kl/Makefile index 96e4ed9d04c..99030345032 100644 --- a/drivers/staging/ath6kl/Makefile +++ b/drivers/staging/ath6kl/Makefile | |||
@@ -110,7 +110,6 @@ ifeq ($(CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK),y) | |||
110 | ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK | 110 | ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK |
111 | endif | 111 | endif |
112 | 112 | ||
113 | ccflags-y += -DLINUX -DKERNEL_2_6 | ||
114 | ccflags-y += -DTCMD | 113 | ccflags-y += -DTCMD |
115 | ccflags-y += -DSEND_EVENT_TO_APP | 114 | ccflags-y += -DSEND_EVENT_TO_APP |
116 | ccflags-y += -DUSER_KEYS | 115 | ccflags-y += -DUSER_KEYS |
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h index 1ff221838c0..e551dbe674d 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | //#define MBOXHW_UNIT_TEST 1 | 43 | //#define MBOXHW_UNIT_TEST 1 |
44 | 44 | ||
45 | #include "athstartpack.h" | ||
46 | PREPACK struct ar6k_irq_proc_registers { | 45 | PREPACK struct ar6k_irq_proc_registers { |
47 | u8 host_int_status; | 46 | u8 host_int_status; |
48 | u8 cpu_int_status; | 47 | u8 cpu_int_status; |
@@ -69,8 +68,6 @@ PREPACK struct ar6k_gmbox_ctrl_registers { | |||
69 | u8 int_status_enable; | 68 | u8 int_status_enable; |
70 | } POSTPACK; | 69 | } POSTPACK; |
71 | 70 | ||
72 | #include "athendpack.h" | ||
73 | |||
74 | #define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(struct ar6k_irq_enable_registers) | 71 | #define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(struct ar6k_irq_enable_registers) |
75 | 72 | ||
76 | #define AR6K_REG_IO_BUFFER_SIZE 32 | 73 | #define AR6K_REG_IO_BUFFER_SIZE 32 |
diff --git a/drivers/staging/ath6kl/include/a_config.h b/drivers/staging/ath6kl/include/a_config.h index 4a0083c6511..f7c09319433 100644 --- a/drivers/staging/ath6kl/include/a_config.h +++ b/drivers/staging/ath6kl/include/a_config.h | |||
@@ -26,28 +26,6 @@ | |||
26 | #ifndef _A_CONFIG_H_ | 26 | #ifndef _A_CONFIG_H_ |
27 | #define _A_CONFIG_H_ | 27 | #define _A_CONFIG_H_ |
28 | 28 | ||
29 | #ifdef UNDER_NWIFI | ||
30 | #include "../os/windows/include/config.h" | ||
31 | #endif | ||
32 | |||
33 | #ifdef ATHR_CE_LEGACY | ||
34 | #include "../os/windows/include/config.h" | ||
35 | #endif | ||
36 | |||
37 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
38 | #include "../os/linux/include/config_linux.h" | 29 | #include "../os/linux/include/config_linux.h" |
39 | #endif | ||
40 | |||
41 | #ifdef REXOS | ||
42 | #include "../os/rexos/include/common/config_rexos.h" | ||
43 | #endif | ||
44 | |||
45 | #ifdef WIN_NWF | ||
46 | #include "../os/windows/include/win/config_win.h" | ||
47 | #endif | ||
48 | |||
49 | #ifdef THREADX | ||
50 | #include "../os/threadx/include/common/config_threadx.h" | ||
51 | #endif | ||
52 | 30 | ||
53 | #endif | 31 | #endif |
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h index d433942e2b9..51cb633ee6c 100644 --- a/drivers/staging/ath6kl/include/a_debug.h +++ b/drivers/staging/ath6kl/include/a_debug.h | |||
@@ -187,35 +187,7 @@ void a_dump_module_debug_info_by_name(char *module_name); | |||
187 | void a_module_debug_support_init(void); | 187 | void a_module_debug_support_init(void); |
188 | void a_module_debug_support_cleanup(void); | 188 | void a_module_debug_support_cleanup(void); |
189 | 189 | ||
190 | #ifdef UNDER_NWIFI | ||
191 | #include "../os/windows/include/debug.h" | ||
192 | #endif | ||
193 | |||
194 | #ifdef ATHR_CE_LEGACY | ||
195 | #include "../os/windows/include/debug.h" | ||
196 | #endif | ||
197 | |||
198 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
199 | #include "../os/linux/include/debug_linux.h" | 190 | #include "../os/linux/include/debug_linux.h" |
200 | #endif | ||
201 | |||
202 | #ifdef REXOS | ||
203 | #include "../os/rexos/include/common/debug_rexos.h" | ||
204 | #endif | ||
205 | |||
206 | #if defined ART_WIN | ||
207 | #include "../os/win_art/include/debug_win.h" | ||
208 | #endif | ||
209 | |||
210 | #ifdef WIN_NWF | ||
211 | #include <debug_win.h> | ||
212 | #endif | ||
213 | |||
214 | #ifdef THREADX | ||
215 | #define ATH_DEBUG_MAKE_MODULE_MASK(index) (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index))) | ||
216 | #include "../os/threadx/include/common/debug_threadx.h" | ||
217 | #endif | ||
218 | |||
219 | 191 | ||
220 | #ifdef __cplusplus | 192 | #ifdef __cplusplus |
221 | } | 193 | } |
diff --git a/drivers/staging/ath6kl/include/a_drv.h b/drivers/staging/ath6kl/include/a_drv.h index 6db10f0f2d1..1548604e846 100644 --- a/drivers/staging/ath6kl/include/a_drv.h +++ b/drivers/staging/ath6kl/include/a_drv.h | |||
@@ -27,28 +27,6 @@ | |||
27 | #ifndef _A_DRV_H_ | 27 | #ifndef _A_DRV_H_ |
28 | #define _A_DRV_H_ | 28 | #define _A_DRV_H_ |
29 | 29 | ||
30 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
31 | #include "../os/linux/include/athdrv_linux.h" | 30 | #include "../os/linux/include/athdrv_linux.h" |
32 | #endif | ||
33 | |||
34 | #ifdef UNDER_NWIFI | ||
35 | #include "../os/windows/include/athdrv.h" | ||
36 | #endif | ||
37 | |||
38 | #ifdef ATHR_CE_LEGACY | ||
39 | #include "../os/windows/include/athdrv.h" | ||
40 | #endif | ||
41 | |||
42 | #ifdef REXOS | ||
43 | #include "../os/rexos/include/common/athdrv_rexos.h" | ||
44 | #endif | ||
45 | |||
46 | #ifdef WIN_NWF | ||
47 | #include "../os/windows/include/athdrv.h" | ||
48 | #endif | ||
49 | |||
50 | #ifdef THREADX | ||
51 | #include "../os/threadx/include/common/athdrv_threadx.h" | ||
52 | #endif | ||
53 | 31 | ||
54 | #endif /* _ADRV_H_ */ | 32 | #endif /* _ADRV_H_ */ |
diff --git a/drivers/staging/ath6kl/include/a_osapi.h b/drivers/staging/ath6kl/include/a_osapi.h index 7bdeeea2150..fd7ae0d612c 100644 --- a/drivers/staging/ath6kl/include/a_osapi.h +++ b/drivers/staging/ath6kl/include/a_osapi.h | |||
@@ -27,35 +27,6 @@ | |||
27 | #ifndef _A_OSAPI_H_ | 27 | #ifndef _A_OSAPI_H_ |
28 | #define _A_OSAPI_H_ | 28 | #define _A_OSAPI_H_ |
29 | 29 | ||
30 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
31 | #include "../os/linux/include/osapi_linux.h" | 30 | #include "../os/linux/include/osapi_linux.h" |
32 | #endif | ||
33 | |||
34 | #ifdef UNDER_NWIFI | ||
35 | #include "../os/windows/include/osapi.h" | ||
36 | #include "../os/windows/include/netbuf.h" | ||
37 | #endif | ||
38 | |||
39 | #ifdef ATHR_CE_LEGACY | ||
40 | #include "../os/windows/include/osapi.h" | ||
41 | #include "../os/windows/include/netbuf.h" | ||
42 | #endif | ||
43 | |||
44 | #ifdef REXOS | ||
45 | #include "../os/rexos/include/common/osapi_rexos.h" | ||
46 | #endif | ||
47 | |||
48 | #if defined ART_WIN | ||
49 | #include "../os/win_art/include/osapi_win.h" | ||
50 | #include "../os/win_art/include/netbuf.h" | ||
51 | #endif | ||
52 | |||
53 | #ifdef WIN_NWF | ||
54 | #include <osapi_win.h> | ||
55 | #endif | ||
56 | |||
57 | #if defined(THREADX) | ||
58 | #include "../os/threadx/include/common/osapi_threadx.h" | ||
59 | #endif | ||
60 | 31 | ||
61 | #endif /* _OSAPI_H_ */ | 32 | #endif /* _OSAPI_H_ */ |
diff --git a/drivers/staging/ath6kl/include/a_types.h b/drivers/staging/ath6kl/include/a_types.h index 18f4cfe4f97..4b6783f6aec 100644 --- a/drivers/staging/ath6kl/include/a_types.h +++ b/drivers/staging/ath6kl/include/a_types.h | |||
@@ -27,32 +27,6 @@ | |||
27 | #ifndef _A_TYPES_H_ | 27 | #ifndef _A_TYPES_H_ |
28 | #define _A_TYPES_H_ | 28 | #define _A_TYPES_H_ |
29 | 29 | ||
30 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
31 | #include "../os/linux/include/athtypes_linux.h" | 30 | #include "../os/linux/include/athtypes_linux.h" |
32 | #endif | ||
33 | |||
34 | #ifdef UNDER_NWIFI | ||
35 | #include "../os/windows/include/athtypes.h" | ||
36 | #endif | ||
37 | |||
38 | #ifdef ATHR_CE_LEGACY | ||
39 | #include "../os/windows/include/athtypes.h" | ||
40 | #endif | ||
41 | |||
42 | #ifdef REXOS | ||
43 | #include "../os/rexos/include/common/athtypes_rexos.h" | ||
44 | #endif | ||
45 | |||
46 | #if defined ART_WIN | ||
47 | #include "../os/win_art/include/athtypes_win.h" | ||
48 | #endif | ||
49 | |||
50 | #ifdef WIN_NWF | ||
51 | #include <athtypes_win.h> | ||
52 | #endif | ||
53 | |||
54 | #ifdef THREADX | ||
55 | #include "../os/threadx/include/common/athtypes_threadx.h" | ||
56 | #endif | ||
57 | 31 | ||
58 | #endif /* _ATHTYPES_H_ */ | 32 | #endif /* _ATHTYPES_H_ */ |
diff --git a/drivers/staging/ath6kl/include/ar6000_api.h b/drivers/staging/ath6kl/include/ar6000_api.h index 1e1d92a507e..e9460800272 100644 --- a/drivers/staging/ath6kl/include/ar6000_api.h +++ b/drivers/staging/ath6kl/include/ar6000_api.h | |||
@@ -26,29 +26,7 @@ | |||
26 | #ifndef _AR6000_API_H_ | 26 | #ifndef _AR6000_API_H_ |
27 | #define _AR6000_API_H_ | 27 | #define _AR6000_API_H_ |
28 | 28 | ||
29 | #if defined(__linux__) && !defined(LINUX_EMULATION) | ||
30 | #include "../os/linux/include/ar6xapi_linux.h" | 29 | #include "../os/linux/include/ar6xapi_linux.h" |
31 | #endif | ||
32 | |||
33 | #ifdef UNDER_NWIFI | ||
34 | #include "../os/windows/include/ar6xapi.h" | ||
35 | #endif | ||
36 | |||
37 | #ifdef ATHR_CE_LEGACY | ||
38 | #include "../os/windows/include/ar6xapi.h" | ||
39 | #endif | ||
40 | |||
41 | #ifdef REXOS | ||
42 | #include "../os/rexos/include/common/ar6xapi_rexos.h" | ||
43 | #endif | ||
44 | |||
45 | #if defined ART_WIN | ||
46 | #include "../os/win_art/include/ar6xapi_win.h" | ||
47 | #endif | ||
48 | |||
49 | #ifdef WIN_NWF | ||
50 | #include "../os/windows/include/ar6xapi.h" | ||
51 | #endif | ||
52 | 30 | ||
53 | #endif /* _AR6000_API_H */ | 31 | #endif /* _AR6000_API_H */ |
54 | 32 | ||
diff --git a/drivers/staging/ath6kl/include/athendpack.h b/drivers/staging/ath6kl/include/athendpack.h deleted file mode 100644 index 1b940503bb2..00000000000 --- a/drivers/staging/ath6kl/include/athendpack.h +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | //------------------------------------------------------------------------------ | ||
2 | // <copyright file="athendpack.h" company="Atheros"> | ||
3 | // Copyright (c) 2004-2010 Atheros Corporation. All rights reserved. | ||
4 | // | ||
5 | // | ||
6 | // Permission to use, copy, modify, and/or distribute this software for any | ||
7 | // purpose with or without fee is hereby granted, provided that the above | ||
8 | // copyright notice and this permission notice appear in all copies. | ||
9 | // | ||
10 | // THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
11 | // WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
12 | // MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
13 | // ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
14 | // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
15 | // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
16 | // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
17 | // | ||
18 | // | ||
19 | //------------------------------------------------------------------------------ | ||
20 | //============================================================================== | ||
21 | // end compiler-specific structure packing | ||
22 | // | ||
23 | // Author(s): ="Atheros" | ||
24 | //============================================================================== | ||
25 | #ifdef VXWORKS | ||
26 | #endif /* VXWORKS */ | ||
27 | |||
28 | #if defined(LINUX) || defined(__linux__) | ||
29 | #endif /* LINUX */ | ||
30 | |||
31 | #ifdef QNX | ||
32 | #endif /* QNX */ | ||
33 | |||
34 | #ifdef INTEGRITY | ||
35 | #include "integrity/athendpack_integrity.h" | ||
36 | #endif /* INTEGRITY */ | ||
37 | |||
38 | #ifdef NUCLEUS | ||
39 | #endif /* NUCLEUS */ | ||
40 | |||
41 | |||
42 | #ifdef UNDER_NWIFI | ||
43 | #include "../os/windows/include/athendpack.h" | ||
44 | #endif | ||
45 | |||
46 | #ifdef ATHR_CE_LEGACY | ||
47 | #include "../os/windows/include/athendpack.h" | ||
48 | #endif /* WINCE */ | ||
49 | |||
50 | #ifdef WIN_NWF | ||
51 | #include <athendpack_win.h> | ||
52 | #endif | ||
diff --git a/drivers/staging/ath6kl/include/athstartpack.h b/drivers/staging/ath6kl/include/athstartpack.h deleted file mode 100644 index 1c45f666d8a..00000000000 --- a/drivers/staging/ath6kl/include/athstartpack.h +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | //------------------------------------------------------------------------------ | ||
2 | // <copyright file="athstartpack.h" company="Atheros"> | ||
3 | // Copyright (c) 2004-2010 Atheros Corporation. All rights reserved. | ||
4 | // | ||
5 | // | ||
6 | // Permission to use, copy, modify, and/or distribute this software for any | ||
7 | // purpose with or without fee is hereby granted, provided that the above | ||
8 | // copyright notice and this permission notice appear in all copies. | ||
9 | // | ||
10 | // THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
11 | // WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
12 | // MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
13 | // ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
14 | // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
15 | // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
16 | // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
17 | // | ||
18 | // | ||
19 | //------------------------------------------------------------------------------ | ||
20 | //============================================================================== | ||
21 | // start compiler-specific structure packing | ||
22 | // | ||
23 | // Author(s): ="Atheros" | ||
24 | //============================================================================== | ||
25 | #ifdef VXWORKS | ||
26 | #endif /* VXWORKS */ | ||
27 | |||
28 | #if defined(LINUX) || defined(__linux__) | ||
29 | #endif /* LINUX */ | ||
30 | |||
31 | #ifdef QNX | ||
32 | #endif /* QNX */ | ||
33 | |||
34 | #ifdef INTEGRITY | ||
35 | #include "integrity/athstartpack_integrity.h" | ||
36 | #endif /* INTEGRITY */ | ||
37 | |||
38 | #ifdef NUCLEUS | ||
39 | #endif /* NUCLEUS */ | ||
40 | |||
41 | #ifdef UNDER_NWIFI | ||
42 | #include "../os/windows/include/athstartpack.h" | ||
43 | #endif | ||
44 | |||
45 | #ifdef ATHR_CE_LEGACY | ||
46 | #include "../os/windows/include/athstartpack.h" | ||
47 | #endif /* WINCE */ | ||
48 | |||
49 | #ifdef WIN_NWF | ||
50 | #include <athstartpack_win.h> | ||
51 | #endif | ||
52 | |||
53 | #ifdef THREADX | ||
54 | #include "../os/threadx/include/common/osapi_threadx.h" | ||
55 | #endif | ||
diff --git a/drivers/staging/ath6kl/include/common/bmi_msg.h b/drivers/staging/ath6kl/include/common/bmi_msg.h index e76624c5915..84e8db569a9 100644 --- a/drivers/staging/ath6kl/include/common/bmi_msg.h +++ b/drivers/staging/ath6kl/include/common/bmi_msg.h | |||
@@ -22,10 +22,6 @@ | |||
22 | #ifndef __BMI_MSG_H__ | 22 | #ifndef __BMI_MSG_H__ |
23 | #define __BMI_MSG_H__ | 23 | #define __BMI_MSG_H__ |
24 | 24 | ||
25 | #ifndef ATH_TARGET | ||
26 | #include "athstartpack.h" | ||
27 | #endif | ||
28 | |||
29 | /* | 25 | /* |
30 | * Bootloader Messaging Interface (BMI) | 26 | * Bootloader Messaging Interface (BMI) |
31 | * | 27 | * |
@@ -234,8 +230,4 @@ PREPACK struct bmi_target_info { | |||
234 | * Note: Not supported on all versions of ROM firmware. | 230 | * Note: Not supported on all versions of ROM firmware. |
235 | */ | 231 | */ |
236 | 232 | ||
237 | #ifndef ATH_TARGET | ||
238 | #include "athendpack.h" | ||
239 | #endif | ||
240 | |||
241 | #endif /* __BMI_MSG_H__ */ | 233 | #endif /* __BMI_MSG_H__ */ |
diff --git a/drivers/staging/ath6kl/include/common/dbglog.h b/drivers/staging/ath6kl/include/common/dbglog.h index 3a3d00da0b8..e5ef9394f00 100644 --- a/drivers/staging/ath6kl/include/common/dbglog.h +++ b/drivers/staging/ath6kl/include/common/dbglog.h | |||
@@ -24,10 +24,6 @@ | |||
24 | #ifndef _DBGLOG_H_ | 24 | #ifndef _DBGLOG_H_ |
25 | #define _DBGLOG_H_ | 25 | #define _DBGLOG_H_ |
26 | 26 | ||
27 | #ifndef ATH_TARGET | ||
28 | #include "athstartpack.h" | ||
29 | #endif | ||
30 | |||
31 | #ifdef __cplusplus | 27 | #ifdef __cplusplus |
32 | extern "C" { | 28 | extern "C" { |
33 | #endif | 29 | #endif |
@@ -127,8 +123,4 @@ PREPACK struct dbglog_config_s { | |||
127 | } | 123 | } |
128 | #endif | 124 | #endif |
129 | 125 | ||
130 | #ifndef ATH_TARGET | ||
131 | #include "athendpack.h" | ||
132 | #endif | ||
133 | |||
134 | #endif /* _DBGLOG_H_ */ | 126 | #endif /* _DBGLOG_H_ */ |
diff --git a/drivers/staging/ath6kl/include/common/dset_internal.h b/drivers/staging/ath6kl/include/common/dset_internal.h index 69475331eab..e3ecd8e1a3c 100644 --- a/drivers/staging/ath6kl/include/common/dset_internal.h +++ b/drivers/staging/ath6kl/include/common/dset_internal.h | |||
@@ -25,10 +25,6 @@ | |||
25 | #ifndef __DSET_INTERNAL_H__ | 25 | #ifndef __DSET_INTERNAL_H__ |
26 | #define __DSET_INTERNAL_H__ | 26 | #define __DSET_INTERNAL_H__ |
27 | 27 | ||
28 | #ifndef ATH_TARGET | ||
29 | #include "athstartpack.h" | ||
30 | #endif | ||
31 | |||
32 | /* | 28 | /* |
33 | * Internal dset definitions, common for DataSet layer. | 29 | * Internal dset definitions, common for DataSet layer. |
34 | */ | 30 | */ |
@@ -56,8 +52,4 @@ typedef PREPACK struct dset_descriptor_s { | |||
56 | Dataset descriptor for BPatch. */ | 52 | Dataset descriptor for BPatch. */ |
57 | } POSTPACK dset_descriptor_t; | 53 | } POSTPACK dset_descriptor_t; |
58 | 54 | ||
59 | #ifndef ATH_TARGET | ||
60 | #include "athendpack.h" | ||
61 | #endif | ||
62 | |||
63 | #endif /* __DSET_INTERNAL_H__ */ | 55 | #endif /* __DSET_INTERNAL_H__ */ |
diff --git a/drivers/staging/ath6kl/include/common/dsetid.h b/drivers/staging/ath6kl/include/common/dsetid.h index 090e3096792..cc797bab5c4 100644 --- a/drivers/staging/ath6kl/include/common/dsetid.h +++ b/drivers/staging/ath6kl/include/common/dsetid.h | |||
@@ -25,10 +25,6 @@ | |||
25 | #ifndef __DSETID_H__ | 25 | #ifndef __DSETID_H__ |
26 | #define __DSETID_H__ | 26 | #define __DSETID_H__ |
27 | 27 | ||
28 | #ifndef ATH_TARGET | ||
29 | #include "athstartpack.h" | ||
30 | #endif | ||
31 | |||
32 | /* Well-known DataSet IDs */ | 28 | /* Well-known DataSet IDs */ |
33 | #define DSETID_UNUSED 0x00000000 | 29 | #define DSETID_UNUSED 0x00000000 |
34 | #define DSETID_BOARD_DATA 0x00000001 /* Cal and board data */ | 30 | #define DSETID_BOARD_DATA 0x00000001 /* Cal and board data */ |
@@ -127,8 +123,4 @@ PREPACK struct patch_s { | |||
127 | */ | 123 | */ |
128 | #define DSETID_BPATCH_FLAG 0x80000000 | 124 | #define DSETID_BPATCH_FLAG 0x80000000 |
129 | 125 | ||
130 | #ifndef ATH_TARGET | ||
131 | #include "athendpack.h" | ||
132 | #endif | ||
133 | |||
134 | #endif /* __DSETID_H__ */ | 126 | #endif /* __DSETID_H__ */ |
diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h index 5c40d8a2229..c9520edf5c3 100644 --- a/drivers/staging/ath6kl/include/common/epping_test.h +++ b/drivers/staging/ath6kl/include/common/epping_test.h | |||
@@ -25,10 +25,6 @@ | |||
25 | #ifndef EPPING_TEST_H_ | 25 | #ifndef EPPING_TEST_H_ |
26 | #define EPPING_TEST_H_ | 26 | #define EPPING_TEST_H_ |
27 | 27 | ||
28 | #ifndef ATH_TARGET | ||
29 | #include "athstartpack.h" | ||
30 | #endif | ||
31 | |||
32 | /* alignment to 4-bytes */ | 28 | /* alignment to 4-bytes */ |
33 | #define EPPING_ALIGNMENT_PAD (((sizeof(struct htc_frame_hdr) + 3) & (~0x3)) - sizeof(struct htc_frame_hdr)) | 29 | #define EPPING_ALIGNMENT_PAD (((sizeof(struct htc_frame_hdr) + 3) & (~0x3)) - sizeof(struct htc_frame_hdr)) |
34 | 30 | ||
@@ -112,9 +108,4 @@ typedef PREPACK struct { | |||
112 | #define HCI_TRANSPORT_STREAM_NUM 16 /* this number is higher than the define WMM AC classes so we | 108 | #define HCI_TRANSPORT_STREAM_NUM 16 /* this number is higher than the define WMM AC classes so we |
113 | can use this to distinguish packets */ | 109 | can use this to distinguish packets */ |
114 | 110 | ||
115 | #ifndef ATH_TARGET | ||
116 | #include "athendpack.h" | ||
117 | #endif | ||
118 | |||
119 | |||
120 | #endif /*EPPING_TEST_H_*/ | 111 | #endif /*EPPING_TEST_H_*/ |
diff --git a/drivers/staging/ath6kl/include/common/gmboxif.h b/drivers/staging/ath6kl/include/common/gmboxif.h index dd9afbd78ff..ea11c14def4 100644 --- a/drivers/staging/ath6kl/include/common/gmboxif.h +++ b/drivers/staging/ath6kl/include/common/gmboxif.h | |||
@@ -23,10 +23,6 @@ | |||
23 | #ifndef __GMBOXIF_H__ | 23 | #ifndef __GMBOXIF_H__ |
24 | #define __GMBOXIF_H__ | 24 | #define __GMBOXIF_H__ |
25 | 25 | ||
26 | #ifndef ATH_TARGET | ||
27 | #include "athstartpack.h" | ||
28 | #endif | ||
29 | |||
30 | /* GMBOX interface definitions */ | 26 | /* GMBOX interface definitions */ |
31 | 27 | ||
32 | #define AR6K_GMBOX_CREDIT_COUNTER 1 /* we use credit counter 1 to track credits */ | 28 | #define AR6K_GMBOX_CREDIT_COUNTER 1 /* we use credit counter 1 to track credits */ |
@@ -70,9 +66,5 @@ typedef PREPACK struct { | |||
70 | #define MBOX_SIG_HCI_BRIDGE_PWR_SAV_OFF 4 | 66 | #define MBOX_SIG_HCI_BRIDGE_PWR_SAV_OFF 4 |
71 | 67 | ||
72 | 68 | ||
73 | #ifndef ATH_TARGET | ||
74 | #include "athendpack.h" | ||
75 | #endif | ||
76 | |||
77 | #endif /* __GMBOXIF_H__ */ | 69 | #endif /* __GMBOXIF_H__ */ |
78 | 70 | ||
diff --git a/drivers/staging/ath6kl/include/common/htc.h b/drivers/staging/ath6kl/include/common/htc.h index b9d4495d432..85cbfa89d67 100644 --- a/drivers/staging/ath6kl/include/common/htc.h +++ b/drivers/staging/ath6kl/include/common/htc.h | |||
@@ -24,10 +24,6 @@ | |||
24 | #ifndef __HTC_H__ | 24 | #ifndef __HTC_H__ |
25 | #define __HTC_H__ | 25 | #define __HTC_H__ |
26 | 26 | ||
27 | #ifndef ATH_TARGET | ||
28 | #include "athstartpack.h" | ||
29 | #endif | ||
30 | |||
31 | #define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field)) | 27 | #define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field)) |
32 | 28 | ||
33 | #define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \ | 29 | #define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \ |
@@ -227,10 +223,5 @@ typedef PREPACK struct { | |||
227 | u8 LookAhead[4]; /* 4 byte lookahead */ | 223 | u8 LookAhead[4]; /* 4 byte lookahead */ |
228 | } POSTPACK HTC_BUNDLED_LOOKAHEAD_REPORT; | 224 | } POSTPACK HTC_BUNDLED_LOOKAHEAD_REPORT; |
229 | 225 | ||
230 | #ifndef ATH_TARGET | ||
231 | #include "athendpack.h" | ||
232 | #endif | ||
233 | |||
234 | |||
235 | #endif /* __HTC_H__ */ | 226 | #endif /* __HTC_H__ */ |
236 | 227 | ||
diff --git a/drivers/staging/ath6kl/include/common/regdump.h b/drivers/staging/ath6kl/include/common/regdump.h index aa64821617e..614dfa102ea 100644 --- a/drivers/staging/ath6kl/include/common/regdump.h +++ b/drivers/staging/ath6kl/include/common/regdump.h | |||
@@ -24,10 +24,6 @@ | |||
24 | #ifndef __REGDUMP_H__ | 24 | #ifndef __REGDUMP_H__ |
25 | #define __REGDUMP_H__ | 25 | #define __REGDUMP_H__ |
26 | 26 | ||
27 | #ifndef ATH_TARGET | ||
28 | #include "athstartpack.h" | ||
29 | #endif | ||
30 | |||
31 | #if defined(AR6001) | 27 | #if defined(AR6001) |
32 | #include "AR6001/AR6001_regdump.h" | 28 | #include "AR6001/AR6001_regdump.h" |
33 | #endif | 29 | #endif |
@@ -52,8 +48,4 @@ PREPACK struct register_dump_s { | |||
52 | } POSTPACK; | 48 | } POSTPACK; |
53 | #endif /* __ASSEMBLER__ */ | 49 | #endif /* __ASSEMBLER__ */ |
54 | 50 | ||
55 | #ifndef ATH_TARGET | ||
56 | #include "athendpack.h" | ||
57 | #endif | ||
58 | |||
59 | #endif /* __REGDUMP_H__ */ | 51 | #endif /* __REGDUMP_H__ */ |
diff --git a/drivers/staging/ath6kl/include/common/targaddrs.h b/drivers/staging/ath6kl/include/common/targaddrs.h index 794ae2182a7..e921b302c45 100644 --- a/drivers/staging/ath6kl/include/common/targaddrs.h +++ b/drivers/staging/ath6kl/include/common/targaddrs.h | |||
@@ -22,10 +22,6 @@ | |||
22 | #ifndef __TARGADDRS_H__ | 22 | #ifndef __TARGADDRS_H__ |
23 | #define __TARGADDRS_H__ | 23 | #define __TARGADDRS_H__ |
24 | 24 | ||
25 | #ifndef ATH_TARGET | ||
26 | #include "athstartpack.h" | ||
27 | #endif | ||
28 | |||
29 | #if defined(AR6002) | 25 | #if defined(AR6002) |
30 | #include "AR6002/addrs.h" | 26 | #include "AR6002/addrs.h" |
31 | #endif | 27 | #endif |
@@ -238,8 +234,4 @@ PREPACK struct host_interest_s { | |||
238 | 234 | ||
239 | #endif /* !__ASSEMBLER__ */ | 235 | #endif /* !__ASSEMBLER__ */ |
240 | 236 | ||
241 | #ifndef ATH_TARGET | ||
242 | #include "athendpack.h" | ||
243 | #endif | ||
244 | |||
245 | #endif /* __TARGADDRS_H__ */ | 237 | #endif /* __TARGADDRS_H__ */ |
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index d3de3cca0c7..363e9353a6b 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h | |||
@@ -34,10 +34,6 @@ | |||
34 | #ifndef _WMI_H_ | 34 | #ifndef _WMI_H_ |
35 | #define _WMI_H_ | 35 | #define _WMI_H_ |
36 | 36 | ||
37 | #ifndef ATH_TARGET | ||
38 | #include "athstartpack.h" | ||
39 | #endif | ||
40 | |||
41 | #include "wmix.h" | 37 | #include "wmix.h" |
42 | #include "wlan_defs.h" | 38 | #include "wlan_defs.h" |
43 | 39 | ||
@@ -3122,10 +3118,6 @@ typedef PREPACK struct { | |||
3122 | * End of AP mode definitions | 3118 | * End of AP mode definitions |
3123 | */ | 3119 | */ |
3124 | 3120 | ||
3125 | #ifndef ATH_TARGET | ||
3126 | #include "athendpack.h" | ||
3127 | #endif | ||
3128 | |||
3129 | #ifdef __cplusplus | 3121 | #ifdef __cplusplus |
3130 | } | 3122 | } |
3131 | #endif | 3123 | #endif |
diff --git a/drivers/staging/ath6kl/include/common/wmix.h b/drivers/staging/ath6kl/include/common/wmix.h index 5ebb8285d13..38c2970aa4d 100644 --- a/drivers/staging/ath6kl/include/common/wmix.h +++ b/drivers/staging/ath6kl/include/common/wmix.h | |||
@@ -40,10 +40,6 @@ | |||
40 | extern "C" { | 40 | extern "C" { |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #ifndef ATH_TARGET | ||
44 | #include "athstartpack.h" | ||
45 | #endif | ||
46 | |||
47 | #include "dbglog.h" | 43 | #include "dbglog.h" |
48 | 44 | ||
49 | /* | 45 | /* |
@@ -268,9 +264,6 @@ typedef PREPACK struct { | |||
268 | u32 count; | 264 | u32 count; |
269 | } POSTPACK WMIX_PROF_COUNT_EVENT; | 265 | } POSTPACK WMIX_PROF_COUNT_EVENT; |
270 | 266 | ||
271 | #ifndef ATH_TARGET | ||
272 | #include "athendpack.h" | ||
273 | #endif | ||
274 | 267 | ||
275 | #ifdef __cplusplus | 268 | #ifdef __cplusplus |
276 | } | 269 | } |
diff --git a/drivers/staging/ath6kl/wlan/include/ieee80211.h b/drivers/staging/ath6kl/wlan/include/ieee80211.h index 532ab0eb20c..cf47d0657e7 100644 --- a/drivers/staging/ath6kl/wlan/include/ieee80211.h +++ b/drivers/staging/ath6kl/wlan/include/ieee80211.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #ifndef _NET80211_IEEE80211_H_ | 23 | #ifndef _NET80211_IEEE80211_H_ |
24 | #define _NET80211_IEEE80211_H_ | 24 | #define _NET80211_IEEE80211_H_ |
25 | 25 | ||
26 | #include "athstartpack.h" | ||
27 | |||
28 | /* | 26 | /* |
29 | * 802.11 protocol definitions. | 27 | * 802.11 protocol definitions. |
30 | */ | 28 | */ |
@@ -396,6 +394,4 @@ enum ieee80211_authmode { | |||
396 | 394 | ||
397 | #define IEEE80211_PS_MAX_QUEUE 50 /*Maximum no of buffers that can be queues for PS*/ | 395 | #define IEEE80211_PS_MAX_QUEUE 50 /*Maximum no of buffers that can be queues for PS*/ |
398 | 396 | ||
399 | #include "athendpack.h" | ||
400 | |||
401 | #endif /* _NET80211_IEEE80211_H_ */ | 397 | #endif /* _NET80211_IEEE80211_H_ */ |
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 153ca1f5bc9..aad0c97dca0 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c | |||
@@ -265,8 +265,6 @@ const u8 up_to_ac[]= { | |||
265 | WMM_AC_VO, | 265 | WMM_AC_VO, |
266 | }; | 266 | }; |
267 | 267 | ||
268 | #include "athstartpack.h" | ||
269 | |||
270 | /* This stuff is used when we want a simple layer-3 visibility */ | 268 | /* This stuff is used when we want a simple layer-3 visibility */ |
271 | typedef PREPACK struct _iphdr { | 269 | typedef PREPACK struct _iphdr { |
272 | u8 ip_ver_hdrlen; /* version and hdr length */ | 270 | u8 ip_ver_hdrlen; /* version and hdr length */ |
@@ -284,8 +282,6 @@ typedef PREPACK struct _iphdr { | |||
284 | u8 ip_dst[4]; | 282 | u8 ip_dst[4]; |
285 | } POSTPACK iphdr; | 283 | } POSTPACK iphdr; |
286 | 284 | ||
287 | #include "athendpack.h" | ||
288 | |||
289 | static s16 rssi_event_value = 0; | 285 | static s16 rssi_event_value = 0; |
290 | static s16 snr_event_value = 0; | 286 | static s16 snr_event_value = 0; |
291 | 287 | ||