From: David van Moolenbroek <david@minix3.org>
Date: Wed, 11 Aug 2010 11:16:44 +0000 (+0000)
Subject: ramdisk: add preliminary support for ahci
X-Git-Tag: v3.1.8~80
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=3f6f7672c20a2eb6ba348e8585a1987c4f4dea71;p=minix.git

ramdisk: add preliminary support for ahci
---

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 4bdecef3d..e04b1490b 100644
--- 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 427f1c327..a81a9182c 100644
--- 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