Index: trunk/i386/libsaio/console.c
===================================================================
--- trunk/i386/libsaio/console.c	(revision 1151)
+++ trunk/i386/libsaio/console.c	(revision 1152)
@@ -263,5 +263,5 @@
 void pause() 
 {
     printf("Press a key to continue...\n");
-	getchar(); // replace getchar() by pause() ?? were useful...?
+	getchar(); // replace getchar() by pause() were useful.
 }
Index: trunk/i386/libsaio/nvidia.c
===================================================================
--- trunk/i386/libsaio/nvidia.c	(revision 1151)
+++ trunk/i386/libsaio/nvidia.c	(revision 1152)
@@ -1319,7 +1319,7 @@
 		}
 	}
     
-    if (getValueForKey(kdcfg0, &value, &len, &bootInfo->chameleonConfig) && len == DCFG0_LEN * 2){
+    if (getValueForKey(kDcfg0, &value, &len, &bootInfo->chameleonConfig) && len == DCFG0_LEN * 2){
         
         uint8_t new_dcfg0[DCFG0_LEN];
         
@@ -1337,7 +1337,7 @@
     }
     
     
-    if (getValueForKey(kdcfg1, &value, &len, &bootInfo->chameleonConfig) && len == DCFG1_LEN * 2){
+    if (getValueForKey(kDcfg1, &value, &len, &bootInfo->chameleonConfig) && len == DCFG1_LEN * 2){
 
         uint8_t new_dcfg1[DCFG1_LEN];
     
Index: trunk/i386/libsaio/sys.c
===================================================================
--- trunk/i386/libsaio/sys.c	(revision 1151)
+++ trunk/i386/libsaio/sys.c	(revision 1152)
@@ -481,13 +481,13 @@
 
 int open_bvdev(const char *bvd, const char *path, int flags)
 {
-        const struct devsw	*dp;
-	const char		*cp;
-	BVRef			bvr;
-	int			i;
-	int			len;
-	int			unit;
-	int			partition;
+    const struct devsw	*dp;
+	const char			*cp;
+	BVRef				bvr;
+	int					i;
+	int					len;
+	int					unit;
+	int					partition;
 
 	if ((i = open(path, flags)) >= 0) {
 		return i;
@@ -520,7 +520,7 @@
 			bvr = newBootVolumeRef(dp->biosdev + unit, partition);
 			return open_bvr(bvr, path, flags);
 		}
-        }
+    }
 	return -1;
 }
 
Index: trunk/i386/libsaio/pci_setup.c
===================================================================
--- trunk/i386/libsaio/pci_setup.c	(revision 1151)
+++ trunk/i386/libsaio/pci_setup.c	(revision 1152)
@@ -50,9 +50,9 @@
 							setup_ati_devprop(current); 
 							break;
 					
-						case PCI_VENDOR_ID_INTEL: 
-                            setup_gma_devprop(current);
-                            break;
+						case PCI_VENDOR_ID_INTEL:
+							setup_gma_devprop(current);
+							break;
 					
 						case PCI_VENDOR_ID_NVIDIA: 
 							setup_nvidia_devprop(current);
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 1151)
+++ trunk/i386/boot2/boot.c	(revision 1152)
@@ -180,8 +180,8 @@
 	
 	bool dummyVal;
 	if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->chameleonConfig) && dummyVal) {
-		printf("Press any key to continue...");
-		getchar();
+		printf("(Wait) ");
+		pause();
 	}
 	
 	usb_loop();
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 1151)
+++ trunk/i386/boot2/boot.h	(revision 1152)
@@ -111,8 +111,8 @@
 
 #define kUseNvidiaROM		"UseNvidiaROM"		/* nvidia.c */
 #define kVBIOS				"VBIOS"				/* nvidia.c */
-#define kdcfg0				"display_0"			/* nvidia.c */
-#define kdcfg1				"display_1"			/* nvidia.c */
+#define kDcfg0				"display_0"			/* nvidia.c */
+#define kDcfg1				"display_1"			/* nvidia.c */
 
 #define kEthernetBuiltIn	"EthernetBuiltIn"	/* pci_setup.c */
 #define kGraphicsEnabler	"GraphicsEnabler"	/* pci_setup.c */
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 1151)
+++ trunk/CHANGES	(revision 1152)
@@ -1,3 +1,5 @@
+- Added NVidia ION AHCI controllers dev id to AHCIPortInjector kext.
+  Forgot to mention source on the commit: http://forum.voodooprojects.org/index.php/topic,1170.0.html
 - Renamed com.apple.Boot.plist to org.chameleon.Boot.plist.
 - Added "ShowInfo" key (enabled by default for now), which enables/disables the display of
   partition and resolution related info, on the Gui.
@@ -33,12 +35,12 @@
 - Optimized cursor spinout in textmode if no verbose mode is set
 - Added ram table structures definitions
 - Added getSmbios() a param permitting to select between orig and new smbios entries
-- Changed "Default Partition" behaviour to accept only native system volumes or foreign partitions.
+- Changed "Default Partition" behavior to accept only native system volumes or foreign partitions.
 - Added NVIDIA new NVCAP customization support and support for ION gfx cards from aserebln
 - Added ATI new framebuffers support and new cards from PCEFI10.6
 - improved ACPI file search algo by implementing a cache.
 - Nvidia injection fix
-- pciroot would not always return correct UID in autodection mode
+- pciroot would not always return correct UID in auto detection mode
 - Fixed the hibernation problem in boot2/resume.c
 - Fixed all new booter versions with SystemType would override the facp value even if correct,
   now keeps the facp value if correct and no override has been done, implemented a best effort algo.