svn commit: r187350 - in user/sam/wifi/sys/dev/ath: . ath_hal

[Sam Leffler]

Author: sam
Date: Fri Jan 16 22:41:12 2009
New Revision: 187350
URL: http://svn.freebsd.org/changeset/base/187350

Log:
  remove the regulatory class id's from the ath_hal_init_channels api

Modified:
  user/sam/wifi/sys/dev/ath/ath_hal/ah.h
  user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c
  user/sam/wifi/sys/dev/ath/if_ath.c

Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah.h	Fri Jan 16 22:39:48 2009	(r187349)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah.h	Fri Jan 16 22:41:12 2009	(r187350)
@@ -860,7 +860,6 @@ extern	struct ath_hal * __ahdecl ath_hal
  */
 extern	HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *,
 		HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
-		uint8_t *regclassids, u_int maxregids, u_int *nregids,
 		HAL_CTRY_CODE cc, u_int modeSelect,
 		HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels);
 

Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c	Fri Jan 16 22:39:48 2009	(r187349)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c	Fri Jan 16 22:41:12 2009	(r187350)
@@ -2235,7 +2235,6 @@ IS_BIT_SET(int bit, const uint64_t bitma
 HAL_BOOL
 ath_hal_init_channels(struct ath_hal *ah,
 		      HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
-		      uint8_t *regclassids, u_int maxregids, u_int *nregids,
 		      HAL_CTRY_CODE cc, u_int modeSelect,
 		      HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels)
 {

Modified: user/sam/wifi/sys/dev/ath/if_ath.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/if_ath.c	Fri Jan 16 22:39:48 2009	(r187349)
+++ user/sam/wifi/sys/dev/ath/if_ath.c	Fri Jan 16 22:41:12 2009	(r187350)
@@ -6204,7 +6204,7 @@ getchannels(struct ath_softc *sc, int *n
 	}
 	error = 0;
 	if (!ath_hal_init_channels(ah, halchans, IEEE80211_CHAN_MAX, &nhalchans,
-	    NULL, 0, NULL, cc, HAL_MODE_ALL, outdoor, ecm)) {
+	    cc, HAL_MODE_ALL, outdoor, ecm)) {
 		u_int32_t rd;
 		(void) ath_hal_getregdomain(ah, &rd);
 		device_printf(sc->sc_dev, "ath_hal_init_channels failed, "