ramdisk: add preliminary support for ahci

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 4bdecef3dbe9234c3697a0e97c15d5965407c528..e04b1490b2e85b7c67bbdbc0c67fde3da6cc0b42 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -1,7 +1,7 @@
 # Makefile for ramdisk image
 
-PROGRAMS=at_wini bios_wini cdprobe dev2name floppy loadramdisk mount newroot \
-       pci sh service sysenv mfs ext2
+PROGRAMS=ahci at_wini bios_wini cdprobe dev2name floppy loadramdisk mount \
+       newroot pci sh service sysenv mfs ext2
 EXTRA=system.conf passwd rs.single
 
 CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR}
@@ -25,6 +25,12 @@ bintoc:      bintoc.c
 image: proto.gen mtab rc $(PROGRAMS) $(EXTRA)
        mkfs.mfs image proto.gen || { rm -f image; false; }
 
+ahci: ../ahci/ahci
+       install -s ../$@/$@ $@
+
+../ahci/ahci:
+       $(MAKE) -C ../ahci
+
 at_wini: ../at_wini/at_wini
        install -s ../$@/$@ $@
 

diff --git a/drivers/ramdisk/rc b/drivers/ramdisk/rc
index 427f1c32775359bd200c85500dcfa7c3afa8f97c..a81a9182cb2f20658f11063e1666b93d8f8ae2ab 100644 (file)
--- a/drivers/ramdisk/rc
+++ b/drivers/ramdisk/rc
@@ -11,6 +11,10 @@ if [ X`/bin/sysenv bios_wini` = Xyes ]
 then
        echo Using bios_wini.
        /bin/service -c up /sbin/bios_wini -dev /dev/c0d0
+elif [ X`/bin/sysenv ahci` = Xyes ]
+then
+       # this is here temporarily, for testing purposes
+       /bin/service -c up /sbin/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0
 else
        /bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0
        /bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1