From owner-p4-projects@FreeBSD.ORG  Wed Mar  5 01:35:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 15EA51065671; Wed,  5 Mar 2008 01:35:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9C78106566C
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 01:35:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B66AD8FC16
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 01:35:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m251ZnZe081405
	for <perforce@freebsd.org>; Wed, 5 Mar 2008 01:35:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m251Zn2O081403
	for perforce@freebsd.org; Wed, 5 Mar 2008 01:35:49 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Mar 2008 01:35:49 GMT
Message-Id: <200803050135.m251Zn2O081403@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136877 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Mar 2008 01:35:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=136877

Change 136877 by sam@sam_ebb on 2008/03/05 01:35:33

	v0.9.20.3 doesn't return maxTxPower settings for 5111 parts;
	fake it using the max regulatory power, the hal will cap any
	tx power above what the h/w can do

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#40 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#40 (text+ko) ====

@@ -5746,7 +5746,7 @@
 	int i, nhalchans, error;
 
 	halchans = malloc(IEEE80211_CHAN_MAX * sizeof(HAL_CHANNEL),
-			M_TEMP, M_NOWAIT);
+			M_TEMP, M_NOWAIT | M_ZERO);
 	if (halchans == NULL) {
 		device_printf(sc->sc_dev,
 		    "%s: unable to allocate channel table\n", __func__);
@@ -5771,8 +5771,10 @@
 		ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel,
 					c->channelFlags);
 		if (bootverbose)
-			device_printf(sc->sc_dev, "hal channel %u/%x -> %u\n",
-			    c->channel, c->channelFlags, ichan->ic_ieee);
+			device_printf(sc->sc_dev, "hal channel %u/%x -> %u "
+			    "maxpow %d minpow %d maxreg %d\n",
+			    c->channel, c->channelFlags, ichan->ic_ieee,
+			    c->maxTxPower, c->minTxPower, c->maxRegTxPower);
 		ichan->ic_freq = c->channel;
 
 		if ((c->channelFlags & CHANNEL_PUREG) == CHANNEL_PUREG) {
@@ -5794,7 +5796,9 @@
 						    ichan->ic_flags);
 		}
 		ichan->ic_maxregpower = c->maxRegTxPower;	/* dBm */
-		ichan->ic_maxpower = c->maxTxPower;		/* 1/2 dBm */
+		/* XXX: old hal's don't provide maxTxPower for some parts */
+		ichan->ic_maxpower = (c->maxTxPower != 0) ?
+		    c->maxTxPower : 2*c->maxRegTxPower;		/* 1/2 dBm */
 		ichan->ic_minpower = c->minTxPower;		/* 1/2 dBm */
 	}
 	*nchans = nhalchans;