Index: branches/azimutz/CleanCut/doc/BootHelp.txt
===================================================================
--- branches/azimutz/CleanCut/doc/BootHelp.txt	(revision 320)
+++ branches/azimutz/CleanCut/doc/BootHelp.txt	(revision 321)
@@ -42,22 +42,22 @@
 
 Options useful in the com.apple.Boot.plist file:
   Wait=Yes|No             Prompt for a key press before starting the kernel.
-  "Quiet Boot"=Yes|No     Use quiet boot mode (no messages or prompt).
+  Quiet Boot=Yes|No       Use quiet boot mode (no messages or prompt).
   Timeout=8               Number of seconds to pause at the boot: prompt.
-  "Instant Menu"=Yes      Force displaying the partition selection menu. 
+  Instant Menu=Yes        Force displaying the partition selection menu. 
 
-  "Default Partition"     Sets the default boot partition,
+  Default Partition       Sets the default boot partition,
     =hd(x,y)|             where 'x' & 'y' are the disk and partition numbers
     =<UUID>                 or specify the selected volume UUID string.
-  "Hide Partition"        Remove unwanted partition(s) from the boot menu.
+  Hide Partition          Remove unwanted partition(s) from the boot menu.
     =hd(x,y) [hd(m,n)]      only non mac osx boot partitions can be hidden.
 
-  "Rename Partition"        Rename partition(s) for the boot menu.
+  Rename Partition        Rename partition(s) for the boot menu.
     =hd(x,y) <alias> [;hd(m,n) <alias2> ...]
 
   GUI=No                  Disable the GUI (enabled by default).
-  "Boot Banner"=Yes|No    Show boot banner in GUI mode (enabled by default).
-  "Legacy Logo"=Yes|No    Use the legacy grey apple logo (disabled by default).
+  Boot Banner=Yes|No      Show boot banner in GUI mode (enabled by default).
+  Legacy Logo=Yes|No      Use the legacy grey apple logo (disabled by default).
   
   PciRoot=<value>         Use an alternate value for PciRoot (default value 0).
 
@@ -95,10 +95,10 @@
                             if smbios.plist doesn't exist, factory
                             values are kept.
 
-  "Scan Single Drive"     Scan the drive only where the booter got loaded from.
+  Scan Single Drive       Scan the drive only where the booter got loaded from.
     =Yes|No               Fix rescan pbs when using a DVD reader in AHCI mode. 
   Rescan=Yes              Enable CD-ROM rescan mode.
-  "Rescan Prompt"=Yes     Prompts for enable CD-ROM rescan mode.
+  Rescan Prompt=Yes       Prompts for enable CD-ROM rescan mode.
   SystemId=<UUID>         Set manually the system id UUID,
                           SMUUID in smbios config (reserved field) isn't used.
   SystemType=<n>          Set the system type where n is between 0..6
Index: branches/azimutz/CleanCut/version
===================================================================
--- branches/azimutz/CleanCut/version	(revision 320)
+++ branches/azimutz/CleanCut/version	(revision 321)
@@ -1 +1 @@
-2.0-RC5
\ No newline at end of file
+2.0-RC5 CleanCut
\ No newline at end of file
Index: branches/azimutz/CleanCut/CHANGES
===================================================================
--- branches/azimutz/CleanCut/CHANGES	(revision 320)
+++ branches/azimutz/CleanCut/CHANGES	(revision 321)
@@ -17,7 +17,7 @@
 - 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.
@@ -31,14 +31,14 @@
   conversions api, to be completed by function that we should reuse.
   
 - Fixed SystemType would be always forced to a value, now optionally changed
-  only if ovveriden
+  only if overriden
 - Kept SystemID as the only option to change manually the system-id 
-  For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig aer now DEPRECATED.
+  For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig are now DEPRECATED.
 
-- Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml  retry algo that disapeared in his patch, should be more discussed for RC6)
+- Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml  retry algo that disappeared in his patch, should be more discussed for RC6)
 - Added JrCs modified convention name change to coding_standards
 - Now malloc (ex. MALLOC in Asere patch) is renamed malloc(size) and is an alias 
-  to safe_malloc(size, file, line) with _FILE_ and _LINE_ prerocessor definitions
+  to safe_malloc(size, file, line) with _FILE_ and _LINE_ preprocessor definitions
 - Added a new 'Rename Partition Feature', now permitting to rename partition 
   like 'System reserved' to a more meaningful name
 - Added SystemID option permitting to change the System UUID to a fixed value.
Index: branches/azimutz/CleanCut/i386/libsaio/fake_efi.h
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/fake_efi.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/fake_efi.h	(revision 321)
@@ -8,7 +8,6 @@
 /* Set up space for up to 10 configuration table entries */
 #define MAX_CONFIGURATION_TABLE_ENTRIES 10
 
-extern void
-setupFakeEfi(void);
+extern void setupFakeEfi(void);
  
 #endif /* !__LIBSAIO_FAKE_EFI_H */
Index: branches/azimutz/CleanCut/i386/libsaio/bootstruct.h
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/bootstruct.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/bootstruct.h	(revision 321)
@@ -46,7 +46,7 @@
 #define CONFIG_SIZE (40 * 4096)
 
 /*
- * Max size fo config data array, in bytes.
+ * Max size for config data array, in bytes.
  */
 #define IO_CONFIG_DATA_SIZE		163840
 
@@ -124,10 +124,10 @@
     char *           configEnd;                    // pointer to end of config files
     char             config[CONFIG_SIZE];
 
-    config_file_t    bootConfig;		               // boot.plist
+    config_file_t    bootConfig;		           // boot.plist
     config_file_t    overrideConfig;               // additional boot.plist which can override bootConfig keys
-    config_file_t    themeConfig;				           // theme.plist
-    config_file_t    smbiosConfig;				         // smbios.plist
+    config_file_t    themeConfig;				   // theme.plist
+    config_file_t    smbiosConfig;				   // smbios.plist
     config_file_t    helperConfig;                 // boot helper partition's boot.plist
     config_file_t    ramdiskConfig;                // RAMDisk.plist
 } PrivateBootInfo_t;
Index: branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c	(revision 321)
@@ -599,10 +599,14 @@
 	const char * value;
 	
 	// Restart Fix
-	if (Platform.CPU.Vendor == 0x756E6547) {	/* Intel */
-		fix_restart = true;
+	if (Platform.CPU.Vendor == 0x756E6547) // Intel
+	{
+		fix_restart = false; //Azi: think this should be false by default; i never needed any.
+		// On the other hand, i could use a shutdown fix now and then :)
 		getBoolForKey(kRestartFix, &fix_restart, &bootInfo->bootConfig);
-	} else {
+	}
+	else
+	{
 		verbose ("Not an Intel platform: Restart Fix not applied !!!\n");
 		fix_restart = false;
 	}
@@ -630,13 +634,13 @@
 			if(fadt_mod->PM_Profile<=6)
 				Platform.Type = fadt_mod->PM_Profile; // get the fadt if correct
 			else 
-				Platform.Type = 1;		/* Set a fixed value (Desktop) */
+				Platform.Type = 1; // Set a fixed value (Desktop)
 			verbose("Error: system-type must be 0..6. Defaulting to %d !\n", Platform.Type);
 		}
 		else
 			Platform.Type = (unsigned char) strtoul(value, NULL, 10);
 	}
-	// Set PM_Profile from System-type if only user wanted this value to be forced
+	// Set PM_Profile from System-type only if user wanted this value to be forced
 	if (fadt_mod->PM_Profile != Platform.Type) 
 	{
 	    if (value) 
@@ -687,18 +691,18 @@
 	return fadt_mod;
 }
 
-/* Setup ACPI without replacing DSDT. */
+/* Setup ACPI without replacing DSDT. - not needed atm.
 int setupAcpiNoMod()
 {
 	//	addConfigurationTable(&gEfiAcpiTableGuid, getAddressOfAcpiTable(), "ACPI");
 	//	addConfigurationTable(&gEfiAcpi20TableGuid, getAddressOfAcpi20Table(), "ACPI_20");
-	/* XXX aserebln why uint32 cast if pointer is uint64 ? */
+	// XXX aserebln why uint32 cast if pointer is uint64 ?
 	acpi10_p = (uint32_t)getAddressOfAcpiTable();
 	acpi20_p = (uint32_t)getAddressOfAcpi20Table();
 	addConfigurationTable(&gEfiAcpiTableGuid, &acpi10_p, "ACPI");
 	if(acpi20_p) addConfigurationTable(&gEfiAcpi20TableGuid, &acpi20_p, "ACPI_20");
 	return 1;
-}
+}*/
 
 /* Setup ACPI. Replace DSDT if DSDT.aml is found */
 int setupAcpi(void)
Index: branches/azimutz/CleanCut/i386/libsaio/smbios_patcher.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/smbios_patcher.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/smbios_patcher.c	(revision 321)
@@ -128,10 +128,10 @@
 			sm_defaults=sm_macbook_defaults;
 		}
 	} else {
-		switch (Platform.CPU.NoCores) 
+		switch (Platform.CPU.NoCores)
 		{
 			case 1: 
-				sm_defaults=sm_macmini_defaults; 
+				sm_defaults=sm_macmini_defaults;
 				break;
 			case 2:
 				sm_defaults=sm_imac_defaults;
@@ -147,16 +147,16 @@
 							case 0x19: // Intel Core i5 650
 							case 0x1E: // Intel Core i7 LGA1156 (45nm)
 							case 0x1F: // Intel Core i5 LGA1156 (45nm)
-								sm_defaults=sm_imacCore_i5_i7_defaults; 
+								sm_defaults=sm_imacCore_i5_i7_defaults;
 								break;
 							default:
-								sm_defaults=sm_macpro_defaults; 
+								sm_defaults=sm_macpro_defaults;
 								break;
 						}
 						break;
 					}
 					default:
-						sm_defaults=sm_macpro_defaults; 
+						sm_defaults=sm_macpro_defaults;
 						break;
 				}
 				break;
Index: branches/azimutz/CleanCut/i386/libsaio/usb.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/usb.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/usb.c	(revision 321)
@@ -38,14 +38,12 @@
 // Add usb device to the list
 void notify_usb_dev(pci_dt_t *pci_dev)
 {
-	
 	struct pciList* current = usbList;
 	if(!usbList)
 	{
 		usbList = (struct pciList*)malloc(sizeof(struct pciList));
 		usbList->next = NULL;
 		usbList->pciDev = pci_dev;
-		
 	}
 	else
 	{
@@ -87,14 +85,18 @@
 		{
 			// EHCI
 			case 0x20:
-		    	if(fix_ehci)   retVal &= ehci_acquire(current->pciDev);
-		    	if(fix_legacy) retVal &= legacy_off(current->pciDev);
+		    	if (fix_ehci)
+					retVal &= ehci_acquire(current->pciDev);
 				
+		    	if (fix_legacy)
+					retVal &= legacy_off(current->pciDev);
+				
 				break;
 				
 			// UHCI
 			case 0x00:
-				if (fix_uhci) retVal &= uhci_reset(current->pciDev);
+				if (fix_uhci)
+					retVal &= uhci_reset(current->pciDev);
 
 				break;
 		}
@@ -122,7 +124,6 @@
 			pci_dev->vendor_id, pci_dev->device_id,
 			pci_dev->dev.bits.bus, pci_dev->dev.bits.dev, pci_dev->dev.bits.func);
 	
-	
 	// capaddr = Capability Registers = dev.addr + offset stored in dev.addr + 0x10 (USBBASE)
 	capaddr = pci_config_read32(pci_dev->dev.addr, 0x10);	
 	
@@ -130,7 +131,7 @@
 	opaddr = capaddr + *((unsigned char*)(capaddr)); 		
 	
 	// eecp = EHCI Extended Capabilities offset = capaddr HCCPARAMS bits 15:8
-	eecp=*((unsigned char*)(capaddr + 9));
+	eecp = *((unsigned char*)(capaddr + 9));
 	
 	DBG("capaddr=%x opaddr=%x eecp=%x\n", capaddr, opaddr, eecp);
 	
Index: branches/azimutz/CleanCut/i386/libsaio/nvidia.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/nvidia.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/nvidia.c	(revision 321)
@@ -272,7 +272,7 @@
 	{ 0x10DE05F9, "Quadro CX" },
 	{ 0x10DE05FD, "Quadro FX 5800" },
 	{ 0x10DE05FE, "Quadro FX 4800" },
-  { 0x10DE0600, "GeForce 8800 GTS 512" },
+	{ 0x10DE0600, "GeForce 8800 GTS 512" },
 	{ 0x10DE0602, "GeForce 8800 GT" },
 	{ 0x10DE0604, "GeForce 9800 GX2" },
 	{ 0x10DE0605, "GeForce 9800 GT" },
Index: branches/azimutz/CleanCut/i386/libsaio/ati.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/ati.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/ati.c	(revision 321)
@@ -45,64 +45,64 @@
 
 extern uint32_t devices_number;
 
-const char *ati_compatible_0[]			= { "@0,compatible", "ATY,%s" };
-const char *ati_compatible_1[]			= { "@1,compatible", "ATY,%s" };
-const char *ati_device_type_0[]			= { "@0,device_type", "display" };
-const char *ati_device_type_1[]			= { "@1,device_type", "display" };
-const char *ati_device_type[]			= { "device_type", "ATY,%sParent" };
-const char *ati_name_0[]			= { "@0,name", "ATY,%s" };
-const char *ati_name_1[]			= { "@1,name", "ATY,%s" };
-const char *ati_name[]				= { "name", "ATY,%sParent" };
-const char *ati_efidisplay_0[]			= { "@0,ATY,EFIDisplay", "TMDSB" };
-struct ati_data_key ati_connector_type_0	= { 0x04, "@0,connector-type", {0x00, 0x04, 0x00, 0x00} };
-struct ati_data_key ati_connector_type_1	= { 0x04, "@1,connector-type", {0x04, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_display_con_fl_type_0	= { 0x04, "@0,display-connect-flags", {0x00, 0x00, 0x04, 0x00} };
-const char *ati_display_type_0[]		= { "@0,display-type", "LCD" };
-const char *ati_display_type_1[]		= { "@1,display-type", "NONE" };
-struct ati_data_key ati_aux_power_conn		= { 0x04, "AAPL,aux-power-connected", {0x01, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_backlight_ctrl		= { 0x04, "AAPL,backlight-control", {0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_aapl01_coher		= { 0x04, "AAPL01,Coherency", {0x01, 0x00, 0x00, 0x00} };
-const char *ati_card_no[]			= { "ATY,Card#", "109-B77101-00" };
-const char *ati_copyright[]			= { "ATY,Copyright", "Copyright AMD Inc. All Rights Reserved. 2005-2009" };
-const char *ati_efi_compile_d[]			= { "ATY,EFICompileDate", "Jan 26 2009" };
-struct ati_data_key ati_efi_disp_conf		= { 0x08, "ATY,EFIDispConfig", {0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01} };
-struct ati_data_key ati_efi_drv_type		= { 0x01, "ATY,EFIDriverType", {0x02} };
-struct ati_data_key ati_efi_enbl_mode		= { 0x01, "ATY,EFIEnabledMode", {0x01} };
-struct ati_data_key ati_efi_init_stat		= { 0x04, "ATY,EFIHWInitStatus", {0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_efi_orientation		= { 0x02, "ATY,EFIOrientation", {0x02, 0x00} };
-const char *ati_efi_version[]			= { "ATY,EFIVersion", "01.00.318" };
-const char *ati_efi_versionB[]			= { "ATY,EFIVersionB", "113-SBSJ1G04-00R-02" };
-const char *ati_efi_versionE[]			= { "ATY,EFIVersionE", "113-B7710A-318" };
-struct ati_data_key ati_mclk			= { 0x04, "ATY,MCLK", {0x70, 0x2e, 0x11, 0x00} };
-struct ati_data_key ati_mem_rev_id		= { 0x02, "ATY,MemRevisionID", {0x03, 0x00} };
-struct ati_data_key ati_mem_vend_id		= { 0x02, "ATY,MemVendorID", {0x02, 0x00} };
-const char *ati_mrt[]				= { "ATY,MRT", " " };
-const char *ati_romno[]				= { "ATY,Rom#", "113-B7710C-176" };
-struct ati_data_key ati_sclk			= { 0x04, "ATY,SCLK", {0x28, 0xdb, 0x0b, 0x00} };
-struct ati_data_key ati_vendor_id		= { 0x02, "ATY,VendorID", {0x02, 0x10} };
-struct ati_data_key ati_platform_info		= { 0x80, "ATY,PlatformInfo", {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_mvad			= { 0x40, "MVAD", {0x3f, 0x5c, 0x82, 0x02, 0xff, 0x90, 0x00, 0x54, 0x60, 0x00, 0xac, 0x10, 0xa0, 0x17, 0x00, 0x03, 0xb0, 0x68, 0x00, 0x0a, 0xa0, 0x0a, 0x30, 0x00, 0x20, 0x00, 0x40, 0x06, 0x6e, 0x06, 0x03, 0x00, 0x06, 0x00, 0x40, 0x06, 0x00, 0x0a, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x10, 0x06, 0x92, 0x20, 0x00, 0x03} };
-struct ati_data_key ati_saved_config		= { 0x100, "saved-config", {0x3f, 0x5c, 0x82, 0x02, 0xff, 0x90, 0x00, 0x54, 0x60, 0x00, 0xac, 0x10, 0xa0, 0x17, 0x00, 0x03, 0xb0, 0x68, 0x00, 0x0a, 0xa0, 0x0a, 0x30, 0x00, 0x20, 0x00, 0x40, 0x06, 0x6e, 0x06, 0x03, 0x00, 0x06, 0x00, 0x40, 0x06, 0x00, 0x0a, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x10, 0x06, 0x92, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xee, 0x02, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+const char *ati_compatible_0[]					 = { "@0,compatible", "ATY,%s" };
+const char *ati_compatible_1[]					 = { "@1,compatible", "ATY,%s" };
+const char *ati_device_type_0[]					 = { "@0,device_type", "display" };
+const char *ati_device_type_1[]					 = { "@1,device_type", "display" };
+const char *ati_device_type[]					 = { "device_type", "ATY,%sParent" };
+const char *ati_name_0[]						 = { "@0,name", "ATY,%s" };
+const char *ati_name_1[]						 = { "@1,name", "ATY,%s" };
+const char *ati_name[]							 = { "name", "ATY,%sParent" };
+const char *ati_efidisplay_0[]					 = { "@0,ATY,EFIDisplay", "TMDSB" };
+struct ati_data_key ati_connector_type_0		 = { 0x04, "@0,connector-type", {0x00, 0x04, 0x00, 0x00} };
+struct ati_data_key ati_connector_type_1		 = { 0x04, "@1,connector-type", {0x04, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_display_con_fl_type_0	 = { 0x04, "@0,display-connect-flags", {0x00, 0x00, 0x04, 0x00} };
+const char *ati_display_type_0[]				 = { "@0,display-type", "LCD" };
+const char *ati_display_type_1[]				 = { "@1,display-type", "NONE" };
+struct ati_data_key ati_aux_power_conn			 = { 0x04, "AAPL,aux-power-connected", {0x01, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_backlight_ctrl			 = { 0x04, "AAPL,backlight-control", {0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_aapl01_coher			 = { 0x04, "AAPL01,Coherency", {0x01, 0x00, 0x00, 0x00} };
+const char *ati_card_no[]						 = { "ATY,Card#", "109-B77101-00" };
+const char *ati_copyright[]						 = { "ATY,Copyright", "Copyright AMD Inc. All Rights Reserved. 2005-2009" };
+const char *ati_efi_compile_d[]					 = { "ATY,EFICompileDate", "Jan 26 2009" };
+struct ati_data_key ati_efi_disp_conf			 = { 0x08, "ATY,EFIDispConfig", {0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01} };
+struct ati_data_key ati_efi_drv_type			 = { 0x01, "ATY,EFIDriverType", {0x02} };
+struct ati_data_key ati_efi_enbl_mode			 = { 0x01, "ATY,EFIEnabledMode", {0x01} };
+struct ati_data_key ati_efi_init_stat			 = { 0x04, "ATY,EFIHWInitStatus", {0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_efi_orientation			 = { 0x02, "ATY,EFIOrientation", {0x02, 0x00} };
+const char *ati_efi_version[]					 = { "ATY,EFIVersion", "01.00.318" };
+const char *ati_efi_versionB[]					 = { "ATY,EFIVersionB", "113-SBSJ1G04-00R-02" };
+const char *ati_efi_versionE[]					 = { "ATY,EFIVersionE", "113-B7710A-318" };
+struct ati_data_key ati_mclk					 = { 0x04, "ATY,MCLK", {0x70, 0x2e, 0x11, 0x00} };
+struct ati_data_key ati_mem_rev_id				 = { 0x02, "ATY,MemRevisionID", {0x03, 0x00} };
+struct ati_data_key ati_mem_vend_id				 = { 0x02, "ATY,MemVendorID", {0x02, 0x00} };
+const char *ati_mrt[]							 = { "ATY,MRT", " " };
+const char *ati_romno[]							 = { "ATY,Rom#", "113-B7710C-176" };
+struct ati_data_key ati_sclk					 = { 0x04, "ATY,SCLK", {0x28, 0xdb, 0x0b, 0x00} };
+struct ati_data_key ati_vendor_id				 = { 0x02, "ATY,VendorID", {0x02, 0x10} };
+struct ati_data_key ati_platform_info			 = { 0x80, "ATY,PlatformInfo", {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_mvad					 = { 0x40, "MVAD", {0x3f, 0x5c, 0x82, 0x02, 0xff, 0x90, 0x00, 0x54, 0x60, 0x00, 0xac, 0x10, 0xa0, 0x17, 0x00, 0x03, 0xb0, 0x68, 0x00, 0x0a, 0xa0, 0x0a, 0x30, 0x00, 0x20, 0x00, 0x40, 0x06, 0x6e, 0x06, 0x03, 0x00, 0x06, 0x00, 0x40, 0x06, 0x00, 0x0a, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x10, 0x06, 0x92, 0x20, 0x00, 0x03} };
+struct ati_data_key ati_saved_config			 = { 0x100, "saved-config", {0x3f, 0x5c, 0x82, 0x02, 0xff, 0x90, 0x00, 0x54, 0x60, 0x00, 0xac, 0x10, 0xa0, 0x17, 0x00, 0x03, 0xb0, 0x68, 0x00, 0x0a, 0xa0, 0x0a, 0x30, 0x00, 0x20, 0x00, 0x40, 0x06, 0x6e, 0x06, 0x03, 0x00, 0x06, 0x00, 0x40, 0x06, 0x00, 0x0a, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x10, 0x06, 0x92, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xee, 0x02, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
 ///non 48xx keys
-const char *ati_efidisplay_0_n4[]		= { "@0,ATY,EFIDisplay", "TMDSA" };
-struct ati_data_key ati_connector_type_0_n4	= { 0x04, "@0,connector-type", {0x04, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_connector_type_1_n4	= { 0x04, "@1,connector-type", {0x00, 0x02, 0x00, 0x00} };
-struct ati_data_key ati_aapl_emc_disp_list_n4	= { 0x40, "AAPL,EMC-Display-List", {0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x1b, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x1c, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_fb_offset_n4		= { 0x08, "ATY,FrameBufferOffset", {0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_hwgpio_n4		= { 0x04, "ATY,HWGPIO", {0x23, 0xa8, 0x48, 0x00} };
-struct ati_data_key ati_iospace_offset_n4	= { 0x08, "ATY,IOSpaceOffset", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00} };
-struct ati_data_key ati_mclk_n4			= { 0x04, "ATY,MCLK", {0x00, 0x35, 0x0c, 0x00} };
-struct ati_data_key ati_sclk_n4			= { 0x04, "ATY,SCLK", {0x60, 0xae, 0x0a, 0x00} };
-struct ati_data_key ati_refclk_n4		= { 0x04, "ATY,RefCLK", {0x8c, 0x0a, 0x00, 0x00} };
-struct ati_data_key ati_regspace_offset_n4	= { 0x08, "ATY,RegisterSpaceOffset", {0x00, 0x00, 0x00, 0x00, 0x90, 0xa2, 0x00, 0x00} };
-struct ati_data_key ati_vram_memsize_0		= { 0x08, "@0,VRAM,memsize", {0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_vram_memsize_1		= { 0x08, "@1,VRAM,memsize", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_aapl_blackscr_prefs_0_n4= { 0x04, "AAPL00,blackscreen-preferences", {0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_aapl_blackscr_prefs_1_n4= { 0x04, "AAPL01,blackscreen-preferences", {0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_swgpio_info_n4		= { 0x04, "ATY,SWGPIO Info", {0x00, 0x48, 0xa8, 0x23} };
-struct ati_data_key ati_efi_orientation_n4	= { 0x01, "ATY,EFIOrientation", {0x08} };
-struct ati_data_key ati_mvad_n4			= { 0x100, "MVAD", {0x3e, 0x5c, 0x82, 0x00, 0xff, 0x90, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x3c, 0x80, 0x07, 0x20, 0x08, 0x30, 0x00, 0x20, 0x00, 0xb0, 0x04, 0xd3, 0x04, 0x03, 0x00, 0x06, 0x00, 0xb0, 0x04, 0x80, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x90, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
-struct ati_data_key ati_saved_config_n4		= { 0x100, "saved-config", {0x3e, 0x5c, 0x82, 0x00, 0xff, 0x90, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x3c, 0x80, 0x07, 0x20, 0x08, 0x30, 0x00, 0x20, 0x00, 0xb0, 0x04, 0xd3, 0x04, 0x03, 0x00, 0x06, 0x00, 0xb0, 0x04, 0x80, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x90, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+const char *ati_efidisplay_0_n4[]				 = { "@0,ATY,EFIDisplay", "TMDSA" };
+struct ati_data_key ati_connector_type_0_n4		 = { 0x04, "@0,connector-type", {0x04, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_connector_type_1_n4		 = { 0x04, "@1,connector-type", {0x00, 0x02, 0x00, 0x00} };
+struct ati_data_key ati_aapl_emc_disp_list_n4	 = { 0x40, "AAPL,EMC-Display-List", {0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x1b, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x1c, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_fb_offset_n4			 = { 0x08, "ATY,FrameBufferOffset", {0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_hwgpio_n4				 = { 0x04, "ATY,HWGPIO", {0x23, 0xa8, 0x48, 0x00} };
+struct ati_data_key ati_iospace_offset_n4		 = { 0x08, "ATY,IOSpaceOffset", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00} };
+struct ati_data_key ati_mclk_n4					 = { 0x04, "ATY,MCLK", {0x00, 0x35, 0x0c, 0x00} };
+struct ati_data_key ati_sclk_n4					 = { 0x04, "ATY,SCLK", {0x60, 0xae, 0x0a, 0x00} };
+struct ati_data_key ati_refclk_n4				 = { 0x04, "ATY,RefCLK", {0x8c, 0x0a, 0x00, 0x00} };
+struct ati_data_key ati_regspace_offset_n4		 = { 0x08, "ATY,RegisterSpaceOffset", {0x00, 0x00, 0x00, 0x00, 0x90, 0xa2, 0x00, 0x00} };
+struct ati_data_key ati_vram_memsize_0			 = { 0x08, "@0,VRAM,memsize", {0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_vram_memsize_1			 = { 0x08, "@1,VRAM,memsize", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_aapl_blackscr_prefs_0_n4 = { 0x04, "AAPL00,blackscreen-preferences", {0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_aapl_blackscr_prefs_1_n4 = { 0x04, "AAPL01,blackscreen-preferences", {0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_swgpio_info_n4			 = { 0x04, "ATY,SWGPIO Info", {0x00, 0x48, 0xa8, 0x23} };
+struct ati_data_key ati_efi_orientation_n4		 = { 0x01, "ATY,EFIOrientation", {0x08} };
+struct ati_data_key ati_mvad_n4					 = { 0x100, "MVAD", {0x3e, 0x5c, 0x82, 0x00, 0xff, 0x90, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x3c, 0x80, 0x07, 0x20, 0x08, 0x30, 0x00, 0x20, 0x00, 0xb0, 0x04, 0xd3, 0x04, 0x03, 0x00, 0x06, 0x00, 0xb0, 0x04, 0x80, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x90, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+struct ati_data_key ati_saved_config_n4			 = { 0x100, "saved-config", {0x3e, 0x5c, 0x82, 0x00, 0xff, 0x90, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x3c, 0x80, 0x07, 0x20, 0x08, 0x30, 0x00, 0x20, 0x00, 0xb0, 0x04, 0xd3, 0x04, 0x03, 0x00, 0x06, 0x00, 0xb0, 0x04, 0x80, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x90, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x31, 0x30, 0x50, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x32, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
 
 struct pcir_s {
 	uint32_t signature;
@@ -156,8 +156,6 @@
 	{ 0x1002945A,  "ATI Radeon 4800 Mobility Series"}  ,
 	{ 0x1002945B,  "ATI Radeon 4800 Mobility Series"}  ,
 	{ 0x1002944B,  "ATI Radeon 4800 Mobility Series"}  ,
-        { 0x10029490,  "ATI Radeon 4670 Series"}  ,
-        { 0x10029498,  "ATI Radeon 4650 Series"}  ,
 	{ 0x10029490,  "ATI Radeon 4600 Series"}  ,
 	{ 0x10029498,  "ATI Radeon 4600 Series"}  ,
 	{ 0x1002949E,  "ATI Radeon 4600 Series"}  ,
@@ -169,16 +167,16 @@
 	{ 0x10029552,  "ATI Radeon 4300 Mobility Series"}  ,
 	{ 0x10029553,  "ATI Radeon 4500 Mobility Series"}  ,
 	{ 0x1002954F,  "ATI Radeon 4300 Series"} ,
-        { 0x100294B3,  "ATI Radeon 4770 Series"} ,
-        { 0x100294B5,  "ATI Radeon 4770 Series"} ,
-        { 0x100268B8,  "ATI Radeon 5700 Series"} ,
-        { 0x100268BE,  "ATI Radeon 5700 Series"} ,
-        { 0x10026898,  "ATI Radeon 5800 Series"} ,
-        { 0x10026899,  "ATI Radeon 5800 Series"}
+    { 0x100294B3,  "ATI Radeon 4770 Series"} ,
+    { 0x100294B5,  "ATI Radeon 4770 Series"} ,
+    { 0x100268B8,  "ATI Radeon 5700 Series"} ,
+    { 0x100268BE,  "ATI Radeon 5700 Series"} ,
+    { 0x10026898,  "ATI Radeon 5800 Series"} ,
+    { 0x10026899,  "ATI Radeon 5800 Series"}
 };
 
 static struct ati_chipsets_t ATIKnownFramebuffers[] = {
-	{ 0x00000000, "Megalodon" },
+	{ 0x00000000,  "Megalodon" },
 	{ 0x10029589,  "Lamna"}  ,
 	{ 0x10029588,  "Lamna"}  ,
 	{ 0x100294C3,  "Iago"}  ,
@@ -222,23 +220,23 @@
 	{ 0x1002945A,  "Motmot"}  ,
 	{ 0x1002945B,  "Motmot"}  ,
 	{ 0x1002944B,  "Motmot"}  ,
-        { 0x10029490,  "Peregrine"}  ,
-        { 0x10029498,  "Peregrine"}  ,
-        { 0x1002949E,  "Peregrine"}  ,
-        { 0x10029480,  "Peregrine"}  ,
-        { 0x10029488,  "Peregrine"}  ,
-        { 0x10029540,  "Peregrine"}  ,
-        { 0x10029541,  "Peregrine"}  ,
-        { 0x1002954E,  "Peregrine"}  ,
-        { 0x10029552,  "Peregrine"}  ,
-        { 0x10029553,  "Peregrine"}  ,
-        { 0x1002954F,  "Peregrine"}  ,
-        { 0x100294B3,  "Peregrine"},
-        { 0x100294B5,  "Peregrine"},
-        { 0x100268B8,  "Motmot"},
-        { 0x100268BE,  "Motmot"},
-        { 0x10026898,  "Motmot"},
-        { 0x10026899,  "Motmot"}
+    { 0x10029490,  "Peregrine"}  ,
+    { 0x10029498,  "Peregrine"}  ,
+    { 0x1002949E,  "Peregrine"}  ,
+    { 0x10029480,  "Peregrine"}  ,
+    { 0x10029488,  "Peregrine"}  ,
+    { 0x10029540,  "Peregrine"}  ,
+    { 0x10029541,  "Peregrine"}  ,
+    { 0x1002954E,  "Peregrine"}  ,
+    { 0x10029552,  "Peregrine"}  ,
+    { 0x10029553,  "Peregrine"}  ,
+    { 0x1002954F,  "Peregrine"}  ,
+    { 0x100294B3,  "Peregrine"},
+    { 0x100294B5,  "Peregrine"},
+    { 0x100268B8,  "Motmot"},
+    { 0x100268BE,  "Motmot"},
+    { 0x10026898,  "Motmot"},
+    { 0x10026899,  "Motmot"}
 };
 
 static uint32_t accessROM(pci_dt_t *ati_dev, unsigned int mode)
@@ -730,7 +728,7 @@
 			bios = NULL;	// try to dump from legacy space, otherwise can result in 100% fan speed
 		} else {
 			// readAtomBios result in bug on some cards (100% fan speed and black screen),
-			// not using it for posted card, rading from legacy space instead
+			// not using it for posted card, reading from legacy space instead
 			bios = readAtomBIOS(ati_dev);
 		}
 	} else {
Index: branches/azimutz/CleanCut/i386/libsaio/platform.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/platform.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/platform.c	(revision 321)
@@ -56,7 +56,7 @@
     done = true;
 }
 
-/** 
+/**
     Scan platform hardware information, called by the main entry point (common_boot() ) 
     _before_ bootConfig xml parsing settings are loaded
 */
Index: branches/azimutz/CleanCut/i386/libsaio/disk.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/disk.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/disk.c	(revision 321)
@@ -629,17 +629,21 @@
 
 //==========================================================================
 
-// HFS+ GUID in LE form
-EFI_GUID const GPT_HFS_GUID	= { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
-// turbo - also our booter partition
-EFI_GUID const GPT_BOOT_GUID	= { 0x426F6F74, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
-// turbo - or an efi system partition
-EFI_GUID const GPT_EFISYS_GUID	= { 0xC12A7328, 0xF81F, 0x11D2, { 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } };
-// zef - basic data partition EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 for foreign OS support
-EFI_GUID const GPT_BASICDATA_GUID = { 0xEBD0A0A2, 0xB9E5, 0x4433, { 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7 } };
+// HFS+ GUID in LE form - Hierarchical File System (HFS+) partition - 48465300-0000-11AA-AA11-00306543ECAC
+EFI_GUID const GPT_HFS_GUID		   = { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
+
+// turbo - Apple Boot partition - 426F6F74-0000-11AA-AA11-00306543ECAC
+EFI_GUID const GPT_BOOT_GUID	   = { 0x426F6F74, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
+
+// turbo - or an EFI System partition - C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+EFI_GUID const GPT_EFISYS_GUID	   = { 0xC12A7328, 0xF81F, 0x11D2, { 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } };
+
+// zef - Basic Data partition - EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 for foreign OS support
+EFI_GUID const GPT_BASICDATA_GUID  = { 0xEBD0A0A2, 0xB9E5, 0x4433, { 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7 } };
+
+// Microsoft Reserved Partition E3C9E316-0B5C-4DB8-817DF92DF00215AE
 EFI_GUID const GPT_BASICDATA2_GUID = { 0xE3C9E316, 0x0B5C, 0x4DB8, { 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } };
 
-
 BVRef newGPTBVRef( int biosdev, int partno, unsigned int blkoff,
                    const gpt_ent * part,
                    FSInit initFunc, FSLoadFile loadFunc,
@@ -1282,7 +1286,7 @@
                                       kBIOSDevTypeHardDrive, bvrFlags);
             }
 
-						// zef - foreign OS support
+			// zef - foreign OS support
             if ( (efi_guid_compare(&GPT_BASICDATA_GUID, (EFI_GUID const*)gptMap->ent_type) == 0) ||
                  (efi_guid_compare(&GPT_BASICDATA2_GUID, (EFI_GUID const*)gptMap->ent_type) == 0) )
             {
@@ -1679,7 +1683,7 @@
 
 //==========================================================================
 
-/* If Rename Partition has defined an alias, then extract it  for description purpose */
+/* If Rename Partition has defined an alias, then extract it for description purpose */
 static const char * getVolumeLabelAlias( BVRef bvr, const char * str, long strMaxLen)
 {
   const int MAX_ALIAS_SIZE=31;
@@ -1693,7 +1697,7 @@
   if(!p || !(*p)) return 0; // this volume must not be renamed, or option is malformed
 
   p+= strlen(str); // skip the "hd(n,m) " field
-  // multiple aliases can be found separated by a semi-column
+  // multiple aliases can be found separated by a semicolon
   while(*p && *p != ';' && q<(szAlias+MAX_ALIAS_SIZE)) *q++=*p++;
   *q='\0';
 
Index: branches/azimutz/CleanCut/i386/libsaio/cpu.h
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/cpu.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/cpu.h	(revision 321)
@@ -22,7 +22,7 @@
 #define K8_FIDVID_STATUS		0xC0010042
 #define K10_COFVID_STATUS		0xC0010071
 
-#define DEFAULT_FSB		100000          /* for now, hardcoding 100MHz for old CPUs */
+//#define DEFAULT_FSB		100000          // for now, hardcoding 100MHz for old CPUs - disabled
 
 // DFE: This constant comes from older xnu:
 #define CLKNUM			1193182		/* formerly 1193167 */
Index: branches/azimutz/CleanCut/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/stringTable.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/stringTable.c	(revision 321)
@@ -582,7 +582,7 @@
  * Returns 0 - successful.
  *		  -1 - unsuccesful.
  */
-int loadConfigFile (const char *configFile, config_file_t *config)
+int loadConfigFile(const char *configFile, config_file_t *config)
 {
 	int fd, count;
 
@@ -700,7 +700,7 @@
 			
 			// build xml dictionary
 			ParseXMLFile(config->plist, &config->dictionary);
-			sysConfigValid = true;	
+			sysConfigValid = true;
 			ret=0;
 			break;
 		}
Index: branches/azimutz/CleanCut/i386/libsaio/saio_types.h
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/saio_types.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/libsaio/saio_types.h	(revision 321)
@@ -64,7 +64,7 @@
 typedef struct {
 	char	plist[4096];	// buffer for plist
 	TagPtr	dictionary;		// buffer for xml dictionary
-	bool  canOverride;  // flag to mark a dictionary can be overriden
+	bool	canOverride;	// flag to mark a dictionary can be overriden
 } config_file_t;
 
 /*
@@ -184,20 +184,20 @@
     char             type_name[BVSTRLEN]; /* (type of partition, eg. Apple_HFS) */
     BVFree           bv_free;         /* BVFree function */
     uint32_t         modTime;
-    char			       label[BVSTRLEN]; /* partition volume label */
-    char			       altlabel[BVSTRLEN]; /* partition volume label */
+    char			 label[BVSTRLEN]; /* partition volume label */
+    char			 altlabel[BVSTRLEN]; /* partition volume label */
     bool             filtered;        /* newFilteredBVChain() will set to TRUE */
     bool             visible;         /* will shown in the device list */
 };
 
 enum {
-  kBVFlagPrimary          = 0x01,
-  kBVFlagNativeBoot       = 0x02,
-  kBVFlagForeignBoot      = 0x04,
-  kBVFlagBootable         = 0x08,
-  kBVFlagEFISystem        = 0x10,
-  kBVFlagBooter           = 0x20,
-  kBVFlagSystemVolume     = 0x40
+	kBVFlagPrimary          = 0x01,
+	kBVFlagNativeBoot       = 0x02,
+	kBVFlagForeignBoot      = 0x04,
+	kBVFlagBootable         = 0x08,
+	kBVFlagEFISystem        = 0x10,
+	kBVFlagBooter           = 0x20,
+	kBVFlagSystemVolume     = 0x40
 };
 
 enum {
@@ -210,12 +210,11 @@
 };
 
 enum {
-	
 	kPartitionTypeHFS	  = 0xAF,
 	kPartitionTypeHPFS    = 0x07,
 	kPartitionTypeFAT16   = 0x06,
 	kPartitionTypeFAT32   = 0x0c,
-	kPartitionTypeEXT3    = 0x83,
+	kPartitionTypeEXT3    = 0x83
 };
 
 //#define BIOS_DEV_TYPE(d)  ((d) & kBIOSDevTypeMask)
Index: branches/azimutz/CleanCut/i386/boot0/boot0.s
===================================================================
--- branches/azimutz/CleanCut/i386/boot0/boot0.s	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot0/boot0.s	(revision 321)
@@ -315,33 +315,33 @@
 .Pass1:
 %ifdef HFSFIRST
     cmp	    BYTE [si + part.type], kPartTypeHFS		; In pass 1 we're going to find a HFS+ partition
-                                                  ; equipped with boot1h in its boot record
-                                                  ; regardless if it's active or not.
+                                                    ; equipped with boot1h in its boot record
+                                                    ; regardless if it's active or not.
     jne     .continue
-  	mov		  dh, 1                									; Argument for loadBootSector to check HFS+ partition signature.
+  	mov		dh, 1                					; Argument for loadBootSector to check HFS+ partition signature.
 %else
     cmp     BYTE [si + part.bootid], kPartActive	; In pass 1 we are walking on the standard path
-                                                  ; by trying to hop on the active partition.
+                                                    ; by trying to hop on the active partition.
     jne     .continue
-    xor	  	dh, dh               									; Argument for loadBootSector to skip HFS+ partition
-											                        		; signature check.
+    xor	  	dh, dh               					; Argument for loadBootSector to skip HFS+ partition
+											        ; signature check.
 %endif
 
-    jmp    .tryToBoot
+    jmp     .tryToBoot
 
 .Pass2:    
 %ifdef HFSFIRST
     cmp     BYTE [si + part.bootid], kPartActive	; In pass 2 we are walking on the standard path
-                                                  ; by trying to hop on the active partition.
+                                                    ; by trying to hop on the active partition.
     jne     .continue
-    xor		  dh, dh               									; Argument for loadBootSector to skip HFS+ partition
-											                        		; signature check.
+    xor		dh, dh               					; Argument for loadBootSector to skip HFS+ partition
+											        ; signature check.
 %else
     cmp	    BYTE [si + part.type], kPartTypeHFS		; In pass 2 we're going to find a HFS+ partition
-                                                  ; equipped with boot1h in its boot record
-                                                  ; regardless if it's active or not.
+                                                    ; equipped with boot1h in its boot record
+                                                    ; regardless if it's active or not.
     jne     .continue
-  	mov 		dh, 1                									; Argument for loadBootSector to check HFS+ partition signature.
+  	mov 	dh, 1                					; Argument for loadBootSector to check HFS+ partition signature.
 %endif
 
     DebugChar('*')
Index: branches/azimutz/CleanCut/i386/boot2/boot.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/boot.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/boot.c	(revision 321)
@@ -63,7 +63,7 @@
 bool gOverrideKernel;
 static char gBootKernelCacheFile[512];
 static char gCacheNameAdler[64 + 256];
-char *gPlatformName = gCacheNameAdler;
+//char *gPlatformName = gCacheNameAdler; disabled
 char gRootDevice[512];
 char gMKextName[512];
 char gMacOSVersion[8];
@@ -177,6 +177,9 @@
     }
 
     bool dummyVal;
+
+	//Azi: Wait=y is breaking other keys when typed "after them" at boot prompt.
+	// Works properly if typed in first place or used on Boot.plist.
 	if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) {
 		printf("Press any key to continue...");
 		getc();
@@ -276,7 +279,7 @@
     }
 
     // Override firstRun to get to the boot menu instantly by setting "Instant Menu"=y in system config
-    if (getBoolForKey(kInsantMenuKey, &instantMenu, &bootInfo->bootConfig) && instantMenu) {
+    if (getBoolForKey(kInstantMenuKey, &instantMenu, &bootInfo->bootConfig) && instantMenu) {
         firstRun = false;
     }
 
Index: branches/azimutz/CleanCut/i386/boot2/boot.h
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 321)
@@ -32,77 +32,80 @@
 #include "libsaio.h"
 
 /*
+ * Default names
+ */
+#define kDefaultKernel		"mach_kernel"
+
+/*
  * Keys used in system Boot.plist
  */
-#define kGraphicsModeKey	"Graphics Mode"
-#define kTextModeKey		"Text Mode"
-#define kQuietBootKey		"Quiet Boot"
-#define kKernelFlagsKey		"Kernel Flags"
-#define kMKextCacheKey		"MKext Cache"
-#define kKernelNameKey		"Kernel"
-#define kKernelCacheKey		"Kernel Cache"
-#define kBootDeviceKey		"Boot Device"
-#define kTimeoutKey			"Timeout"
-#define kRootDeviceKey		"rd"
-#define kBootUUIDKey		"boot-uuid"
-#define kHelperRootUUIDKey	"Root UUID"
-#define kPlatformKey		"platform"
-#define kACPIKey			"acpi"
-#define kCDROMPromptKey		"CD-ROM Prompt"
-#define kCDROMOptionKey		"CD-ROM Option Key"
-#define kRescanPromptKey	"Rescan Prompt"
-#define kRescanKey		    "Rescan"
-#define kScanSingleDriveKey	"Scan Single Drive"
-#define kInsantMenuKey		"Instant Menu"
-#define kDefaultKernel		"mach_kernel"
-#define kGUIKey				"GUI"
-#define kBootBannerKey		"Boot Banner"
-#define kWaitForKeypressKey	"Wait"
+#define kGraphicsModeKey	"Graphics Mode"		// graphics.c
+#define kTextModeKey		"Text Mode"			// graphics.c
+#define kQuietBootKey		"Quiet Boot"		// boot.c
+#define kKernelFlagsKey		"Kernel Flags"		// options.c
+#define kMKextCacheKey		"MKext Cache"		// options.c
+#define kKernelNameKey		"Kernel"			// options.c
+#define kKernelCacheKey		"Kernel Cache"		// boot.c
+#define kBootDeviceKey		"Boot Device"		// options.c
+#define kTimeoutKey			"Timeout"			// options.c
+#define kRootDeviceKey		"rd"				// options.c
+#define kBootUUIDKey		"boot-uuid"			// options.c
+#define kHelperRootUUIDKey	"Root UUID"			// options.c
+//#define kPlatformKey		"platform"			// options.c, removed
+//#define kACPIKey			"acpi"				gone
+#define kCDROMPromptKey		"CD-ROM Prompt"		// options.c
+#define kCDROMOptionKey		"CD-ROM Option Key"	// options.c
+#define kRescanPromptKey	"Rescan Prompt"		// boot.c
+#define kRescanKey		    "Rescan"			// boot.c
+#define kScanSingleDriveKey	"Scan Single Drive"	// boot.c
+#define kInstantMenuKey		"Instant Menu"		// boot.c
+#define kGUIKey				"GUI"				// boot.c
+#define kBootBannerKey		"Boot Banner"		// options.c
+#define kWaitForKeypressKey	"Wait"				// boot.c
 /* AsereBLN: added the other keys */
-#define kUseAtiROM			"UseAtiROM"			/* ati.c */
-#define kWake				"Wake"				/* boot.c */
-#define kForceWake			"ForceWake"			/* boot.c */
-#define kWakeImage			"WakeImage"			/* boot.c */
-#define kProductVersion		"ProductVersion"	/* boot.c */
-#define karch				"arch"				/* boot.c */
-#define kDSDT				"DSDT"				/* acpi_patcher.c */
-#define kDropSSDT			"DropSSDT"			/* acpi_patcher.c */
-#define kRestartFix			"RestartFix"		/* acpi_patcher.c */
-#define kRestartFix			"RestartFix"        /* acpi_patcher.c */
-#define kGeneratePStates	"GeneratePStates"	/* acpi_patcher.c */
-#define kGenerateCStates	"GenerateCStates"	/* acpi_patcher.c */
-#define kEnableC4States		"EnableC4State"		/* acpi_patcher.c */
-#define kDeviceProperties	"device-properties"	/* device_inject.c */
-#define kHidePartition		"Hide Partition"	/* disk.c */
-#define kRenamePartition	"Rename Partition"	/* disk.c */
-#define kSMBIOS				"SMBIOS"			/* fake_efi.c */
-#define kSystemID			"SystemId"			/* fake_efi.c */
-#define kSystemType			"SystemType"		/* fake_efi.c */
-#define kUseNvidiaROM		"UseNvidiaROM"		/* nvidia.c */
-#define kVBIOS				"VBIOS"				/* nvidia.c */
-#define kPCIRootUID			"PCIRootUID"		/* pci_root.c */
-#define kEthernetBuiltIn	"EthernetBuiltIn"	/* pci_setup.c */
-#define kGraphicsEnabler	"GraphicsEnabler"	/* pci_setup.c */
-#define kForceHPET			"ForceHPET"			/* pci_setup.c */
-#define kUseMemDetect		"UseMemDetect"	    /* platform.c */
-#define kSMBIOSdefaults		"SMBIOSdefaults"	/* smbios_patcher.c */
-#define kUSBBusFix			"USBBusFix"			/* usb.c */
-#define kEHCIacquire		"EHCIacquire"		/* usb.c */
-#define kUHCIreset			"UHCIreset"			/* usb.c */
-#define kLegacyOff			"USBLegacyOff"		/* usb.c */
-#define kEHCIhard			"EHCIhard"			/* usb.c */
-#define kDefaultPartition	"Default Partition"	/* sys.c */
-#define kMD0Image			"md0"				/* ramdisk.h */
+#define kUseAtiROM			"UseAtiROM"			// ati.c
+#define kWake				"Wake"				// boot.c
+#define kForceWake			"ForceWake"			// boot.c
+#define kWakeImage			"WakeImage"			// boot.c
+#define kProductVersion		"ProductVersion"	// boot.c
+#define karch				"arch"				// boot.c
+#define kDSDT				"DSDT"				// acpi_patcher.c
+#define kDropSSDT			"DropSSDT"			// acpi_patcher.c
+#define kRestartFix			"RestartFix"        // acpi_patcher.c
+#define kGeneratePStates	"GeneratePStates"	// acpi_patcher.c
+#define kGenerateCStates	"GenerateCStates"	// acpi_patcher.c
+#define kEnableC4States		"EnableC4State"		// acpi_patcher.c
+#define kDeviceProperties	"device-properties"	// device_inject.c
+#define kHidePartition		"Hide Partition"	// disk.c
+#define kRenamePartition	"Rename Partition"	// disk.c
+#define kSMBIOS				"SMBIOS"			// fake_efi.c
+#define kSystemID			"SystemId"			// fake_efi.c
+#define kSystemType			"SystemType"		// fake_efi.c
+#define kUseNvidiaROM		"UseNvidiaROM"		// nvidia.c
+#define kVBIOS				"VBIOS"				// nvidia.c
+#define kPCIRootUID			"PCIRootUID"		// pci_root.c
+#define kEthernetBuiltIn	"EthernetBuiltIn"	// pci_setup.c
+#define kGraphicsEnabler	"GraphicsEnabler"	// pci_setup.c
+#define kForceHPET			"ForceHPET"			// pci_setup.c
+#define kUseMemDetect		"UseMemDetect"	    // platform.c
+#define kSMBIOSdefaults		"SMBIOSdefaults"	// smbios_patcher.c
+#define kUSBBusFix			"USBBusFix"			// usb.c
+#define kEHCIacquire		"EHCIacquire"		// usb.c
+#define kUHCIreset			"UHCIreset"			// usb.c
+#define kLegacyOff			"USBLegacyOff"		// usb.c
+#define kEHCIhard			"EHCIhard"			// usb.c
+#define kDefaultPartition	"Default Partition"	// sys.c
+#define kMD0Image			"md0"				// ramdisk.h
 
 /*
  * Flags to the booter or kernel
  */
-#define kVerboseModeFlag	"-v"
-#define kSafeModeFlag		"-x"
-#define kOldSafeModeFlag	"-f"
-#define kIgnoreBootFileFlag	"-F"
-#define kSingleUserModeFlag	"-s"
-#define k32BitModeFlag		"-x32"
+#define kVerboseModeFlag	"-v"				// options.c
+#define kSafeModeFlag		"-x"				// options.c
+#define kOldSafeModeFlag	"-f"				// options.c
+#define kIgnoreBootFileFlag	"-F"				// options.c
+#define kSingleUserModeFlag	"-s"				// options.c
+#define k32BitModeFlag		"-x32"				// boot.c
 
 /*
  * Booter behavior control
@@ -120,7 +123,7 @@
 extern char bootBanner[];
 extern char bootPrompt[];
 extern bool gOverrideKernel;
-extern char *gPlatformName;
+//extern char *gPlatformName; disabled
 extern char gMKextName[];
 extern char gRootDevice[];
 extern bool gEnableCDROMRescan;
Index: branches/azimutz/CleanCut/i386/boot2/gui.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/gui.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/gui.c	(revision 321)
@@ -168,7 +168,8 @@
 
 static bool infoMenuNativeBoot = false;
 
-static unsigned long screen_params[4] = {DEFAULT_SCREEN_WIDTH, DEFAULT_SCREEN_HEIGHT, 32, 0};	// here we store the used screen resolution
+// here we store the used screen resolution
+static unsigned long screen_params[4] = {DEFAULT_SCREEN_WIDTH, DEFAULT_SCREEN_HEIGHT, 32, 0};
 
 static int getImageIndexByName(const char *name)
 {
@@ -189,8 +190,8 @@
 	int compareIndex = (upperLimit - lowerLimit) >> 1; // Midpoint
 	int result;
 	
-	// NOTE: This algorithm assumes that the embeddedImages is sorted.
-	// This is currently done using the make file. If the array is every 
+	// NOTE: This algorithm assumes that the embedded images are sorted.
+	// This is currently done using the make file. If the array is ever
 	// manualy generated, this *will* fail to work properly.
 	while((result = strcmp(name, embeddedImages[compareIndex].name)) != 0)
 	{
@@ -1796,7 +1797,7 @@
 		loadBootGraphics();
 	}
 
-	// parse screen size parameters
+	// parse display size parameters - Azi: shouldn't this stuff be like the one on initGUI? no "else"
 	if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0) {
 		screen_params[0] = pos;
 	} else {
Index: branches/azimutz/CleanCut/i386/boot2/mboot.h
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/mboot.h	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/mboot.h	(revision 321)
@@ -1,4 +1,5 @@
 /* File added by David F. Elliott <dfe@cox.net> on 2007/06/27 */
+
 #include "multiboot.h"
 
 /*
Index: branches/azimutz/CleanCut/i386/boot2/ramdisk.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/ramdisk.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/ramdisk.c	(revision 321)
@@ -16,7 +16,7 @@
 bool gRAMDiskBTAliased = false;
 char gRAMDiskFile[512];
 
-// Notify OS X that a ramdisk has been setup. XNU with attach this to /dev/md0
+// Notify OS X that a ramdisk has been setup. XNU will attach this to /dev/md0
 void md0Ramdisk()
 {
 	RAMDiskParam ramdiskPtr;
Index: branches/azimutz/CleanCut/i386/boot2/options.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/options.c	(revision 320)
+++ branches/azimutz/CleanCut/i386/boot2/options.c	(revision 321)
@@ -1171,12 +1171,12 @@
       return -1;
 
     // Load config table specified by the user, or use the default.
+	//Azi: not working.
+    //if (!getValueForBootKey(cp, "config", &val, &cnt)) {
+    //  val = 0;
+    //  cnt = 0;
+    //}
 
-    if (!getValueForBootKey(cp, "config", &val, &cnt)) {
-      val = 0;
-      cnt = 0;
-    }
-
     // Load com.apple.Boot.plist from the selected volume
     // and use its contents to override default bootConfig.
     // This is not a mandatory opeartion anymore.
Index: branches/azimutz/CleanCut/i386/doc/README
===================================================================
--- branches/azimutz/CleanCut/i386/doc/README	(revision 320)
+++ branches/azimutz/CleanCut/i386/doc/README	(revision 321)
@@ -20,7 +20,7 @@
 	
 	For DOS compatibility reason, one extra stage of boot is required if
 	the boot device is a hard disk.  The first sector of the hard disk will
-	contain the MOS-DOS boot code and a boot record partition table.
+	contain the MS-DOS boot code and a boot record partition table.
 	When this sector is loaded into 0000:7C00H, it will relocate itself
 	to somewhere else and then load the first sector of the active
 	partition into 0000:7C00H.  Both UNIX and DOS use the command "fdisk"
@@ -51,7 +51,7 @@
 	stage bootstrap loader "boot2()".  In order to be able to load the
 	big kernel image (bigger than 512K or 640K, depends on the memory
 	configuration), the second stage boot loader will run on the protected
-	mode.  This bootstarp loader does not have any stand alone device
+	mode.  This bootstrap loader does not have any stand alone device
 	drivers, all the I/O's are through the BIOS calls.  Since the first
 	stage boot code will no longer be used at this moment, the memory
 	location of the first stage boot code (0000:1000H to 0000:1200H) will
@@ -62,10 +62,10 @@
 	and boot data segments must not be greater than 64K.
 	
 	The boot loader loads the kernel image at memory location above 1 MB
-	to skip the memory hole between 521K/640K and 1MB.  After the kernel
+	to skip the memory hole between 512K/640K and 1MB.  After the kernel
 	is loaded, the boot loader stores the information in the stack and
 	then passes control to kernel.  Currently, the three information passed
-	fromm the boot loader to the kernel are type of the boot device, size
+	from the boot loader to the kernel are type of the boot device, size
 	of the base memory and size of the extended memory.
 
 
@@ -76,7 +76,7 @@
 	1MB, the kernel has to start as protected mode.  In addition, the
 	link editor description file (vuifile) has to indicate that
 	the text and data segments start above 1MB.  Also, the boot loader
-	passes the infomation to the kernel through the stack.
+	passes the information to the kernel through the stack.
 
 
 5. Disk Layout and Bad Block Handling

Property changes on: branches/azimutz/CleanCut
___________________________________________________________________
Added: svn:ignore
   + obj
sym
revision



Property changes on: branches/azimutz
___________________________________________________________________
Modified: svn:ignore
   - obj
sym

   +