From owner-p4-projects@FreeBSD.ORG  Fri Feb 27 20:14:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A068B1065678; Fri, 27 Feb 2009 20:14:13 +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 57D691065672
	for <perforce@FreeBSD.org>; Fri, 27 Feb 2009 20:14:13 +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 3D01A8FC19
	for <perforce@FreeBSD.org>; Fri, 27 Feb 2009 20:14:13 +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 n1RKED0j045563
	for <perforce@FreeBSD.org>; Fri, 27 Feb 2009 20:14:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1RKEDN7045561
	for perforce@freebsd.org; Fri, 27 Feb 2009 20:14:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 27 Feb 2009 20:14:13 GMT
Message-Id: <200902272014.n1RKEDN7045561@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 158403 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: Fri, 27 Feb 2009 20:14:15 -0000

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

Change 158403 by hselasky@hselasky_laptop001 on 2009/02/27 20:13:30

	
	USB NDIS: Make code compile again.

Affected files ...

.. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#11 edit
.. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#14 edit
.. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#6 edit
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#12 edit
.. //depot/projects/usb/src/sys/modules/if_ndis/Makefile#5 edit
.. //depot/projects/usb/src/sys/modules/ndis/Makefile#6 edit

Differences ...

==== //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#11 (text+ko) ====

@@ -65,9 +65,6 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include <legacy/dev/usb/usb.h>
-#include <legacy/dev/usb/usbdi.h>
-
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
 #include <compat/ndis/resource_var.h>

==== //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#14 (text+ko) ====

@@ -95,8 +95,6 @@
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <legacy/dev/usb/usb.h>
-#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>

==== //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#6 (text+ko) ====

@@ -56,16 +56,16 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include <dev/usb2/include/usb2_error.h>
-#include <dev/usb2/include/usb2_standard.h>
-#include <dev/usb2/include/usb2_defs.h>
+#include <dev/usb/usb_error.h>
+#include <dev/usb/usb.h>
+#include <dev/usb/usb_defs.h>
 
-#include <dev/usb2/core/usb2_core.h>
-#include <dev/usb2/core/usb2_request.h>
-#include <dev/usb2/core/usb2_process.h>
-#include <dev/usb2/core/usb2_device.h>
-#include <dev/usb2/core/usb2_busdma.h>
-#include <dev/usb2/core/usb2_parse.h>
+#include <dev/usb/usb_core.h>
+#include <dev/usb/usb_request.h>
+#include <dev/usb/usb_process.h>
+#include <dev/usb/usb_device.h>
+#include <dev/usb/usb_busdma.h>
+#include <dev/usb/usb_parse.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>

==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#12 (text+ko) ====

@@ -53,7 +53,7 @@
 #include <sys/bus.h>
 #include <machine/bus.h>
 
-#include <dev/usb2/core/usb2_core.h>
+#include <dev/usb/usb_core.h>
 
 #include <net80211/ieee80211_var.h>
 
@@ -67,7 +67,7 @@
 
 SYSCTL_NODE(_hw, OID_AUTO, ndisusb, CTLFLAG_RD, 0, "NDIS USB driver parameters");
 
-MODULE_DEPEND(ndis, usb2_core, 1, 1, 1);
+MODULE_DEPEND(ndis, usb, 1, 1, 1);
 MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
 MODULE_DEPEND(ndis, if_ndis, 1, 1, 1);
 

==== //depot/projects/usb/src/sys/modules/if_ndis/Makefile#5 (text+ko) ====

@@ -5,6 +5,6 @@
 KMOD=	if_ndis
 SRCS=	if_ndis.c if_ndis_pci.c if_ndis_pccard.c if_ndis_usb.c
 SRCS+=	device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
-SRCS+=	opt_usb.h usbdevs.h opt_bus.h usb2_if.h
+SRCS+=	opt_usb.h usbdevs.h opt_bus.h usb_if.h
 
 .include <bsd.kmod.mk>

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

@@ -6,7 +6,7 @@
 SRCS=	subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c
 SRCS+=	kern_windrv.c subr_usbd.c
 SRCS+=	device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS+=	opt_usb.h usb2_if.h opt_bus.h
+SRCS+=	opt_usb.h usb_if.h opt_bus.h
 
 .if ${MACHINE_ARCH} == "amd64"
 SRCS+=	winx64_wrap.S