From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 17:02:02 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E5F21065673; Sun,  1 Feb 2009 17:02:01 +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 3BA78106564A
	for <perforce@FreeBSD.org>; Sun,  1 Feb 2009 17:02:01 +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 2A9E38FC14
	for <perforce@FreeBSD.org>; Sun,  1 Feb 2009 17:02:01 +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 n11H21b7018953
	for <perforce@FreeBSD.org>; Sun, 1 Feb 2009 17:02:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n11H21AF018951
	for perforce@freebsd.org; Sun, 1 Feb 2009 17:02:01 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 1 Feb 2009 17:02:01 GMT
Message-Id: <200902011702.n11H21AF018951@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 156997 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: Sun, 01 Feb 2009 17:02:02 -0000

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

Change 156997 by hselasky@hselasky_laptop001 on 2009/02/01 17:01:25

	
	Integrate EHCI Marvell++ support from the old USB stack.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_ixp4xx.c#1 add
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_mbus.c#1 add
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#23 edit
.. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#14 (text+ko) ====

@@ -468,7 +468,6 @@
 	struct ehci_sitd *sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT];
 	struct ehci_itd *sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT];
 	void   *sc_intr_hdl;
-	device_t sc_dev;
 	bus_size_t sc_io_size;
 	bus_space_tag_t sc_io_tag;
 	bus_space_handle_t sc_io_hdl;

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#23 (text+ko) ====

@@ -237,7 +237,6 @@
 	    USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
-	sc->sc_dev = self;
 
 	pci_enable_busmaster(self);
 

==== //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#6 (text+ko) ====

@@ -36,4 +36,12 @@
 SRCS+= ehci2.c
 SRCS+= ehci2_pci.c
 
+.if defined(HAS_MARVELL_EHCI)
+SRCS+= ehci2_mbus.c
+.endif
+
+.if defined(HAS_IXP4XX_EHCI)
+SRCS+= ehci2_ixp4xx.c
+.endif
+
 .include <bsd.kmod.mk>