Changeset 6c68b97 in mainline for generic

Timestamp:

2005-12-15T18:17:59Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

961b5f0

Parents:

10c071e

Message:

ia32: floppy boot image uses GRUB

Location:

generic

Files:

• include/config.h (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)

generic/include/config.h

@@ -44 +44 @@
         size_t memory_size;
         size_t kernel_size;
+        
+        __address init_addr;
+        size_t init_size;
 
         count_t cpu_count;

generic/src/main/main.c

@@ -143 +143 @@
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
+        config.init_addr = init_addr;
+        config.init_size = init_size;
 
         heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
@@ -207 +209 @@
         task_init();
         thread_init();
+        
+        if (config.init_size > 0)
+                printf("config.init_addr=%X, config.init_size=%d\n", config.init_addr, config.init_size);
 
         /*