From owner-svn-src-user@FreeBSD.ORG  Fri Nov  4 22:58:34 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 687511065675;
	Fri,  4 Nov 2011 22:58:34 +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 587908FC1D;
	Fri,  4 Nov 2011 22:58:34 +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 pA4MwYEg038099;
	Fri, 4 Nov 2011 22:58:34 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA4MwYr9038097;
	Fri, 4 Nov 2011 22:58:34 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201111042258.pA4MwYr9038097@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 4 Nov 2011 22:58:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227097 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2011 22:58:34 -0000

Author: adrian
Date: Fri Nov  4 22:58:34 2011
New Revision: 227097
URL: http://svn.freebsd.org/changeset/base/227097

Log:
  Implement an analog register write, which Merlin requires a delay for.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_internal.h

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_internal.h	Fri Nov  4 22:56:48 2011	(r227096)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_internal.h	Fri Nov  4 22:58:34 2011	(r227097)
@@ -485,6 +485,8 @@ isBigEndian(void)
 /* Analog register writes may require a delay between each one (eg Merlin?) */
 #define	OS_A_REG_RMW_FIELD(_a, _r, _f, _v) \
 	do { OS_REG_WRITE(_a, _r, (OS_REG_READ(_a, _r) &~ (_f)) | (((_v) << _f##_S) & (_f))) ; OS_DELAY(100); } while (0)
+#define	OS_A_REG_WRITE(_a, _r, _v) \
+	do { OS_REG_WRITE(_a, _r, _v) ; OS_DELAY(100); } while (0)
 
 /* wait for the register contents to have the specified value */
 extern	HAL_BOOL ath_hal_wait(struct ath_hal *, u_int reg,