From owner-svn-src-head@FreeBSD.ORG Fri Apr 8 08:49:51 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DC071065673; Fri, 8 Apr 2011 08:49:51 +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 532238FC19; Fri, 8 Apr 2011 08:49:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p388np2R069526; Fri, 8 Apr 2011 08:49:51 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p388npUA069522; Fri, 8 Apr 2011 08:49:51 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201104080849.p388npUA069522@svn.freebsd.org> From: Adrian Chadd Date: Fri, 8 Apr 2011 08:49:51 +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: r220444 - head/sys/dev/ath/ath_hal 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2011 08:49:51 -0000 Author: adrian Date: Fri Apr 8 08:49:50 2011 New Revision: 220444 URL: http://svn.freebsd.org/changeset/base/220444 Log: Fix the completely wrong types I used in the previous commit. Modified: head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ah_internal.h Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Fri Apr 8 07:44:00 2011 (r220443) +++ head/sys/dev/ath/ath_hal/ah.c Fri Apr 8 08:49:50 2011 (r220444) @@ -903,8 +903,8 @@ ath_hal_getChanNoise(struct ath_hal *ah, */ int ath_hal_get_mimo_chan_noise(struct ath_hal *ah, - const struct ieee80211_channel *chan, uint8_t *nf_ctl, - uint8_t *nf_ext) + const struct ieee80211_channel *chan, int16_t *nf_ctl, + int16_t *nf_ext) { HAL_CHANNEL_INTERNAL *ichan; int i; Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Fri Apr 8 07:44:00 2011 (r220443) +++ head/sys/dev/ath/ath_hal/ah.h Fri Apr 8 08:49:50 2011 (r220444) @@ -955,8 +955,8 @@ extern HAL_STATUS __ahdecl ath_hal_set_c * radio. Returns 1 for valid results, 0 for invalid channel. */ extern int __ahdecl ath_hal_get_mimo_chan_noise(struct ath_hal *ah, - const struct ieee80211_channel *chan, uint8_t *nf_ctl, - uint8_t *nf_ext); + const struct ieee80211_channel *chan, int16_t *nf_ctl, + int16_t *nf_ext); /* * Calibrate noise floor data following a channel scan or similar. Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Fri Apr 8 07:44:00 2011 (r220443) +++ head/sys/dev/ath/ath_hal/ah_internal.h Fri Apr 8 08:49:50 2011 (r220444) @@ -144,8 +144,8 @@ typedef struct { int16_t rawNoiseFloor; int16_t noiseFloorAdjust; #ifdef AH_SUPPORT_AR5416 - uint8_t noiseFloorCtl[AH_MIMO_MAX_CHAINS]; - uint8_t noiseFloorExt[AH_MIMO_MAX_CHAINS]; + int16_t noiseFloorCtl[AH_MIMO_MAX_CHAINS]; + int16_t noiseFloorExt[AH_MIMO_MAX_CHAINS]; #endif /* AH_SUPPORT_AR5416 */ uint16_t mainSpur; /* cached spur value for this channel */ } HAL_CHANNEL_INTERNAL;