Recent changes to the rate structure registration broke rt2x00, the hw_value was reduced from 32bits to 16bits while rt2x00 used the full 32bits. However the way rt2x00 used the value was inflexible and needed to be changed anyway. This patch creates a array containing information for each rate, the hw_value passed to mac80211 is the index value for that array including a field to indicate if short preamble should be enabled. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
186 lines
5.2 KiB
C
186 lines
5.2 KiB
C
/*
|
|
Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
|
|
<http://rt2x00.serialmonkey.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the
|
|
Free Software Foundation, Inc.,
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
Module: rt2x00lib
|
|
Abstract: Data structures and definitions for the rt2x00lib module.
|
|
*/
|
|
|
|
#ifndef RT2X00LIB_H
|
|
#define RT2X00LIB_H
|
|
|
|
/*
|
|
* Interval defines
|
|
* Both the link tuner as the rfkill will be called once per second.
|
|
*/
|
|
#define LINK_TUNE_INTERVAL ( round_jiffies_relative(HZ) )
|
|
#define RFKILL_POLL_INTERVAL ( 1000 )
|
|
|
|
/*
|
|
* rt2x00_rate: Per rate device information
|
|
*/
|
|
struct rt2x00_rate {
|
|
unsigned short flags;
|
|
#define DEV_RATE_OFDM 0x0001
|
|
#define DEV_RATE_SHORT_PREAMBLE 0x0002
|
|
|
|
unsigned short bitrate; /* In 100kbit/s */
|
|
|
|
unsigned short ratemask;
|
|
#define DEV_RATEMASK_1MB ( (1 << 1) - 1 )
|
|
#define DEV_RATEMASK_2MB ( (1 << 2) - 1 )
|
|
#define DEV_RATEMASK_5_5MB ( (1 << 3) - 1 )
|
|
#define DEV_RATEMASK_11MB ( (1 << 4) - 1 )
|
|
#define DEV_RATEMASK_6MB ( (1 << 5) - 1 )
|
|
#define DEV_RATEMASK_9MB ( (1 << 6) - 1 )
|
|
#define DEV_RATEMASK_12MB ( (1 << 7) - 1 )
|
|
#define DEV_RATEMASK_18MB ( (1 << 8) - 1 )
|
|
#define DEV_RATEMASK_24MB ( (1 << 9) - 1 )
|
|
#define DEV_RATEMASK_36MB ( (1 << 10) - 1 )
|
|
#define DEV_RATEMASK_48MB ( (1 << 11) - 1 )
|
|
#define DEV_RATEMASK_54MB ( (1 << 12) - 1 )
|
|
|
|
unsigned short plcp;
|
|
};
|
|
|
|
extern const struct rt2x00_rate rt2x00_supported_rates[12];
|
|
|
|
static inline u16 rt2x00_create_rate_hw_value(const u16 index,
|
|
const u16 short_preamble)
|
|
{
|
|
return (short_preamble << 8) | (index & 0xff);
|
|
}
|
|
|
|
static inline const struct rt2x00_rate *rt2x00_get_rate(const u16 hw_value)
|
|
{
|
|
return &rt2x00_supported_rates[hw_value & 0xff];
|
|
}
|
|
|
|
static inline int rt2x00_get_rate_preamble(const u16 hw_value)
|
|
{
|
|
return (hw_value & 0xff00);
|
|
}
|
|
|
|
/*
|
|
* Radio control handlers.
|
|
*/
|
|
int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state);
|
|
void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Initialization handlers.
|
|
*/
|
|
int rt2x00lib_start(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Configuration handlers.
|
|
*/
|
|
void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
|
|
struct rt2x00_intf *intf,
|
|
enum ieee80211_if_types type,
|
|
u8 *mac, u8 *bssid);
|
|
void rt2x00lib_config_preamble(struct rt2x00_dev *rt2x00dev,
|
|
struct rt2x00_intf *intf,
|
|
const unsigned int short_preamble);
|
|
void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
|
|
enum antenna rx, enum antenna tx);
|
|
void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
|
|
struct ieee80211_conf *conf, const int force_config);
|
|
|
|
/*
|
|
* Queue handlers.
|
|
*/
|
|
void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_free(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Firmware handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_FIRMWARE
|
|
int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev);
|
|
#else
|
|
static inline int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
|
|
|
|
/*
|
|
* Debugfs handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_DEBUGFS
|
|
void rt2x00debug_register(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);
|
|
#else
|
|
static inline void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
|
struct sk_buff *skb)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
|
|
|
|
/*
|
|
* RFkill handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_RFKILL
|
|
int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev);
|
|
#else
|
|
static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_RFKILL */
|
|
|
|
#endif /* RT2X00LIB_H */
|