From owner-svn-src-head@FreeBSD.ORG  Wed May  9 18:17:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A9709106564A;
	Wed,  9 May 2012 18:17:02 +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 930FD8FC0A;
	Wed,  9 May 2012 18:17:02 +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 q49IH2jj096530;
	Wed, 9 May 2012 18:17:02 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q49IH2OK096523;
	Wed, 9 May 2012 18:17:02 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201205091817.q49IH2OK096523@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 9 May 2012 18:17:02 +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: r235206 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
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: Wed, 09 May 2012 18:17:02 -0000

Author: adrian
Date: Wed May  9 18:17:01 2012
New Revision: 235206
URL: http://svn.freebsd.org/changeset/base/235206

Log:
  Add some empty DFS methods for AR5210/AR5211 for now, if DFS is enabled
  but these don't exist, the code panics.
  
  I should really just add or use a DFS HAL capability before doing this,
  so the methods wouldn't be needed..

Modified:
  head/sys/dev/ath/ath_hal/ar5210/ar5210.h
  head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  head/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
  head/sys/dev/ath/ath_hal/ar5211/ar5211.h
  head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210.h	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210.h	Wed May  9 18:17:01 2012	(r235206)
@@ -252,6 +252,8 @@ extern	HAL_BOOL ar5210GetDiagState(struc
 extern	uint32_t ar5210Get11nExtBusy(struct ath_hal *);
 extern	HAL_BOOL ar5210GetMibCycleCounts(struct ath_hal *,
 		HAL_SURVEY_SAMPLE *);
+extern	void ar5210EnableDfs(struct ath_hal *, HAL_PHYERR_PARAM *);
+extern	void ar5210GetDfsThresh(struct ath_hal *, HAL_PHYERR_PARAM *);
 
 extern	u_int ar5210GetKeyCacheSize(struct ath_hal *);
 extern	HAL_BOOL ar5210IsKeyCacheEntryValid(struct ath_hal *, uint16_t);

Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c	Wed May  9 18:17:01 2012	(r235206)
@@ -133,6 +133,10 @@ static const struct ath_hal_private ar52
 	.ah_setCoverageClass		= ar5210SetCoverageClass,
 	.ah_get11nExtBusy		= ar5210Get11nExtBusy,
 	.ah_getMibCycleCounts		= ar5210GetMibCycleCounts,
+	.ah_enableDfs			= ar5210EnableDfs,
+	.ah_getDfsThresh		= ar5210GetDfsThresh,
+	/* XXX procRadarEvent */
+	/* XXX isFastClockEnabled */
 
 	/* Key Cache Functions */
 	.ah_getKeyCacheSize		= ar5210GetKeyCacheSize,

Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c	Wed May  9 18:17:01 2012	(r235206)
@@ -667,3 +667,13 @@ ar5210GetMibCycleCounts(struct ath_hal *
 
 	return (AH_FALSE);
 }
+
+void
+ar5210EnableDfs(struct ath_hal *ah, HAL_PHYERR_PARAM *pe)
+{
+}
+
+void
+ar5210GetDfsThresh(struct ath_hal *ah, HAL_PHYERR_PARAM *pe)
+{
+}

Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211.h	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211.h	Wed May  9 18:17:01 2012	(r235206)
@@ -279,6 +279,8 @@ extern	HAL_BOOL ar5211GetDiagState(struc
 extern	uint32_t ar5211Get11nExtBusy(struct ath_hal *);
 extern	HAL_BOOL ar5211GetMibCycleCounts(struct ath_hal *,
 		HAL_SURVEY_SAMPLE *);
+extern	void ar5211EnableDfs(struct ath_hal *, HAL_PHYERR_PARAM *);
+extern	void ar5211GetDfsThresh(struct ath_hal *, HAL_PHYERR_PARAM *);
 
 extern	u_int ar5211GetKeyCacheSize(struct ath_hal *);
 extern	HAL_BOOL ar5211IsKeyCacheEntryValid(struct ath_hal *, uint16_t);

Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c	Wed May  9 18:17:01 2012	(r235206)
@@ -133,6 +133,10 @@ static const struct ath_hal_private ar52
 	.ah_setCoverageClass		= ar5211SetCoverageClass,
 	.ah_get11nExtBusy		= ar5211Get11nExtBusy,
 	.ah_getMibCycleCounts		= ar5211GetMibCycleCounts,
+	.ah_enableDfs			= ar5211EnableDfs,
+	.ah_getDfsThresh		= ar5211GetDfsThresh,
+	/* XXX procRadarEvent */
+	/* XXX isFastClockEnabled */
 
 	/* Key Cache Functions */
 	.ah_getKeyCacheSize		= ar5211GetKeyCacheSize,

Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c	Wed May  9 17:32:10 2012	(r235205)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c	Wed May  9 18:17:01 2012	(r235206)
@@ -709,3 +709,13 @@ ar5211GetMibCycleCounts(struct ath_hal *
 
 	return (AH_FALSE);
 }
+
+void
+ar5211EnableDfs(struct ath_hal *ah, HAL_PHYERR_PARAM *pe)
+{
+}
+
+void
+ar5211GetDfsThresh(struct ath_hal *ah, HAL_PHYERR_PARAM *pe)
+{
+}