diff options
Diffstat (limited to 'sys/dev/ic/rtwreg.h')
| -rw-r--r-- | sys/dev/ic/rtwreg.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sys/dev/ic/rtwreg.h b/sys/dev/ic/rtwreg.h index ea759e9cc8a..365ffd0ef7a 100644 --- a/sys/dev/ic/rtwreg.h +++ b/sys/dev/ic/rtwreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwreg.h,v 1.6 2005/05/29 02:56:33 reyk Exp $ */ +/* $OpenBSD: rtwreg.h,v 1.7 2005/05/29 03:49:52 reyk Exp $ */ /* $NetBSD: rtwreg.h,v 1.12 2005/01/16 11:50:43 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -272,7 +272,7 @@ */ /* Loopback Test: disables TXI/TXQ outputs. */ -#define RTW_TCR_LBK_MASK BITS(18,17) +#define RTW_TCR_LBK_MASK BITS(18,17) #define RTW_TCR_LBK_NORMAL LSHIFT(0, RTW_TCR_LBK_MASK) /* normal ops */ #define RTW_TCR_LBK_MAC LSHIFT(1, RTW_TCR_LBK_MASK) /* MAC loopback */ #define RTW_TCR_LBK_BBP LSHIFT(2, RTW_TCR_LBK_MASK) /* baseband loop. */ @@ -692,10 +692,14 @@ * 0: MAC bangs bits */ #define RTW8180_PHYCFG_MAC_RFTYPE_MASK BITS(29,28) -#define RTW8180_PHYCFG_MAC_RFTYPE_INTERSIL LSHIFT(0, RTW8180_PHYCFG_MAC_RFTYPE_MASK) -#define RTW8180_PHYCFG_MAC_RFTYPE_RFMD LSHIFT(1, RTW8180_PHYCFG_MAC_RFTYPE_MASK) -#define RTW8180_PHYCFG_MAC_RFTYPE_GCT RTW8180_PHYCFG_MAC_RFTYPE_RFMD -#define RTW8180_PHYCFG_MAC_RFTYPE_PHILIPS LSHIFT(3, RTW8180_PHYCFG_MAC_RFTYPE_MASK) +#define RTW8180_PHYCFG_MAC_RFTYPE_INTERSIL \ + LSHIFT(0, RTW8180_PHYCFG_MAC_RFTYPE_MASK) +#define RTW8180_PHYCFG_MAC_RFTYPE_RFMD \ + LSHIFT(1, RTW8180_PHYCFG_MAC_RFTYPE_MASK) +#define RTW8180_PHYCFG_MAC_RFTYPE_GCT \ + RTW8180_PHYCFG_MAC_RFTYPE_RFMD +#define RTW8180_PHYCFG_MAC_RFTYPE_PHILIPS \ + LSHIFT(3, RTW8180_PHYCFG_MAC_RFTYPE_MASK) #define RTW8180_PHYCFG_MAC_PHILIPS_ADDR_MASK BITS(27,24) #define RTW8180_PHYCFG_MAC_PHILIPS_DATA_MASK BITS(23,0) #define RTW8180_PHYCFG_MAC_MAXIM_LODATA_MASK BITS(27,24) @@ -791,7 +795,7 @@ #define RTW8185_CAMDEBUG_CAMKEY BITS(23, 0) #define RTW8185_WPACONFIG 0xb0 /* WPA Config Register, 16b */ -#define RTW8185_WPACONFIG_RXWPADUMMY BIT(8) +#define RTW8185_WPACONFIG_RXWPADUMMY BIT(8) #define RTW8185_WPACONFIG_DISRX_AESMIC BIT(3) #define RTW8185_WPACONFIG_RXDECRYPT BIT(2) #define RTW8185_WPACONFIG_TXENCRYPT BIT(1) |