Changeset 1e9a463 in mainline for arch/ia32/src

Timestamp:

2005-08-30T13:17:10Z (20 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

6f878b7

Parents:

288a204

Message:

Licence to print1/test.c added.
New function for printing memory map at ia32.

Location:

arch/ia32/src

Files:

• ia32.c (modified) (2 diffs)
• mm/frame.c (modified) (1 diff)
• mm/memory_init.c (modified) (1 diff)

arch/ia32/src/ia32.c

@@ -46 +46 @@
 #include <arch/asm.h>
 #include <arch/acpi/acpi.h>
+#include <arch/mm/memory_init.h>
 
 void arch_pre_mm_init(void)
@@ -78 +79 @@
 {
         if (config.cpu_active == 1) {
+                memory_print_map();
+                
                 #ifdef __SMP__
                 acpi_init();

arch/ia32/src/mm/frame.c

@@ -46 +46 @@
                 
                 for (i=e820counter;i>0;i--) {
-                        printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type);
                         if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
                                 frame_region_not_free(e820table[i-1].base_address,e820table[i-1].size);

arch/ia32/src/mm/memory_init.c

@@ -35 +35 @@
 }
 
+void memory_print_map(void)
+{
+        __u8 i;
+        
+        for (i=e820counter;i>0;i--) {
+                printf("E820 base: %Q size: %Q type: ", e820table[i-1].base_address, e820table[i-1].size);
+                switch (e820table[i-1].type) {
+                        case MEMMAP_MEMORY_AVAILABLE: 
+                                printf("available memory\n");
+                                break;
+                        case MEMMAP_MEMORY_RESERVED: 
+                                printf("reserved memory\n");
+                                break;
+                        case MEMMAP_MEMORY_ACPI: 
+                                printf("ACPI table\n");
+                                break;
+                        case MEMMAP_MEMORY_NVS: 
+                                printf("NVS\n");
+                                break;
+                        case MEMMAP_MEMORY_UNUSABLE: 
+                                printf("unusable memory\n");
+                                break;
+                        default:
+                                printf("undefined memory type\n");
+                }
+        }
 
+}