hurd-l4/laden Makefile.am laden.h output.h stri...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/07 16:04:26

Modified files:
        laden          : Makefile.am laden.h 
Added files:
        laden          : output.h string.h 

Log message:
        Make it a bit more modular.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/output.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/string.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/laden.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: hurd-l4/laden/Makefile.am
diff -u hurd-l4/laden/Makefile.am:1.1 hurd-l4/laden/Makefile.am:1.2
--- hurd-l4/laden/Makefile.am:1.1       Sat Jul 26 13:26:09 2003
+++ hurd-l4/laden/Makefile.am   Sun Sep  7 16:04:25 2003
@@ -27,8 +27,9 @@
 
 laden_CFLAGS = -I$(srcdir) $(AM_CFLAGS)
 
-laden_SOURCES =  $(ARCH_SOURCES) elf.h laden.h output.c output-none.c \
-  laden.c loader.c kip-fixup.c string.c
+laden_SOURCES =  $(ARCH_SOURCES) elf.h laden.h string.h string.c \
+       output.h output.c output-none.c \
+       laden.c loader.c kip-fixup.c
 
 /* FIXME: Make linkbase configurable.  */
 laden_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x180000
Index: hurd-l4/laden/laden.h
diff -u hurd-l4/laden/laden.h:1.2 hurd-l4/laden/laden.h:1.3
--- hurd-l4/laden/laden.h:1.2   Wed Sep  3 21:29:35 2003
+++ hurd-l4/laden/laden.h       Sun Sep  7 16:04:25 2003
@@ -19,6 +19,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include <l4.h>
+#include "string.h"
+#include "output.h"
 
 
 #define PROGRAM_NAME   "laden"
@@ -61,31 +63,6 @@
   })
 
 
-/* Every architecture must define at least one output driver, but might
-   define several.  For each output driver, the name and operations on
-   the driver must be provided in the following structure.  */
-
-struct output_driver
-{
-  const char *name;
-
-  /* Initialize the output device.  */
-  void (*init) (void);
-
-  /* Deinitialize the output device.  */
-  void (*deinit) (void);
-
-  /* Output a character.  */
-  void (*putchar) (int chr);
-};
-
-
-/* Every architecture must provide a list of all output drivers,
-   terminated by a driver structure which has a null pointer as its
-   name.  */
-extern struct output_driver *output_drivers[];
-
-
 /* Every architecture must provide the following functions.  */
 
 /* Return a help text for this architecture.  */
@@ -103,36 +80,11 @@
 int load_mem_info (l4_memory_desc_t memdesc, int nr);
 
 
-/* From string.h.  */
-
-int strcmp (const char *s1, const char *s2);
-
-void *memcpy (void *dest, const void *src, int n);
-
-void *memset (void *s, int c, int n);
-
-
-
 /* The generic code defines these functions.  */
 
 /* End the program with a failure.  This can halt or reset the
    system.  */
 void shutdown (void);
-
-/* Activate the output driver NAME or the default one if NAME is a
-   null pointer.  Must be called once at startup, before calling
-   putchar or any other output routine.  */
-void output_init (char *name);
-
-/* Deactivate the output driver.  Must be called after the last time
-   putchar or any other output routine is called, and before control
-   is passed on to the L4 kernel.  */
-void output_deinit (void);
-
-/* Print the single character CHR on the output device.  */
-void putchar (int chr);
-
-void printf (const char *fmt, ...);
 
 /* Print an error message and fail.  */
 #define panic(...)                             \