Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx> --- drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 -------------------- drivers/staging/ath6kl/include/common/ini_dset.h | 82 ------------------- drivers/staging/ath6kl/include/common/regDb.h | 29 ------- drivers/staging/ath6kl/include/common/wlan_dset.h | 33 -------- 4 files changed, 0 insertions(+), 230 deletions(-) delete mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h delete mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h delete mode 100644 drivers/staging/ath6kl/include/common/regDb.h delete mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h diff --git a/drivers/staging/ath6kl/include/common/btcoexGpio.h b/drivers/staging/ath6kl/include/common/btcoexGpio.h deleted file mode 100644 index 9d5a239..0000000 --- a/drivers/staging/ath6kl/include/common/btcoexGpio.h +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2010 Atheros Communications Inc. -// All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// - -#ifndef BTCOEX_GPIO_H_ -#define BTCOEX_GPIO_H_ - - - -#ifdef FPGA -#define GPIO_A (15) -#define GPIO_B (16) -#define GPIO_C (17) -#define GPIO_D (18) -#define GPIO_E (19) -#define GPIO_F (21) -#define GPIO_G (21) -#else -#define GPIO_A (0) -#define GPIO_B (5) -#define GPIO_C (6) -#define GPIO_D (7) -#define GPIO_E (7) -#define GPIO_F (7) -#define GPIO_G (7) -#endif - - - - - -#define GPIO_DEBUG_WORD_1 (1<<GPIO_A) -#define GPIO_DEBUG_WORD_2 (1<<GPIO_B) -#define GPIO_DEBUG_WORD_3 ((1<<GPIO_B) | (1<<GPIO_A)) -#define GPIO_DEBUG_WORD_4 (1<<GPIO_C) -#define GPIO_DEBUG_WORD_5 ((1<<GPIO_C) | (1<<GPIO_A)) -#define GPIO_DEBUG_WORD_6 ((1<<GPIO_C) | (1<<GPIO_B)) -#define GPIO_DEBUG_WORD_7 ((1<<GPIO_C) | (1<<GPIO_B) | (1<<GPIO_A)) - -#define GPIO_DEBUG_WORD_8 (1<<GPIO_D) -#define GPIO_DEBUG_WORD_9 ((1<<GPIO_D) | GPIO_DEBUG_WORD_1) -#define GPIO_DEBUG_WORD_10 ((1<<GPIO_D) | GPIO_DEBUG_WORD_2) -#define GPIO_DEBUG_WORD_11 ((1<<GPIO_D) | GPIO_DEBUG_WORD_3) -#define GPIO_DEBUG_WORD_12 ((1<<GPIO_D) | GPIO_DEBUG_WORD_4) -#define GPIO_DEBUG_WORD_13 ((1<<GPIO_D) | GPIO_DEBUG_WORD_5) -#define GPIO_DEBUG_WORD_14 ((1<<GPIO_D) | GPIO_DEBUG_WORD_6) -#define GPIO_DEBUG_WORD_15 ((1<<GPIO_D) | GPIO_DEBUG_WORD_7) - -#define GPIO_DEBUG_WORD_16 (1<<GPIO_E) -#define GPIO_DEBUG_WORD_17 ((1<<GPIO_E) | GPIO_DEBUG_WORD_1) -#define GPIO_DEBUG_WORD_18 ((1<<GPIO_E) | GPIO_DEBUG_WORD_2) -#define GPIO_DEBUG_WORD_19 ((1<<GPIO_E) | GPIO_DEBUG_WORD_3) -#define GPIO_DEBUG_WORD_20 ((1<<GPIO_E) | GPIO_DEBUG_WORD_4) -#define GPIO_DEBUG_WORD_21 ((1<<GPIO_E) | GPIO_DEBUG_WORD_5) -#define GPIO_DEBUG_WORD_22 ((1<<GPIO_E) | GPIO_DEBUG_WORD_6) -#define GPIO_DEBUG_WORD_23 ((1<<GPIO_E) | GPIO_DEBUG_WORD_7) - - - -extern void btcoexDbgPulseWord(u32 gpioPinMask); -extern void btcoexDbgPulse(u32 pin); - -#ifdef CONFIG_BTCOEX_ENABLE_GPIO_DEBUG -#define BTCOEX_DBG_PULSE_WORD(gpioPinMask) (btcoexDbgPulseWord(gpioPinMask)) -#define BTCOEX_DBG_PULSE(pin) (btcoexDbgPulse(pin)) -#else -#define BTCOEX_DBG_PULSE_WORD(gpioPinMask) -#define BTCOEX_DBG_PULSE(pin) - -#endif -#endif - diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h deleted file mode 100644 index a9e05fa..0000000 --- a/drivers/staging/ath6kl/include/common/ini_dset.h +++ /dev/null @@ -1,82 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2004-2010 Atheros Corporation. All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// -// -// Author(s): ="Atheros" -//------------------------------------------------------------------------------ - -#ifndef _INI_DSET_H_ -#define _INI_DSET_H_ - -/* - * Each of these represents a WHAL INI table, which consists - * of an "address column" followed by 1 or more "value columns". - * - * Software uses the base WHAL_INI_DATA_ID+column to access a - * DataSet that holds a particular column of data. - */ -typedef enum { -#if defined(AR6002_REV4) || defined(AR6003) -/* Add these definitions for compatibility */ -#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN -#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 WHAL_INI_DATA_ID_BB_RFGAIN - WHAL_INI_DATA_ID_NULL =0, - WHAL_INI_DATA_ID_MODE_SPECIFIC =1, /* 2,3,4,5 */ - WHAL_INI_DATA_ID_COMMON =6, /* 7 */ - WHAL_INI_DATA_ID_BB_RFGAIN =8, /* 9,10 */ -#ifdef FPGA - WHAL_INI_DATA_ID_ANALOG_BANK0 =11, /* 12 */ - WHAL_INI_DATA_ID_ANALOG_BANK1 =13, /* 14 */ - WHAL_INI_DATA_ID_ANALOG_BANK2 =15, /* 16 */ - WHAL_INI_DATA_ID_ANALOG_BANK3 =17, /* 18, 19 */ - WHAL_INI_DATA_ID_ANALOG_BANK6 =20, /* 21,22 */ - WHAL_INI_DATA_ID_ANALOG_BANK7 =23, /* 24 */ - WHAL_INI_DATA_ID_ADDAC =25, /* 26 */ -#else - WHAL_INI_DATA_ID_ANALOG_COMMON =11, /* 12 */ - WHAL_INI_DATA_ID_ANALOG_MODE_SPECIFIC=13, /* 14,15 */ - WHAL_INI_DATA_ID_ANALOG_BANK6 =16, /* 17,18 */ - WHAL_INI_DATA_ID_MODE_OVERRIDES =19, /* 20,21,22,23 */ - WHAL_INI_DATA_ID_COMMON_OVERRIDES =24, /* 25 */ - WHAL_INI_DATA_ID_ANALOG_OVERRIDES =26, /* 27,28 */ -#endif /* FPGA */ -#else - WHAL_INI_DATA_ID_NULL =0, - WHAL_INI_DATA_ID_MODE_SPECIFIC =1, /* 2,3 */ - WHAL_INI_DATA_ID_COMMON =4, /* 5 */ - WHAL_INI_DATA_ID_BB_RFGAIN =6, /* 7,8 */ -#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN - WHAL_INI_DATA_ID_ANALOG_BANK1 =9, /* 10 */ - WHAL_INI_DATA_ID_ANALOG_BANK2 =11, /* 12 */ - WHAL_INI_DATA_ID_ANALOG_BANK3 =13, /* 14, 15 */ - WHAL_INI_DATA_ID_ANALOG_BANK6 =16, /* 17, 18 */ - WHAL_INI_DATA_ID_ANALOG_BANK7 =19, /* 20 */ - WHAL_INI_DATA_ID_MODE_OVERRIDES =21, /* 22,23 */ - WHAL_INI_DATA_ID_COMMON_OVERRIDES =24, /* 25 */ - WHAL_INI_DATA_ID_ANALOG_OVERRIDES =26, /* 27,28 */ - WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 =29, /* 30,31 */ -#endif - WHAL_INI_DATA_ID_MAX =31 -} WHAL_INI_DATA_ID; - -typedef PREPACK struct { - u16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common - u16 offset; - u32 newValue; -} POSTPACK INI_DSET_REG_OVERRIDE; - -#endif diff --git a/drivers/staging/ath6kl/include/common/regDb.h b/drivers/staging/ath6kl/include/common/regDb.h deleted file mode 100644 index f8245f1..0000000 --- a/drivers/staging/ath6kl/include/common/regDb.h +++ /dev/null @@ -1,29 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2005-2010 Atheros Corporation. All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// -//------------------------------------------------------------------------------ -//============================================================================== -// Author(s): ="Atheros" -//============================================================================== - -#ifndef __REG_DB_H__ -#define __REG_DB_H__ - -#include "./regulatory/reg_dbschema.h" -#include "./regulatory/reg_dbvalues.h" - -#endif /* __REG_DB_H__ */ diff --git a/drivers/staging/ath6kl/include/common/wlan_dset.h b/drivers/staging/ath6kl/include/common/wlan_dset.h deleted file mode 100644 index e775b25..0000000 --- a/drivers/staging/ath6kl/include/common/wlan_dset.h +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2007-2010 Atheros Corporation. All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// -//------------------------------------------------------------------------------ -//============================================================================== -// Author(s): ="Atheros" -//============================================================================== - -#ifndef __WLAN_DSET_H__ -#define __WLAN_DSET_H__ - -typedef PREPACK struct wow_config_dset { - - u8 valid_dset; - u8 gpio_enable; - u16 gpio_pin; -} POSTPACK WOW_CONFIG_DSET; - -#endif -- 1.7.0.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel