Changes in boot/arch/ia64/src/main.c [4646710:a35b458] in mainline

File:

• boot/arch/ia64/src/main.c (modified) (14 diffs)

boot/arch/ia64/src/main.c

@@ -67 +67 @@
         memmap_item_t *memmap = bootinfo.memmap;
         size_t items = 0;
-        
+
         if (!bootpar) {
                 /* Fake-up a memory map for simulators. */
@@ -83 +83 @@
                 size_t mm_size = bootpar->efi_memmap_sz;
                 size_t md_size = bootpar->efi_memdesc_sz;
-                
+
                 /*
                  * Walk the EFI memory map using the V1 memory descriptor
@@ -109 +109 @@
                                 continue;
                         }
-                        
+
                         memmap[items].base = md->phys_start;
                         memmap[items].size = md->pages * EFI_PAGE_SIZE;
@@ -115 +115 @@
                 }
         }
-        
+
         bootinfo.memmap_items = items;
 }
@@ -134 +134 @@
                 efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
                 sal_system_table_header_t *sal_st;
-                
+
                 sal_st = efi_vendor_table_find(
                     (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
 
                 sal_system_table_parse(sal_st);
-                
+
                 bootinfo.sys_freq = sal_base_clock_frequency();
         } else {
@@ -150 +150 @@
 {
         version_print();
-        
+
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
         printf(" %p|%p: kernel entry point\n",
@@ -156 +156 @@
         printf(" %p|%p: loader entry point\n",
             (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
-        
+
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -162 +162 @@
                     components[i].addr, components[i].name,
                     components[i].inflated, components[i].size);
-        
+
         void *dest[COMPONENTS];
         size_t top = KERNEL_ADDRESS;
@@ -169 +169 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -175 +175 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 }
-                
+
                 dest[i] = (void *) top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         /*
          * We will use the next available address for a copy of each component to
@@ -197 +197 @@
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 /*
                  * Copy the component to a location which is guaranteed not to
@@ -203 +203 @@
                  */
                 memmove((void *) top, components[i - 1].addr, components[i - 1].size);
-                
+
                 int err = inflate((void *) top, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -213 +213 @@
                 }
         }
-        
+
         printf(".\n");
 
@@ -219 +219 @@
         read_sal_configuration();
         read_pal_configuration();
-        
+
         printf("Booting the kernel ...\n");
         jump_to_kernel(&bootinfo);