[ros-diffs] [tfaber] 56138: [CLT2012] - Remove the outdated USB driver

Author: tfaber
Date: Tue Mar 13 00:08:45 2012
New Revision: 56138

URL: http://svn.reactos.org/svn/reactos?rev=56138&view=rev
Log:
[CLT2012]
- Remove the outdated USB driver

Removed:
    branches/ros-branch-0_3_14-clt2012/drivers/usb/nt4compat/
Modified:
    branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf
    branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf
    branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif
    branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt
    branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild

Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/…
==============================================================================
--- branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue
Mar 13 00:08:45 2012
@@ -1398,20 +1398,6 @@
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
 
-; USB uhci/ehci driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001
-
-; USB storage driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended
Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001
-
 ; Windows Installer Service

HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS
Installer"

HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls
installation, maintenance, and removal of software packaged as an msi (Windows
Installer)"

Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/…
==============================================================================
--- branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Mar
13 00:08:45 2012
@@ -1730,20 +1730,6 @@
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
 
-; USB uhci/ehci driver
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001
-
-; USB storage driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended
Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001
-
 ; Windows Installer Service

HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS
Installer"

HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls
installation, maintenance, and removal of software packaged as an msi (Windows
Installer)"

Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/…
==============================================================================
--- branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Mar 13
00:08:45 2012
@@ -32,7 +32,6 @@
 disk.sys=,,,,,,x,,,,,,4
 floppy.sys=,,,,,,x,,,,,,4
 i8042prt.sys=,,,,,,x,,,,,,4
-usbdrv.sys=,,,,,,,,,,,,4
 kbdclass.sys=,,,,,,x,,,,,,4
 l_intl.nls=,,,,,,,,,,,,2
 ntfs.sys=,,,,,,,,,,,,4

Modified: branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/drive…
==============================================================================
--- branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt [iso-8859-1] Tue Mar 13
00:08:45 2012
@@ -1,5 +1,4 @@
 
-add_subdirectory(nt4compat)
 add_subdirectory(usbd)
 #add_subdirectory(usbehci) The USB branch has usbehci_new
 #add_subdirectory(usbhub) Compiles, just skipped in trunk

Modified: branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/drive…
==============================================================================
--- branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild [iso-8859-1] Tue Mar
13 00:08:45 2012
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="nt4compat">
-		<xi:include href="nt4compat/directory.rbuild" />
-	</directory>
 	<directory name="usbd">
 		<xi:include href="usbd/usbd.rbuild" />
 	</directory>