From owner-p4-projects@FreeBSD.ORG  Thu Sep 21 07:38:36 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E822C16A584; Thu, 21 Sep 2006 07:38:35 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 96A5E16A582
	for <perforce@freebsd.org>; Thu, 21 Sep 2006 07:38:35 +0000 (UTC)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 637EF43D46
	for <perforce@freebsd.org>; Thu, 21 Sep 2006 07:38:35 +0000 (GMT)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L7cZtE049655
	for <perforce@freebsd.org>; Thu, 21 Sep 2006 07:38:35 GMT
	(envelope-from trhodes@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L7cZol049652
	for perforce@freebsd.org; Thu, 21 Sep 2006 07:38:35 GMT
	(envelope-from trhodes@freebsd.org)
Date: Thu, 21 Sep 2006 07:38:35 GMT
Message-Id: <200609210738.k8L7cZol049652@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trhodes@freebsd.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106438 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: Thu, 21 Sep 2006 07:38:36 -0000

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

Change 106438 by trhodes@trhodes_local on 2006/09/21 07:37:59

	Integrate this file.

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#8 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#8 (text) ====

@@ -27,9 +27,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.5 2006/09/11 19:47:53 sos Exp $");
+
 #include "opt_ata.h"
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -84,6 +85,10 @@
 
 /* USB-ATA 'controller' softc */
 struct atausb_softc {
+    device_t		dev;		/* base device */
+    int			maxlun;
+    struct ata_request	*ata_request;
+    usb_device_request_t usb_request;
     struct bbb_cbw	cbw;
     struct bbb_csw	csw;
     struct mtx		locked_mtx;