Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 May 2012 18:17:02 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r235206 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
Message-ID:  <201205091817.q49IH2OK096523@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)
+{
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205091817.q49IH2OK096523>