Changeset 5e2aa83 in mainline for kernel/arch/ia64

Timestamp:

2011-07-05T21:28:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ff65e91

Parents:

f7a55f9 (diff), bee37cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/ia64-revival.

Location:

kernel/arch/ia64

Files:

• include/bootinfo.h (modified) (3 diffs)
• src/ia64.c (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)

kernel/arch/ia64/include/bootinfo.h

@@ -34 +34 @@
 #define MEMMAP_ITEMS 128
 
-#define EFI_MEMMAP_FREE_MEM 0
+#define MEMMAP_FREE_MEM 0
 
 /** Size of buffer for storing task name in binit_task_t. */
@@ -54 +54 @@
         unsigned long base;
         unsigned long size;
-} efi_memmap_item_t;
+} memmap_item_t;
 
 typedef struct {
         binit_t taskmap;
         
-        efi_memmap_item_t memmap[MEMMAP_ITEMS];
+        memmap_item_t memmap[MEMMAP_ITEMS];
         unsigned int memmap_items;
         
@@ -66 +66 @@
         unsigned long freq_scale;
         unsigned int wakeup_intno;
-        int hello_configured;
 } bootinfo_t;
 

kernel/arch/ia64/src/ia64.c

@@ -151 +151 @@
         /* Set platform name. */
 #ifdef MACHINE_ski
-        platform = "pc";
+        platform = "ski";
 #endif
 #ifdef MACHINE_i460GX

kernel/arch/ia64/src/mm/frame.c

@@ -58 +58 @@
                 unsigned int i;
                 for (i = 0; i < bootinfo->memmap_items; i++) {
-                        if (bootinfo->memmap[i].type == EFI_MEMMAP_FREE_MEM) {
+                        if (bootinfo->memmap[i].type == MEMMAP_FREE_MEM) {
                                 uint64_t base = bootinfo->memmap[i].base;
                                 uint64_t size = bootinfo->memmap[i].size;