PERFORCE change 163258 for review

[Hans Petter Selasky]

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

Change 163258 by hselasky at hselasky_laptop001 on 2009/06/01 13:02:33

	
	IFC (more)

Affected files ...

.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#32 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#14 integrate

Differences ...

==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#32 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $
- * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c 192984 2009-05-28 17:36:36Z thompsa $
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.41 2009/05/29 18:46:57 thompsa Exp $
  */
 
 /*
@@ -238,12 +238,12 @@
  ****************************************************************************/
 
 /* USB methods */
-static usb2_callback_t	ubt_ctrl_write_callback;
-static usb2_callback_t	ubt_intr_read_callback;
-static usb2_callback_t	ubt_bulk_read_callback;
-static usb2_callback_t	ubt_bulk_write_callback;
-static usb2_callback_t	ubt_isoc_read_callback;
-static usb2_callback_t	ubt_isoc_write_callback;
+static usb_callback_t	ubt_ctrl_write_callback;
+static usb_callback_t	ubt_intr_read_callback;
+static usb_callback_t	ubt_bulk_read_callback;
+static usb_callback_t	ubt_bulk_write_callback;
+static usb_callback_t	ubt_isoc_read_callback;
+static usb_callback_t	ubt_isoc_write_callback;
 
 static int		ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **);
 static int		ubt_isoc_read_one_frame(struct usb_xfer *, int);

==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#14 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
- * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h 192984 2009-05-28 17:36:36Z thompsa $
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.11 2009/05/28 17:36:36 thompsa Exp $
  */
 
 #ifndef _NG_UBT_VAR_H_