From owner-p4-projects@FreeBSD.ORG  Mon Jun  1 13:17:29 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 180061065676; Mon,  1 Jun 2009 13:17:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C887B1065674
	for <perforce@FreeBSD.org>; Mon,  1 Jun 2009 13:17:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B60F28FC13
	for <perforce@FreeBSD.org>; Mon,  1 Jun 2009 13:17:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51DHSs1080683
	for <perforce@FreeBSD.org>; Mon, 1 Jun 2009 13:17:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51DHSF1080681
	for perforce@freebsd.org; Mon, 1 Jun 2009 13:17:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Jun 2009 13:17:28 GMT
Message-Id: <200906011317.n51DHSF1080681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163260 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 13:17:30 -0000

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

Change 163260 by hselasky@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 = 
 {