From owner-svn-src-head@FreeBSD.ORG  Fri Dec 23 09:09:10 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B50F81065675;
	Fri, 23 Dec 2011 09:09:10 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FA6C8FC1B;
	Fri, 23 Dec 2011 09:09:10 +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 pBN99AcS056941;
	Fri, 23 Dec 2011 09:09:10 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBN99Awq056939;
	Fri, 23 Dec 2011 09:09:10 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201112230909.pBN99Awq056939@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 23 Dec 2011 09:09:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228837 - head/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2011 09:09:10 -0000

Author: adrian
Date: Fri Dec 23 09:09:10 2011
New Revision: 228837
URL: http://svn.freebsd.org/changeset/base/228837

Log:
  Disable the code which hard-sets the LEDs on.  This prevents the LED
  state from correctly updating things.
  
  The reference driver directly enables/disables the LED state as required,
  rather than nailing it up like it currently is.  That'll have to come
  later by adding some further HAL methods.
  
  Obtained from:	Atheros

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Fri Dec 23 08:53:22 2011	(r228836)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Fri Dec 23 09:09:10 2011	(r228837)
@@ -73,11 +73,23 @@ ar5416SetLedState(struct ath_hal *ah, HA
 		AR_MAC_LED_ASSOC_NONE,
 		AR_MAC_LED_ASSOC_NONE,
 	};
+#if 0
 	uint32_t bits;
+#endif
 
 	if (AR_SREV_HOWL(ah))
 		return;
 
+	OS_REG_RMW_FIELD(ah, AR_MAC_LED,
+	    AR_MAC_LED_ASSOC, ledbits[state & 0x7]);
+
+	/*
+	 * For now, don't override the power/network LED
+	 * "on" bits.  The reference driver notes that some
+	 * devices connect the LED pins to other functionality
+	 * so we can't just leave this on by default.
+	 */
+#if 0
 	bits = OS_REG_READ(ah, AR_MAC_LED);
 	bits = (bits &~ AR_MAC_LED_MODE)
 	     | SM(AR_MAC_LED_MODE_POWON, AR_MAC_LED_MODE)
@@ -88,6 +100,7 @@ ar5416SetLedState(struct ath_hal *ah, HA
 	bits = (bits &~ AR_MAC_LED_ASSOC)
 	     | SM(ledbits[state & 0x7], AR_MAC_LED_ASSOC);
 	OS_REG_WRITE(ah, AR_MAC_LED, bits);
+#endif
 }
 
 /*