[ros-diffs] [cgutman] 55024: [USB-BRINGUP-TRUNK] - Add USB stuff to 1st stage setup

Author: cgutman
Date: Fri Jan 20 22:04:57 2012
New Revision: 55024

URL: http://svn.reactos.org/svn/reactos?rev=55024&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Add USB stuff to 1st stage setup

Modified:
    branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c
    branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff
    branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
    branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt

Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us…
==============================================================================
--- branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri Jan
20 22:04:57 2012
@@ -63,6 +63,7 @@
     if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver,
&Context)
      && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver,
&Context)
      && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context)
+	 && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver,
&Context)
      && !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver,
&Context))
         return FALSE;
     if (!INF_GetDataField(&Context, 1, &ImagePath))

Modified: branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata…
==============================================================================
--- branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -541,11 +541,7 @@
 drivers\storage\ide\pciide\pciide.sys               2
 drivers\storage\ide\pciidex\pciidex.sys             2
 
-;drivers\usb\miniport\usbohci\usbohci.sys           2
-;drivers\usb\miniport\usbuhci\usbuhci.sys           2
-;drivers\usb\usbhub\usbhub.sys                      2
-;drivers\usb\usbport\usbport.sys                    2
-;drivers\usb\nt4compat\usbdriver\usbdriver.sys      2
+drivers\hid\mouhid\mouhid.sys                       2
 
 drivers\video\displays\vga\vgaddi.dll               1
 drivers\video\displays\framebuf\framebuf.dll        1

Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata…
==============================================================================
--- 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 22:04:57
2012
@@ -32,7 +32,15 @@
 disk.sys=,,,,,,x,,,,,,4
 floppy.sys=,,,,,,x,,,,,,4
 i8042prt.sys=,,,,,,x,,,,,,4
-usbdrv.sys=,,,,,,,,,,,,4
+hidclass.sys=,,,,,,,,,,,,4
+hidparse.sys=,,,,,,,,,,,,4
+hidusb.sys=,,,,,,,,,,,,4
+usbhub.sys=,,,,,,,,,,,,4
+;usbuhci.sys=,,,,,,,,,,,,4
+usbohci.sys=,,,,,,,,,,,,4
+usbehci.sys=,,,,,,,,,,,,4
+usbstor.sys=,,,,,,,,,,,,4
+kbdhid.sys=,,,,,,,,,,,,4
 kbdclass.sys=,,,,,,x,,,,,,4
 l_intl.nls=,,,,,,,,,,,,2
 ntfs.sys=,,,,,,,,,,,,4
@@ -61,11 +69,29 @@
 PCI\CC_0105 = uniata
 PCI\CC_0106 = uniata
 *PNP0600 = uniata
+USB\CLASS_09 = usbhub
+USB\ROOT_HUB = usbhub
+USB\ROOT_HUB20 = usbhub
+;PCI\CC_0C0300 = usbuhci
+PCI\CC_0C0310 = usbohci
+PCI\CC_0C0320 = usbehci
+;USB\Class_08&SubClass_06&Prot_50 = usbstor
+HID_DEVICE_SYSTEM_KEYBOARD = kbdhid
 
 [BootBusExtenders.Load]
 acpi = acpi.sys
 pci = pci.sys
 isapnp = isapnp.sys
+
+[InputDevicesSupport.Load]
+usbehci = usbehci.sys
+usbohci = usbohci.sys
+;usbuhci = usbuhci.sys
+usbhub = usbhub.sys
+;usbccgp = usbccgp.sys
+hidusb = hidusb.sys
+usbstor = usbstor.sys
+kbdhid = kbdhid.sys
 
 [BusExtenders.Load]
 pciide = pciide.sys

Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -17,4 +17,6 @@
 
 
 add_importlibs(hidclass ntoskrnl hidparse hal)
-add_importlib_target(hidclass.spec)
+add_importlib_target(hidclass.spec)
+
+add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -14,3 +14,5 @@
 add_importlib_target(hidparse.spec)
 
 target_link_libraries(hidparse hidparser)
+
+add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -6,4 +6,6 @@
 add_library(hidusb SHARED ${SOURCE})
 
 set_module_type(hidusb kernelmodedriver)
-add_importlibs(hidusb hidclass ntoskrnl usbd hal)
+add_importlibs(hidusb hidclass ntoskrnl usbd hal)
+
+add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k…
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -7,3 +7,5 @@
 
 set_module_type(kbdhid kernelmodedriver)
 add_importlibs(kbdhid ntoskrnl hal hidparse)
+
+add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -17,3 +17,5 @@
 
 set_module_type(usbehci kernelmodedriver)
 add_importlibs(usbehci ntoskrnl hal)
+
+add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Fri Jan
20 22:04:57 2012
@@ -30,4 +30,6 @@
 endif(MSVC)
 
 set_module_type(usbehci kernelmodedriver)
-add_importlibs(usbehci ntoskrnl ks drmk hal)
+add_importlibs(usbehci ntoskrnl ks drmk hal)
+
+add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -11,3 +11,5 @@
 
 set_module_type(usbhub kernelmodedriver)
 add_importlibs(usbhub ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] Fri Jan
20 22:04:57 2012
@@ -9,3 +9,5 @@
 
 set_module_type(usbhub kernelmodedriver)
 add_importlibs(usbhub ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -30,4 +30,6 @@
 endif(MSVC)
 
 set_module_type(usbohci kernelmodedriver)
-add_importlibs(usbohci ntoskrnl ks drmk hal usbd)
+add_importlibs(usbohci ntoskrnl ks drmk hal usbd)
+
+add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Fri Jan 20
22:04:57 2012
@@ -7,3 +7,5 @@
 
 set_module_type(usbstor kernelmodedriver)
 add_importlibs(usbstor ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all)