Modified: trunk/reactos/drivers/usb/miniport/linux/pci_hal.c
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
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/uhci-hcd.c
Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h
Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h
Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml
Modified: trunk/reactos/drivers/usb/usbport/buffer_simple.c
Modified: trunk/reactos/drivers/usb/usbport/config.c
Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c
Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c
Modified: trunk/reactos/drivers/usb/usbport/hcd-pci.c
Modified: trunk/reactos/drivers/usb/usbport/hcd.c
Modified: trunk/reactos/drivers/usb/usbport/hub.c
Modified: trunk/reactos/drivers/usb/usbport/message.c
Modified: trunk/reactos/drivers/usb/usbport/urb.c
Modified: trunk/reactos/drivers/usb/usbport/usb-debug.c
Modified: trunk/reactos/drivers/usb/usbport/usb.c
Modified: trunk/reactos/drivers/usb/usbport/usbcore.c
Deleted: trunk/reactos/drivers/usb/usbport/usbcore.def
Added: trunk/reactos/drivers/usb/usbport/usbport.def
Modified: trunk/reactos/drivers/usb/usbport/usbport.xml
--- trunk/reactos/drivers/usb/miniport/linux/pci_hal.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/linux/pci_hal.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -2,7 +2,7 @@
// this file is part of linux_wrapper.h
//FIXME: Move this file, make its definitions more general
-#include "../host/ohci_main.h"
+#include "../usbohci/ohci_main.h"
/*
Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory.
--- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -97,7 +97,7 @@
#include <linux/list.h>
#include <linux/interrupt.h> /* for in_interrupt () */
#include <linux/usb.h>
-#include "../core/hcd.h"
+#include "hcd.h"
#include <asm/io.h>
#include <asm/irq.h>
@@ -108,7 +108,7 @@
#include "ohci_config.h"
#include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
//#define OHCI_VERBOSE_DEBUG
#endif
--- trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -10,7 +10,7 @@
#include <debug.h>
#include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
#include "ohci_main.h"
// declare basic init funcs
--- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,13 +1,12 @@
-<module name="ohci" type="kernelmodedriver" installbase="system32/drivers" installname="ohci.sys" warnings="true">
- <importlibrary definition="ohci.def" />
+<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<define name="__USE_W32API" />
<define name="DEBUG_MODE" />
- <include base="ntoskrnl">include</include>
<include>../linux</include>
+ <include base="usbport"></include>
<library>sys_base</library>
<library>ntoskrnl</library>
<library>hal</library>
- <library>usbcore</library>
+ <library>usbport</library>
<file>ohci-hcd.c</file>
<file>ohci_main.c</file>
<file>ohci.rc</file>
--- trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -61,7 +61,7 @@
#include "uhci_config.h"
#include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
#include "uhci-hcd.h"
#if 0
--- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h 2005-09-08 20:53:17 UTC (rev 17751)
@@ -6,9 +6,9 @@
#include <ddk/usbiodef.h>
#include <initguid.h>
-#include "../core/hcd.h"
+#include "hcd.h"
-#include "../host/ohci_main.h"
+#include "../usbohci/ohci_main.h"
#define USB_UHCI_TAG TAG('u','s','b','u')
--- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,12 +1,12 @@
-<module name="uhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys" warnings="true">
+<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<define name="__USE_W32API" />
<define name="DEBUG_MODE" />
- <include base="ntoskrnl">include</include>
<include>../linux</include>
+ <include base="usbport"></include>
<library>sys_base</library>
<library>ntoskrnl</library>
<library>hal</library>
- <library>usbcore</library>
+ <library>usbport</library>
<file>cleanup.c</file>
<file>close.c</file>
<file>create.c</file>
--- trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-09-08 20:53:17 UTC (rev 17751)
@@ -3,8 +3,8 @@
#include <ddk/ntddk.h>
#include <ddk/usbioctl.h>
-#include "../usb_wrapper.h"
-#include "../core/hub.h"
+#include "../miniport/usb_wrapper.h"
+#include "../usbport/hub.h"
#define USB_HUB_TAG TAG('u','s','b','h')
--- trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,12 +1,11 @@
-<module name="hub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys" warnings="true">
+<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<define name="__USE_W32API" />
<define name="DEBUG_MODE" />
- <include base="ntoskrnl">include</include>
- <include>../linux</include>
+ <include>../miniport/linux</include>
<library>sys_base</library>
<library>ntoskrnl</library>
<library>hal</library>
- <library>usbcore</library>
+ <library>usbport</library>
<file>createclose.c</file>
<file>fdo.c</file>
<file>misc.c</file>
--- trunk/reactos/drivers/usb/usbport/buffer_simple.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/buffer_simple.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -5,7 +5,7 @@
*
*/
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#define __KERNEL__
#define CONFIG_PCI
#include "hcd.h"
--- trunk/reactos/drivers/usb/usbport/config.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/config.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <asm/byteorder.h>
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#endif
#define USB_MAXALTSETTING 128 /* Hard limit */
--- trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -4,7 +4,7 @@
*/
#define NDEBUG
-#include "../../usb_wrapper.h"
+#include "../../miniport/usb_wrapper.h"
#define keyboarddebug 0
--- trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -3,7 +3,7 @@
*/
#define NDEBUG
-#include "../../usb_wrapper.h"
+#include "../../miniport/usb_wrapper.h"
extern USBPORT_INTERFACE UsbPortInterface;
--- trunk/reactos/drivers/usb/usbport/hcd-pci.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/hcd-pci.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -34,7 +34,7 @@
#include "hcd.h"
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#include "hcd.h"
#endif
--- trunk/reactos/drivers/usb/usbport/hcd.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/hcd.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -41,7 +41,7 @@
#include <linux/usb.h>
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
//#define DEBUG
#endif
--- trunk/reactos/drivers/usb/usbport/hub.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/hub.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -36,7 +36,7 @@
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#include "hcd.h"
#include "hub.h"
--- trunk/reactos/drivers/usb/usbport/message.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/message.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -10,7 +10,7 @@
#include <linux/mm.h>
#include <asm/byteorder.h>
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#endif
#include "hcd.h" /* for usbcore internals */
--- trunk/reactos/drivers/usb/usbport/urb.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/urb.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,4 +1,4 @@
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#include "hcd.h"
/**
--- trunk/reactos/drivers/usb/usbport/usb-debug.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/usb-debug.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -17,7 +17,7 @@
#endif
#include <linux/usb.h>
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#endif
static void usb_show_endpoint(struct usb_host_endpoint *endpoint)
--- trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -50,7 +50,7 @@
#include "hcd.h"
#include "usb.h"
#else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
#include "hcd.h"
#endif
--- trunk/reactos/drivers/usb/usbport/usbcore.c 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/usbcore.c 2005-09-08 20:53:17 UTC (rev 17751)
@@ -5,7 +5,7 @@
#include <ddk/ntddk.h>
#include <debug.h>
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
USBPORT_INTERFACE UsbPortInterface;
--- trunk/reactos/drivers/usb/usbport/usbcore.def 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/usbcore.def 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,33 +0,0 @@
-;
-; Exports definition file for usbcore.sys
-;
-EXPORTS
-usb_init@0
-usb_exit@0
-usb_init_urb@4
-usb_alloc_urb@8
-usb_free_urb@4
-usb_get_urb@4
-usb_get_dev@4
-usb_submit_urb@8
-usb_unlink_urb@4
-usb_bus_init@4
-usb_alloc_bus@4
-usb_free_bus@4
-usb_register_bus@4
-usb_deregister_bus@4
-usb_register_root_hub@8
-usb_calc_bus_time@16
-usb_check_bandwidth@8
-usb_claim_bandwidth@16
-usb_release_bandwidth@12
-usb_hcd_giveback_urb@12
-;usb_hcd_irq@12
-usb_hc_died@4
-usb_alloc_dev@8
-usb_connect@4
-usb_put_dev@4
-usb_disabled@0
-usb_hcd_pci_probe@8
-usb_hcd_pci_remove@4
-RegisterPortDriver@8
\ No newline at end of file
--- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 20:18:46 UTC (rev 17750)
+++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 20:53:17 UTC (rev 17751)
@@ -1,9 +1,8 @@
-<module name="usbcore" type="kernelmodedriver" installbase="system32/drivers" installname="usbcore.sys" warnings="true">
- <importlibrary definition="usbcore.def" />
+<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+ <importlibrary definition="usbport.def" />
<define name="__USE_W32API" />
<define name="DEBUG_MODE" />
<define name="DEBUG" />
- <include base="ntoskrnl">include</include>
<library>sys_base</library>
<library>ntoskrnl</library>
<library>hal</library>