summaryrefslogtreecommitdiff
path: root/laden/laden.h
diff options
context:
space:
mode:
authormarcus <marcus>2004-03-16 03:37:32 +0000
committermarcus <marcus>2004-03-16 03:37:32 +0000
commitb96e7b2fed320430cf971bd4550ff8f74d51eb23 (patch)
tree0e5176834bfa3ab60511794e39a8321c1a2e3ba9 /laden/laden.h
parentf685e9c1f0fe14b614da166c900f0eddd6eebc5e (diff)
2004-03-15 Marcus Brinkmann <marcus@gnu.org>
* loader.h (loader_get_memory_desc): Change return type to l4_memory_desc_t *. * laden.h (rootserver_t): Remove typedef. (kernel, sigma0, sigma1, rootserver): Change type to l4_rootserver_t. (memory_map): Change type to l4_memory_desc_t. * laden.c (kernel, sigma0, sigma1, rootserver): Change type to l4_rootserver_t. (memory_map): Change type to l4_memory_desc_t. (loader_get_memory_desc): Change return type to l4_memory_desc_t *. * kip-fixup.c (kip_fixup): Use cast to l4_memory_desc_t.
Diffstat (limited to 'laden/laden.h')
-rw-r--r--laden/laden.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/laden/laden.h b/laden/laden.h
index 56aa84a..edcbd17 100644
--- a/laden/laden.h
+++ b/laden/laden.h
@@ -44,15 +44,14 @@ void find_components (void);
/* Start kernel. IP is the entry point. */
void start_kernel (l4_word_t ip);
-typedef __l4_rootserver_t rootserver_t;
/* For the rootserver components, find_components() must fill in the
start and end address of the ELF images in memory. The end address
is one more than the address of the last byte in the image. */
-extern rootserver_t kernel;
-extern rootserver_t sigma0;
-extern rootserver_t sigma1;
-extern rootserver_t rootserver;
+extern l4_rootserver_t kernel;
+extern l4_rootserver_t sigma0;
+extern l4_rootserver_t sigma1;
+extern l4_rootserver_t rootserver;
/* The boot info to be inserted into the L4 KIP. find_components()
must provide this information. */
@@ -60,7 +59,7 @@ extern l4_word_t boot_info;
/* The memory map to be provided to the kernel. */
#define MEMORY_MAP_MAX 200
-extern struct l4_memory_desc memory_map[MEMORY_MAP_MAX];
+extern l4_memory_desc_t memory_map[MEMORY_MAP_MAX];
extern l4_word_t memory_map_size;
#define add_memory_map(start, end, mtype, msubtype) \