Index: branches/ErmaC/Enoch/i386/libsaio/gma.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/gma.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/gma.c	(revision 2692)
@@ -462,7 +462,7 @@
 
 	model = get_gma_controller_name(device_id, vendor_id);
 
-	verbose("\tClass code: [%04x]\n", gma_dev->class_id);
+	verbose("\tClass code: [%04X]\n", gma_dev->class_id);
 
 	verbose("\t%s [%04x:%04x] (rev %02x)\nSubsystem: [%04x:%04x] :: %s\n",
 			model, gma_dev->vendor_id, gma_dev->device_id, gma_dev->revision_id, gma_dev->subsys_id.subsys.vendor_id, gma_dev->subsys_id.subsys.device_id, devicepath);
Index: branches/ErmaC/Enoch/i386/libsaio/hda.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/hda.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/hda.c	(revision 2692)
@@ -178,6 +178,7 @@
 	{ HDA_NVIDIA_GK106,	"GK106" /*, 0, ? */ },
 	{ HDA_NVIDIA_GK107,	"GK107" /*, 0, ? */ },
 	{ HDA_NVIDIA_GK104,	"GK104" /*, 0, ? */ },
+
 	//1002  Advanced Micro Devices [AMD] nee ATI Technologies Inc
 	{ HDA_ATI_SB450,	"SB4x0" /*, 0, 0 */ },
 	{ HDA_ATI_SB600,	"SB600" /*, 0, 0 */ },
@@ -659,7 +660,7 @@
 	uint16_t	controller_device_id = hda_dev->device_id;
 	const char	*value;
 
-	verbose("\tClass code: [%04x]\n", hda_dev->class_id);
+	verbose("\tClass code: [%04X]\n", hda_dev->class_id);
 
 	devicepath = get_pci_dev_path(hda_dev);
 	controller_name = get_hda_controller_name(controller_device_id, controller_vendor_id);
Index: branches/ErmaC/Enoch/i386/libsaio/hda.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/hda.h	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/hda.h	(revision 2692)
@@ -77,9 +77,9 @@
 struct hdacc_codecs;
 typedef struct
 {
-	uint32_t cid;
-	uint16_t revid;
-	char *name;
+	uint32_t id;
+	uint32_t rev;
+	const char *name;
 } hdacc_codecs;
 */
 
@@ -441,6 +441,7 @@
 #define HDA_CODEC_ALC882        HDA_CODEC_CONSTRUCT(REALTEK, 0x0882)
 #define HDA_CODEC_ALC883        HDA_CODEC_CONSTRUCT(REALTEK, 0x0883)
 #define HDA_CODEC_ALC885        HDA_CODEC_CONSTRUCT(REALTEK, 0x0885)
+#define HDA_CODEC_ALC886        HDA_CODEC_CONSTRUCT(REALTEK, 0x0886)
 #define HDA_CODEC_ALC887        HDA_CODEC_CONSTRUCT(REALTEK, 0x0887)
 #define HDA_CODEC_ALC888        HDA_CODEC_CONSTRUCT(REALTEK, 0x0888)
 #define HDA_CODEC_ALC889        HDA_CODEC_CONSTRUCT(REALTEK, 0x0889)
Index: branches/ErmaC/Enoch/i386/libsaio/nvidia.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/nvidia.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/nvidia.c	(revision 2692)
@@ -2113,7 +2113,7 @@
 	// get card type
 	nvCardType = (REG32(0) >> 20) & 0x1ff;
 
-	verbose("\tClass code: [%04x]\n", nvda_dev->class_id);
+	verbose("\tClass code: [%04X]\n", nvda_dev->class_id);
 
 	model = get_nvidia_model(((nvda_dev->vendor_id << 16) | nvda_dev->device_id),((nvda_dev->subsys_id.subsys.vendor_id << 16) | nvda_dev->subsys_id.subsys.device_id));
 
Index: branches/ErmaC/Enoch/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/ati.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/ati.c	(revision 2692)
@@ -1646,7 +1646,7 @@
 //	static char compatible[64];
 	char *devicepath;
 
-	verbose("\tClass code: [%04x]\n", ati_dev->class_id );
+	verbose("\tClass code: [%04X]\n", ati_dev->class_id );
 
 	if (!init_card(ati_dev))
 	{
Index: branches/ErmaC/Enoch/i386/libsaio/biosfn.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/biosfn.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/libsaio/biosfn.c	(revision 2692)
@@ -45,10 +45,10 @@
 
 
 #ifndef DEBUG_MEMRANGE
-	#define DEBUG_MEMRANGE 1
+	#define MEMRANGE 1
 #endif
 
-#if DEBUG_MEMRANGE
+#if MEMRANGE
 	#define DBG(x...)	printf(x)
 #else
 	#define DBG(x...)	msglog(x)
@@ -136,7 +136,7 @@
 #endif
 }
 
-#if DEBUG_MEMRANGE
+#if MEMRANGE
 
 static unsigned long rerangeMemoryMap(unsigned long count);
 static unsigned long rerangeMemoryMap(unsigned long count)
@@ -207,7 +207,7 @@
 
 	MemoryRange *	range = (MemoryRange *)BIOS_ADDR;
 	unsigned long	count = 0;
-#if DEBUG_MEMRANGE
+#if MEMRANGE
 	unsigned long	rerangedCount;
 #endif
 	unsigned long long	conMemSize = 0;
@@ -279,7 +279,7 @@
 	*conMemSizePtr = conMemSize / 1024;  // size in KB
 	*extMemSizePtr = extMemSize / 1024;  // size in KB
 
-#if DEBUG_MEMRANGE
+#if MEMRANGE
 	rerangedCount = rerangeMemoryMap(count);
 	range += rerangedCount - count;
 #endif
Index: branches/ErmaC/Enoch/i386/boot2/boot.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/boot.c	(revision 2691)
+++ branches/ErmaC/Enoch/i386/boot2/boot.c	(revision 2692)
@@ -640,7 +640,8 @@
 			}
 		}
 
-		if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {
+		if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig))
+		{
 			if (strncmp(val, "i386", sizeof("i386") ) == 0)
 			{
 				archCpuType = CPU_TYPE_I386;
Index: branches/ErmaC/Enoch/i386/boot2/boot.h
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/boot.h	(revision 2691)
+++ branches/ErmaC/Enoch/i386/boot2/boot.h	(revision 2692)
@@ -85,7 +85,7 @@
 #define kScanSingleDriveKey		"Scan Single Drive"
 #define kInstantMenuKey			"Instant Menu"
 #define kDefaultKernel			"mach_kernel"
-#define kOSXKernel			"kernel"		// Yosemite
+#define kOSXKernel			"kernel"		// Yosemite+
 #define kGUIKey				"GUI"
 #define kBootBannerKey			"Boot Banner"
 #define kShowInfoKey			"ShowInfo"		// gui.c