Index: branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c	(revision 2458)
+++ branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c	(revision 2459)
@@ -211,7 +211,7 @@
 
 struct acpi_2_ssdt *generate_cst_ssdt(struct acpi_2_fadt* fadt)
 {
-	static char ssdt_header[] = // cst_ssdt_header
+	static char const ssdt_header[] = // cst_ssdt_header
 	{
 		0x53, 0x53, 0x44, 0x54, 0xE7, 0x00, 0x00, 0x00, /* SSDT.... */
 		0x01, 0x17, 0x50, 0x6D, 0x52, 0x65, 0x66, 0x41, /* ..PmRefA */
@@ -414,7 +414,7 @@
 
 struct acpi_2_ssdt *generate_pss_ssdt(struct acpi_2_dsdt* dsdt)
 {
-	static char ssdt_header[] = // pss_ssdt_header
+	static char const ssdt_header[] = // pss_ssdt_header
 	{
 		0x53, 0x53, 0x44, 0x54, 0x7E, 0x00, 0x00, 0x00, /* SSDT.... */
 		0x01, 0x6A, 0x50, 0x6D, 0x52, 0x65, 0x66, 0x00, /* ..PmRef. */
Index: branches/ErmaC/Enoch/i386/libsaio/bootargs.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/bootargs.h	(revision 2458)
+++ branches/ErmaC/Enoch/i386/libsaio/bootargs.h	(revision 2459)
@@ -131,6 +131,11 @@
 #define kBootArgsFlagRebootOnPanic	(1 << 0)
 #define kBootArgsFlagHiDPI		(1 << 1)
 #define kBootArgsFlagBlack		(1 << 2)
+#define kBootArgsFlagCSRActiveConfig	(1 << 3)
+#define kBootArgsFlagCSRPendingConfig	(1 << 4)
+#define kBootArgsFlagCSRBoot		(1 << 5)
+#define kBootArgsFlagBlackBg		(1 << 6)
+#define kBootArgsFlagLoginUI		(1 << 7)
 
 typedef struct boot_args_pre_lion
 {
@@ -157,7 +162,7 @@
 
     uint32_t    efiSystemTable;   /* physical address of system table in runtime area */
 
-    uint8_t     efiMode;       /* 32 = 32-bit, 64 = 64-bit */
+    uint8_t     efiMode;       /* 32 means 32-bit mode, 64 means 64-bit mode */
     uint8_t     __reserved1[3];
     uint32_t    __reserved2[1];
     uint32_t    performanceDataStart; /* physical address of log */
@@ -172,7 +177,7 @@
     uint16_t    Revision;	/* Revision of boot_args structure */
     uint16_t    Version;	/* Version of boot_args structure */
 
-    uint8_t     efiMode;    /* 32 = 32-bit, 64 = 64-bit */
+    uint8_t     efiMode;    /* 32 means 32-bit mode, 64 means 64-bit mode */
     uint8_t     debugMode;  /* Bit field with behavior changes */
     uint16_t    flags;
 
@@ -196,8 +201,8 @@
     uint64_t    efiRuntimeServicesVirtualPageStart; /* virtual address of defragmented runtime pages */
 
     uint32_t    efiSystemTable;   /* physical address of system table in runtime area */
-    uint8_t     __reserved1[2];
-    uint32_t    __reserved2;
+    uint32_t    kslide;
+
     uint32_t    performanceDataStart; /* physical address of log */
     uint32_t    performanceDataSize;
 
@@ -207,8 +212,14 @@
     uint64_t	bootMemSize;
     uint64_t    PhysicalMemorySize;
     uint64_t    FSBFrequency;
-    uint32_t    __reserved4[734];
 
+    uint64_t    pciConfigSpaceBaseAddress;
+    uint32_t    pciConfigSpaceStartBusNumber;
+    uint32_t    pciConfigSpaceEndBusNumber;
+    uint32_t	csrActiveConfig;
+    uint32_t	csrPendingConfig;
+    uint32_t    __reserved4[728];
+
 } boot_args;
 
 extern char gMacOSVersion[8];
Index: branches/ErmaC/Enoch/i386/boot2/gui.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/gui.c	(revision 2458)
+++ branches/ErmaC/Enoch/i386/boot2/gui.c	(revision 2459)
@@ -1011,12 +1011,12 @@
 			{
 				// ErmaC : TODO test needed for recovery icon
 				// Use HFSRECOVERY icon.
-//				if (device->flags & kBVFlagBooter)
-//				{
-//					devicetype = iDeviceHFSRECOVERY;
-//				}
-//				else
-//				{
+				if (device->flags & kBVFlagBooter)
+				{
+					devicetype = iDeviceHFSRECOVERY;
+				}
+				else
+				{
 
 					// Use HFS or HFSRAID icon depending on bvr flags. Fallbacks are handled by alt_image above.
 					switch (device->OSVersion[3]) {
@@ -1051,7 +1051,7 @@
 							devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS);
 							break;
 					}
-//				}
+				}
 
 				break;
 
Index: branches/ErmaC/Enoch/i386/boot2/appleboot.h
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/appleboot.h	(revision 2458)
+++ branches/ErmaC/Enoch/i386/boot2/appleboot.h	(revision 2459)
@@ -38,7 +38,7 @@
 
 // The original data was 16K in size (128x128) and would make the booter
 // cross a 64K segment boundary. boot0 cannot load more than 127 sectors
-// without changes. To eiminate that complexity, the data was run length
+// without changes. To eliminate that complexity, the data was run length
 // encoded to save space. The reduced size is 1372 bytes.
 
 const unsigned char gAppleBootPictRLE[] =