Author: cgutman
Date: Thu Oct 13 22:07:31 2011
New Revision: 54122
URL: http://svn.reactos.org/svn/reactos?rev=54122&view=rev
Log:
[USBDRV]
- Rename usbdriver to usbdrv (Freeloader can't load files that aren't 8.3 -
needs looking into)
- Include usbdrv in build
Added:
trunk/reactos/drivers/usb/nt4compat/usbdrv/
- copied from r54114, trunk/reactos/drivers/usb/nt4compat/usbdriver/
trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild
- copied, changed from r54114,
trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild
Removed:
trunk/reactos/drivers/usb/nt4compat/usbdriver/
trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild
Modified:
trunk/reactos/drivers/usb/CMakeLists.txt
trunk/reactos/drivers/usb/directory.rbuild
trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt
trunk/reactos/drivers/usb/nt4compat/directory.rbuild
trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt
Modified: trunk/reactos/drivers/usb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt?rev=54122&r1=54121&r2=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Oct 13 22:07:31
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.rbuild?rev=54122&r1=54121&r2=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Thu Oct 13 22:07:31
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>
Modified: trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt?rev=54122&r1=54121&r2=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt [iso-8859-1] Thu Oct 13
22:07:31 2011
@@ -1,2 +1,2 @@
-add_subdirectory(usbdriver)
+add_subdirectory(usbdrv)
Modified: trunk/reactos/drivers/usb/nt4compat/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/directory.rbuild?rev=54122&r1=54121&r2=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/directory.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/directory.rbuild [iso-8859-1] Thu Oct
13 22:07:31 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude";>
- <directory name="usbdriver">
- <xi:include href="usbdriver/usbdriver.rbuild" />
+ <directory name="usbdrv">
+ <xi:include href="usbdrv/usbdrv.rbuild" />
</directory>
</group>
Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt?rev=54122&r1=54114&r2=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt [iso-8859-1] Thu
Oct 13 22:07:31 2011
@@ -25,11 +25,11 @@
keyboard.c
usbdriver.rc)
-add_library(usbdriver SHARED ${SOURCE})
+add_library(usbdrv SHARED ${SOURCE})
-set_module_type(usbdriver kernelmodedriver)
-add_importlibs(usbdriver ntoskrnl hal)
+set_module_type(usbdrv kernelmodedriver)
+add_importlibs(usbdrv ntoskrnl hal)
-add_pch(usbdriver usbdriver.h)
+add_pch(usbdrv usbdriver.h)
-add_cd_file(TARGET usbdriver DESTINATION reactos/system32/drivers FOR all)
+add_cd_file(TARGET usbdrv DESTINATION reactos/system32/drivers NO_CAB FOR all)
Removed: trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild?rev=54114&view=auto
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild (removed)
@@ -1,30 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="usbdriver" type="kernelmodedriver"
installbase="system32/drivers" installname="usbdriver.sys">
- <define name="INCLUDE_EHCI" />
- <define name="_MULTI_UHCI" />
- <define name="_MULTI_EHCI" />
- <define name="_X86" />
- <include base="usbdriver">.</include>
- <library>ntoskrnl</library>
- <library>hal</library>
- <file>ehci.c</file>
- <file>ohci.c</file>
- <file>uhci.c</file>
- <file>roothub.c</file>
- <file>hub.c</file>
- <file>td.c</file>
- <file>usb.c</file>
- <file>umss.c</file>
- <file>bulkonly.c</file>
- <file>cbi.c</file>
- <file>devmgr.c</file>
- <file>dmgrdisp.c</file>
- <file>compdrv.c</file>
- <file>etd.c</file>
- <file>gendrv.c</file>
- <file>mouse.c</file>
- <file>keyboard.c</file>
- <file>usbdriver.rc</file>
- <pch>usbdriver.h</pch>
-</module>
Copied: trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild (from r54114,
trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild?p2=trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild&p1=trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild&r1=54114&r2=54122&rev=54122&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild [iso-8859-1] Thu
Oct 13 22:07:31 2011
@@ -1,11 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="usbdriver" type="kernelmodedriver"
installbase="system32/drivers" installname="usbdriver.sys">
+<module name="usbdrv" type="kernelmodedriver" installbase="system32/drivers"
installname="usbdrv.sys">
+ <bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<define name="INCLUDE_EHCI" />
<define name="_MULTI_UHCI" />
<define name="_MULTI_EHCI" />
<define name="_X86" />
- <include base="usbdriver">.</include>
+ <include base="usbdrv">.</include>
<library>ntoskrnl</library>
<library>hal</library>
<file>ehci.c</file>
