Deleted Added
full compact
musb_otg_atmelarm.c (184610) musb_otg_atmelarm.c (184824)
1/* $FreeBSD: head/sys/dev/usb2/controller/musb2_otg_atmelarm.c 184610 2008-11-04 02:31:03Z alfred $ */
1/* $FreeBSD: head/sys/dev/usb2/controller/musb2_otg_atmelarm.c 184824 2008-11-10 20:54:31Z thompsa $ */
2/*-
3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

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

133 }
134 sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1);
135 if (!(sc->sc_otg.sc_bus.bdev)) {
136 goto error;
137 }
138 device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus);
139
140 err = usb2_config_td_setup(&sc->sc_otg.sc_config_td, sc,
2/*-
3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

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

133 }
134 sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1);
135 if (!(sc->sc_otg.sc_bus.bdev)) {
136 goto error;
137 }
138 device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus);
139
140 err = usb2_config_td_setup(&sc->sc_otg.sc_config_td, sc,
141 &sc->sc_otg.sc_bus.mtx, NULL, 0, 4);
141 &sc->sc_otg.sc_bus.bus_mtx, NULL, 0, 4);
142 if (err) {
143 device_printf(dev, "could not setup config thread!\n");
144 goto error;
145 }
146#if (__FreeBSD_version >= 700031)
147 err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
148 NULL, (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl);
149#else

--- 107 unchanged lines hidden ---
142 if (err) {
143 device_printf(dev, "could not setup config thread!\n");
144 goto error;
145 }
146#if (__FreeBSD_version >= 700031)
147 err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
148 NULL, (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl);
149#else

--- 107 unchanged lines hidden ---