Merge branch 'ideport' of https://github.com/disean/reactos into pc98-test

Author: binarymaster

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}"
 

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

drivers/storage/ide/atapi/CMakeLists.txt

@@ -1,6 +1,48 @@
 
-add_library(atapi MODULE atapi.c atapi.rc)
-target_link_libraries(atapi libcntpr)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sptilib)
+
+if(ARCH STREQUAL "i386")
+    set(DETECT_LEGACY_DEVICES TRUE)
+    add_definitions(-DATA_DETECT_LEGACY_DEVICES)
+endif()
+
+list(APPEND SOURCE
+    include/atahw.h
+    include/debug.h
+    include/devevent.h
+    include/scsiex.h
+    atapi.c
+    atapi.h
+    data.c
+    dev_config.c
+    dev_error.c
+    dev_identify.c
+    dev_power.c
+    dev_timings.c
+    enum.c
+    fdo.c
+    ioctl.c
+    pdo.c
+    portstate.c
+    satl.c
+    scsi.c
+    smart.c
+    wmi.c)
+
+if(DETECT_LEGACY_DEVICES)
+    list(APPEND SOURCE pata_legacy.c)
+endif()
+
+add_library(atapi MODULE ${SOURCE} atapi.rc)
+
+if (STACK_PROTECTOR)
+    target_sources(atapi PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
+endif()
+
 set_module_type(atapi kernelmodedriver)
-add_importlibs(atapi scsiport)
+target_link_libraries(atapi memcmp sptilib ${PSEH_LIB})
+# add_pch(atapi atapi.h SOURCE) # TODO
+add_importlibs(atapi ntoskrnl hal wmilib)
 add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(atapi_reg.inf)