Date: Sun, 1 Feb 2009 17:02:01 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 156997 for review Message-ID: <200902011702.n11H21AF018951@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902011702.n11H21AF018951>