From owner-p4-projects@FreeBSD.ORG Thu Jul 3 20:52:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 600751065676; Thu, 3 Jul 2008 20:52:42 +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 09477106566C for ; Thu, 3 Jul 2008 20:52:42 +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 03BD78FC14 for ; Thu, 3 Jul 2008 20:52:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m63Kqf5A027800 for ; Thu, 3 Jul 2008 20:52:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m63KqfML027798 for perforce@freebsd.org; Thu, 3 Jul 2008 20:52:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 3 Jul 2008 20:52:41 GMT Message-Id: <200807032052.m63KqfML027798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2008 20:52:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=144570 Change 144570 by hselasky@hselasky_laptop001 on 2008/07/03 20:52:27 The USB NDIS module is complete. - symbol renaming NOTE: The module is not complete and there is an ongoing project at FreeBSD P4 to fix this. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#1 add .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#1 add .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#2 (text+ko) ==== @@ -33,20 +33,14 @@ #include __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.9 2007/06/18 22:24:32 imp Exp $"); -#include -#include -#include -#include -#include -#include +#include +#include + +#include + #include -#include +#include -#include -#include -#include -#include - #include #include #include @@ -62,14 +56,13 @@ #include #include #include + #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.5 2005/04/24 20:21:22 wpaul Exp $"); +MODULE_DEPEND(ndis, usb2_core, 1, 1, 1); -MODULE_DEPEND(ndis, usb, 1, 1, 1); - -static device_probe_t ndisusb_probe; -static device_attach_t ndisusb_attach; +static device_probe_t ndisusb2_probe; +static device_attach_t ndisusb2_attach; static struct resource_list *ndis_get_resource_list(device_t, device_t); extern device_attach_t ndis_attach; @@ -83,8 +76,8 @@ static device_method_t ndis_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, ndisusb_probe), - DEVMETHOD(device_attach, ndisusb_attach), + DEVMETHOD(device_probe, ndisusb2_probe), + DEVMETHOD(device_attach, ndisusb2_attach), DEVMETHOD(device_detach, ndis_detach), DEVMETHOD(device_shutdown, ndis_shutdown), @@ -104,27 +97,24 @@ static devclass_t ndis_devclass; -DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); +DRIVER_MODULE(ndis, ushub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); static int -ndisusb_probe(device_t dev) +ndisusb2_probe(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(dev); + struct usb2_attach_arg *uaa = device_get_ivars(dev); if (windrv_lookup(0, "USB Bus") == NULL) { - return (UMATCH_NONE); + return (ENXIO); } - if (uaa->usb_mode != USB_MODE_HOST) { - return (UMATCH_NONE); + if (uaa->usb2_mode != USB_MODE_HOST) { + return (ENXIO); } - if (uaa->iface != NULL) { - return (UMATCH_NONE); - } - return (UMATCH_NONE); + return (ENXIO); } static int -ndisusb_attach(device_t dev) +ndisusb2_attach(device_t dev) { struct ndis_softc *sc = device_get_softc(dev); driver_object *drv; ==== //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#2 (text+ko) ==== @@ -1,0 +1,13 @@ +S= ${.CURDIR}/../../.. + +.PATH: $S/dev/usb2/ndis + +KMOD= usb2_ndis +SRCS= +SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h +SRCS+= opt_usb.h opt_bus.h + +SRCS+= usb2_ndis.c +SRCS+= if_ndis_usb2.c + +.include