Index: boot/arch/ia64/loader/main.c
===================================================================
--- boot/arch/ia64/loader/main.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
+++ boot/arch/ia64/loader/main.c	(revision 0e56eb1a15c7e636f2beb1a2d7ca2c425fec275f)
@@ -45,12 +45,11 @@
 }
 
-#define DEFAULT_MEMORY_BASE 0x4000000
-#define DEFAULT_MEMORY_SIZE 0x4000000
-#define DEFAULT_LEGACY_IO_BASE 0x00000FFFFC000000 
-#define DEFAULT_LEGACY_IO_SIZE 0x4000000 
+#define DEFAULT_MEMORY_BASE		0x4000000
+#define DEFAULT_MEMORY_SIZE		0x4000000
+#define DEFAULT_LEGACY_IO_BASE		0x00000FFFFC000000 
+#define DEFAULT_LEGACY_IO_SIZE		0x4000000 
 
-#define DEFAULT_FREQ_SCALE 0x0000000100000001 // 1/1
-#define DEFAULT_SYS_FREQ 100000000 //100MHz
-
+#define DEFAULT_FREQ_SCALE		0x0000000100000001 /* 1/1 */
+#define DEFAULT_SYS_FREQ		100000000 /* 100MHz */
 
 #ifdef REVISION
@@ -69,21 +68,16 @@
 static void version_print(void)
 {
-	printf("HelenOS IA64 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+	printf("HelenOS IA64 Bootloader\nRelease %s%s%s\n"
+	    "Copyright (c) 2006 HelenOS project\n", release, revision,
+	    timestamp);
 }
 
 void bootstrap(void)
 {
-
 	int ii;
-	
-	
-	bootinfo_t *bootinfo=&binfo;
-	
-	
-
+	bootinfo_t *bootinfo = &binfo;
 
 	version_print();
 
-	
 	init_components(components);
 
@@ -97,34 +91,37 @@
 		    components[i].name, components[i].size);
 
-	if(!bootinfo->hello_configured)
-	{
+	if (!bootinfo->hello_configured) {
 		/*
-		 * Load configuration defaults for simulators
+		 * Load configuration defaults for simulators.
 		 */
-		 bootinfo->memmap_items=0;
+		 bootinfo->memmap_items = 0;
 		 
-		 bootinfo->memmap[bootinfo->memmap_items].base=DEFAULT_MEMORY_BASE;
-		 bootinfo->memmap[bootinfo->memmap_items].size=DEFAULT_MEMORY_SIZE;
-		 bootinfo->memmap[bootinfo->memmap_items].type=EFI_MEMMAP_FREE_MEM;
+		 bootinfo->memmap[bootinfo->memmap_items].base =
+		     DEFAULT_MEMORY_BASE;
+		 bootinfo->memmap[bootinfo->memmap_items].size =
+		     DEFAULT_MEMORY_SIZE;
+		 bootinfo->memmap[bootinfo->memmap_items].type =
+		     EFI_MEMMAP_FREE_MEM;
 		 bootinfo->memmap_items++;
 
-		 bootinfo->memmap[bootinfo->memmap_items].base=DEFAULT_LEGACY_IO_BASE;
-		 bootinfo->memmap[bootinfo->memmap_items].size=DEFAULT_LEGACY_IO_SIZE;
-		 bootinfo->memmap[bootinfo->memmap_items].type=EFI_MEMMAP_IO_PORTS;
+		 bootinfo->memmap[bootinfo->memmap_items].base =
+		     DEFAULT_LEGACY_IO_BASE;
+		 bootinfo->memmap[bootinfo->memmap_items].size =
+		     DEFAULT_LEGACY_IO_SIZE;
+		 bootinfo->memmap[bootinfo->memmap_items].type =
+		     EFI_MEMMAP_IO_PORTS;
 		 bootinfo->memmap_items++;
 		 
 		 bootinfo->freq_scale = DEFAULT_FREQ_SCALE;
 		 bootinfo->sys_freq = DEFAULT_SYS_FREQ;
-		 
 	}
-
-
 
 	bootinfo->taskmap.count = 0;
 	for (i = 0; i < COMPONENTS; i++) {
-
 		if (i > 0) {
-			bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr = components[i].start;
-			bootinfo->taskmap.tasks[bootinfo->taskmap.count].size = components[i].size;
+			bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr =
+			    components[i].start;
+			bootinfo->taskmap.tasks[bootinfo->taskmap.count].size =
+			    components[i].size;
 			bootinfo->taskmap.count++;
 		}
@@ -132,6 +129,4 @@
 
 	jump_to_kernel(bootinfo);
-
-
 }