Deleted Added
full compact
ugensa.c (188942) ugensa.c (189265)
1/* $FreeBSD: head/sys/dev/usb/serial/ugensa.c 188942 2009-02-23 18:31:00Z thompsa $ */
1/* $FreeBSD: head/sys/dev/usb/serial/ugensa.c 189265 2009-03-02 02:44:10Z thompsa $ */
2/* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */
3
4/*
5 * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Roland C. Dowdeswell <elric@netbsd.org>.

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

216 UGENSA_N_TRANSFER, ssc, &sc->sc_mtx);
217
218 if (error) {
219 device_printf(dev, "allocating USB "
220 "transfers failed!\n");
221 goto detach;
222 }
223 /* clear stall at first run */
2/* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */
3
4/*
5 * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Roland C. Dowdeswell <elric@netbsd.org>.

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

216 UGENSA_N_TRANSFER, ssc, &sc->sc_mtx);
217
218 if (error) {
219 device_printf(dev, "allocating USB "
220 "transfers failed!\n");
221 goto detach;
222 }
223 /* clear stall at first run */
224 mtx_lock(&sc->sc_mtx);
224 usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
225 usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
225 usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
226 usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
227 mtx_unlock(&sc->sc_mtx);
226
227 /* initialize port number */
228 ssc->sc_usb2_com_ptr->sc_portno = sc->sc_niface;
229 sc->sc_niface++;
230 if (x != uaa->info.bIfaceIndex)
231 usb2_set_parent_iface(uaa->device, x,
232 uaa->info.bIfaceIndex);
233 }

--- 119 unchanged lines hidden ---
228
229 /* initialize port number */
230 ssc->sc_usb2_com_ptr->sc_portno = sc->sc_niface;
231 sc->sc_niface++;
232 if (x != uaa->info.bIfaceIndex)
233 usb2_set_parent_iface(uaa->device, x,
234 uaa->info.bIfaceIndex);
235 }

--- 119 unchanged lines hidden ---