Modified: trunk/reactos/drivers/usb/miniport/linux/usb.h
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c
Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml
Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml
Modified: trunk/reactos/drivers/usb/usbport/usb.c
Modified: trunk/reactos/drivers/usb/usbport/usbport.xml
--- trunk/reactos/drivers/usb/miniport/linux/usb.h 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/miniport/linux/usb.h 2005-09-08 21:32:53 UTC (rev 17753)
@@ -172,6 +172,8 @@
__usb_get_extra_descriptor((ifpoint)->extra,(ifpoint)->extralen,\
type,(void**)ptr)
+void usb_choose_address(struct usb_device *dev);
+
/* -------------------------------------------------------------------------- */
struct usb_operations;
--- trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 21:32:53 UTC (rev 17753)
@@ -268,7 +268,7 @@
PCM_RESOURCE_LIST AllocatedResources;
NTSTATUS Status; // debug
- LONGLONG delay; // debug
+ //LONGLONG delay; // debug
if (DeviceObject == KeyboardFdo || DeviceObject == MouseFdo)
return STATUS_SUCCESS;
--- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 21:32:53 UTC (rev 17753)
@@ -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>
--- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 21:32:53 UTC (rev 17753)
@@ -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>
--- trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 21:32:53 UTC (rev 17753)
@@ -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>
--- trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 21:32:53 UTC (rev 17753)
@@ -404,7 +404,6 @@
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. */
--- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 21:08:53 UTC (rev 17752)
+++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 21:32:53 UTC (rev 17753)
@@ -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" />