diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index 735d6984bcc..09af37418e6 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -68,6 +68,18 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Cla
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","Service",0x00000000,"usbhub"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0101","Service",0x00000000,"pciide"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0101","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0104","Service",0x00000000,"pciide"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0104","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0106","Service",0x00000000,"pciide"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0106","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0600","Service",0x00000000,"atapi"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0600","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
+
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","Service",0x00000000,"cdrom"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","ClassGUID",0x00000000,"{4D36E965-E325-11CE-BFC1-08002BE10318}"
 
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 8aa46e28c86..64b69f2f245 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -89,7 +89,8 @@ FreeSysPartDiskSpace=450
 [SourceDisksFiles]
 nmidebug.sys = 1,,,,,,x,4,,,,1,4
 sacdrv.sys   = 1,,,,,,x,4,,,,1,4
-uniata.sys   = 1,,,,,,x,4,,,,1,4
+;uniata.sys   = 1,,,,,,x,4,,,,1,4
+atapi.sys    = 1,,,,,,x,4,,,,1,4
 buslogic.sys = 1,,,,,,x,4,,,,1,4
 blue.sys     = 1,,,,,,x,4,,,,1,4
 vgafonts.cab = 1,,,,,,,1,,,,1,1
@@ -125,7 +126,7 @@ storport.sys = 1,,,,,,,4,,,,1,4
 fastfat.sys  = 1,,,,,,x,4,,,,1,4
 btrfs.sys    = 1,,,,,,x,4,,,,1,4
 ramdisk.sys  = 1,,,,,,x,4,,,,1,4
-pciide.sys   = 1,,,,,,,4,,,,1,4
+pciide.sys   = 1,,,,,,x,4,,,,1,4
 pciidex.sys  = 1,,,,,,,4,,,,1,4
 pcix.sys     = 1,,,,,,,4,,,,1,4
 pcmcia.sys   = 1,,,,,,,4,,,,1,4
@@ -159,11 +160,15 @@ PCI\CC_0601 = isapnp
 PCI\CC_0604 = pci
 PCI\VEN_104B&CC_0100 = buslogic
 PCI\CC_0101 = pciide
-PCI\CC_0104 = uniata
-PCI\CC_0105 = uniata
-PCI\CC_0106 = uniata
+;PCI\CC_0104 = uniata
+;PCI\CC_0105 = uniata
+;PCI\CC_0106 = uniata
+PCI\CC_0104 = pciide
+PCI\CC_0105 = pciide
+PCI\CC_0106 = pciide
 ;PCI\CC_0106 = storahci
-*PNP0600 = uniata
+;*PNP0600 = uniata
+*PNP0600 = atapi
 USB\CLASS_09 = usbhub
 USB\ROOT_HUB = usbhub
 USB\ROOT_HUB20 = usbhub
@@ -202,9 +207,11 @@ i8042prt = i8042prt.sys
 
 [BusExtenders.Load]
 pciide = pciide.sys
+atapi = atapi.sys
 
 [SCSI.Load]
-uniata = uniata.sys
+;uniata = uniata.sys
+atapi = atapi.sys
 buslogic = buslogic.sys
 storahci = storahci.sys
 disk = disk.sys
diff --git a/drivers/storage/ide/CMakeLists.txt b/drivers/storage/ide/CMakeLists.txt
index f49c4ce8bf3..f1d72ce6cdb 100644
--- a/drivers/storage/ide/CMakeLists.txt
+++ b/drivers/storage/ide/CMakeLists.txt
@@ -1,5 +1,8 @@
 
 add_subdirectory(atapi)
+if(ARCH STREQUAL "i386" AND NOT ENABLE_UNIATA)
+    add_subdirectory(legide)
+endif()
 add_subdirectory(pciide)
 add_subdirectory(pciidex)
 add_subdirectory(uniata)
diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt
index 863f37cca6f..9351a7499d2 100644
--- a/drivers/storage/ide/pciide/CMakeLists.txt
+++ b/drivers/storage/ide/pciide/CMakeLists.txt
@@ -1,7 +1,10 @@
 
+if(NOT ENABLE_UNIATA)
 add_library(pciide MODULE pciide.c pciide.rc)
 set_module_type(pciide kernelmodedriver)
+
 if(MSVC)
+    # Required for NT5.x pciidex.sys
     target_link_options(pciide PRIVATE /SECTION:.rsrc,!D)
 else()
     add_custom_command(
@@ -9,5 +12,8 @@ else()
         COMMAND native-pefixup --section:.rsrc,!D $<TARGET_FILE:pciide>
         VERBATIM)
 endif()
+
 add_importlibs(pciide pciidex ntoskrnl)
 add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all)
+endif()
+add_registry_inf(pciide_reg.inf)
diff --git a/drivers/storage/ide/pciide/pciide_reg.inf b/drivers/storage/ide/pciide/pciide_reg.inf
new file mode 100644
index 00000000000..f8fe1c6ecf0
--- /dev/null
+++ b/drivers/storage/ide/pciide/pciide_reg.inf
@@ -0,0 +1,8 @@
+; PCI IDE driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Group",0x00000000,"System Bus Extender"
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","ImagePath",0x00020000,"system32\drivers\pciide.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Start",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Tag",0x00010001,0x00000010
diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt
index 41726bf8a1f..9b9d721e242 100644
--- a/drivers/storage/ide/uniata/CMakeLists.txt
+++ b/drivers/storage/ide/uniata/CMakeLists.txt
@@ -43,5 +43,9 @@ add_pch(uniata stdafx.h SOURCE)
 set_module_type(uniata kernelmodedriver)
 add_importlibs(uniata scsiport ntoskrnl hal)
 add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all)
-add_registry_inf(uniata_reg.inf)
+# add_registry_inf(uniata_reg.inf)
 add_driver_inf(uniata uniata_comm.inf)
+
+if(ENABLE_UNIATA)
+    set_target_properties(uniata PROPERTIES OUTPUT_NAME "pciide" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+endif()
diff --git a/media/inf/hdc.inf b/media/inf/hdc.inf
index ce81a20278a..35c77e6fb4b 100644
--- a/media/inf/hdc.inf
+++ b/media/inf/hdc.inf
@@ -35,10 +35,10 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_1191&DEV_0007.DeviceDesc%=PciIde_Inst, PCI\VEN_1191&DEV_0007
 %PCI\VEN_1191&DEV_0008.DeviceDesc%=PciIde_Inst, PCI\VEN_1191&DEV_0008
 %PCI\VEN_1191&DEV_0009.DeviceDesc%=PciIde_Inst, PCI\VEN_1191&DEV_0009
-%PCI\VEN_10b9&DEV_5289.DeviceDesc%=uniata_Inst, PCI\VEN_10b9&DEV_5289
-%PCI\VEN_10b9&DEV_5288.DeviceDesc%=uniata_Inst, PCI\VEN_10b9&DEV_5288
-%PCI\VEN_10b9&DEV_5287.DeviceDesc%=uniata_Inst, PCI\VEN_10b9&DEV_5287
-%PCI\VEN_10b9&DEV_5281.DeviceDesc%=uniata_Inst, PCI\VEN_10b9&DEV_5281
+%PCI\VEN_10b9&DEV_5289.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5289
+%PCI\VEN_10b9&DEV_5288.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5288
+%PCI\VEN_10b9&DEV_5287.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5287
+%PCI\VEN_10b9&DEV_5281.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5281
 %PCI\VEN_10b9&DEV_5229&REV_c5.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5229&REV_c5
 %PCI\VEN_10b9&DEV_5229&REV_c4.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5229&REV_c4
 %PCI\VEN_10b9&DEV_5229&REV_c2.DeviceDesc%=PciIde_Inst, PCI\VEN_10b9&DEV_5229&REV_c2
@@ -53,14 +53,14 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_1002&DEV_4349.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4349
 %PCI\VEN_1002&DEV_4369.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4369
 %PCI\VEN_1002&DEV_4376.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4376
-%PCI\VEN_1002&DEV_436e.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_436e
-%PCI\VEN_1002&DEV_4379.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_4379
-%PCI\VEN_1002&DEV_437a.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_437a
+%PCI\VEN_1002&DEV_436e.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_436e
+%PCI\VEN_1002&DEV_4379.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4379
+%PCI\VEN_1002&DEV_437a.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_437a
 %PCI\VEN_1002&DEV_438c.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_438c
-%PCI\VEN_1002&DEV_4380.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_4380
+%PCI\VEN_1002&DEV_4380.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4380
 %PCI\VEN_1002&DEV_439c.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_439c
-%PCI\VEN_1002&DEV_4390.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_4390
-%PCI\VEN_1002&DEV_4391.DeviceDesc%=uniata_Inst, PCI\VEN_1002&DEV_4391
+%PCI\VEN_1002&DEV_4390.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4390
+%PCI\VEN_1002&DEV_4391.DeviceDesc%=PciIde_Inst, PCI\VEN_1002&DEV_4391
 %PCI\VEN_1103&DEV_0004&REV_05.DeviceDesc%=PciIde_Inst, PCI\VEN_1103&DEV_0004&REV_05
 %PCI\VEN_1103&DEV_0004&REV_03.DeviceDesc%=PciIde_Inst, PCI\VEN_1103&DEV_0004&REV_03
 %PCI\VEN_1103&DEV_0004&REV_02.DeviceDesc%=PciIde_Inst, PCI\VEN_1103&DEV_0004&REV_02
@@ -85,64 +85,64 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_8086&DEV_24cb.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_24cb
 %PCI\VEN_8086&DEV_24ca.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_24ca
 %PCI\VEN_8086&DEV_24db.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_24db
-%PCI\VEN_8086&DEV_24d1.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_24d1
-%PCI\VEN_8086&DEV_24df.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_24df
+%PCI\VEN_8086&DEV_24d1.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_24d1
+%PCI\VEN_8086&DEV_24df.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_24df
 %PCI\VEN_8086&DEV_25a2.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_25a2
-%PCI\VEN_8086&DEV_25a3.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_25a3
-%PCI\VEN_8086&DEV_25b0.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_25b0
+%PCI\VEN_8086&DEV_25a3.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_25a3
+%PCI\VEN_8086&DEV_25b0.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_25b0
 %PCI\VEN_8086&DEV_266f.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_266f
-%PCI\VEN_8086&DEV_2651.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2651
-%PCI\VEN_8086&DEV_2652.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2652
-%PCI\VEN_8086&DEV_2653.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2653
+%PCI\VEN_8086&DEV_2651.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2651
+%PCI\VEN_8086&DEV_2652.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2652
+%PCI\VEN_8086&DEV_2653.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2653
 %PCI\VEN_8086&DEV_27df.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27df
-%PCI\VEN_8086&DEV_27c0.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c0
-%PCI\VEN_8086&DEV_27c1.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c1
-%PCI\VEN_8086&DEV_27c3.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c3
-%PCI\VEN_8086&DEV_27c4.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c4
-%PCI\VEN_8086&DEV_27c5.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c5
-%PCI\VEN_8086&DEV_27c6.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_27c6
+%PCI\VEN_8086&DEV_27c0.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c0
+%PCI\VEN_8086&DEV_27c1.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c1
+%PCI\VEN_8086&DEV_27c3.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c3
+%PCI\VEN_8086&DEV_27c4.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c4
+%PCI\VEN_8086&DEV_27c5.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c5
+%PCI\VEN_8086&DEV_27c6.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_27c6
 %PCI\VEN_8086&DEV_269e.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_269e
-%PCI\VEN_8086&DEV_2680.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2680
-%PCI\VEN_8086&DEV_2681.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2681
-%PCI\VEN_8086&DEV_2682.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2682
-%PCI\VEN_8086&DEV_2683.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2683
-%PCI\VEN_8086&DEV_2820.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2820
-%PCI\VEN_8086&DEV_2821.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2821
-%PCI\VEN_8086&DEV_2822.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2822
-%PCI\VEN_8086&DEV_2824.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2824
-%PCI\VEN_8086&DEV_2825.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2825
-%PCI\VEN_8086&DEV_2828.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2828
-%PCI\VEN_8086&DEV_2829.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2829
-%PCI\VEN_8086&DEV_2850.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2850
-%PCI\VEN_8086&DEV_282a.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_282a
-%PCI\VEN_8086&DEV_2920.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2920
-%PCI\VEN_8086&DEV_2921.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2921
-%PCI\VEN_8086&DEV_2926.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2926
-%PCI\VEN_8086&DEV_2923.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2923
-%PCI\VEN_8086&DEV_2922.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2922
-%PCI\VEN_8086&DEV_2928.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2928
-%PCI\VEN_8086&DEV_2929.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_2929
-%PCI\VEN_8086&DEV_292d.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_292d
-%PCI\VEN_8086&DEV_292e.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_292e
-%PCI\VEN_8086&DEV_3a00.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a00
-%PCI\VEN_8086&DEV_3a02.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a02
-%PCI\VEN_8086&DEV_3a03.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a03
-%PCI\VEN_8086&DEV_3a06.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a06
-%PCI\VEN_8086&DEV_3a20.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a20
-%PCI\VEN_8086&DEV_3a22.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a22
-%PCI\VEN_8086&DEV_3a23.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a23
-%PCI\VEN_8086&DEV_3a26.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3a26
-%PCI\VEN_8086&DEV_3b20.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b20
-%PCI\VEN_8086&DEV_3b21.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b21
-%PCI\VEN_8086&DEV_3b22.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b22
-%PCI\VEN_8086&DEV_3b23.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b23
-%PCI\VEN_8086&DEV_3b26.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b26
-%PCI\VEN_8086&DEV_3b28.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b28
-%PCI\VEN_8086&DEV_3b29.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b29
-%PCI\VEN_8086&DEV_3b2d.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b2d
-%PCI\VEN_8086&DEV_3b2e.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b2e
-%PCI\VEN_8086&DEV_3b2f.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3b2f
-; %PCI\VEN_8086&DEV_3200.DeviceDesc%=uniata_Inst, PCI\VEN_8086&DEV_3200
+%PCI\VEN_8086&DEV_2680.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2680
+%PCI\VEN_8086&DEV_2681.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2681
+%PCI\VEN_8086&DEV_2682.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2682
+%PCI\VEN_8086&DEV_2683.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2683
+%PCI\VEN_8086&DEV_2820.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2820
+%PCI\VEN_8086&DEV_2821.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2821
+%PCI\VEN_8086&DEV_2822.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2822
+%PCI\VEN_8086&DEV_2824.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2824
+%PCI\VEN_8086&DEV_2825.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2825
+%PCI\VEN_8086&DEV_2828.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2828
+%PCI\VEN_8086&DEV_2829.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2829
+%PCI\VEN_8086&DEV_2850.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2850
+%PCI\VEN_8086&DEV_282a.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_282a
+%PCI\VEN_8086&DEV_2920.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2920
+%PCI\VEN_8086&DEV_2921.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2921
+%PCI\VEN_8086&DEV_2926.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2926
+%PCI\VEN_8086&DEV_2923.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2923
+%PCI\VEN_8086&DEV_2922.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2922
+%PCI\VEN_8086&DEV_2928.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2928
+%PCI\VEN_8086&DEV_2929.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_2929
+%PCI\VEN_8086&DEV_292d.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_292d
+%PCI\VEN_8086&DEV_292e.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_292e
+%PCI\VEN_8086&DEV_3a00.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a00
+%PCI\VEN_8086&DEV_3a02.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a02
+%PCI\VEN_8086&DEV_3a03.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a03
+%PCI\VEN_8086&DEV_3a06.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a06
+%PCI\VEN_8086&DEV_3a20.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a20
+%PCI\VEN_8086&DEV_3a22.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a22
+%PCI\VEN_8086&DEV_3a23.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a23
+%PCI\VEN_8086&DEV_3a26.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3a26
+%PCI\VEN_8086&DEV_3b20.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b20
+%PCI\VEN_8086&DEV_3b21.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b21
+%PCI\VEN_8086&DEV_3b22.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b22
+%PCI\VEN_8086&DEV_3b23.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b23
+%PCI\VEN_8086&DEV_3b26.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b26
+%PCI\VEN_8086&DEV_3b28.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b28
+%PCI\VEN_8086&DEV_3b29.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b29
+%PCI\VEN_8086&DEV_3b2d.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b2d
+%PCI\VEN_8086&DEV_3b2e.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b2e
+%PCI\VEN_8086&DEV_3b2f.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3b2f
+; %PCI\VEN_8086&DEV_3200.DeviceDesc%=PciIde_Inst, PCI\VEN_8086&DEV_3200
 
 %PCI\VEN_11ab&DEV_5040.DeviceDesc%=PciIde_Inst, PCI\VEN_11ab&DEV_5040
 %PCI\VEN_11ab&DEV_5041.DeviceDesc%=PciIde_Inst, PCI\VEN_11ab&DEV_5041
@@ -156,27 +156,27 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_10de&DEV_01bc.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_01bc
 %PCI\VEN_10de&DEV_0065.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0065
 %PCI\VEN_10de&DEV_0085.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0085
-%PCI\VEN_10de&DEV_008e.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_008e
+%PCI\VEN_10de&DEV_008e.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_008e
 %PCI\VEN_10de&DEV_00d5.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_00d5
 %PCI\VEN_10de&DEV_00e5.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_00e5
-%PCI\VEN_10de&DEV_00e3.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_00e3
-%PCI\VEN_10de&DEV_00ee.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_00ee
+%PCI\VEN_10de&DEV_00e3.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_00e3
+%PCI\VEN_10de&DEV_00ee.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_00ee
 %PCI\VEN_10de&DEV_0035.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0035
-%PCI\VEN_10de&DEV_0036.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_0036
-%PCI\VEN_10de&DEV_003e.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_003e
+%PCI\VEN_10de&DEV_0036.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0036
+%PCI\VEN_10de&DEV_003e.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_003e
 %PCI\VEN_10de&DEV_0053.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0053
-%PCI\VEN_10de&DEV_0054.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_0054
-%PCI\VEN_10de&DEV_0055.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_0055
+%PCI\VEN_10de&DEV_0054.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0054
+%PCI\VEN_10de&DEV_0055.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0055
 %PCI\VEN_10de&DEV_0265.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0265
-%PCI\VEN_10de&DEV_0266.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_0266
-%PCI\VEN_10de&DEV_0267.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_0267
+%PCI\VEN_10de&DEV_0266.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0266
+%PCI\VEN_10de&DEV_0267.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0267
 %PCI\VEN_10de&DEV_036e.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_036e
-%PCI\VEN_10de&DEV_037e.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_037e
-%PCI\VEN_10de&DEV_037f.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_037f
+%PCI\VEN_10de&DEV_037e.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_037e
+%PCI\VEN_10de&DEV_037f.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_037f
 %PCI\VEN_10de&DEV_03ec.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_03ec
-%PCI\VEN_10de&DEV_03e7.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_03e7
-%PCI\VEN_10de&DEV_03f6.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_03f6
-%PCI\VEN_10de&DEV_03f7.DeviceDesc%=uniata_Inst, PCI\VEN_10de&DEV_03f7
+%PCI\VEN_10de&DEV_03e7.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_03e7
+%PCI\VEN_10de&DEV_03f6.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_03f6
+%PCI\VEN_10de&DEV_03f7.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_03f7
 %PCI\VEN_10de&DEV_0448.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0448
 %PCI\VEN_10de&DEV_0560.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_0560
 %PCI\VEN_10de&DEV_056c.DeviceDesc%=PciIde_Inst, PCI\VEN_10de&DEV_056c
@@ -196,14 +196,14 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_105a&DEV_1275.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_1275
 %PCI\VEN_105a&DEV_5275.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_5275
 %PCI\VEN_105a&DEV_7275.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_7275
-%PCI\VEN_105a&DEV_3318.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3318
-%PCI\VEN_105a&DEV_3319.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3319
-%PCI\VEN_105a&DEV_3371.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3371
-%PCI\VEN_105a&DEV_3375.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3375
-%PCI\VEN_105a&DEV_3376.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3376
-%PCI\VEN_105a&DEV_3377.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3377
-%PCI\VEN_105a&DEV_3373.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3373
-%PCI\VEN_105a&DEV_3372.DeviceDesc%=uniata_Inst, PCI\VEN_105a&DEV_3372
+%PCI\VEN_105a&DEV_3318.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3318
+%PCI\VEN_105a&DEV_3319.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3319
+%PCI\VEN_105a&DEV_3371.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3371
+%PCI\VEN_105a&DEV_3375.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3375
+%PCI\VEN_105a&DEV_3376.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3376
+%PCI\VEN_105a&DEV_3377.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3377
+%PCI\VEN_105a&DEV_3373.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3373
+%PCI\VEN_105a&DEV_3372.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_3372
 %PCI\VEN_105a&DEV_6617.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_6617
 %PCI\VEN_105a&DEV_6626.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_6626
 %PCI\VEN_105a&DEV_6629.DeviceDesc%=PciIde_Inst, PCI\VEN_105a&DEV_6629
@@ -217,19 +217,19 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 %PCI\VEN_1166&DEV_0213.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0213
 %PCI\VEN_1166&DEV_0217.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0217
 %PCI\VEN_1166&DEV_0214.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0214
-%PCI\VEN_1166&DEV_024b.DeviceDesc%=uniata_Inst, PCI\VEN_1166&DEV_024b
-%PCI\VEN_1166&DEV_024a.DeviceDesc%=uniata_Inst, PCI\VEN_1166&DEV_024a
-%PCI\VEN_1166&DEV_0240.DeviceDesc%=uniata_Inst, PCI\VEN_1166&DEV_0240
-%PCI\VEN_1166&DEV_0241.DeviceDesc%=uniata_Inst, PCI\VEN_1166&DEV_0241
-%PCI\VEN_1166&DEV_0242.DeviceDesc%=uniata_Inst, PCI\VEN_1166&DEV_0242
+%PCI\VEN_1166&DEV_024b.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_024b
+%PCI\VEN_1166&DEV_024a.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_024a
+%PCI\VEN_1166&DEV_0240.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0240
+%PCI\VEN_1166&DEV_0241.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0241
+%PCI\VEN_1166&DEV_0242.DeviceDesc%=PciIde_Inst, PCI\VEN_1166&DEV_0242
 
-%PCI\VEN_1095&DEV_3114.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_3114
-%PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_3512&REV_02
-%PCI\VEN_1095&DEV_3112&REV_02.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_3112&REV_02
-%PCI\VEN_1095&DEV_0240&REV_02.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_0240&REV_02
-%PCI\VEN_1095&DEV_3512.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_3512
-%PCI\VEN_1095&DEV_3112.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_3112
-%PCI\VEN_1095&DEV_0240.DeviceDesc%=uniata_Inst, PCI\VEN_1095&DEV_0240
+%PCI\VEN_1095&DEV_3114.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_3114
+%PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_3512&REV_02
+%PCI\VEN_1095&DEV_3112&REV_02.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_3112&REV_02
+%PCI\VEN_1095&DEV_0240&REV_02.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_0240&REV_02
+%PCI\VEN_1095&DEV_3512.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_3512
+%PCI\VEN_1095&DEV_3112.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_3112
+%PCI\VEN_1095&DEV_0240.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_0240
 %PCI\VEN_1095&DEV_0680.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_0680
 %PCI\VEN_1095&DEV_0649.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_0649
 %PCI\VEN_1095&DEV_0648.DeviceDesc%=PciIde_Inst, PCI\VEN_1095&DEV_0648
@@ -324,22 +324,29 @@ HKR, , Installer32,    0, "syssetup.dll,HdcClassInstaller"
 
 ; Compatible adapters
 %PCI\CC_0101.DeviceDesc%=PciIde_Inst,PCI\CC_0101                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
-%PCI\CC_0104.DeviceDesc%=uniata_Inst,PCI\CC_0104                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
-%PCI\CC_0105.DeviceDesc%=uniata_Inst,PCI\CC_0105                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
-%PCI\CC_0106.DeviceDesc%=uniata_Inst,PCI\CC_0106                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
-%*PNP0600.PriDeviceDesc%=uniata_Inst, Primary_IDE_Channel
-%*PNP0600.SecDeviceDesc%=uniata_Inst, Secondary_IDE_Channel
-%*PNP0600.DeviceDesc%=uniata_Inst, *PNP0600                            ; Generic_ESDI_Hard_Disk_Controller   (BAD_IDE)
-%UniATA_Name%=uniata_Inst
+%PCI\CC_0104.DeviceDesc%=PciIde_Inst,PCI\CC_0104                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
+%PCI\CC_0105.DeviceDesc%=PciIde_Inst,PCI\CC_0105                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
+%PCI\CC_0106.DeviceDesc%=PciIde_Inst,PCI\CC_0106                       ; Device ID for generic Dual PCI IDE  (UNKNOWN_PCI_IDE)
+%ataChan.DeviceDesc%=Atapi_Inst, Internal_IDE_Channel
+%*PNP0600.PriDeviceDesc%=Atapi_Inst, Primary_IDE_Channel
+%*PNP0600.SecDeviceDesc%=Atapi_Inst, Secondary_IDE_Channel
+%*PNP0600.DeviceDesc%=Atapi_Inst, *PNP0600                            ; Generic_ESDI_Hard_Disk_Controller   (BAD_IDE)
+%UniATA_Name%=PciIde_Inst
 
-;---------------------------- PCI IDE DRIVER ----------------------------
+;---------------------------- ATA BUS DRIVER ----------------------------
 
 [PciIde_Inst.NT]
 CopyFiles = PciIde_CopyFiles.NT
+AddReg = StorPropAddReg
+
+[StorPropAddReg]
+HKR,,EnumPropPages32,,"storprop.dll,IdePropPageProvider"
 
 [PciIde_CopyFiles.NT]
+atapi.sys
 pciide.sys
 pciidex.sys
+storprop.dll
 
 [PciIde_Inst.NT.Services]
 AddService = pciide, 0x00000002, pciide_Service_Inst
@@ -351,23 +358,25 @@ ErrorControl   = 1
 ServiceBinary  = %12%\pciide.sys
 LoadOrderGroup = System Bus Extender
 
-;----------------------------- UNIATA DRIVER ----------------------------
+;---------------------------- ATA PORT DRIVER ---------------------------
 
-[uniata_Inst.NT]
-CopyFiles = uniata_CopyFiles.NT
+[Atapi_Inst.NT]
+CopyFiles = Atapi_CopyFiles.NT
+AddReg = StorPropAddReg
 
-[uniata_CopyFiles.NT]
-uniata.sys
+[Atapi_CopyFiles.NT]
+atapi.sys
+storprop.dll
 
-[uniata_Inst.NT.Services]
-AddService = UniATA, 0x00000002, uniata_Service_Inst
+[Atapi_Inst.NT.Services]
+AddService = atapi, 0x00000002, atapi_Service_Inst
 
-[uniata_Service_Inst]
+[atapi_Service_Inst]
 ServiceType    = 1
 StartType      = 0
 ErrorControl   = 1
-ServiceBinary  = %12%\uniata.sys
-LoadOrderGroup = System Bus Extender
+ServiceBinary  = %12%\atapi.sys
+LoadOrderGroup = SCSI Miniport
 
 ;-------------------------------- STRINGS -------------------------------
 
@@ -574,8 +583,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 controller"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA controller"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA controller"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA controller"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA controller"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA controller"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA controller"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA controller"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA controller"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA controller"
@@ -678,6 +687,7 @@ PCI\VEN_ffff&DEV_ffff&REV_ff.DeviceDesc="IDE controller"
 
 ; Compatible adapters
 UniATA_Name="Universal ATA Driver"
+ataChan.DeviceDesc="ATA Channel"
 *PNP0600.DeviceDesc="IDE/ESDI Hard Disk Controller"
 *PNP0600.PriDeviceDesc="Primary IDE Channel"
 *PNP0600.SecDeviceDesc="Secondary IDE Channel"
@@ -883,8 +893,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 控制器"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA 控制器"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA 控制器"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA 控制器"
@@ -1207,8 +1217,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 Controller"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA Controller"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA Controller"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA Controller"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA Controller"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA Controller"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA Controller"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA Controller"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA Controller"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA Controller"
@@ -1517,8 +1527,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="Controlador ServerWorks HT1000 ATA-100"
 PCI\VEN_1166&DEV_024b.DeviceDesc="Controlador ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_024a.DeviceDesc="Controlador ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_0240.DeviceDesc="Controlador ServerWorks K2 SATA"
-PCI\VEN_1166&DEV_0241.DeviceDesc="Controlador ServerWorks Frodo4 SATA"
-PCI\VEN_1166&DEV_0242.DeviceDesc="Controlador ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0241.DeviceDesc="Controlador ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0242.DeviceDesc="Controlador ServerWorks Frodo4 SATA"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="Controlador SiI 3114 SATA"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="Controlador SiI 3512 SATA"
@@ -1827,8 +1837,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="Kontroler ServerWorks HT1000 ATA-100"
 PCI\VEN_1166&DEV_024b.DeviceDesc="Kontroler ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_024a.DeviceDesc="Kontroler ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_0240.DeviceDesc="Kontroler ServerWorks K2 SATA"
-PCI\VEN_1166&DEV_0241.DeviceDesc="Kontroler ServerWorks Frodo4 SATA"
-PCI\VEN_1166&DEV_0242.DeviceDesc="Kontroler ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0241.DeviceDesc="Kontroler ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0242.DeviceDesc="Kontroler ServerWorks Frodo4 SATA"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="Kontroler SiI 3114 SATA"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="Kontroler SiI 3512 SATA"
@@ -2137,8 +2147,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="Dispozitiv de control ServerWorks HT1000 ATA-1
 PCI\VEN_1166&DEV_024b.DeviceDesc="Dispozitiv de control ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_024a.DeviceDesc="Dispozitiv de control ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_0240.DeviceDesc="Dispozitiv de control ServerWorks K2 SATA"
-PCI\VEN_1166&DEV_0241.DeviceDesc="Dispozitiv de control ServerWorks Frodo4 SATA"
-PCI\VEN_1166&DEV_0242.DeviceDesc="Dispozitiv de control ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0241.DeviceDesc="Dispozitiv de control ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0242.DeviceDesc="Dispozitiv de control ServerWorks Frodo4 SATA"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="Dispozitiv de control SiI 3114 SATA"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="Dispozitiv de control SiI 3512 SATA"
@@ -2447,8 +2457,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 контролле
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA контроллер"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA контроллер"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA контроллер"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA контроллер"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA контроллер"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA контроллер"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA контроллер"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA контроллер"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA контроллер"
@@ -2758,8 +2768,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 Denetleyicisi"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA Denetleyicisi"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA Denetleyicisi"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA Denetleyicisi"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA Denetleyicisi"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA Denetleyicisi"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA Denetleyicisi"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA Denetleyicisi"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA Denetleyicisi"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA Denetleyicisi"
@@ -3068,8 +3078,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="Контроллер ServerWorks HT1000 ATA-10
 PCI\VEN_1166&DEV_024b.DeviceDesc="Контроллер ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_024a.DeviceDesc="Контроллер ServerWorks HT1000 SATA"
 PCI\VEN_1166&DEV_0240.DeviceDesc="Контроллер ServerWorks K2 SATA"
-PCI\VEN_1166&DEV_0241.DeviceDesc="Контроллер ServerWorks Frodo4 SATA"
-PCI\VEN_1166&DEV_0242.DeviceDesc="Контроллер ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0241.DeviceDesc="Контроллер ServerWorks Frodo8 SATA"
+PCI\VEN_1166&DEV_0242.DeviceDesc="Контроллер ServerWorks Frodo4 SATA"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="Контроллер SiI 3114 SATA"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="Контроллер SiI 3512 SATA"
@@ -3378,8 +3388,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 控制器"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA 控制器"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA 控制器"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA 控制器"
@@ -3686,8 +3696,8 @@ PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 控制器"
 PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA 控制器"
 PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA 控制器"
-PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
-PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo8 SATA 控制器"
+PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo4 SATA 控制器"
 
 PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA 控制器"
 PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA 控制器"