diff options
Diffstat (limited to 'c')
-rw-r--r-- | c/src/exec/libcsupport/src/printk.c | 2 | ||||
-rw-r--r-- | c/src/lib/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/include/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/include/bspIo.h | 37 | ||||
-rw-r--r-- | c/src/lib/libc/printk.c | 2 |
5 files changed, 9 insertions, 40 deletions
diff --git a/c/src/exec/libcsupport/src/printk.c b/c/src/exec/libcsupport/src/printk.c index 2d833db4e3..ff47f02682 100644 --- a/c/src/exec/libcsupport/src/printk.c +++ b/c/src/exec/libcsupport/src/printk.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdio.h> -#include <bspIo.h> +#include <rtems/bspIo.h> /* #include <libcpu/cpu.h> */ /*-------------------------------------------------------------------------+ diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog index 40bea96de9..015dd1fb2a 100644 --- a/c/src/lib/ChangeLog +++ b/c/src/lib/ChangeLog @@ -1,3 +1,9 @@ +2002-01-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * libc/printk.c: Include rtems/bspIo.h instead of bspIo.h. + * include/Makefile.am: Remove bspIo.h. + * include/bspIo.h: Removed. + 2001-11-30 Jennifer Averett <jennifer@OARcorp.com> This was tracked as PR88. diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am index 2bb731f2ee..207f47127d 100644 --- a/c/src/lib/include/Makefile.am +++ b/c/src/lib/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.5 -include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \ +include_HEADERS = chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \ spurious.h timerdrv.h vmeintr.h PREINSTALL_FILES = $(PROJECT_INCLUDE) \ diff --git a/c/src/lib/include/bspIo.h b/c/src/lib/include/bspIo.h deleted file mode 100644 index 0ff070c4c5..0000000000 --- a/c/src/lib/include/bspIo.h +++ /dev/null @@ -1,37 +0,0 @@ -/* bspIo.h - * - * This include file contains declaration of interface that - * will be provided by the file contained in this directory. - * - * - * COPYRIGHT (c) 1998 valette@crf.canon.fr - * - * The license and distribution terms for this file may be - * found in found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ -#ifndef _LIBBSP_I386_SHARED_IO_BSP_IO_H -#define _LIBBSP_I386_SHARED_IO_BSP_IO_H - -/* - * All the functions declared as extern after this comment - * MUST be implemented in each BSP. Using this function, - * this directory contains shared code that export higher level - * functionnality described after the next command. - */ -typedef void (*BSP_output_char_function_type) (char c); -typedef char (*BSP_polling_getchar_function_type) (void); - -extern BSP_output_char_function_type BSP_output_char; -extern BSP_polling_getchar_function_type BSP_poll_char; -/* - * All the function declared as extern after this comment - * are available for each ix86 BSP by compiling and linking - * the files contained in this directory PROVIDED definition - * and initialisation of the previous variable are done. - */ -void printk(char *fmt, ...); - -#endif diff --git a/c/src/lib/libc/printk.c b/c/src/lib/libc/printk.c index 2d833db4e3..ff47f02682 100644 --- a/c/src/lib/libc/printk.c +++ b/c/src/lib/libc/printk.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdio.h> -#include <bspIo.h> +#include <rtems/bspIo.h> /* #include <libcpu/cpu.h> */ /*-------------------------------------------------------------------------+ |