diff options
| author | hselasky <hselasky@FreeBSD.org> | 2013-04-07 13:03:57 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2013-04-07 13:03:57 +0000 |
| commit | c29caa8936b8a2ba20b7c6109b82059b8da0dd36 (patch) | |
| tree | 64764bb990c6556a1fe01ecb9a51fa5bed022592 | |
| parent | 7510d38d83ac10c50ffd12e288c87522e81d59f7 (diff) | |
| download | FreeBSD-src-c29caa8936b8a2ba20b7c6109b82059b8da0dd36.zip FreeBSD-src-c29caa8936b8a2ba20b7c6109b82059b8da0dd36.tar.gz | |
Fix regression issue after r248910.
PR: arm/177685
Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
| -rw-r--r-- | sys/arm/at91/at91_pio.c | 4 | ||||
| -rw-r--r-- | sys/arm/at91/at91_piovar.h | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/at91dci_atmelarm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/at91/at91_pio.c b/sys/arm/at91/at91_pio.c index c2998b5..2a50707 100644 --- a/sys/arm/at91/at91_pio.c +++ b/sys/arm/at91/at91_pio.c @@ -554,12 +554,12 @@ at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask) 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 diff --git a/sys/arm/at91/at91_piovar.h b/sys/arm/at91/at91_piovar.h index 0608f16..d2b912d 100644 --- a/sys/arm/at91/at91_piovar.h +++ b/sys/arm/at91/at91_piovar.h @@ -39,7 +39,7 @@ void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, 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, diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c index 678ad48..7f94ed7 100644 --- a/sys/dev/usb/controller/at91dci_atmelarm.c +++ b/sys/dev/usb/controller/at91dci_atmelarm.c @@ -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); |
