Index: trunk/i386/libsaio/cpu.c
===================================================================
--- trunk/i386/libsaio/cpu.c	(revision 2545)
+++ trunk/i386/libsaio/cpu.c	(revision 2546)
@@ -654,7 +654,7 @@
 				break;
 			}
 		}
-		/* Mobile CPU */
+		// Mobile CPU
 		if (rdmsr64(MSR_IA32_PLATFORM_ID) & (1<<28))
 		{
 			p->CPU.Features |= CPU_FEATURE_MOBILE;
@@ -664,13 +664,13 @@
 	{
 		switch(p->CPU.ExtFamily)
 		{
-			case 0x00: /* K8 */
+			case 0x00: //* K8 *//
 				msr = rdmsr64(K8_FIDVID_STATUS);
 				maxcoef = bitfield(msr, 21, 16) / 2 + 4;
 				currcoef = bitfield(msr, 5, 0) / 2 + 4;
 				break;
 
-			case 0x01: /* K10 */
+			case 0x01: //* K10 *//
 				msr = rdmsr64(K10_COFVID_STATUS);
 				do_cpuid2(0x00000006, 0, p->CPU.CPUID[CPUID_6]);
 				// EffFreq: effective frequency interface
@@ -688,7 +688,7 @@
 
 				break;
 
-			case 0x05: /* K14 */
+			case 0x05: //* K14 *//
 				msr = rdmsr64(K10_COFVID_STATUS);
 				currcoef  = (bitfield(msr, 54, 49) + 0x10) << 2;
 				currdiv = (bitfield(msr, 8, 4) + 1) << 2;
@@ -696,7 +696,7 @@
 
 				break;
 
-			case 0x02: /* K11 */
+			case 0x02: //* K11 *//
 				// not implimented
 				break;
 		}
@@ -773,14 +773,14 @@
 	DBG("\n---------------------------------------------\n");
    	DBG("------------------ CPU INFO -----------------\n");
 	DBG("---------------------------------------------\n");
-	DBG("Brand String:            %s\n",		p->CPU.BrandString); // Processor name (BIOS)
-	DBG("Vendor:                  0x%x\n",		p->CPU.Vendor); // Vendor ex: GenuineIntel
-	DBG("Family:                  0x%x\n",		p->CPU.Family); // Family ex: 6 (06h)
+	DBG("Brand String:            %s\n",		p->CPU.BrandString);		// Processor name (BIOS)
+	DBG("Vendor:                  0x%x\n",		p->CPU.Vendor);			// Vendor ex: GenuineIntel
+	DBG("Family:                  0x%x\n",		p->CPU.Family);			// Family ex: 6 (06h)
 	DBG("ExtFamily:               0x%x\n",		p->CPU.ExtFamily);
-	DBG("Signature:               %x\n",		p->CPU.Signature); // CPUID signature
-	DBG("Model:                   0x%x\n",		p->CPU.Model); // Model ex: 37 (025h)
+	DBG("Signature:               %x\n",		p->CPU.Signature);		// CPUID signature
+	DBG("Model:                   0x%x\n",		p->CPU.Model);			// Model ex: 37 (025h)
 	DBG("ExtModel:                0x%x\n",		p->CPU.ExtModel);
-	DBG("Stepping:                0x%x\n",		p->CPU.Stepping); // Stepping ex: 5 (05h)
+	DBG("Stepping:                0x%x\n",		p->CPU.Stepping);		// Stepping ex: 5 (05h)
 	DBG("MaxCoef:                 0x%x\n",		p->CPU.MaxCoef);
 	DBG("CurrCoef:                0x%x\n",		p->CPU.CurrCoef);
 	DBG("MaxDiv:                  0x%x\n",		p->CPU.MaxDiv);
@@ -788,8 +788,8 @@
 	DBG("TSCFreq:                 %dMHz\n",		p->CPU.TSCFrequency / 1000000);
 	DBG("FSBFreq:                 %dMHz\n",		p->CPU.FSBFrequency / 1000000);
 	DBG("CPUFreq:                 %dMHz\n",		p->CPU.CPUFrequency / 1000000);
-	DBG("Cores:                   %d\n",		p->CPU.NoCores); // Cores
-	DBG("Logical processor:       %d\n",		p->CPU.NoThreads); // Logical procesor
+	DBG("Cores:                   %d\n",		p->CPU.NoCores);		// Cores
+	DBG("Logical processor:       %d\n",		p->CPU.NoThreads);		// Logical procesor
 	DBG("Features:                0x%08x\n",	p->CPU.Features);
 
 	DBG("\n---------------------------------------------\n");
Index: trunk/i386/libsaio/platform.h
===================================================================
--- trunk/i386/libsaio/platform.h	(revision 2545)
+++ trunk/i386/libsaio/platform.h	(revision 2546)
@@ -88,9 +88,9 @@
 #define CPU_FEATURE_MSR			0x00000200		// MSR Support
 
 /* SMBIOS Memory Types */ 
-#define SMB_MEM_TYPE_UNDEFINED	0
+#define SMB_MEM_TYPE_UNDEFINED		0
 #define SMB_MEM_TYPE_OTHER		1
-#define SMB_MEM_TYPE_UNKNOWN	2
+#define SMB_MEM_TYPE_UNKNOWN		2
 #define SMB_MEM_TYPE_DRAM		3
 #define SMB_MEM_TYPE_EDRAM		4
 #define SMB_MEM_TYPE_VRAM		5
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 2545)
+++ trunk/i386/boot2/boot.c	(revision 2546)
@@ -72,7 +72,11 @@
  */
 #define kBootErrorTimeout 5
 
-bool		gOverrideKernel, gEnableCDROMRescan, gScanSingleDrive, useGUI;
+bool		gOverrideKernel;
+bool		gEnableCDROMRescan;
+bool		gScanSingleDrive;
+bool		useGUI;
+
 static bool	gUnloadPXEOnExit = false;
 
 static char	gCacheNameAdler[64 + 256];
@@ -81,11 +85,15 @@
 char		gRootDevice[ROOT_DEVICE_SIZE];
 char		gMKextName[512];
 char		gMacOSVersion[8];
-int		bvCount = 0, gDeviceCount = 0;
+int		bvCount = 0;
+int		gDeviceCount = 0;
 //int		menucount = 0;
 long		gBootMode; /* defaults to 0 == kBootModeNormal */
-BVRef		bvr, menuBVR, bvChain;
 
+BVRef		bvr;
+BVRef		menuBVR;
+BVRef		bvChain;
+
 static unsigned long	Adler32(unsigned char *buffer, long length);
 //static void			selectBiosDevice(void);