From owner-svn-src-head@FreeBSD.ORG Tue May 21 18:16:54 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 26A5C3C3; Tue, 21 May 2013 18:16:54 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wi0-x230.google.com (mail-wi0-x230.google.com [IPv6:2a00:1450:400c:c05::230]) by mx1.freebsd.org (Postfix) with ESMTP id 420802DD; Tue, 21 May 2013 18:16:53 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id hr14so3087249wib.9 for ; Tue, 21 May 2013 11:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=hm5i1Z8yt1SIzJiUZNKDRmRmOVJvtiwmXytmew/U/v4=; b=ANFcNHTjQSOs0rMoVQ1NrPNqA5X6/AysQpEvUSlAeqXmQ5EaiJtPz9aS0GCPNgJ4PL N0mF0ir1sNFxUhzwcqXoAOXS3JofVM8ba4azhEQ/TH6hU8P+Fm7qyfTYg5GCf7lnJJFB Dg82v88ChmdcNrgSpUONbRsJ78KlUOM6t0PtIXHMkjPSloGBFmwZ5vqU4rp9BXbiB4cF AMsJImaFGGOE8MQh0AmZm0Q5ED7jhjmRYoCv7moumrOMzyP8pJG51X4Hy+11hx2bEIh6 UbV9fxCwWLrWEoX3oYD0UOmbkQJmzZCn2XPX/AMjJJ5jFsxpiro+gaOC/b/hI2DOP3Vo BWGA== MIME-Version: 1.0 X-Received: by 10.180.189.41 with SMTP id gf9mr7278518wic.32.1369160212223; Tue, 21 May 2013 11:16:52 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.217.107.9 with HTTP; Tue, 21 May 2013 11:16:51 -0700 (PDT) In-Reply-To: <20130521164200.GA1643@glenbarber.us> References: <201305211428.r4LES5L8018987@svn.freebsd.org> <20130521164200.GA1643@glenbarber.us> Date: Tue, 21 May 2013 11:16:51 -0700 X-Google-Sender-Auth: u4HXEBbt-gSy02wezg44QwVUMUg Message-ID: Subject: Re: svn commit: r250856 - head/sys/dev/ath/ath_hal/ar5416 From: Adrian Chadd To: Glen Barber Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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: Tue, 21 May 2013 18:16:54 -0000 Yup, this should be fixed, thanks! Adrian On 21 May 2013 09:42, Glen Barber wrote: > On Tue, May 21, 2013 at 02:28:05PM +0000, Adrian Chadd wrote: >> Author: adrian >> Date: Tue May 21 14:28:05 2013 >> New Revision: 250856 >> URL: http://svnweb.freebsd.org/changeset/base/250856 >> >> Log: >> Fix build break - the SetCapability calls return HAL_BOOL, >> not HAL_STATUS. >> >> Modified: >> head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c >> >> Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c >> ============================================================================== >> --- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue May 21 13:02:37 2013 (r250855) >> +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue May 21 14:28:05 2013 (r250856) >> @@ -504,7 +504,7 @@ ar5416SetCapability(struct ath_hal *ah, >> return AH_TRUE; >> case HAL_CAP_ENFORCE_TXOP: >> if (capability != 1) >> - return (HAL_ENOTSUPP); >> + return AH_FALSE; >> if (setting) { >> AH5212(ah)->ah_miscMode >> |= AR_PCU_TXOP_TBTT_LIMIT_ENA; > > This breaks tinderbox. > > /src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c -I/src/sys/dev/ath > -I/src/sys/dev/ath/ath_hal > /src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:507:12: error: implicit > conversion from enumeration type 'HAL_STATUS' to different enumeration > type 'HAL_BOOL' [-Werror,-Wenum-conversion] > return (HAL_ENOTSUPP); > ~~~~~~ ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > > Stop. > make: stopped in /obj/arm.arm/src/sys/LINT > > Glen >