From owner-svn-src-head@FreeBSD.ORG Sun Apr 7 13:14:23 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 31330D0C; Sun, 7 Apr 2013 13:14:23 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by mx1.freebsd.org (Postfix) with ESMTP id 08E09BEC; Sun, 7 Apr 2013 13:14:22 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1UOpQG-000F4u-6I; Sun, 07 Apr 2013 13:14:16 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id r37DED4K026151; Sun, 7 Apr 2013 07:14:13 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX182CmPlj3kmEzKe4d+lPzgq Subject: Re: svn commit: r249232 - in head/sys: arm/at91 dev/usb/controller From: Ian Lepore To: Hans Petter Selasky In-Reply-To: <201304071303.r37D3vEc051731@svn.freebsd.org> References: <201304071303.r37D3vEc051731@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Sun, 07 Apr 2013 07:14:13 -0600 Message-ID: <1365340453.41399.166.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit 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: Sun, 07 Apr 2013 13:14:23 -0000 You forgot to say: Pointy Hat to: ian I'm not quite sure how I fumbled the return-type change when I applied the patches from our local repo; thanks to Christoph for spotting this. -- Ian On Sun, 2013-04-07 at 13:03 +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Sun Apr 7 13:03:57 2013 > New Revision: 249232 > URL: http://svnweb.freebsd.org/changeset/base/249232 > > Log: > Fix regression issue after r248910. > > PR: arm/177685 > Submitted by: Christoph Mallon > > Modified: > head/sys/arm/at91/at91_pio.c > head/sys/arm/at91/at91_piovar.h > head/sys/dev/usb/controller/at91dci_atmelarm.c > > Modified: head/sys/arm/at91/at91_pio.c > ============================================================================== > --- head/sys/arm/at91/at91_pio.c Sun Apr 7 11:05:38 2013 (r249231) > +++ head/sys/arm/at91/at91_pio.c Sun Apr 7 13:03:57 2013 (r249232) > @@ -554,12 +554,12 @@ at91_pio_gpio_clear(uint32_t pio, uint32 > PIO[PIO_CODR / 4] = data_mask; > } > > -uint8_t > +uint32_t > at91_pio_gpio_get(uint32_t pio, uint32_t data_mask) > { > uint32_t *PIO = (uint32_t *)(AT91_BASE + pio); > > - return ((PIO[PIO_PDSR / 4] & data_mask)); > + return (PIO[PIO_PDSR / 4] & data_mask); > } > > void > > Modified: head/sys/arm/at91/at91_piovar.h > ============================================================================== > --- head/sys/arm/at91/at91_piovar.h Sun Apr 7 11:05:38 2013 (r249231) > +++ head/sys/arm/at91/at91_piovar.h Sun Apr 7 13:03:57 2013 (r249232) > @@ -39,7 +39,7 @@ void at91_pio_gpio_output(uint32_t pio, > void at91_pio_gpio_high_z(uint32_t pio, uint32_t high_z_mask, int enable); > void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); > void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); > -uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); > +uint32_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); > void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, > int use_deglitch); > void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, > > Modified: head/sys/dev/usb/controller/at91dci_atmelarm.c > ============================================================================== > --- head/sys/dev/usb/controller/at91dci_atmelarm.c Sun Apr 7 11:05:38 2013 (r249231) > +++ head/sys/dev/usb/controller/at91dci_atmelarm.c Sun Apr 7 13:03:57 2013 (r249232) > @@ -91,7 +91,7 @@ at91_vbus_poll(struct at91_udp_softc *sc > { > uint8_t vbus_val; > > - vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK); > + vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK) != 0; > at91dci_vbus_interrupt(&sc->sc_dci, vbus_val); > > callout_reset(&sc->sc_vbus, hz, (void *)&at91_vbus_poll, sc);