summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2005-10-07 22:03:26 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2005-10-07 22:03:26 +0000
commit6647ea05aff742016253d1428e71ed6118918651 (patch)
tree1758805d37bce478c3abe379c38c72437cdcc05b /sys/dev
parentc6b2d156b2d32737068bf6da7fc9aa828f277b41 (diff)
KNF
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ar5210.c4
-rw-r--r--sys/dev/ic/ar5211.c6
-rw-r--r--sys/dev/ic/ar5211reg.h12
-rw-r--r--sys/dev/ic/ar5212.c4
-rw-r--r--sys/dev/ic/ar5212var.h4
5 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c
index 412b16fc919..11d2758024a 100644
--- a/sys/dev/ic/ar5210.c
+++ b/sys/dev/ic/ar5210.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5210.c,v 1.31 2005/10/04 13:50:00 reyk Exp $ */
+/* $OpenBSD: ar5210.c,v 1.32 2005/10/07 22:03:25 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -1907,7 +1907,7 @@ ar5k_ar5210_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
/* Fail if the AR5210 didn't wake up */
if (i <= 0)
return (AH_FALSE);
-
+
staid &= ~AR5K_AR5210_STA_ID1_PWR_SV;
break;
diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c
index f6b8f685dcf..1b27facf093 100644
--- a/sys/dev/ic/ar5211.c
+++ b/sys/dev/ic/ar5211.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5211.c,v 1.23 2005/10/04 13:50:00 reyk Exp $ */
+/* $OpenBSD: ar5211.c,v 1.24 2005/10/07 22:03:25 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -2011,7 +2011,7 @@ ar5k_ar5211_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
/* Fail if the AR5211 didn't wake up */
if (i <= 0)
return (AH_FALSE);
-
+
staid &= ~AR5K_AR5211_STA_ID1_PWR_SV;
break;
@@ -2511,7 +2511,7 @@ ar5k_ar5211_rfregs(struct ath_hal *hal, HAL_CHANNEL *channel, u_int freq,
AR5K_REG_WAIT(i);
AR5K_REG_WRITE((u_int32_t)rf[i].rf_register,
rf[i].rf_value[freq]);
- }
+ }
hal->ah_rf_gain = HAL_RFGAIN_INACTIVE;
}
diff --git a/sys/dev/ic/ar5211reg.h b/sys/dev/ic/ar5211reg.h
index d4d2d9cb8dc..c47ae42bf46 100644
--- a/sys/dev/ic/ar5211reg.h
+++ b/sys/dev/ic/ar5211reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5211reg.h,v 1.6 2005/07/30 17:13:17 reyk Exp $ */
+/* $OpenBSD: ar5211reg.h,v 1.7 2005/10/07 22:03:25 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -336,16 +336,16 @@
*/
#define AR5K_AR5211_QCU_CBRCFG(_n) AR5K_AR5211_QCU(_n, 0x08c0)
#define AR5K_AR5211_QCU_CBRCFG_INTVAL 0x00ffffff
-#define AR5K_AR5211_QCU_CBRCFG_INTVAL_S 0
+#define AR5K_AR5211_QCU_CBRCFG_INTVAL_S 0
#define AR5K_AR5211_QCU_CBRCFG_ORN_THRES 0xff000000
-#define AR5K_AR5211_QCU_CBRCFG_ORN_THRES_S 24
+#define AR5K_AR5211_QCU_CBRCFG_ORN_THRES_S 24
/*
* QCU Ready time configuration registers
*/
#define AR5K_AR5211_QCU_RDYTIMECFG(_n) AR5K_AR5211_QCU(_n, 0x0900)
#define AR5K_AR5211_QCU_RDYTIMECFG_INTVAL 0x00ffffff
-#define AR5K_AR5211_QCU_RDYTIMECFG_INTVAL_S 0
+#define AR5K_AR5211_QCU_RDYTIMECFG_INTVAL_S 0
#define AR5K_AR5211_QCU_RDYTIMECFG_DURATION 0x00ffffff
#define AR5K_AR5211_QCU_RDYTIMECFG_ENABLE 0x01000000
@@ -665,9 +665,9 @@ typedef enum {
#define AR5K_AR5211_EEPROM_REG_DOMAIN 0xbf
#define AR5K_AR5211_EEPROM_INFO_BASE 0xc0
#define AR5K_AR5211_EEPROM_INFO_VERSION \
- (AR5K_AR5211_EEPROM_INFO_BASE + 1)
+ (AR5K_AR5211_EEPROM_INFO_BASE + 1)
#define AR5K_AR5211_EEPROM_INFO_MAX \
- (0x400 - AR5K_AR5211_EEPROM_INFO_BASE)
+ (0x400 - AR5K_AR5211_EEPROM_INFO_BASE)
/*
* PCU registers
diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c
index 2dba7499832..4f2d3345426 100644
--- a/sys/dev/ic/ar5212.c
+++ b/sys/dev/ic/ar5212.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5212.c,v 1.26 2005/09/19 10:27:08 reyk Exp $ */
+/* $OpenBSD: ar5212.c,v 1.27 2005/10/07 22:03:25 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -2329,7 +2329,7 @@ ar5k_ar5212_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
/* Fail if the AR5212 didn't wake up */
if (i <= 0)
return (AH_FALSE);
-
+
staid &= ~AR5K_AR5212_STA_ID1_PWR_SV;
break;
diff --git a/sys/dev/ic/ar5212var.h b/sys/dev/ic/ar5212var.h
index 34cdf309a55..84b76bf6b4e 100644
--- a/sys/dev/ic/ar5212var.h
+++ b/sys/dev/ic/ar5212var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5212var.h,v 1.8 2005/07/30 17:13:17 reyk Exp $ */
+/* $OpenBSD: ar5212var.h,v 1.9 2005/10/07 22:03:25 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -745,7 +745,7 @@ struct ar5k_ar5212_ini_mode {
{ 0x00000000, 0x00000000, 0x00000000, 0x00000108, 0x00000000 } \
} }, \
{ 0x801c, AR5K_INI_FLAG_BOTH, { \
- { 0x128d8fa7, 0x09880fcf, 0x04e00f95, 0x128d8fab, 0x09880fcf }, \
+ { 0x128d8fa7, 0x09880fcf, 0x04e00f95, 0x128d8fab, 0x09880fcf }, \
{ 0x128d93a7, 0x098813cf, 0x04e01395, 0x128d93ab, 0x098813cf } \
} }, \
{ 0x9824, AR5K_INI_FLAG_BOTH, { \