diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h b/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h new file mode 100644 index 000000000000..32ce9fab5dbe --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h @@ -0,0 +1,44 @@ +#ifndef __RTL8712_TIMECTRL_BITDEF_H__ +#define __RTL8712_TIMECTRL_BITDEF_H__ + +/*TSFTR*/ +/*SLOT*/ +/*USTIME*/ + +/*TUBASE*/ +#define _TUBASE_MSK 0x07FF + +/*SIFS_CCK*/ +#define _SIFS_CCK_TRX_MSK 0xFF00 +#define _SIFS_CCK_TRX_SHT 0x8 +#define _SIFS_CCK_CTX_MSK 0x00FF +#define _SIFS_CCK_CTX_SHT 0 + +/*SIFS_OFDM*/ +#define _SIFS_OFDM_TRX_MSK 0xFF00 +#define _SIFS_OFDM_TRX_SHT 0x8 +#define _SIFS_OFDM_CTX_MSK 0x00FF +#define _SIFS_OFDM_CTX_SHT 0 + +/*PIFS*/ +/*ACKTO*/ +/*EIFS*/ +/*BCNITV*/ +/*ATIMWND*/ + +/*DRVERLYINT*/ +#define _ENSWBCN BIT(15) +#define _DRVERLY_TU_MSK 0x0FF0 +#define _DRVERLY_TU_SHT 4 +#define _DRVERLY_US_MSK 0x000F +#define _DRVERLY_US_SHT 0 + +/*BCNDMATIM*/ +#define _BCNDMATIM_MSK 0x03FF + +/*BCNERRTH*/ +/*MLT*/ + + +#endif /* __RTL8712_TIMECTRL_BITDEF_H__*/ + |