From 2d354ea6a562761a1417bed71dfe8e722ef16409 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 27 Jul 2000 06:17:44 +0000 Subject: Minor problems addressed with the merger and with the arm_bare_bsp. That BSP now has a stub clock driver so the tests can link even if they won't execute. A handful of Makefiles had to be updated and we had to account for printk.c being a shared file now. --- c/src/lib/libbsp/arm/shared/Makefile.am | 2 +- c/src/lib/libbsp/arm/shared/comm/console.c | 2 +- c/src/lib/libbsp/arm/shared/io/.cvsignore | 2 - c/src/lib/libbsp/arm/shared/io/Makefile.am | 22 ------ c/src/lib/libbsp/arm/shared/io/bspio.h | 38 ---------- c/src/lib/libbsp/arm/shared/io/printk.c | 113 ----------------------------- c/src/lib/libbsp/arm/shared/irq/irq_init.c | 3 +- 7 files changed, 4 insertions(+), 178 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/shared/io/.cvsignore delete mode 100644 c/src/lib/libbsp/arm/shared/io/Makefile.am delete mode 100644 c/src/lib/libbsp/arm/shared/io/bspio.h delete mode 100644 c/src/lib/libbsp/arm/shared/io/printk.c (limited to 'c/src/lib/libbsp/arm/shared') diff --git a/c/src/lib/libbsp/arm/shared/Makefile.am b/c/src/lib/libbsp/arm/shared/Makefile.am index 2a3b172604..cfcf5d60f0 100644 --- a/c/src/lib/libbsp/arm/shared/Makefile.am +++ b/c/src/lib/libbsp/arm/shared/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = comm io irq +SUBDIRS = comm irq include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c index ec623c3dda..2aa30d233e 100644 --- a/c/src/lib/libbsp/arm/shared/comm/console.c +++ b/c/src/lib/libbsp/arm/shared/comm/console.c @@ -21,7 +21,7 @@ void __assert (const char *file, int line, const char *msg); #include -#include +#include #include #include #include diff --git a/c/src/lib/libbsp/arm/shared/io/.cvsignore b/c/src/lib/libbsp/arm/shared/io/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/arm/shared/io/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/arm/shared/io/Makefile.am b/c/src/lib/libbsp/arm/shared/io/Makefile.am deleted file mode 100644 index 2c543cc77d..0000000000 --- a/c/src/lib/libbsp/arm/shared/io/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -H_FILES = bspio.h - -C_FILES = printk.c - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) - -all: $(PREINSTALL_FILES) - -EXTRA_DIST = bspio.h printk.c - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/shared/io/bspio.h b/c/src/lib/libbsp/arm/shared/io/bspio.h deleted file mode 100644 index b4ef8510da..0000000000 --- a/c/src/lib/libbsp/arm/shared/io/bspio.h +++ /dev/null @@ -1,38 +0,0 @@ -/* bspIo.h - * - * This include file contains declaration of interface that - * will be provided by the file contained in this directory. - * - * - * COPYRIGHT (c) 2000 Canon Research France SA. - * Emmanuel Raguet, mailto:raguet@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_ARM_SHARED_IO_BSP_IO_H -#define _LIBBSP_ARM_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/libbsp/arm/shared/io/printk.c b/c/src/lib/libbsp/arm/shared/io/printk.c deleted file mode 100644 index d53699a3de..0000000000 --- a/c/src/lib/libbsp/arm/shared/io/printk.c +++ /dev/null @@ -1,113 +0,0 @@ -/*-------------------------------------------------------------------------+ -| printk.c - ARM BSP -+--------------------------------------------------------------------------+ -| -| COPYRIGHT (c) 2000 Canon Research France SA. -| Emmanuel Raguet, mailto:raguet@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$ -+--------------------------------------------------------------------------*/ - - -#include -#include -#include - -/*-------------------------------------------------------------------------+ -| Function: printNum -| Description: print number in a given base. -| Global Variables: None. -| Arguments: num - number to print, base - base used to print the number. -| Returns: Nothing. -+--------------------------------------------------------------------------*/ -static void -printNum(long unsigned int num, int base, int sign) -{ - long unsigned int n; - int count; - char toPrint[20]; - - if ( (sign == 1) && ((long)num < 0) ) { - BSP_output_char('-'); - num = -num; - } - - count = 0; - while ((n = num / base) > 0) { - toPrint[count++] = (num - (n*base)); - num = n ; - } - toPrint[count++] = num; - - for (n = 0; n < count; n++){ - BSP_output_char("0123456789ABCDEF"[(int)(toPrint[count-(n+1)])]); - } -} /* printNum */ - - -/*-------------------------------------------------------------------------+ -| Function: printk -| Description: a simplified version of printf intended for use when the - console is not yet initialized or in ISR's. -| Global Variables: None. -| Arguments: as in printf: fmt - format string, ... - unnamed arguments. -| Returns: Nothing. -+--------------------------------------------------------------------------*/ -void -printk(char *fmt, ...) -{ - va_list ap; /* points to each unnamed argument in turn */ - char c, *str; - int lflag, base, sign; - - _CPU_ISR_Disable(level); - - va_start(ap, fmt); /* make ap point to 1st unnamed arg */ - for (; *fmt != '\0'; fmt++) - { - lflag = 0; - base = 0; - sign = 0; - if (*fmt == '%') - { - if ((c = *++fmt) == 'l') - { - lflag = 1; - c = *++fmt; - } - switch (c) - { - case 'o': case 'O': base = 8; sign = 0; break; - case 'd': case 'D': base = 10; sign = 1; break; - case 'u': case 'U': base = 10; sign = 0; break; - case 'x': case 'X': base = 16; sign = 0; break; - case 's': - for (str = va_arg(ap, char *); *str; str++) - BSP_output_char(*str); - break; - case 'c': - BSP_output_char(va_arg(ap, char)); - break; - default: - BSP_output_char(c); - break; - } /* switch*/ - - if (base) - printNum(lflag ? va_arg(ap, long int) : (long int)va_arg(ap, int), - base, sign); - } - else - { - BSP_output_char(*fmt); - } - } - va_end(ap); /* clean up when done */ - _CPU_ISR_Enable(level); - -} /* printk */ - diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_init.c b/c/src/lib/libbsp/arm/shared/irq/irq_init.c index a815657f8d..add12a0e92 100644 --- a/c/src/lib/libbsp/arm/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/arm/shared/irq/irq_init.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include /* @@ -32,6 +32,7 @@ void rtems_irq_mngt_init() { int i; long *vectorTable; + rtems_interrupt_level level; vectorTable = VECTOR_TABLE; -- cgit v1.2.3