Deleted Added
full compact
at91dci_atmelarm.c (190174) at91dci_atmelarm.c (190183)
1#include <sys/cdefs.h>
1#include <sys/cdefs.h>
2__FBSDID("$FreeBSD: head/sys/dev/usb/controller/at91dci_atmelarm.c 190174 2009-03-20 19:04:31Z thompsa $");
2__FBSDID("$FreeBSD: head/sys/dev/usb/controller/at91dci_atmelarm.c 190183 2009-03-20 21:57:54Z thompsa $");
3
4/*-
5 * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 188 unchanged lines hidden (view full) ---

199 sc->sc_dci.sc_bus.bdev = device_add_child(dev, "usbus", -1);
200 if (!(sc->sc_dci.sc_bus.bdev)) {
201 goto error;
202 }
203 device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
204
205#if (__FreeBSD_version >= 700031)
206 err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
3
4/*-
5 * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 188 unchanged lines hidden (view full) ---

199 sc->sc_dci.sc_bus.bdev = device_add_child(dev, "usbus", -1);
200 if (!(sc->sc_dci.sc_bus.bdev)) {
201 goto error;
202 }
203 device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
204
205#if (__FreeBSD_version >= 700031)
206 err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
207 NULL, (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
207 NULL, (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
208#else
209 err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
208#else
209 err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
210 (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
210 (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
211#endif
212 if (err) {
213 sc->sc_dci.sc_intr_hdl = NULL;
214 goto error;
215 }
216#if (__FreeBSD_version >= 700031)
217 err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
211#endif
212 if (err) {
213 sc->sc_dci.sc_intr_hdl = NULL;
214 goto error;
215 }
216#if (__FreeBSD_version >= 700031)
217 err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
218 NULL, (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
218 NULL, (driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
219#else
220 err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
219#else
220 err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
221 (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
221 (driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl);
222#endif
223 if (err) {
224 sc->sc_vbus_intr_hdl = NULL;
225 goto error;
226 }
227 err = at91dci_init(&sc->sc_dci);
228 if (!err) {
229 err = device_probe_and_attach(sc->sc_dci.sc_bus.bdev);

--- 117 unchanged lines hidden ---
222#endif
223 if (err) {
224 sc->sc_vbus_intr_hdl = NULL;
225 goto error;
226 }
227 err = at91dci_init(&sc->sc_dci);
228 if (!err) {
229 err = device_probe_and_attach(sc->sc_dci.sc_bus.bdev);

--- 117 unchanged lines hidden ---