From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 6 21:19:43 2012 Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG> Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DCE4106567A; Fri, 6 Jan 2012 21:19:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 70EDC8FC13; Fri, 6 Jan 2012 21:19:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q06LJhpi008456; Fri, 6 Jan 2012 21:19:43 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q06LJhk2008453; Fri, 6 Jan 2012 21:19:43 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201201062119.q06LJhk2008453@svn.freebsd.org> From: Dimitry Andric <dim@FreeBSD.org> Date: Fri, 6 Jan 2012 21:19:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229733 - in stable/9/sys/dev/ath/ath_hal: ar5210 ar5211 X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree <svn-src-stable-9.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9> List-Post: <mailto:svn-src-stable-9@freebsd.org> List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 06 Jan 2012 21:19:43 -0000 Author: dim Date: Fri Jan 6 21:19:43 2012 New Revision: 229733 URL: http://svn.freebsd.org/changeset/base/229733 Log: MFC r228980: Reapply r228785 now it has been tested by Adrian. Also add comments with the old AR_SCR_SLE_XXX values, with a short explanation why they were changed. Reviewed by: adrian Modified: stable/9/sys/dev/ath/ath_hal/ar5210/ar5210reg.h stable/9/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/dev/ath/ath_hal/ar5210/ar5210reg.h ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Fri Jan 6 21:16:51 2012 (r229732) +++ stable/9/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Fri Jan 6 21:19:43 2012 (r229733) @@ -245,9 +245,20 @@ #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 0x00000000 /* force wake */ -#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */ -#define AR_SCR_SLE_ALLOW 0x00020000 /* allow to control sleep */ +/* + * The previous values for the following three defines were: + * + * AR_SCR_SLE_WAKE 0x00000000 + * AR_SCR_SLE_SLP 0x00010000 + * AR_SCR_SLE_ALLOW 0x00020000 + * + * However, these have been pre-shifted with AR_SCR_SLE_S. The + * OS_REG_READ() macro would attempt to shift them again, effectively + * shifting out any of the set bits completely. + */ +#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_BITS "\20\20SLE_SLP\21SLE_ALLOW" #define AR_INTPEND_IP 0x00000001 /* interrupt pending */ Modified: stable/9/sys/dev/ath/ath_hal/ar5211/ar5211reg.h ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Fri Jan 6 21:16:51 2012 (r229732) +++ stable/9/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Fri Jan 6 21:19:43 2012 (r229733) @@ -618,9 +618,20 @@ #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 0x00000000 /* force wake */ -#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */ -#define AR_SCR_SLE_NORM 0x00020000 /* sleep logic normal operation */ +/* + * The previous values for the following three defines were: + * + * AR_SCR_SLE_WAKE 0x00000000 + * AR_SCR_SLE_SLP 0x00010000 + * AR_SCR_SLE_NORM 0x00020000 + * + * However, these have been pre-shifted with AR_SCR_SLE_S. The + * OS_REG_READ() macro would attempt to shift them again, effectively + * shifting out any of the set bits completely. + */ +#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_UNITS 0x00000008 /* SCR units/TU */ #define AR_SCR_BITS "\20\20SLE_SLP\21SLE"