From d0fd35677e3ee7b8dfe129f4e45862cdd9713fb4 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Jan 2012 23:58:29 +0000 Subject: [PATCH] [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 --- boot/bootdata/txtsetup.sif | 1 + drivers/usb/usbd/CMakeLists.txt | 2 ++ drivers/usb/usbehci_new/hub_controller.cpp | 2 +- drivers/usb/usbohci/hub_controller.cpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 9d339e3cf6d..4b7cf3657b4 100644 --- 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 5f30aab7530..b04f9e61ed6 100644 --- 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 4c50e20ed77..5d8e8453766 100644 --- 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 67761753312..5336cf09adf 100644 --- 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 -- 2.17.1