[USB-BRINGUP-TRUNK]

- Add USB stuff to 1st stage setup

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

diff --git a/base/setup/usetup/interface/devinst.c b/base/setup/usetup/interface/devinst.c
index 0f3f1ed..3c1e43d 100644 (file)
--- a/base/setup/usetup/interface/devinst.c
+++ b/base/setup/usetup/interface/devinst.c
@@ -63,6 +63,7 @@ InstallDriver(
     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))

diff --git a/boot/bootdata/packages/reactos.dff b/boot/bootdata/packages/reactos.dff
index 2212786..f3f8000 100644 (file)
--- a/boot/bootdata/packages/reactos.dff
+++ b/boot/bootdata/packages/reactos.dff
@@ -541,11 +541,7 @@ drivers\serial\serial\serial.sys                    2
 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

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 1c0ca8d..9d339e3 100644 (file)
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -32,7 +32,15 @@ kdcom.dll=,,,,,,,,,,,,2
 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,12 +69,30 @@ PCI\CC_0104 = uniata
 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
 

diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt
index be06d0d..b5ae158 100644 (file)
--- a/drivers/hid/hidclass/CMakeLists.txt
+++ b/drivers/hid/hidclass/CMakeLists.txt
@@ -17,4 +17,6 @@ set_target_properties(hidclass PROPERTIES SUFFIX ".sys")
 
 
 add_importlibs(hidclass ntoskrnl hidparse hal)
-add_importlib_target(hidclass.spec)
\ No newline at end of file
+add_importlib_target(hidclass.spec)
+
+add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/hid/hidparse/CMakeLists.txt b/drivers/hid/hidparse/CMakeLists.txt
index 346b6b6..52f388d 100644 (file)
--- a/drivers/hid/hidparse/CMakeLists.txt
+++ b/drivers/hid/hidparse/CMakeLists.txt
@@ -14,3 +14,5 @@ add_importlibs(hidparse ntoskrnl)
 add_importlib_target(hidparse.spec)
 
 target_link_libraries(hidparse hidparser)
+
+add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/hid/hidusb/CMakeLists.txt b/drivers/hid/hidusb/CMakeLists.txt
index 0366bca..88e3700 100644 (file)
--- a/drivers/hid/hidusb/CMakeLists.txt
+++ b/drivers/hid/hidusb/CMakeLists.txt
@@ -6,4 +6,6 @@ list(APPEND SOURCE
 add_library(hidusb SHARED ${SOURCE})
 
 set_module_type(hidusb kernelmodedriver)
-add_importlibs(hidusb hidclass ntoskrnl usbd hal)
\ No newline at end of file
+add_importlibs(hidusb hidclass ntoskrnl usbd hal)
+
+add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/hid/kbdhid/CMakeLists.txt b/drivers/hid/kbdhid/CMakeLists.txt
index afa61c1..f8667ef 100644 (file)
--- a/drivers/hid/kbdhid/CMakeLists.txt
+++ b/drivers/hid/kbdhid/CMakeLists.txt
@@ -7,3 +7,5 @@ add_library(kbdhid SHARED kbdhid.c kbdhid.rc)
 
 set_module_type(kbdhid kernelmodedriver)
 add_importlibs(kbdhid ntoskrnl hal hidparse)
+
+add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all)

diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt
index 075a4b9..01ee36d 100644 (file)
--- a/drivers/usb/usbehci/CMakeLists.txt
+++ b/drivers/usb/usbehci/CMakeLists.txt
@@ -17,3 +17,5 @@ add_library(usbehci SHARED ${SOURCE})
 
 set_module_type(usbehci kernelmodedriver)
 add_importlibs(usbehci ntoskrnl hal)
+
+add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)

diff --git a/drivers/usb/usbehci_new/CMakeLists.txt b/drivers/usb/usbehci_new/CMakeLists.txt
index f288e79..f8779a2 100644 (file)
--- a/drivers/usb/usbehci_new/CMakeLists.txt
+++ b/drivers/usb/usbehci_new/CMakeLists.txt
@@ -30,4 +30,6 @@ else()
 endif(MSVC)
 
 set_module_type(usbehci kernelmodedriver)
-add_importlibs(usbehci ntoskrnl ks drmk hal)
\ No newline at end of file
+add_importlibs(usbehci ntoskrnl ks drmk hal)
+
+add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/usb/usbhub/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt
index c324f23..20cd476 100644 (file)
--- a/drivers/usb/usbhub/CMakeLists.txt
+++ b/drivers/usb/usbhub/CMakeLists.txt
@@ -11,3 +11,5 @@ add_library(usbhub SHARED ${SOURCE})
 
 set_module_type(usbhub kernelmodedriver)
 add_importlibs(usbhub ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all)

diff --git a/drivers/usb/usbhub_new/CMakeLists.txt b/drivers/usb/usbhub_new/CMakeLists.txt
index 8137696..a33f9db 100644 (file)
--- a/drivers/usb/usbhub_new/CMakeLists.txt
+++ b/drivers/usb/usbhub_new/CMakeLists.txt
@@ -9,3 +9,5 @@ target_link_libraries(usbhub ${PSEH_LIB})
 
 set_module_type(usbhub kernelmodedriver)
 add_importlibs(usbhub ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all)

diff --git a/drivers/usb/usbohci/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt
index 678f975..d7f16ab 100644 (file)
--- a/drivers/usb/usbohci/CMakeLists.txt
+++ b/drivers/usb/usbohci/CMakeLists.txt
@@ -30,4 +30,6 @@ else()
 endif(MSVC)
 
 set_module_type(usbohci kernelmodedriver)
-add_importlibs(usbohci ntoskrnl ks drmk hal usbd)
\ No newline at end of file
+add_importlibs(usbohci ntoskrnl ks drmk hal usbd)
+
+add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file

diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt
index 816d7f3..04a3500 100644 (file)
--- a/drivers/usb/usbstor/CMakeLists.txt
+++ b/drivers/usb/usbstor/CMakeLists.txt
@@ -7,3 +7,5 @@ add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.
 
 set_module_type(usbstor kernelmodedriver)
 add_importlibs(usbstor ntoskrnl hal usbd)
+
+add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all)