Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 22 Dec 2011 21:54:53 +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: r228817 - in head/sys/dev/ath/ath_hal: ar5212 ar5416
Message-ID:  <201112222154.pBMLsrx7035371@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Thu Dec 22 21:54:53 2011
New Revision: 228817
URL: http://svn.freebsd.org/changeset/base/228817

Log:
  Use the correct types when calling the decompression mask function.
  
  There's currently no public code which uses this feature and the
  current reference driver doesn't enable this feature at all.
  It's possible it was used by a previous version of the driver and
  that indeed it should return HAL_STATUS; but at this point I'm
  happy to require that they complain and submit a patch.
  
  This was found by LLVM compile-time type checking.
  
  Submitted by:	dim

Modified:
  head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Thu Dec 22 19:09:55 2011	(r228816)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Thu Dec 22 21:54:53 2011	(r228817)
@@ -574,7 +574,7 @@ ar5212SetDecompMask(struct ath_hal *ah, 
 	struct ath_hal_5212 *ahp = AH5212(ah);
 
         if (keyidx >= HAL_DECOMP_MASK_SIZE)
-                return HAL_EINVAL; 
+                return AH_FALSE;
         OS_REG_WRITE(ah, AR_DCM_A, keyidx);
         OS_REG_WRITE(ah, AR_DCM_D, en ? AR_DCM_D_EN : 0);
         ahp->ah_decompMask[keyidx] = en;

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Dec 22 19:09:55 2011	(r228816)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Dec 22 21:54:53 2011	(r228817)
@@ -161,7 +161,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
 HAL_BOOL
 ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
 {
-	return HAL_OK;
+	return AH_TRUE;
 }
 
 /* Setup coverage class */

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