svn commit: r228799 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
Dimitry Andric
dim at FreeBSD.org
Thu Dec 22 13:47:37 UTC 2011
Author: dim
Date: Thu Dec 22 13:47:36 2011
New Revision: 228799
URL: http://svn.freebsd.org/changeset/base/228799
Log:
Revert r228785. We'll need to work around the warnings in another way.
Requested by: adrian
MFC after: 1 week
Modified:
head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Thu Dec 22 09:36:37 2011 (r228798)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Thu Dec 22 13:47:36 2011 (r228799)
@@ -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 */
Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Thu Dec 22 09:36:37 2011 (r228798)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Thu Dec 22 13:47:36 2011 (r228799)
@@ -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"
More information about the svn-src-all
mailing list