27c27
< __FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 225882 2011-09-30 04:55:23Z kevlo $");
---
> __FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 234281 2012-04-14 11:29:32Z marius $");
55c55
< #define OPENED 1
---
> #define OPENED 1
60a61
>
66a68
>
70c72
< #define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
---
> #define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
72c74
< #define AT91_PIO_LOCK_INIT(_sc) \
---
> #define AT91_PIO_LOCK_INIT(_sc) \
75,78c77,80
< #define AT91_PIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
< #define AT91_PIO_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED);
< #define AT91_PIO_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
< #define CDEV2SOFTC(dev) ((dev)->si_drv1)
---
> #define AT91_PIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
> #define AT91_PIO_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED);
> #define AT91_PIO_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
> #define CDEV2SOFTC(dev) ((dev)->si_drv1)
135c137
< struct at91_pio_softc *sc = device_get_softc(dev);
---
> struct at91_pio_softc *sc;
137a140
> sc = device_get_softc(dev);
149c152
< * Activate the interrupt, but disable all interrupts in the hardware
---
> * Activate the interrupt, but disable all interrupts in the hardware.
173a177
>
218d221
< return;
228c231
< /* Reading the status also clears the interrupt */
---
> /* Reading the status also clears the interrupt. */
239c242
< static int
---
> static int
249c252
< // Enable interrupts
---
> /* Enable interrupts. */
253c256
< return (0);
---
> return (0);
265c268
< // Disable interrupts
---
> /* Disable interrupts. */
274a278
>
282a287
>
372d376
< return;
376c380
< at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
---
> at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
385d388
< return;
392c395,396
< /* reading this register will clear the interrupts */
---
>
> /* Reading this register will clear the interrupts. */
402c406
< { 0, 0 }
---
> DEVMETHOD_END
411c415,416
< DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, 0, 0);
---
> DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, NULL,
> NULL);
< __FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 225882 2011-09-30 04:55:23Z kevlo $");
---
> __FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 234281 2012-04-14 11:29:32Z marius $");
55c55
< #define OPENED 1
---
> #define OPENED 1
60a61
>
66a68
>
70c72
< #define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
---
> #define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
72c74
< #define AT91_PIO_LOCK_INIT(_sc) \
---
> #define AT91_PIO_LOCK_INIT(_sc) \
75,78c77,80
< #define AT91_PIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
< #define AT91_PIO_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED);
< #define AT91_PIO_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
< #define CDEV2SOFTC(dev) ((dev)->si_drv1)
---
> #define AT91_PIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
> #define AT91_PIO_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED);
> #define AT91_PIO_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
> #define CDEV2SOFTC(dev) ((dev)->si_drv1)
135c137
< struct at91_pio_softc *sc = device_get_softc(dev);
---
> struct at91_pio_softc *sc;
137a140
> sc = device_get_softc(dev);
149c152
< * Activate the interrupt, but disable all interrupts in the hardware
---
> * Activate the interrupt, but disable all interrupts in the hardware.
173a177
>
218d221
< return;
228c231
< /* Reading the status also clears the interrupt */
---
> /* Reading the status also clears the interrupt. */
239c242
< static int
---
> static int
249c252
< // Enable interrupts
---
> /* Enable interrupts. */
253c256
< return (0);
---
> return (0);
265c268
< // Disable interrupts
---
> /* Disable interrupts. */
274a278
>
282a287
>
372d376
< return;
376c380
< at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
---
> at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
385d388
< return;
392c395,396
< /* reading this register will clear the interrupts */
---
>
> /* Reading this register will clear the interrupts. */
402c406
< { 0, 0 }
---
> DEVMETHOD_END
411c415,416
< DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, 0, 0);
---
> DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, NULL,
> NULL);