[USBDRIVER]

No objections on the mailing list, so I'm excluding "usbdriver" from build.
It should still stay as a reference in the tree till the new USB drivers are finalized and merged back to Trunk.

svn path=/trunk/; revision=52361

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 6a7a8a8..9173665 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -540,7 +540,7 @@ drivers\storage\ide\pciidex\pciidex.sys             2
 ;drivers\usb\miniport\usbuhci\usbuhci.sys           2
 ;drivers\usb\usbhub\usbhub.sys                      2
 ;drivers\usb\usbport\usbport.sys                    2
-drivers\usb\nt4compat\usbdriver\usbdriver.sys       2
+;drivers\usb\nt4compat\usbdriver\usbdriver.sys      2
 
 drivers\video\displays\vga\vgaddi.dll               1
 drivers\video\displays\framebuf\framebuf.dll        1

diff --git a/reactos/drivers/usb/CMakeLists.txt b/reactos/drivers/usb/CMakeLists.txt
index 291a429..a7eb481 100644 (file)
--- a/reactos/drivers/usb/CMakeLists.txt
+++ b/reactos/drivers/usb/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_subdirectory(nt4compat)
+#add_subdirectory(nt4compat)
 add_subdirectory(usbd)
 #add_subdirectory(usbehci) The USB branch has usbehci_new
 #add_subdirectory(usbhub) Compiles, just skipped in trunk

diff --git a/reactos/drivers/usb/directory.rbuild b/reactos/drivers/usb/directory.rbuild
index e81eb8b..04b926b 100644 (file)
--- a/reactos/drivers/usb/directory.rbuild
+++ b/reactos/drivers/usb/directory.rbuild
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <directory name="nt4compat">
+       <!--directory name="nt4compat">
                <xi:include href="nt4compat/directory.rbuild" />
-       </directory>
+       </directory-->
        <directory name="usbd">
                <xi:include href="usbd/usbd.rbuild" />
        </directory>