From d41edbe37f48381c029dbe9c3bccda366c532ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Thu, 8 Sep 2005 21:32:53 +0000
Subject: [PATCH] Remove warnings and allow installation of USB files with make
 install

svn path=/trunk/; revision=17753
---
 reactos/drivers/usb/miniport/linux/usb.h         | 2 ++
 reactos/drivers/usb/miniport/usbohci/ohci_main.c | 2 +-
 reactos/drivers/usb/miniport/usbohci/usbohci.xml | 2 +-
 reactos/drivers/usb/miniport/usbuhci/usbuhci.xml | 2 +-
 reactos/drivers/usb/usbhub/usbhub.xml            | 2 +-
 reactos/drivers/usb/usbport/usb.c                | 1 -
 reactos/drivers/usb/usbport/usbport.xml          | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/reactos/drivers/usb/miniport/linux/usb.h b/reactos/drivers/usb/miniport/linux/usb.h
index efc1115a91e..3e787afe26d 100644
--- a/reactos/drivers/usb/miniport/linux/usb.h
+++ b/reactos/drivers/usb/miniport/linux/usb.h
@@ -172,6 +172,8 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
 	__usb_get_extra_descriptor((ifpoint)->extra,(ifpoint)->extralen,\
 		type,(void**)ptr)
 
+void usb_choose_address(struct usb_device *dev);
+
 /* -------------------------------------------------------------------------- */
 
 struct usb_operations;
diff --git a/reactos/drivers/usb/miniport/usbohci/ohci_main.c b/reactos/drivers/usb/miniport/usbohci/ohci_main.c
index f8c8a0c12bf..c2ea9e8bbb7 100644
--- a/reactos/drivers/usb/miniport/usbohci/ohci_main.c
+++ b/reactos/drivers/usb/miniport/usbohci/ohci_main.c
@@ -268,7 +268,7 @@ OHCD_PnPStartDevice(IN PDEVICE_OBJECT DeviceObject,
 	PCM_RESOURCE_LIST AllocatedResources;
 
 	NTSTATUS Status; // debug
-	LONGLONG delay; // debug
+	//LONGLONG delay; // debug
 
 	if (DeviceObject == KeyboardFdo || DeviceObject == MouseFdo)
 		return STATUS_SUCCESS;
diff --git a/reactos/drivers/usb/miniport/usbohci/usbohci.xml b/reactos/drivers/usb/miniport/usbohci/usbohci.xml
index 06946986107..e3b0863644a 100644
--- a/reactos/drivers/usb/miniport/usbohci/usbohci.xml
+++ b/reactos/drivers/usb/miniport/usbohci/usbohci.xml
@@ -1,4 +1,4 @@
-<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
 	<include>../linux</include>
diff --git a/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml b/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
index 15c3f14375f..c81699478d6 100644
--- a/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
+++ b/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
@@ -1,4 +1,4 @@
-<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
 	<include>../linux</include>
diff --git a/reactos/drivers/usb/usbhub/usbhub.xml b/reactos/drivers/usb/usbhub/usbhub.xml
index 1d234a61ffa..b9ec0f80e9f 100644
--- a/reactos/drivers/usb/usbhub/usbhub.xml
+++ b/reactos/drivers/usb/usbhub/usbhub.xml
@@ -1,4 +1,4 @@
-<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
 	<include>../miniport/linux</include>
diff --git a/reactos/drivers/usb/usbport/usb.c b/reactos/drivers/usb/usbport/usb.c
index f53b90a05f6..5a4ba48ff40 100644
--- a/reactos/drivers/usb/usbport/usb.c
+++ b/reactos/drivers/usb/usbport/usb.c
@@ -404,7 +404,6 @@ usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
 	firsttime = 1;
 	
 	save_id = (struct usb_device_id*)id;
-retry_id:	
 	id = (struct usb_device_id*)save_id;
 
 	/* proc_connectinfo in devio.c may call us with id == NULL. */
diff --git a/reactos/drivers/usb/usbport/usbport.xml b/reactos/drivers/usb/usbport/usbport.xml
index b1be49855b1..5bcd45c75b4 100644
--- a/reactos/drivers/usb/usbport/usbport.xml
+++ b/reactos/drivers/usb/usbport/usbport.xml
@@ -1,4 +1,4 @@
-<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys">
 	<importlibrary definition="usbport.def" />
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />