[INF]

- Add bth.inf
[FBTUSB]
- Add to build and bootcd

svn path=/trunk/; revision=56246

diff --git a/reactos/drivers/CMakeLists.txt b/reactos/drivers/CMakeLists.txt
index 22fad3a..2465aad 100644 (file)
--- a/reactos/drivers/CMakeLists.txt
+++ b/reactos/drivers/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 add_subdirectory(base)
 add_subdirectory(battery)
+add_subdirectory(bluetooth)
 add_subdirectory(bus)
 add_subdirectory(directx)
 add_subdirectory(filesystems)

diff --git a/reactos/drivers/bluetooth/CMakeLists.txt b/reactos/drivers/bluetooth/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ec2c6b8
--- /dev/null
+++ b/reactos/drivers/bluetooth/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(fbtusb)

diff --git a/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt b/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9fcbec7
--- /dev/null
+++ b/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+include_directories(
+    BEFORE include
+    include)
+
+add_library(fbtusb SHARED
+    fbtdev.c
+    fbtpnp.c
+    fbtpwr.c
+    fbtrwr.c
+    fbtusb.c
+#   fbtwmi.c
+    fbtusb.rc)
+
+allow_warnings(fbtusb)
+set_module_type(fbtusb kernelmodedriver)
+add_importlibs(fbtusb ntoskrnl hal usbd)
+add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all)

diff --git a/reactos/media/inf/CMakeLists.txt b/reactos/media/inf/CMakeLists.txt
index dcb349a..d045418 100644 (file)
--- a/reactos/media/inf/CMakeLists.txt
+++ b/reactos/media/inf/CMakeLists.txt
@@ -3,6 +3,7 @@ list(APPEND INF_FILES
     audio.inf
     battery.inf
     bda.inf
+    bth.inf
     cdrom.inf
     cpu.inf
     disk.inf

diff --git a/reactos/media/inf/bth.inf b/reactos/media/inf/bth.inf
new file mode 100644 (file)
index 0000000..dfb2a56
Binary files /dev/null and b/reactos/media/inf/bth.inf differ

diff --git a/reactos/media/inf/syssetup.inf b/reactos/media/inf/syssetup.inf
index 0cac79e..5c7073e 100644 (file)
--- a/reactos/media/inf/syssetup.inf
+++ b/reactos/media/inf/syssetup.inf
@@ -3,7 +3,8 @@ Signature = $Windows NT$
 ClassGUID = {00000000-0000-0000-0000-000000000000}\r
 \r
 [DeviceInfsToInstall]\r
-battery.inf\r
+battery.inf
+bth.inf\r
 cdrom.inf\r
 cpu.inf\r
 disk.inf\r

diff --git a/reactos/media/inf/syssetup.inf.tpl b/reactos/media/inf/syssetup.inf.tpl
index d35fe0c..16ee81c 100644 (file)
--- a/reactos/media/inf/syssetup.inf.tpl
+++ b/reactos/media/inf/syssetup.inf.tpl
@@ -14,7 +14,8 @@ ClassGUID={00000000-0000-0000-0000-000000000000}
 [DeviceInfsToInstall]\r
 ; MS uses netnovel.inf as class-installer INF for NICs\r
 ; we use a separate one to keep things clean\r
-battery.inf\r
+battery.inf
+bth.inf\r
 cdrom.inf\r
 cpu.inf\r
 disk.inf\r