r275 - in openbios-devel: include include/openbios kernel

Author: blueswirl
Date: 2008-11-30 14:42:11 +0100 (Sun, 30 Nov 2008)
New Revision: 275

Modified:
   openbios-devel/include/a.out.h
   openbios-devel/include/openbios/kernel.h
   openbios-devel/kernel/bootstrap.c
Log:
Fix some more warnings

Modified: openbios-devel/include/a.out.h
===================================================================
--- openbios-devel/include/a.out.h	2008-11-30 11:54:01 UTC (rev 274)
+++ openbios-devel/include/a.out.h	2008-11-30 13:42:11 UTC (rev 275)
@@ -127,17 +127,19 @@
 #define SEGMENT_SIZE PAGE_SIZE
 #endif

+#if !defined(SEGMENT_SIZE)
 #ifdef linux
 #if defined(__i386__) || defined(__mc68000__)
 #define SEGMENT_SIZE	1024
 #elif defined(__sparc__)
-#define SEGMENT_SIZE    4096
+#define SEGMENT_SIZE    0x2000
 #else
-#ifndef SEGMENT_SIZE
+#if defined(PAGE_SIZE)
 #define SEGMENT_SIZE	PAGE_SIZE
 #endif
 #endif
 #endif
+#endif

#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))

Modified: openbios-devel/include/openbios/kernel.h
===================================================================
--- openbios-devel/include/openbios/kernel.h	2008-11-30 11:54:01 UTC (rev 274)
+++ openbios-devel/include/openbios/kernel.h	2008-11-30 13:42:11 UTC (rev 275)
@@ -37,11 +37,14 @@
 extern int		get_inputbyte( void );
 #endif

+#ifndef BOOTSTRAP
 #undef putchar
 #undef getchar

extern int		putchar( int ch );
-extern int		availchar( void );
 extern int		getchar( void );
+#endif

+extern int		availchar( void );
+
 #endif   /* _H_KERNEL */

Modified: openbios-devel/kernel/bootstrap.c
===================================================================
--- openbios-devel/kernel/bootstrap.c	2008-11-30 11:54:01 UTC (rev 274)
+++ openbios-devel/kernel/bootstrap.c	2008-11-30 13:42:11 UTC (rev 275)
@@ -80,7 +80,7 @@
    "$include", "$encode-file"
 };

-void init_trampoline(void)
+static void init_trampoline(void)
 {
    if (!trampoline) {
    	/* We're using side effects which is to some extent nasty */