[ros-diffs] [cgutman] 55034: [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

cgutman at svn.reactos.org cgutman at svn.reactos.org
Fri Jan 20 23:58:29 UTC 2012


Author: cgutman
Date: Fri Jan 20 23:58:29 2012
New Revision: 55034

URL: http://svn.reactos.org/svn/reactos?rev=55034&view=rev
Log:
[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

Modified:
    branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
    branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp
    branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp

Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif?rev=55034&r1=55033&r2=55034&view=diff
==============================================================================
--- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Jan 20 23:58:29 2012
@@ -35,6 +35,7 @@
 hidclass.sys=,,,,,,,,,,,,4
 hidparse.sys=,,,,,,,,,,,,4
 hidusb.sys=,,,,,,,,,,,,4
+usbd.sys=,,,,,,,,,,,,4
 usbhub.sys=,,,,,,,,,,,,4
 ;usbuhci.sys=,,,,,,,,,,,,4
 usbohci.sys=,,,,,,,,,,,,4

Modified: branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt?rev=55034&r1=55033&r2=55034&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:58:29 2012
@@ -9,3 +9,5 @@
 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)

Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp?rev=55034&r1=55033&r2=55034&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Jan 20 23:58:29 2012
@@ -3299,7 +3299,7 @@
     //
     // done
     //
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp?rev=55034&r1=55033&r2=55034&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Jan 20 23:58:29 2012
@@ -3287,7 +3287,7 @@
     //
     // done
     //
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS




More information about the Ros-diffs mailing list