[USB-BRINGUP-TRUNK]

- Add usbd to bootcd because usbohci depends on it
- Make device interface creation failure a non-fatal error so the port drivers start successfully in 1st stage

svn path=/branches/usb-bringup-trunk/; revision=55034

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 9d339e3..4b7cf36 100644 (file)
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -35,6 +35,7 @@ i8042prt.sys=,,,,,,x,,,,,,4
 hidclass.sys=,,,,,,,,,,,,4
 hidparse.sys=,,,,,,,,,,,,4
 hidusb.sys=,,,,,,,,,,,,4
+usbd.sys=,,,,,,,,,,,,4
 usbhub.sys=,,,,,,,,,,,,4
 ;usbuhci.sys=,,,,,,,,,,,,4
 usbohci.sys=,,,,,,,,,,,,4

diff --git a/drivers/usb/usbd/CMakeLists.txt b/drivers/usb/usbd/CMakeLists.txt
index 5f30aab..b04f9e6 100644 (file)
--- a/drivers/usb/usbd/CMakeLists.txt
+++ b/drivers/usb/usbd/CMakeLists.txt
@@ -9,3 +9,5 @@ add_library(usbd SHARED
 set_module_type(usbd kernelmodedriver)
 add_importlibs(usbd ntoskrnl hal)
 add_importlib_target(usbd.spec)
+
+add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/usb/usbehci_new/hub_controller.cpp b/drivers/usb/usbehci_new/hub_controller.cpp
index 4c50e20..5d8e845 100644 (file)
--- a/drivers/usb/usbehci_new/hub_controller.cpp
+++ b/drivers/usb/usbehci_new/hub_controller.cpp
@@ -3299,7 +3299,7 @@ CHubController::SetDeviceInterface(
     //
     // done
     //
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS

diff --git a/drivers/usb/usbohci/hub_controller.cpp b/drivers/usb/usbohci/hub_controller.cpp
index 6776175..5336cf0 100644 (file)
--- a/drivers/usb/usbohci/hub_controller.cpp
+++ b/drivers/usb/usbohci/hub_controller.cpp
@@ -3287,7 +3287,7 @@ CHubController::SetDeviceInterface(
     //
     // done
     //
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS