PERFORCE change 163260 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=163260

Change 163260 by hselasky at hselasky_laptop001 on 2009/06/01 13:16:45

	
	IFC (more)

Affected files ...

.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#27 integrate

Differences ...

==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#27 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $
- * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 192984 2009-05-28 17:36:36Z thompsa $
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.24 2009/05/29 18:46:57 thompsa Exp $
  */
 
 #include "usbdevs.h"
@@ -79,16 +79,16 @@
 static device_attach_t		ubtbcmfw_attach;
 static device_detach_t		ubtbcmfw_detach;
 
-static usb2_callback_t		ubtbcmfw_write_callback;
-static usb2_callback_t		ubtbcmfw_read_callback;
+static usb_callback_t		ubtbcmfw_write_callback;
+static usb_callback_t		ubtbcmfw_read_callback;
 
-static usb2_fifo_close_t	ubtbcmfw_close;
-static usb2_fifo_cmd_t		ubtbcmfw_start_read;
-static usb2_fifo_cmd_t		ubtbcmfw_start_write;
-static usb2_fifo_cmd_t		ubtbcmfw_stop_read;
-static usb2_fifo_cmd_t		ubtbcmfw_stop_write;
-static usb2_fifo_ioctl_t	ubtbcmfw_ioctl;
-static usb2_fifo_open_t		ubtbcmfw_open;
+static usb_fifo_close_t	ubtbcmfw_close;
+static usb_fifo_cmd_t		ubtbcmfw_start_read;
+static usb_fifo_cmd_t		ubtbcmfw_start_write;
+static usb_fifo_cmd_t		ubtbcmfw_stop_read;
+static usb_fifo_cmd_t		ubtbcmfw_stop_write;
+static usb_fifo_ioctl_t	ubtbcmfw_ioctl;
+static usb_fifo_open_t		ubtbcmfw_open;
 
 static struct usb_fifo_methods	ubtbcmfw_fifo_methods = 
 {