d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression issue after r248910.

Browse Source 
PR:		arm/177685
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
This commit is contained in:
hselasky 2013-04-07 13:03:57 +00:00
parent 7510d38d83
commit c29caa8936
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/at91/at91_pio.c
View File

@ -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

2
sys/arm/at91/at91_piovar.h
View File

@ -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,

2
sys/dev/usb/controller/at91dci_atmelarm.c
View File

@ -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);