From 8141780521642ee251736a521be72d651b8aaa6e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 12 Feb 2012 03:48:54 +0000 Subject: [PATCH] [BUILD] - Add rbuild files - Fix dumb dependencies in cmake files [DEBUG] - Kill more debugging svn path=/branches/usb-bringup-trunk/; revision=55554 --- drivers/drivers.rbuild | 3 +++ drivers/filters/mountmgr/CMakeLists.txt | 2 +- drivers/filters/mountmgr/mountmgr.rbuild | 4 ++-- drivers/hid/directory.rbuild | 19 +++++++++++++++++++ drivers/hid/hidclass/CMakeLists.txt | 1 - drivers/hid/hidclass/hidclass.rbuild | 13 +++++++++++++ drivers/hid/hidparse/hidparse.rbuild | 13 +++++++++++++ drivers/hid/hidusb/hidusb.rbuild | 11 +++++++++++ drivers/hid/kbdhid/kbdhid.h | 1 + drivers/hid/kbdhid/kbdhid.rbuild | 12 ++++++++++++ drivers/hid/mouhid/mouhid.h | 1 + drivers/hid/mouhid/mouhid.rbuild | 11 +++++++++++ drivers/usb/directory.rbuild | 13 +++++++++++-- drivers/usb/usbccgp/usbccgp.rbuild | 19 +++++++++++++++++++ drivers/usb/usbd/usbd.c | 1 + drivers/usb/usbd/usbd.rbuild | 1 + drivers/usb/usbehci/CMakeLists.txt | 2 +- drivers/usb/usbehci/usbehci.rbuild | 22 ++++++++++++++++++++++ drivers/usb/usbhub/usbhub.rbuild | 16 ++++++++++++++++ drivers/usb/usbohci/usbohci.rbuild | 23 +++++++++++++++++++++++ drivers/usb/usbstor/usbstor.h | 2 +- drivers/usb/usbstor/usbstor.rbuild | 10 ++++++++++ lib/drivers/directory.rbuild | 3 +++ lib/drivers/hidparser/CMakeLists.txt | 2 +- lib/drivers/hidparser/hidparser.h | 1 + lib/drivers/hidparser/hidparser.rbuild | 11 +++++++++++ 26 files changed, 208 insertions(+), 9 deletions(-) create mode 100644 drivers/hid/directory.rbuild create mode 100644 drivers/hid/hidclass/hidclass.rbuild create mode 100644 drivers/hid/hidparse/hidparse.rbuild create mode 100644 drivers/hid/hidusb/hidusb.rbuild create mode 100644 drivers/hid/kbdhid/kbdhid.rbuild create mode 100644 drivers/hid/mouhid/mouhid.rbuild create mode 100644 drivers/usb/usbccgp/usbccgp.rbuild create mode 100644 drivers/usb/usbehci/usbehci.rbuild create mode 100644 drivers/usb/usbhub/usbhub.rbuild create mode 100644 drivers/usb/usbohci/usbohci.rbuild create mode 100644 lib/drivers/hidparser/hidparser.rbuild diff --git a/drivers/drivers.rbuild b/drivers/drivers.rbuild index 67ab810bca2..15b36eaeead 100644 --- a/drivers/drivers.rbuild +++ b/drivers/drivers.rbuild @@ -19,6 +19,9 @@ + + + diff --git a/drivers/filters/mountmgr/CMakeLists.txt b/drivers/filters/mountmgr/CMakeLists.txt index 0c67ca75b0a..4a99868931c 100644 --- a/drivers/filters/mountmgr/CMakeLists.txt +++ b/drivers/filters/mountmgr/CMakeLists.txt @@ -15,4 +15,4 @@ allow_warnings(mountmgr) 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) diff --git a/drivers/filters/mountmgr/mountmgr.rbuild b/drivers/filters/mountmgr/mountmgr.rbuild index cce556ef482..52aa848418f 100644 --- a/drivers/filters/mountmgr/mountmgr.rbuild +++ b/drivers/filters/mountmgr/mountmgr.rbuild @@ -1,7 +1,7 @@ - - + + 0x05020400 . ntoskrnl diff --git a/drivers/hid/directory.rbuild b/drivers/hid/directory.rbuild new file mode 100644 index 00000000000..4fa5c649c5f --- /dev/null +++ b/drivers/hid/directory.rbuild @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt index b5ae158a775..f5f69220a3a 100644 --- a/drivers/hid/hidclass/CMakeLists.txt +++ b/drivers/hid/hidclass/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE 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") diff --git a/drivers/hid/hidclass/hidclass.rbuild b/drivers/hid/hidclass/hidclass.rbuild new file mode 100644 index 00000000000..c5419c63b93 --- /dev/null +++ b/drivers/hid/hidclass/hidclass.rbuild @@ -0,0 +1,13 @@ + + + + + + ntoskrnl + hidparse + hal + fdo.c + hidclass.c + hidclass.rc + pdo.c + diff --git a/drivers/hid/hidparse/hidparse.rbuild b/drivers/hid/hidparse/hidparse.rbuild new file mode 100644 index 00000000000..6cc8ed3677a --- /dev/null +++ b/drivers/hid/hidparse/hidparse.rbuild @@ -0,0 +1,13 @@ + + + + + + + include + lib/drivers/hidparser + ntoskrnl + hidparser + hidparse.c + hidparse.rc + diff --git a/drivers/hid/hidusb/hidusb.rbuild b/drivers/hid/hidusb/hidusb.rbuild new file mode 100644 index 00000000000..fd9c46de598 --- /dev/null +++ b/drivers/hid/hidusb/hidusb.rbuild @@ -0,0 +1,11 @@ + + + + + ntoskrnl + hidclass + usbd + hal + hidusb.c + hidusb.rc + diff --git a/drivers/hid/kbdhid/kbdhid.h b/drivers/hid/kbdhid/kbdhid.h index 51fd4e4ed47..bc606bb2f82 100644 --- a/drivers/hid/kbdhid/kbdhid.h +++ b/drivers/hid/kbdhid/kbdhid.h @@ -5,6 +5,7 @@ #include #include #include +#define NDEBUG #include #include //#include diff --git a/drivers/hid/kbdhid/kbdhid.rbuild b/drivers/hid/kbdhid/kbdhid.rbuild new file mode 100644 index 00000000000..904f6d2324c --- /dev/null +++ b/drivers/hid/kbdhid/kbdhid.rbuild @@ -0,0 +1,12 @@ + + + + + + include + ntoskrnl + hal + hidparse + kbdhid.c + kbdhid.rc + diff --git a/drivers/hid/mouhid/mouhid.h b/drivers/hid/mouhid/mouhid.h index c00fcb55f88..78048fdce5d 100644 --- a/drivers/hid/mouhid/mouhid.h +++ b/drivers/hid/mouhid/mouhid.h @@ -5,6 +5,7 @@ #include #include #include +#define NDEBUG #include #include #include diff --git a/drivers/hid/mouhid/mouhid.rbuild b/drivers/hid/mouhid/mouhid.rbuild new file mode 100644 index 00000000000..cfb1f95bfa0 --- /dev/null +++ b/drivers/hid/mouhid/mouhid.rbuild @@ -0,0 +1,11 @@ + + + + + include + ntoskrnl + hal + hidparse + mouhid.c + mouhid.rc + diff --git a/drivers/usb/directory.rbuild b/drivers/usb/directory.rbuild index 211d6d4a9e0..8640fe372b0 100644 --- a/drivers/usb/directory.rbuild +++ b/drivers/usb/directory.rbuild @@ -1,13 +1,22 @@ + + + - + diff --git a/drivers/usb/usbccgp/usbccgp.rbuild b/drivers/usb/usbccgp/usbccgp.rbuild new file mode 100644 index 00000000000..4b26820fbed --- /dev/null +++ b/drivers/usb/usbccgp/usbccgp.rbuild @@ -0,0 +1,19 @@ + + + + + 0x600 + + include + ntoskrnl + hal + usbd + pseh + descriptor.c + fdo.c + function.c + misc.c + pdo.c + usbccgp.c + usbccgp.rc + diff --git a/drivers/usb/usbd/usbd.c b/drivers/usb/usbd/usbd.c index c7a6e4394d2..fa3735acc16 100644 --- a/drivers/usb/usbd/usbd.c +++ b/drivers/usb/usbd/usbd.c @@ -34,6 +34,7 @@ #include #include +#define NDEBUG #include #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 diff --git a/drivers/usb/usbd/usbd.rbuild b/drivers/usb/usbd/usbd.rbuild index c5900b5ff35..18ef89793e4 100644 --- a/drivers/usb/usbd/usbd.rbuild +++ b/drivers/usb/usbd/usbd.rbuild @@ -1,6 +1,7 @@ + ntoskrnl hal diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt index de16efaeb3d..8bad4b1d840 100644 --- a/drivers/usb/usbehci/CMakeLists.txt +++ b/drivers/usb/usbehci/CMakeLists.txt @@ -29,6 +29,6 @@ else() 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) \ No newline at end of file diff --git a/drivers/usb/usbehci/usbehci.rbuild b/drivers/usb/usbehci/usbehci.rbuild new file mode 100644 index 00000000000..63d39433c95 --- /dev/null +++ b/drivers/usb/usbehci/usbehci.rbuild @@ -0,0 +1,22 @@ + + + + + 0x600 + ntoskrnl + hal + pseh + usbehci.cpp + usb_device.cpp + usb_request.cpp + usb_queue.cpp + hcd_controller.cpp + hardware.cpp + misc.cpp + purecall.cpp + hub_controller.cpp + memory_manager.cpp + usbehci.rc + -fno-rtti + -fno-exceptions + diff --git a/drivers/usb/usbhub/usbhub.rbuild b/drivers/usb/usbhub/usbhub.rbuild new file mode 100644 index 00000000000..8b9543c7ef3 --- /dev/null +++ b/drivers/usb/usbhub/usbhub.rbuild @@ -0,0 +1,16 @@ + + + + + + include + ntoskrnl + hal + usbd + pseh + fdo.c + misc.c + pdo.c + usbhub.c + usbhub.rc + diff --git a/drivers/usb/usbohci/usbohci.rbuild b/drivers/usb/usbohci/usbohci.rbuild new file mode 100644 index 00000000000..1b96cc7fece --- /dev/null +++ b/drivers/usb/usbohci/usbohci.rbuild @@ -0,0 +1,23 @@ + + + + + 0x600 + ntoskrnl + hal + usbd + pseh + usbohci.cpp + usb_device.cpp + usb_request.cpp + usb_queue.cpp + hcd_controller.cpp + hardware.cpp + misc.cpp + purecall.cpp + hub_controller.cpp + memory_manager.cpp + usbohci.rc + -fno-rtti + -fno-exceptions + diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 47dabfd5442..dbc8ef51ae7 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -2,7 +2,7 @@ #pragma once #include -#define YDEBUG +#define NDEBUG #include #include #include diff --git a/drivers/usb/usbstor/usbstor.rbuild b/drivers/usb/usbstor/usbstor.rbuild index d7215fc8e92..ac4f9e62f68 100644 --- a/drivers/usb/usbstor/usbstor.rbuild +++ b/drivers/usb/usbstor/usbstor.rbuild @@ -1,10 +1,20 @@ + include ntoskrnl hal + usbd + descriptor.c + disk.c + fdo.c + misc.c + pdo.c + queue.c + error.c + scsi.c usbstor.c usbstor.rc diff --git a/lib/drivers/directory.rbuild b/lib/drivers/directory.rbuild index 2c0c011058a..2dd51908b4f 100644 --- a/lib/drivers/directory.rbuild +++ b/lib/drivers/directory.rbuild @@ -4,6 +4,9 @@ + + + diff --git a/lib/drivers/hidparser/CMakeLists.txt b/lib/drivers/hidparser/CMakeLists.txt index 6ab1276ef59..b0b15dd22f4 100644 --- a/lib/drivers/hidparser/CMakeLists.txt +++ b/lib/drivers/hidparser/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions( -DUNICODE -D_UNICODE - -DNDEBUG=1) + -DNDEBUG) list(APPEND SOURCE context.c diff --git a/lib/drivers/hidparser/hidparser.h b/lib/drivers/hidparser/hidparser.h index 71eb157e6f0..e71af66f042 100644 --- a/lib/drivers/hidparser/hidparser.h +++ b/lib/drivers/hidparser/hidparser.h @@ -15,6 +15,7 @@ #include #include #include +#define NDEBUG #include // diff --git a/lib/drivers/hidparser/hidparser.rbuild b/lib/drivers/hidparser/hidparser.rbuild new file mode 100644 index 00000000000..61416b5f723 --- /dev/null +++ b/lib/drivers/hidparser/hidparser.rbuild @@ -0,0 +1,11 @@ + + + + + + + hidparser.c + parser.c + context.c + api.c + \ No newline at end of file