Author: cfinck Date: Sun Jun 19 10:13:59 2011 New Revision: 52361
URL: http://svn.reactos.org/svn/reactos?rev=52361&view=rev Log: [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.
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/usb/directory.rbuild
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -540,7 +540,7 @@ ;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
Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt?... ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -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
Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbuil... ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -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>