diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
commit | f063a0c0c995d010960efcc1b2ed14b99674f25c (patch) | |
tree | 106e30acd1a58b3cf9f3c15abe1de83f1919e03b /drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | |
parent | 3c3762957818dc902222733a8184f23102e24472 (diff) | |
parent | 5af634789c93b97cfb314a102436716be8fbc577 (diff) | |
download | op-kernel-dev-f063a0c0c995d010960efcc1b2ed14b99674f25c.zip op-kernel-dev-f063a0c0c995d010960efcc1b2ed14b99674f25c.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
Staging: brcm80211: fix usage of roundup in structures
Staging: bcm: fix up network device reference counting
Staging: keucr: fix up US_ macro change
staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
staging: brcm80211: Remove unnecessary header files.
staging: brcm80211: Remove unnecessary includes from bcmutils.c
staging: brcm80211: Removed unnecessary pktsetprio() function.
Staging: brcm80211: remove typedefs.h
Staging: brcm80211: remove uintptr typedef usage
Staging: hv: remove struct vmbus_channel_interface
Staging: hv: remove Open from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_open directly
Staging: hv: netvsc: call vmbus_open directly
Staging: hv: channel: export vmbus_open to modules
Staging: hv: remove Close from struct vmbus_channel_interface
Staging: hv: netvsc: call vmbus_close directly
Staging: hv: storvsc: call vmbus_close directly
Staging: hv: channel: export vmbus_close to modules
Staging: hv: remove SendPacket from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_sendpacket directly
...
Fix up conflicts in
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
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__*/ + |