Deleted Added
full compact
usb_controller.c (190878) usb_controller.c (191400)
1/* $FreeBSD: head/sys/dev/usb/controller/usb_controller.c 190878 2009-04-10 04:08:34Z thompsa $ */
1/* $FreeBSD: head/sys/dev/usb/controller/usb_controller.c 191400 2009-04-22 17:08:10Z 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.

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

164
165 usb2_proc_free(&bus->giant_callback_proc);
166 usb2_proc_free(&bus->non_giant_callback_proc);
167
168 /* Get rid of USB explore process */
169
170 usb2_proc_free(&bus->explore_proc);
171
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.

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

164
165 usb2_proc_free(&bus->giant_callback_proc);
166 usb2_proc_free(&bus->non_giant_callback_proc);
167
168 /* Get rid of USB explore process */
169
170 usb2_proc_free(&bus->explore_proc);
171
172 /* Get rid of control transfer process */
173
174 usb2_proc_free(&bus->control_xfer_proc);
175
172 return (0);
173}
174
175/*------------------------------------------------------------------------*
176 * usb2_bus_explore
177 *
178 * This function is used to explore the device tree from the root.
179 *------------------------------------------------------------------------*/

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

407 } else if (usb2_proc_create(&bus->non_giant_callback_proc,
408 &bus->bus_mtx, pname, USB_PRI_HIGH)) {
409 printf("WARNING: Creation of USB non-Giant "
410 "callback process failed.\n");
411 } else if (usb2_proc_create(&bus->explore_proc,
412 &bus->bus_mtx, pname, USB_PRI_MED)) {
413 printf("WARNING: Creation of USB explore "
414 "process failed.\n");
176 return (0);
177}
178
179/*------------------------------------------------------------------------*
180 * usb2_bus_explore
181 *
182 * This function is used to explore the device tree from the root.
183 *------------------------------------------------------------------------*/

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

411 } else if (usb2_proc_create(&bus->non_giant_callback_proc,
412 &bus->bus_mtx, pname, USB_PRI_HIGH)) {
413 printf("WARNING: Creation of USB non-Giant "
414 "callback process failed.\n");
415 } else if (usb2_proc_create(&bus->explore_proc,
416 &bus->bus_mtx, pname, USB_PRI_MED)) {
417 printf("WARNING: Creation of USB explore "
418 "process failed.\n");
419 } else if (usb2_proc_create(&bus->control_xfer_proc,
420 &bus->bus_mtx, pname, USB_PRI_MED)) {
421 printf("WARNING: Creation of USB control transfer "
422 "process failed.\n");
415 } else {
416 /* Get final attach going */
417 USB_BUS_LOCK(bus);
418 if (usb2_proc_msignal(&bus->explore_proc,
419 &bus->attach_msg[0], &bus->attach_msg[1])) {
420 /* ignore */
421 }
422 USB_BUS_UNLOCK(bus);

--- 163 unchanged lines hidden ---
423 } else {
424 /* Get final attach going */
425 USB_BUS_LOCK(bus);
426 if (usb2_proc_msignal(&bus->explore_proc,
427 &bus->attach_msg[0], &bus->attach_msg[1])) {
428 /* ignore */
429 }
430 USB_BUS_UNLOCK(bus);

--- 163 unchanged lines hidden ---