From a6c1d38f592a167a45287c6401cfc66567eee15a Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 22 Dec 2011 13:47:36 +0000 Subject: [PATCH] Revert r228785. We'll need to work around the warnings in another way. Requested by: adrian MFC after: 1 week --- sys/dev/ath/ath_hal/ar5210/ar5210reg.h | 6 +++--- sys/dev/ath/ath_hal/ar5211/ar5211reg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210reg.h b/sys/dev/ath/ath_hal/ar5210/ar5210reg.h index 25b12a5bff4..894d9bbd854 100644 --- a/sys/dev/ath/ath_hal/ar5210/ar5210reg.h +++ b/sys/dev/ath/ath_hal/ar5210/ar5210reg.h @@ -245,9 +245,9 @@ #define AR_SCR_SLDUR 0x0000ffff /* sleep duration */ #define AR_SCR_SLE 0x00030000 /* sleep enable */ #define AR_SCR_SLE_S 16 -#define AR_SCR_SLE_WAKE 0 /* force wake */ -#define AR_SCR_SLE_SLP 1 /* force sleep */ -#define AR_SCR_SLE_ALLOW 2 /* allow to control sleep */ +#define AR_SCR_SLE_WAKE 0x00000000 /* force wake */ +#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */ +#define AR_SCR_SLE_ALLOW 0x00020000 /* allow to control sleep */ #define AR_SCR_BITS "\20\20SLE_SLP\21SLE_ALLOW" #define AR_INTPEND_IP 0x00000001 /* interrupt pending */ diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211reg.h b/sys/dev/ath/ath_hal/ar5211/ar5211reg.h index d558201cbd5..647f20db455 100644 --- a/sys/dev/ath/ath_hal/ar5211/ar5211reg.h +++ b/sys/dev/ath/ath_hal/ar5211/ar5211reg.h @@ -618,9 +618,9 @@ #define AR_SCR_SLDUR_S 0 #define AR_SCR_SLE 0x00030000 /* sleep enable mask */ #define AR_SCR_SLE_S 16 /* sleep enable bits shift */ -#define AR_SCR_SLE_WAKE 0 /* force wake */ -#define AR_SCR_SLE_SLP 1 /* force sleep */ -#define AR_SCR_SLE_NORM 2 /* sleep logic normal operation */ +#define AR_SCR_SLE_WAKE 0x00000000 /* force wake */ +#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */ +#define AR_SCR_SLE_NORM 0x00020000 /* sleep logic normal operation */ #define AR_SCR_SLE_UNITS 0x00000008 /* SCR units/TU */ #define AR_SCR_BITS "\20\20SLE_SLP\21SLE"