From 6b93fbc2de023b30b2fab3fc2f89ad7300dbf26c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 3 Mar 2012 22:46:04 +0000
Subject: [PATCH] [STORAGE] - Back by popular demand, the storage driver to end
 all storage drivers, uniata! - I had forgotten how many issues atapi had
 itself and the hardware compatibility improvement (if there was one) was
 offset by lack of features

svn path=/trunk/; revision=55978
---
 reactos/boot/bootdata/hivesys_i386.inf |  14 +++-----------
 reactos/boot/bootdata/txtsetup.sif     |   5 ++---
 reactos/media/inf/hdc.inf              | Bin 242774 -> 241932 bytes
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf
index cb767b8ca6e..3e6c03acfd8 100644
--- a/reactos/boot/bootdata/hivesys_i386.inf
+++ b/reactos/boot/bootdata/hivesys_i386.inf
@@ -1240,21 +1240,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\dr
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001
 
-; ATAPI miniport driver
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Group",0x00000000,"SCSI Miniport"
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Tag",0x00010001,0x00000010
-
-; UNIATA miniport driver
+; UniATA/Atapi miniport driver
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"SCSI Miniport"
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender"
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys"
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000020
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010
 
 ; Audio Service
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service"
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index 48b02129f0e..af9351a03f3 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -17,9 +17,8 @@ FreeSysPartDiskSpace=350
 
 [SourceDisksFiles]
 acpi.sys=,,,,,,,,,,,,4
-atapi.sys=,,,,,,x,,,,,,4
-uniata.sys=,,,,,,x,,,,,,4
 nmidebug.sys=,,,,,,x,,,,,,4
+uniata.sys=,,,,,,x,,,,,,4
 buslogic.sys=,,,,,,x,,,,,,4
 blue.sys=,,,,,,x,,,,,,4
 bootvid.dll=,,,,,,,,,,,,2
@@ -71,7 +70,7 @@ PCI\CC_0101 = pciide
 PCI\CC_0104 = uniata
 PCI\CC_0105 = uniata
 PCI\CC_0106 = uniata
-*PNP0600 = atapi
+*PNP0600 = uniata
 ;USB\CLASS_09 = usbhub
 USB\ROOT_HUB = usbhub
 USB\ROOT_HUB20 = usbhub
diff --git a/reactos/media/inf/hdc.inf b/reactos/media/inf/hdc.inf
index 2c03f93fa795282eb6e0dea91dcffc0a68f5bb1a..b747e6da5d9bd726f619fc5ea5ebfc28f373355f 100644
GIT binary patch
delta 2782
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
X(kB9YM@}CYIjzvo|M|%2k^$v^E)$9I

delta 2713
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