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.

6 files changed, 28 insertions, 15 deletions

diff --git a/laden/ChangeLog b/laden/ChangeLog
index a753c9c..9d47cb0 100644
--- a/laden/ChangeLog
+++ b/laden/ChangeLog
@@ -1,3 +1,17 @@
+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.
+
 2003-10-26  Marcus Brinkmann  <marcus@gnu.org>
 
 	* Makefile.am (AM_CPPFLAGS): Removed.
diff --git a/laden/kip-fixup.c b/laden/kip-fixup.c
index dd8498a..ff1b9a3 100644
--- a/laden/kip-fixup.c
+++ b/laden/kip-fixup.c
@@ -67,7 +67,7 @@ kip_fixup (void)
 
   memcpy ((char *) (((l4_word_t) kip) + kip->memory_info.mem_desc_ptr),
 	  (char *) memory_map,
-	  sizeof (struct l4_memory_desc) * memory_map_size);
+	  sizeof (l4_memory_desc_t) * memory_map_size);
 
   kip->memory_info.nr = memory_map_size;
   for (nr = 0; nr < memory_map_size; nr++)
diff --git a/laden/laden.c b/laden/laden.c
index 972c2df..4d41724 100644
--- a/laden/laden.c
+++ b/laden/laden.c
@@ -28,16 +28,16 @@
 /* The program name.  */
 char *program_name = "laden";
 
-rootserver_t kernel;
-rootserver_t sigma0;
-rootserver_t sigma1;
-rootserver_t rootserver;
+l4_rootserver_t kernel;
+l4_rootserver_t sigma0;
+l4_rootserver_t sigma1;
+l4_rootserver_t rootserver;
 
 /* The boot info to be inserted into the L4 KIP.  */
 l4_word_t boot_info;
 
 
-struct l4_memory_desc memory_map[MEMORY_MAP_MAX];
+l4_memory_desc_t memory_map[MEMORY_MAP_MAX];
 
 l4_word_t memory_map_size;
 
@@ -52,7 +52,7 @@ loader_get_num_memory_desc (void)
 
 /* Return the NRth memory descriptor.  The first memory descriptor is
    indexed by 0.  */
-l4_memory_desc_t
+l4_memory_desc_t *
 loader_get_memory_desc (l4_word_t nr)
 {
   return &memory_map[nr];
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)			\
diff --git a/laden/loader.c b/laden/loader.c
index 249c6a4..b0adbfd 100644
--- a/laden/loader.c
+++ b/laden/loader.c
@@ -37,7 +37,7 @@
 static void
 mem_check (const char *name, l4_word_t start, l4_word_t end)
 {
-  l4_memory_desc_t memdesc;
+  l4_memory_desc_t *memdesc;
   int nr;
   int fits = 0;
   int conflicts = 0;
diff --git a/laden/loader.h b/laden/loader.h
index d9c310b..647d78f 100644
--- a/laden/loader.h
+++ b/laden/loader.h
@@ -32,7 +32,7 @@ l4_word_t loader_get_num_memory_desc (void);
 
 /* Return the NRth memory descriptor.  The first memory descriptor is
    indexed by 0.  */
-l4_memory_desc_t loader_get_memory_desc (l4_word_t nr);
+l4_memory_desc_t *loader_get_memory_desc (l4_word_t nr);
 
 
 /* Add the region with the name NAME from START to END to the table of