Date: Thu, 30 Jul 2009 23:54:00 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195985 - projects/mips/sys/mips/atheros Message-ID: <200907302354.n6UNs0oN049667@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gonzo Date: Thu Jul 30 23:54:00 2009 New Revision: 195985 URL: http://svn.freebsd.org/changeset/base/195985 Log: - Make USB part of AR71XX kernel buildable again Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c projects/mips/sys/mips/atheros/ar71xx_ohci.c Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Jul 30 23:48:29 2009 (r195984) +++ projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Jul 30 23:54:00 2009 (r195985) @@ -35,11 +35,14 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/rman.h> +#include <sys/condvar.h> +#include <sys/kernel.h> +#include <sys/module.h> #include <machine/bus.h> -#include <dev/usb/usb_mfunc.h> #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> @@ -129,7 +132,7 @@ ar71xx_ehci_attach(device_t self) sc->sc_bus.devices_max = EHCI_MAX_DEVICES; /* get all DMA memory */ - if (usb2_bus_mem_alloc_all(&sc->sc_bus, + if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) { return (ENOMEM); } @@ -257,7 +260,7 @@ ar71xx_ehci_detach(device_t self) sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); + usb_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); return (0); } Modified: projects/mips/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ohci.c Thu Jul 30 23:48:29 2009 (r195984) +++ projects/mips/sys/mips/atheros/ar71xx_ohci.c Thu Jul 30 23:54:00 2009 (r195985) @@ -28,8 +28,16 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <dev/usb/usb_mfunc.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/rman.h> +#include <sys/condvar.h> +#include <sys/kernel.h> +#include <sys/module.h> + #include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_busdma.h> @@ -71,7 +79,7 @@ ar71xx_ohci_attach(device_t dev) sc->sc_ohci.sc_bus.devices_max = OHCI_MAX_DEVICES; /* get all DMA memory */ - if (usb2_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, + if (usb_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) { return (ENOMEM); } @@ -177,7 +185,7 @@ ar71xx_ohci_detach(device_t dev) sc->sc_ohci.sc_io_tag = 0; sc->sc_ohci.sc_io_hdl = 0; } - usb2_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc); + usb_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907302354.n6UNs0oN049667>