Deleted Added
sdiff udiff text old ( 215802 ) new ( 228483 )
full compact
usb_bus.h (215802) usb_bus.h (228483)
1/* $FreeBSD: head/sys/dev/usb/usb_bus.h 215802 2010-11-24 19:11:32Z weongyo $ */
1/* $FreeBSD: head/sys/dev/usb/usb_bus.h 228483 2011-12-14 00:28:54Z hselasky $ */
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.

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

64 struct usb_process explore_proc;
65
66 /* Control request process */
67 struct usb_process control_xfer_proc;
68
69 struct usb_bus_msg explore_msg[2];
70 struct usb_bus_msg detach_msg[2];
71 struct usb_bus_msg attach_msg[2];
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.

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

64 struct usb_process explore_proc;
65
66 /* Control request process */
67 struct usb_process control_xfer_proc;
68
69 struct usb_bus_msg explore_msg[2];
70 struct usb_bus_msg detach_msg[2];
71 struct usb_bus_msg attach_msg[2];
72 struct usb_bus_msg suspend_msg[2];
73 struct usb_bus_msg resume_msg[2];
74 struct usb_bus_msg shutdown_msg[2];
72 /*
73 * This mutex protects the USB hardware:
74 */
75 struct mtx bus_mtx;
76 struct usb_xfer_queue intr_q;
77 struct usb_callout power_wdog; /* power management */
78
79 device_t parent;

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

93
94 uint16_t isoc_time_last; /* in milliseconds */
95
96 uint8_t alloc_failed; /* Set if memory allocation failed. */
97 uint8_t driver_added_refcount; /* Current driver generation count */
98 enum usb_revision usbrev; /* USB revision. See "USB_REV_XXX". */
99
100 uint8_t devices_max; /* maximum number of USB devices */
75 /*
76 * This mutex protects the USB hardware:
77 */
78 struct mtx bus_mtx;
79 struct usb_xfer_queue intr_q;
80 struct usb_callout power_wdog; /* power management */
81
82 device_t parent;

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

96
97 uint16_t isoc_time_last; /* in milliseconds */
98
99 uint8_t alloc_failed; /* Set if memory allocation failed. */
100 uint8_t driver_added_refcount; /* Current driver generation count */
101 enum usb_revision usbrev; /* USB revision. See "USB_REV_XXX". */
102
103 uint8_t devices_max; /* maximum number of USB devices */
101 uint8_t do_probe; /* set if USB BUS should be re-probed */
104 uint8_t do_probe; /* set if USB should be re-probed */
105 uint8_t no_explore; /* don't explore USB ports */
102
103 /*
104 * The scratch area can only be used inside the explore thread
105 * belonging to the give serial bus.
106 */
107 union {
108 struct usb_hw_ep_scratch hw_ep_scratch[1];
109 struct usb_temp_setup temp_setup[1];
110 uint8_t data[255];
111 } scratch[1];
112};
113
114#endif /* _USB_BUS_H_ */
106
107 /*
108 * The scratch area can only be used inside the explore thread
109 * belonging to the give serial bus.
110 */
111 union {
112 struct usb_hw_ep_scratch hw_ep_scratch[1];
113 struct usb_temp_setup temp_setup[1];
114 uint8_t data[255];
115 } scratch[1];
116};
117
118#endif /* _USB_BUS_H_ */