Skip to content

Commit 261a01c

Browse files
diseanDarkFire01
authored andcommitted
[UNIATA] Disable the driver and enable the new ATA stack
CORE-17256
1 parent 6d7e8b1 commit 261a01c

6 files changed

Lines changed: 163 additions & 125 deletions

File tree

boot/bootdata/hivesys.inf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Cla
6868
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","Service",0x00000000,"usbhub"
6969
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
7070

71+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0101","Service",0x00000000,"pciide"
72+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0101","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
73+
74+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0104","Service",0x00000000,"pciide"
75+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0104","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
76+
77+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0106","Service",0x00000000,"pciide"
78+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0106","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
79+
80+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0600","Service",0x00000000,"atapi"
81+
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0600","ClassGUID",0x00000000,"{4D36E96A-E325-11CE-BFC1-08002BE10318}"
82+
7183
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","Service",0x00000000,"cdrom"
7284
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","ClassGUID",0x00000000,"{4D36E965-E325-11CE-BFC1-08002BE10318}"
7385

boot/bootdata/txtsetup.sif

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ FreeSysPartDiskSpace=450
8989
[SourceDisksFiles]
9090
nmidebug.sys = 1,,,,,,x,4,,,,1,4
9191
sacdrv.sys = 1,,,,,,x,4,,,,1,4
92-
uniata.sys = 1,,,,,,x,4,,,,1,4
92+
;uniata.sys = 1,,,,,,x,4,,,,1,4
93+
atapi.sys = 1,,,,,,x,4,,,,1,4
9394
buslogic.sys = 1,,,,,,x,4,,,,1,4
9495
blue.sys = 1,,,,,,x,4,,,,1,4
9596
vgafonts.cab = 1,,,,,,,1,,,,1,1
@@ -125,7 +126,7 @@ storport.sys = 1,,,,,,,4,,,,1,4
125126
fastfat.sys = 1,,,,,,x,4,,,,1,4
126127
btrfs.sys = 1,,,,,,x,4,,,,1,4
127128
ramdisk.sys = 1,,,,,,x,4,,,,1,4
128-
pciide.sys = 1,,,,,,,4,,,,1,4
129+
pciide.sys = 1,,,,,,x,4,,,,1,4
129130
pciidex.sys = 1,,,,,,,4,,,,1,4
130131
pcix.sys = 1,,,,,,,4,,,,1,4
131132
pcmcia.sys = 1,,,,,,,4,,,,1,4
@@ -159,11 +160,15 @@ PCI\CC_0601 = isapnp
159160
PCI\CC_0604 = pci
160161
PCI\VEN_104B&CC_0100 = buslogic
161162
PCI\CC_0101 = pciide
162-
PCI\CC_0104 = uniata
163-
PCI\CC_0105 = uniata
164-
PCI\CC_0106 = uniata
163+
;PCI\CC_0104 = uniata
164+
;PCI\CC_0105 = uniata
165+
;PCI\CC_0106 = uniata
166+
PCI\CC_0104 = pciide
167+
PCI\CC_0105 = pciide
168+
PCI\CC_0106 = pciide
165169
;PCI\CC_0106 = storahci
166-
*PNP0600 = uniata
170+
;*PNP0600 = uniata
171+
*PNP0600 = atapi
167172
USB\CLASS_09 = usbhub
168173
USB\ROOT_HUB = usbhub
169174
USB\ROOT_HUB20 = usbhub
@@ -202,9 +207,11 @@ i8042prt = i8042prt.sys
202207

203208
[BusExtenders.Load]
204209
pciide = pciide.sys
210+
atapi = atapi.sys
205211

206212
[SCSI.Load]
207-
uniata = uniata.sys
213+
;uniata = uniata.sys
214+
atapi = atapi.sys
208215
buslogic = buslogic.sys
209216
storahci = storahci.sys
210217
disk = disk.sys

drivers/storage/ide/pciide/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ else()
1111
endif()
1212
add_importlibs(pciide pciidex ntoskrnl)
1313
add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all)
14+
add_registry_inf(pciide_reg.inf)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
; PCI IDE driver
2+
[AddReg]
3+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","ErrorControl",0x00010001,0x00000000
4+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Group",0x00000000,"System Bus Extender"
5+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","ImagePath",0x00020000,"system32\drivers\pciide.sys"
6+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Start",0x00010001,0x00000000
7+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Type",0x00010001,0x00000001
8+
HKLM,"SYSTEM\CurrentControlSet\Services\pciide","Tag",0x00010001,0x00000010

drivers/storage/ide/uniata/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ add_pch(uniata stdafx.h SOURCE)
4343
set_module_type(uniata kernelmodedriver)
4444
add_importlibs(uniata scsiport ntoskrnl hal)
4545
add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all)
46-
add_registry_inf(uniata_reg.inf)
46+
# add_registry_inf(uniata_reg.inf)
4747
add_driver_inf(uniata uniata_comm.inf)

0 commit comments

Comments
 (0)