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_wmac_bitdef.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
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_wmac_bitdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h b/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h new file mode 100644 index 0000000..6d3be2a --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h @@ -0,0 +1,37 @@ +#ifndef __RTL8712_WMAC_BITDEF_H__ +#define __RTL8712_WMAC_BITDEF_H__ + +/*NAVCTRL*/ +#define _NAV_UPPER_EN BIT(18) +#define _NAV_MTO_EN BIT(17) +#define _NAV_UPPER BIT(16) +#define _NAV_MTO_MSK 0xFF00 +#define _NAV_MTO_SHT 8 +#define _RTSRST_MSK 0x00FF +#define _RTSRST_SHT 0 + +/*BWOPMODE*/ +#define _20MHZBW BIT(2) + +/*BACAMCMD*/ +#define _BACAM_POLL BIT(31) +#define _BACAM_RST BIT(17) +#define _BACAM_RW BIT(16) +#define _BACAM_ADDR_MSK 0x0000007F +#define _BACAM_ADDR_SHT 0 + +/*LBDLY*/ +#define _LBDLY_MSK 0x1F + +/*FWDLY*/ +#define _FWDLY_MSK 0x0F + +/*RXERR_RPT*/ +#define _RXERR_RPT_SEL_MSK 0xF0000000 +#define _RXERR_RPT_SEL_SHT 28 +#define _RPT_CNT_MSK 0x000FFFFF +#define _RPT_CNT_SHT 0 + + +#endif /*__RTL8712_WMAC_BITDEF_H__*/ + |