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_security_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_security_bitdef.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_security_bitdef.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_security_bitdef.h b/drivers/staging/rtl8712/rtl8712_security_bitdef.h new file mode 100644 index 0000000..8df4bf4 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_security_bitdef.h @@ -0,0 +1,29 @@ +#ifndef __RTL8712_SECURITY_BITDEF_H__ +#define __RTL8712_SECURITY_BITDEF_H__ + +/*CAMCMD*/ +#define _SECCAM_POLLING BIT(31) +#define _SECCAM_CLR BIT(30) +#define _SECCAM_WE BIT(16) +#define _SECCAM_ADR_MSK 0x000000FF +#define _SECCAM_ADR_SHT 0 + +/*CAMDBG*/ +#define _SECCAM_INFO BIT(31) +#define _SEC_KEYFOUND BIT(30) +#define _SEC_CONFIG_MSK 0x3F000000 +#define _SEC_CONFIG_SHT 24 +#define _SEC_KEYCONTENT_MSK 0x00FFFFFF +#define _SEC_KEYCONTENT_SHT 0 + +/*SECCFG*/ +#define _NOSKMC BIT(5) +#define _SKBYA2 BIT(4) +#define _RXDEC BIT(3) +#define _TXENC BIT(2) +#define _RXUSEDK BIT(1) +#define _TXUSEDK BIT(0) + + +#endif /*__RTL8712_SECURITY_BITDEF_H__*/ + |
