[ros-diffs] [cgutman] 55554: [BUILD] - Add rbuild files - Fix dumb dependencies in cmake files [DEBUG] - Kill more debugging

Author: cgutman
Date: Sun Feb 12 03:48:54 2012
New Revision: 55554

URL: http://svn.reactos.org/svn/reactos?rev=55554&view=rev
Log:
[BUILD]
- Add rbuild files
- Fix dumb dependencies in cmake files
[DEBUG]
- Kill more debugging

Added:
    branches/usb-bringup-trunk/drivers/hid/directory.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild   (with props)
    branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild   (with props)
    branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild   (with props)
Modified:
    branches/usb-bringup-trunk/drivers/drivers.rbuild
    branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild
    branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
    branches/usb-bringup-trunk/drivers/usb/directory.rbuild
    branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c
    branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild
    branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h
    branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild
    branches/usb-bringup-trunk/lib/drivers/directory.rbuild
    branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt
    branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h

Modified: branches/usb-bringup-trunk/drivers/drivers.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/drive…
==============================================================================
--- branches/usb-bringup-trunk/drivers/drivers.rbuild [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/drivers.rbuild [iso-8859-1] Sun Feb 12 03:48:54
2012
@@ -18,6 +18,9 @@
 </directory>
 <directory name="filesystems">
 	<xi:include href="filesystems/directory.rbuild" />
+</directory>
+<directory name="hid">
+	<xi:include href="hid/directory.rbuild" />
 </directory>
 <directory name="filters>
 	<xi:include href="filters/directory.rbuild" />

Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte…
==============================================================================
--- branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Sun
Feb 12 03:48:54 2012
@@ -15,4 +15,4 @@
 set_module_type(mountmgr kernelmodedriver)
 add_importlibs(mountmgr ntoskrnl hal)
 add_pch(mountmgr mntmgr.h)
-#add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte…
==============================================================================
--- branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild [iso-8859-1] Sun
Feb 12 03:48:54 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="mountmgr" type="kernelmodedriver"
installbase="system32/drivers" installname="mountmgr.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+<module name="mountmgr" type="kernelmodedriver"
installbase="system32/drivers" installname="mountmgr.sys"
allowwarnings="true">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="NTDDI_VERSION">0x05020400</define>
 	<include base="mountmgr">.</include>
 	<library>ntoskrnl</library>

Added: branches/usb-bringup-trunk/drivers/hid/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/d…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/directory.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/directory.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="hidclass">
+		<xi:include href="hidclass/hidclass.rbuild" />
+	</directory>
+	<directory name="hidparse">
+		<xi:include href="hidparse/hidparse.rbuild" />
+	</directory>
+	<directory name="hidusb">
+		<xi:include href="hidusb/hidusb.rbuild" />
+	</directory>
+	<directory name="kbdhid">
+		<xi:include href="kbdhid/kbdhid.rbuild" />
+	</directory>
+	<directory name="mouhid">
+		<xi:include href="mouhid/mouhid.rbuild" />
+	</directory>
+</group>

Propchange: branches/usb-bringup-trunk/drivers/hid/directory.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -11,7 +11,6 @@
 add_library(hidclass SHARED ${SOURCE})
 
 set_entrypoint(hidclass 0)
-set_image_base(hidclass 0x00010000)
 set_subsystem(hidclass native)
 set_target_properties(hidclass PROPERTIES SUFFIX ".sys")
 

Added: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild [iso-8859-1] Sun Feb
12 03:48:54 2012
@@ -1,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidclass" type="kernelmodedriver"
entrypoint="0" installbase="system32/drivers"
installname="hidclass.sys">
+	<importlibrary definition="hidclass.spec" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<library>ntoskrnl</library>
+	<library>hidparse</library>
+	<library>hal</library>
+	<file>fdo.c</file>
+	<file>hidclass.c</file>
+	<file>hidclass.rc</file>
+	<file>pdo.c</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild [iso-8859-1] Sun Feb
12 03:48:54 2012
@@ -1,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidparse" type="kernelmodedriver"
installbase="system32/drivers" installname="hidparse.sys">
+	<importlibrary definition="hidparse.spec" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<include base="ReactOS">lib/drivers/hidparser</include>
+	<library>ntoskrnl</library>
+	<library>hidparser</library>
+	<file>hidparse.c</file>
+	<file>hidparse.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidusb" type="kernelmodedriver"
installbase="system32/drivers" installname="hidusb.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<library>ntoskrnl</library>
+	<library>hidclass</library>
+	<library>usbd</library>
+	<library>hal</library>
+	<file>hidusb.c</file>
+	<file>hidusb.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -5,6 +5,7 @@
 #include <hidclass.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 #include <kbdmou.h>
 //#include <kbd.h>

Added: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="kbdhid" type="kernelmodedriver"
installbase="system32/drivers" installname="kbdhid.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>hidparse</library>
+	<file>kbdhid.c</file>
+	<file>kbdhid.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -5,6 +5,7 @@
 #include <hidclass.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 #include <ntddmou.h>
 #include <kbdmou.h>

Added: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mouhid" type="kernelmodedriver"
installbase="system32/drivers" installname="mouhid.sys">
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>hidparse</library>
+	<file>mouhid.c</file>
+	<file>mouhid.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/usb/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/d…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,13 +1,22 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="usbccgp">
+		<xi:include href="usbccgp/usbccgp.rbuild" />
+	</directory>
 	<directory name="usbd">
 		<xi:include href="usbd/usbd.rbuild" />
 	</directory>
-	<!--directory name="usbhub">
+	<directory name="usbehci">
+		<xi:include href="usbehci/usbehci.rbuild" />
+	</directory>
+	<directory name="usbhub">
 		<xi:include href="usbhub/usbhub.rbuild" />
+	</directory>
+	<directory name="usbohci">
+		<xi:include href="usbohci/usbohci.rbuild" />
 	</directory>
 	<directory name="usbstor">
 		<xi:include href="usbstor/usbstor.rbuild" />
-	</directory-->
+	</directory>
 </group>

Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbccgp" type="kernelmodedriver"
installbase="system32/drivers" installname="usbccgp.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+    <library>usbd</library>
+    <library>pseh</library>
+	<file>descriptor.c</file>
+	<file>fdo.c</file>
+	<file>function.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>usbccgp.c</file>
+	<file>usbccgp.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Sun Feb 12 03:48:54
2012
@@ -34,6 +34,7 @@
 
 #include <ntddk.h>
 #include <usbdi.h>
+#define NDEBUG
 #include <debug.h>
 #ifndef PLUGPLAY_REGKEY_DRIVER
 #define PLUGPLAY_REGKEY_DRIVER              2

Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbd" type="kernelmodedriver"
installbase="system32/drivers" installname="usbd.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<importlibrary definition="usbd.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>

Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -29,6 +29,6 @@
 endif(MSVC)
 
 set_module_type(usbehci kernelmodedriver)
-add_importlibs(usbehci ntoskrnl ks drmk hal)
+add_importlibs(usbehci ntoskrnl hal)
 
 add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)

Added: branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbehci" type="kernelmodedriver"
installbase="system32/drivers" installname="usbehci.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+    <library>pseh</library>
+	<file>usbehci.cpp</file>
+	<file>usb_device.cpp</file>
+	<file>usb_request.cpp</file>
+	<file>usb_queue.cpp</file>
+	<file>hcd_controller.cpp</file>
+	<file>hardware.cpp</file>
+	<file>misc.cpp</file>
+	<file>purecall.cpp</file>
+	<file>hub_controller.cpp</file>
+	<file>memory_manager.cpp</file>
+	<file>usbehci.rc</file>
+	<compilerflag>-fno-rtti</compilerflag>
+	<compilerflag>-fno-exceptions</compilerflag>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbhub" type="kernelmodedriver"
installbase="system32/drivers" installname="usbhub.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>usbd</library>
+	<library>pseh</library>
+	<file>fdo.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>usbhub.c</file>
+	<file>usbhub.rc</file>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild (added)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbohci" type="kernelmodedriver"
installbase="system32/drivers" installname="usbohci.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>usbd</library>
+    <library>pseh</library>
+	<file>usbohci.cpp</file>
+	<file>usb_device.cpp</file>
+	<file>usb_request.cpp</file>
+	<file>usb_queue.cpp</file>
+	<file>hcd_controller.cpp</file>
+	<file>hardware.cpp</file>
+	<file>misc.cpp</file>
+	<file>purecall.cpp</file>
+	<file>hub_controller.cpp</file>
+	<file>memory_manager.cpp</file>
+	<file>usbohci.rc</file>
+	<compilerflag>-fno-rtti</compilerflag>
+	<compilerflag>-fno-exceptions</compilerflag>
+</module>

Propchange: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <ntddk.h>
-#define YDEBUG
+#define NDEBUG
 #include <debug.h>
 #include <usbdi.h>
 #include <hubbusif.h>

Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -1,10 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbstor" type="kernelmodedriver"
installbase="system32/drivers" installname="usbstor.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="DEBUG_MODE" />
 	<include base="ntoskrnl">include</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
+	<library>usbd</library>
+	<file>descriptor.c</file>
+	<file>disk.c</file>
+	<file>fdo.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>queue.c</file>
+	<file>error.c</file>
+	<file>scsi.c</file>
 	<file>usbstor.c</file>
 	<file>usbstor.rc</file>
 </module>

Modified: branches/usb-bringup-trunk/lib/drivers/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/d…
==============================================================================
--- branches/usb-bringup-trunk/lib/drivers/directory.rbuild [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/lib/drivers/directory.rbuild [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -3,6 +3,9 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<directory name="csq">
 		<xi:include href="csq/csq.rbuild" />
+	</directory>
+	<directory name="hidparser">
+		<xi:include href="hidparser/hidparser.rbuild" />
 	</directory>
 	<directory name="ip">
 		<xi:include href="ip/ip.rbuild" />

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h…
==============================================================================
--- branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] Sun Feb
12 03:48:54 2012
@@ -1,7 +1,7 @@
 
 add_definitions(
     -DUNICODE -D_UNICODE
-    -DNDEBUG=1)
+    -DNDEBUG)
 
 list(APPEND SOURCE
     context.c

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h…
==============================================================================
--- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sun Feb 12
03:48:54 2012
@@ -15,6 +15,7 @@
 #include <ntddk.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 
 //

Added: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h…
==============================================================================
--- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild (added)
+++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild [iso-8859-1] Sun Feb
12 03:48:54 2012
@@ -1,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidparser" type="staticlibrary">
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="NDEBUG" />
+	<file>hidparser.c</file>
+	<file>parser.c</file>
+	<file>context.c</file>
+	<file>api.c</file>
+</module>

Propchange: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native