Index: trunk/i386/libsaio/cpu.c
===================================================================
--- trunk/i386/libsaio/cpu.c	(revision 1036)
+++ trunk/i386/libsaio/cpu.c	(revision 1037)
@@ -286,7 +286,7 @@
 				/*if(bus_ratio_max > 0) bus_ratio = flex_ratio;*/
 				p->CPU.MaxRatio = max_ratio;
 				p->CPU.MinRatio = min_ratio;
-						
+
 				myfsb = fsbFrequency / 1000000;
 				verbose("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", myfsb, max_ratio);
 				currcoef = bus_ratio_max;
Index: trunk/i386/libsaio/cpu.h
===================================================================
--- trunk/i386/libsaio/cpu.h	(revision 1036)
+++ trunk/i386/libsaio/cpu.h	(revision 1037)
@@ -6,7 +6,7 @@
 #ifndef __LIBSAIO_CPU_H
 #define __LIBSAIO_CPU_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
 
 extern void scan_cpu(PlatformInfo_t *);
 
Index: trunk/i386/libsaio/biosfn.c
===================================================================
--- trunk/i386/libsaio/biosfn.c	(revision 1036)
+++ trunk/i386/libsaio/biosfn.c	(revision 1037)
@@ -675,7 +675,7 @@
 	print_drive_info(di);
 	printf("uses_ebios = 0x%x\n", dp->uses_ebios);
 	printf("result %d\n", ret);
-	printf("press a key->\n"); getchar();
+	pause();
 #endif
 
 	if (ret == 0) {
Index: trunk/i386/libsaio/saio_internal.h
===================================================================
--- trunk/i386/libsaio/saio_internal.h	(revision 1036)
+++ trunk/i386/libsaio/saio_internal.h	(revision 1037)
@@ -49,7 +49,6 @@
 extern int    ebiosEjectMedia(int biosdev);
 extern void	  bios_putchar(int ch);
 extern void   putca(int ch, int attr, int repeat);
-extern void   pause();
 extern int    readKeyboardStatus(void);
 extern int    readKeyboardShiftFlags(void);
 extern unsigned int time18(void);
@@ -89,14 +88,16 @@
 extern bool   gVerboseMode;
 extern bool   gErrors;
 extern void   initBooterLog(void);
+extern void   msglog(const char * format, ...);
 extern void   setupBooterLog(void);
 extern int    putchar(int ch);
 extern int    getchar(void);
-extern void   msglog(const char * format, ...);
 extern int    printf(const char *format, ...);
 extern int    error(const char *format, ...);
 extern int    verbose(const char *format, ...);
 extern void   stop(const char *format, ...);
+//Azi: replace getc/getchar with ? console.c
+extern void   pause();
 
 /* disk.c */
 extern void   rescanBIOSDevice(int biosdev);
Index: trunk/i386/boot2/resume.c
===================================================================
--- trunk/i386/boot2/resume.c	(revision 1036)
+++ trunk/i386/boot2/resume.c	(revision 1037)
@@ -119,7 +119,7 @@
 		printf ("Resuming from Encrypted image is unsupported.\n"
 				"Uncheck \"Use secure virtual memory\" in \"Security\" pane on system preferences.\n"
 				"Press any key to proceed with normal boot.\n");
-		getchar ();
+		getchar();
 		return;
 	}
 // depends on NVRAM
@@ -143,7 +143,7 @@
 	if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))
 	{
 		printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");
-		getchar ();
+		getchar();
 		return;
 	}
 	
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 1036)
+++ trunk/i386/boot2/boot.h	(revision 1037)
@@ -98,8 +98,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/i386/boot2/gui.h
===================================================================
--- trunk/i386/boot2/gui.h	(revision 1036)
+++ trunk/i386/boot2/gui.h	(revision 1037)
@@ -8,46 +8,46 @@
  *
  */
 
+#ifndef __BOOT2_GUI_H
+#define __BOOT2_GUI_H
+
 #include "boot.h"
 #include "bootstruct.h"
 #include "graphics.h"
 #include "graphic_utils.h"
 #include "picopng.h"
 
-#ifndef __BOOT2_GUI_H
-#define __BOOT2_GUI_H
-
 #define CHARACTERS_COUNT	223
 
-#define BOOT_NORMAL		0
+#define BOOT_NORMAL			0
 #define BOOT_VERBOSE		1
 #define BOOT_IGNORECACHE	2
 #define BOOT_SINGLEUSER		3
-#define DO_NOT_BOOT		4
+#define DO_NOT_BOOT			4
 #define CLOSE_INFO_MENU		5
 
-#define INFOMENU_NATIVEBOOT_START 1
-#define INFOMENU_NATIVEBOOT_END	3
+#define INFOMENU_NATIVEBOOT_START	1
+#define INFOMENU_NATIVEBOOT_END		3
 
-#define MENU_SHOW_MEMORY_INFO	4
-#define MENU_SHOW_VIDEO_INFO	5
-#define MENU_SHOW_HELP		6
+#define MENU_SHOW_MEMORY_INFO		4
+#define MENU_SHOW_VIDEO_INFO		5
+#define MENU_SHOW_HELP				6
 
 enum {
 	HorizontalLayout	= 0,
-	VerticalLayout		= 1,
+	VerticalLayout		= 1
 };
 
 enum {
 	kBackspaceKey		= 0x08,
-	kTabKey			= 0x09,
-	kReturnKey		= '\r',
-	kEscapeKey		= 0x1b,
-	kUpArrowkey		= 0x4800, 
+	kTabKey				= 0x09,
+	kReturnKey			= '\r',
+	kEscapeKey			= 0x1b,
+	kUpArrowkey			= 0x4800,
 	kDownArrowkey		= 0x5000,
 	kASCIIKeyMask		= 0x7f,
-	kF5Key			= 0x3f00,
-	kF10Key			= 0x4400
+	kF5Key				= 0x3f00,
+	kF10Key				= 0x4400
 };
 
 /*
Index: trunk/i386/modules/HelloWorld/HelloWorld.cpp
===================================================================
--- trunk/i386/modules/HelloWorld/HelloWorld.cpp	(revision 1036)
+++ trunk/i386/modules/HelloWorld/HelloWorld.cpp	(revision 1037)
@@ -36,9 +36,6 @@
 
 	printf("Hello world from ExecKernel hook. Binary located at 0x%X\n", binary);
 	getchar();
-	
-	//
-	
 }
 
 void HelloWorld_start()
@@ -46,7 +43,6 @@
 	//printf("Hooking 'ExecKernel'\n");
 	register_hook_callback("ExecKernel", &helloWorld);
 	register_hook_callback("Kernel Start", &helloWorld);
-
 }
 
 void HW::printHello()