Wed Jan 23 06:53:31 2013 UTC ()
Whitespace


(skrll)
diff -r1.101 -r1.102 src/sys/dev/usb/usbdivar.h
cvs diff -r1.101 -r1.102 src/sys/dev/usb/usbdivar.h (expand / switch to unified diff)

--- src/sys/dev/usb/usbdivar.h 2013/01/22 12:40:44 1.101
+++ src/sys/dev/usb/usbdivar.h 2013/01/23 06:53:30 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: usbdivar.h,v 1.101 2013/01/22 12:40:44 jmcneill Exp $ */ 1/* $NetBSD: usbdivar.h,v 1.102 2013/01/23 06:53:30 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Lennart Augustsson (lennart@augustsson.net) at 8 * by Lennart Augustsson (lennart@augustsson.net) at
9 * Carlstedt Research & Technology and Matthew R. Green (mrg@eterna.com.au). 9 * Carlstedt Research & Technology and Matthew R. Green (mrg@eterna.com.au).
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -254,27 +254,27 @@ struct usbd_xfer { @@ -254,27 +254,27 @@ struct usbd_xfer {
254 u_int8_t rqflags; 254 u_int8_t rqflags;
255#define URQ_REQUEST 0x01 255#define URQ_REQUEST 0x01
256#define URQ_AUTO_DMABUF 0x10 256#define URQ_AUTO_DMABUF 0x10
257#define URQ_DEV_DMABUF 0x20 257#define URQ_DEV_DMABUF 0x20
258 258
259 SIMPLEQ_ENTRY(usbd_xfer) next; 259 SIMPLEQ_ENTRY(usbd_xfer) next;
260 260
261 void *hcpriv; /* private use by the HC driver */ 261 void *hcpriv; /* private use by the HC driver */
262 u_int8_t hcflags; /* private use by the HC driver */ 262 u_int8_t hcflags; /* private use by the HC driver */
263#define UXFER_ABORTING 0x01 /* xfer is aborting. */ 263#define UXFER_ABORTING 0x01 /* xfer is aborting. */
264#define UXFER_ABORTWAIT 0x02 /* abort completion is being awaited. */ 264#define UXFER_ABORTWAIT 0x02 /* abort completion is being awaited. */
265 kcondvar_t hccv; /* private use by the HC driver */ 265 kcondvar_t hccv; /* private use by the HC driver */
266 266
267 struct callout timeout_handle; 267 struct callout timeout_handle;
268}; 268};
269 269
270void usbd_init(void); 270void usbd_init(void);
271void usbd_finish(void); 271void usbd_finish(void);
272 272
273#if defined(USB_DEBUG) || defined(EHCI_DEBUG) 273#if defined(USB_DEBUG) || defined(EHCI_DEBUG)
274void usbd_dump_iface(struct usbd_interface *iface); 274void usbd_dump_iface(struct usbd_interface *iface);
275void usbd_dump_device(struct usbd_device *dev); 275void usbd_dump_device(struct usbd_device *dev);
276void usbd_dump_endpoint(struct usbd_endpoint *endp); 276void usbd_dump_endpoint(struct usbd_endpoint *endp);
277void usbd_dump_queue(usbd_pipe_handle pipe); 277void usbd_dump_queue(usbd_pipe_handle pipe);
278void usbd_dump_pipe(usbd_pipe_handle pipe); 278void usbd_dump_pipe(usbd_pipe_handle pipe);
279#endif 279#endif
280 280
@@ -285,29 +285,29 @@ void usb_delay_ms(usbd_bus_handle, u_in @@ -285,29 +285,29 @@ void usb_delay_ms(usbd_bus_handle, u_in
285void usbd_delay_ms_locked(usbd_device_handle, u_int, kmutex_t *); 285void usbd_delay_ms_locked(usbd_device_handle, u_int, kmutex_t *);
286void usbd_delay_ms(usbd_device_handle, u_int); 286void usbd_delay_ms(usbd_device_handle, u_int);
287usbd_status usbd_reset_port(usbd_device_handle, int, usb_port_status_t *); 287usbd_status usbd_reset_port(usbd_device_handle, int, usb_port_status_t *);
288usbd_status usbd_setup_pipe(usbd_device_handle dev, 288usbd_status usbd_setup_pipe(usbd_device_handle dev,
289 usbd_interface_handle iface, 289 usbd_interface_handle iface,
290 struct usbd_endpoint *, int, 290 struct usbd_endpoint *, int,
291 usbd_pipe_handle *pipe); 291 usbd_pipe_handle *pipe);
292usbd_status usbd_setup_pipe_flags(usbd_device_handle dev, 292usbd_status usbd_setup_pipe_flags(usbd_device_handle dev,
293 usbd_interface_handle iface, 293 usbd_interface_handle iface,
294 struct usbd_endpoint *, int, 294 struct usbd_endpoint *, int,
295 usbd_pipe_handle *pipe, 295 usbd_pipe_handle *pipe,
296 uint8_t flags); 296 uint8_t flags);
297usbd_status usbd_new_device(device_t, usbd_bus_handle, int, int, int, 297usbd_status usbd_new_device(device_t, usbd_bus_handle, int, int, int,
298 struct usbd_port *); 298 struct usbd_port *);
299usbd_status usbd_reattach_device(device_t, usbd_device_handle, 299usbd_status usbd_reattach_device(device_t, usbd_device_handle,
300 int, const int *); 300 int, const int *);
301 301
302void usbd_remove_device(usbd_device_handle, struct usbd_port *); 302void usbd_remove_device(usbd_device_handle, struct usbd_port *);
303int usbd_printBCD(char *, size_t, int); 303int usbd_printBCD(char *, size_t, int);
304usbd_status usbd_fill_iface_data(usbd_device_handle, int, int); 304usbd_status usbd_fill_iface_data(usbd_device_handle, int, int);
305void usb_free_device(usbd_device_handle); 305void usb_free_device(usbd_device_handle);
306 306
307usbd_status usb_insert_transfer(usbd_xfer_handle); 307usbd_status usb_insert_transfer(usbd_xfer_handle);
308void usb_transfer_complete(usbd_xfer_handle); 308void usb_transfer_complete(usbd_xfer_handle);
309int usb_disconnect_port(struct usbd_port *, device_t, int); 309int usb_disconnect_port(struct usbd_port *, device_t, int);
310 310
311/* Routines from usb.c */ 311/* Routines from usb.c */
312void usb_needs_explore(usbd_device_handle); 312void usb_needs_explore(usbd_device_handle);
313void usb_needs_reattach(usbd_device_handle); 313void usb_needs_reattach(usbd_device_handle);