Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 03:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BUILD]

Browse source 
- Add rbuild files
- Fix dumb dependencies in cmake files
[DEBUG]
- Kill more debugging

svn path=/branches/usb-bringup-trunk/; revision=55554
This commit is contained in:
Cameron Gutman 2012-02-12 03:48:54 +00:00
parent 50daddc967
commit 8141780521
26 changed files with 208 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/drivers.rbuild
View file

@ -19,6 +19,9 @@
<directory name="filesystems"> <directory name="filesystems">
<xi:include href="filesystems/directory.rbuild" /> <xi:include href="filesystems/directory.rbuild" />
</directory> </directory>
<directory name="hid">
<xi:include href="hid/directory.rbuild" />
</directory>
<directory name="filters> <directory name="filters>
<xi:include href="filters/directory.rbuild" /> <xi:include href="filters/directory.rbuild" />
</directory> </directory>

2
drivers/filters/mountmgr/CMakeLists.txt
View file

@ -15,4 +15,4 @@ allow_warnings(mountmgr)
set_module_type(mountmgr kernelmodedriver) set_module_type(mountmgr kernelmodedriver)
add_importlibs(mountmgr ntoskrnl hal) add_importlibs(mountmgr ntoskrnl hal)
add_pch(mountmgr mntmgr.h) 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)

4
drivers/filters/mountmgr/mountmgr.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys"> <module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys" allowwarnings="true">
<bootstrap installbase="$(CDOUTPUT)" /> <bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<define name="NTDDI_VERSION">0x05020400</define> <define name="NTDDI_VERSION">0x05020400</define>
<include base="mountmgr">.</include> <include base="mountmgr">.</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>

19
drivers/hid/directory.rbuild Normal file
View file

@ -0,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>

1
drivers/hid/hidclass/CMakeLists.txt
View file

@ -11,7 +11,6 @@ list(APPEND SOURCE
add_library(hidclass SHARED ${SOURCE}) add_library(hidclass SHARED ${SOURCE})
set_entrypoint(hidclass 0) set_entrypoint(hidclass 0)
set_image_base(hidclass 0x00010000)
set_subsystem(hidclass native) set_subsystem(hidclass native)
set_target_properties(hidclass PROPERTIES SUFFIX ".sys") set_target_properties(hidclass PROPERTIES SUFFIX ".sys")

13
drivers/hid/hidclass/hidclass.rbuild Normal file
View file

@ -0,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>

13
drivers/hid/hidparse/hidparse.rbuild Normal file
View file

@ -0,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>

11
drivers/hid/hidusb/hidusb.rbuild Normal file
View file

@ -0,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>

1
drivers/hid/kbdhid/kbdhid.h
View file

@ -5,6 +5,7 @@
#include <hidclass.h> #include <hidclass.h>
#include <hidpddi.h> #include <hidpddi.h>
#include <hidpi.h> #include <hidpi.h>
#define NDEBUG
#include <debug.h> #include <debug.h>
#include <kbdmou.h> #include <kbdmou.h>
//#include <kbd.h> //#include <kbd.h>

12
drivers/hid/kbdhid/kbdhid.rbuild Normal file
View file

@ -0,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>

1
drivers/hid/mouhid/mouhid.h
View file

@ -5,6 +5,7 @@
#include <hidclass.h> #include <hidclass.h>
#include <hidpddi.h> #include <hidpddi.h>
#include <hidpi.h> #include <hidpi.h>
#define NDEBUG
#include <debug.h> #include <debug.h>
#include <ntddmou.h> #include <ntddmou.h>
#include <kbdmou.h> #include <kbdmou.h>

11
drivers/hid/mouhid/mouhid.rbuild Normal file
View file

@ -0,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>

13
drivers/usb/directory.rbuild
View file

@ -1,13 +1,22 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude"> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="usbccgp">
<xi:include href="usbccgp/usbccgp.rbuild" />
</directory>
<directory name="usbd"> <directory name="usbd">
<xi:include href="usbd/usbd.rbuild" /> <xi:include href="usbd/usbd.rbuild" />
</directory> </directory>
<!--directory name="usbhub"> <directory name="usbehci">
<xi:include href="usbehci/usbehci.rbuild" />
</directory>
<directory name="usbhub">
<xi:include href="usbhub/usbhub.rbuild" /> <xi:include href="usbhub/usbhub.rbuild" />
</directory> </directory>
<directory name="usbohci">
<xi:include href="usbohci/usbohci.rbuild" />
</directory>
<directory name="usbstor"> <directory name="usbstor">
<xi:include href="usbstor/usbstor.rbuild" /> <xi:include href="usbstor/usbstor.rbuild" />
</directory--> </directory>
</group> </group>

19
drivers/usb/usbccgp/usbccgp.rbuild Normal file
View file

@ -0,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>

1
drivers/usb/usbd/usbd.c
View file

@ -34,6 +34,7 @@
#include <ntddk.h> #include <ntddk.h>
#include <usbdi.h> #include <usbdi.h>
#define NDEBUG
#include <debug.h> #include <debug.h>
#ifndef PLUGPLAY_REGKEY_DRIVER #ifndef PLUGPLAY_REGKEY_DRIVER
#define PLUGPLAY_REGKEY_DRIVER 2 #define PLUGPLAY_REGKEY_DRIVER 2

1
drivers/usb/usbd/usbd.rbuild
View file

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys">
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<importlibrary definition="usbd.spec" /> <importlibrary definition="usbd.spec" />
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>

2
drivers/usb/usbehci/CMakeLists.txt
View file

@ -29,6 +29,6 @@ else()
endif(MSVC) endif(MSVC)
set_module_type(usbehci kernelmodedriver) 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) add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)

22
drivers/usb/usbehci/usbehci.rbuild Normal file
View file

@ -0,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>

16
drivers/usb/usbhub/usbhub.rbuild Normal file
View file

@ -0,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>

23
drivers/usb/usbohci/usbohci.rbuild Normal file
View file

@ -0,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>

2
drivers/usb/usbstor/usbstor.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include <ntddk.h> #include <ntddk.h>
#define YDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#include <usbdi.h> #include <usbdi.h>
#include <hubbusif.h> #include <hubbusif.h>

10
drivers/usb/usbstor/usbstor.rbuild
View file

@ -1,10 +1,20 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys"> <module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys">
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<define name="DEBUG_MODE" /> <define name="DEBUG_MODE" />
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</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.c</file>
<file>usbstor.rc</file> <file>usbstor.rc</file>
</module> </module>

3
lib/drivers/directory.rbuild
View file

@ -4,6 +4,9 @@
<directory name="csq"> <directory name="csq">
<xi:include href="csq/csq.rbuild" /> <xi:include href="csq/csq.rbuild" />
</directory> </directory>
<directory name="hidparser">
<xi:include href="hidparser/hidparser.rbuild" />
</directory>
<directory name="ip"> <directory name="ip">
<xi:include href="ip/ip.rbuild" /> <xi:include href="ip/ip.rbuild" />
</directory> </directory>

2
lib/drivers/hidparser/CMakeLists.txt
View file

@ -1,7 +1,7 @@
add_definitions( add_definitions(
-DUNICODE -D_UNICODE -DUNICODE -D_UNICODE
-DNDEBUG=1) -DNDEBUG)
list(APPEND SOURCE list(APPEND SOURCE
context.c context.c

1
lib/drivers/hidparser/hidparser.h
View file

@ -15,6 +15,7 @@
#include <ntddk.h> #include <ntddk.h>
#include <hidpddi.h> #include <hidpddi.h>
#include <hidpi.h> #include <hidpi.h>
#define NDEBUG
#include <debug.h> #include <debug.h>
// //

11
lib/drivers/hidparser/hidparser.rbuild Normal file
View file

@ -0,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>