diff options
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/tools/bin2boot.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/idp/console/console.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/console/console.c | 10 | ||||
| -rw-r--r-- | c/src/lib/wrapup/Makefile.in | 50 |
4 files changed, 54 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c index 7818f66266..d8d19b4166 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c +++ b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c @@ -67,12 +67,12 @@ getNumArg(char *arg) { char *dummy; - if (arg[0] == '0') + if (arg[0] == '0') { if ((arg[1] == 'x') || (arg[1] == 'X')) /* Hexadecimal */ return (DWord)strtol(arg, &dummy, 16); else /* Octal */ return (DWord)strtol(arg, &dummy, 8); - else /* Decimal */ + } else /* Decimal */ return (DWord)strtol(arg, &dummy, 10); } /* getNumArg */ diff --git a/c/src/lib/libbsp/m68k/idp/console/console.c b/c/src/lib/libbsp/m68k/idp/console/console.c index 90d21ece5f..3e67d70e61 100644 --- a/c/src/lib/libbsp/m68k/idp/console/console.c +++ b/c/src/lib/libbsp/m68k/idp/console/console.c @@ -16,7 +16,7 @@ #include <ringbuf.h> -Ring_buffer_t Buffer[ 2 ]; +Ring_buffer_t Console_Buffer[ 2 ]; rtems_isr C_Receive_ISR(rtems_vector_number vector); @@ -39,8 +39,8 @@ rtems_device_driver console_initialize( { rtems_status_code status; - Ring_buffer_Initialize( &Buffer[ 0 ] ); - Ring_buffer_Initialize( &Buffer[ 1 ] ); + Ring_buffer_Initialize( &Console_Buffer[ 0 ] ); + Ring_buffer_Initialize( &Console_Buffer[ 1 ] ); init_pit(); @@ -91,10 +91,10 @@ rtems_boolean is_character_ready( int port ) { - if ( Ring_buffer_Is_empty( &Buffer[ port ] ) ) + if ( Ring_buffer_Is_empty( &Console_Buffer[ port ] ) ) return FALSE; - Ring_buffer_Remove_character( &Buffer[ port ], *ch ); + Ring_buffer_Remove_character( &Console_Buffer[ port ], *ch ); return TRUE; } @@ -114,7 +114,7 @@ rtems_boolean quick_char_check( int port ) { - if ( Ring_buffer_Is_empty( &Buffer[ port ] ) ) + if ( Ring_buffer_Is_empty( &Console_Buffer[ port ] ) ) return FALSE; return TRUE; diff --git a/c/src/lib/libbsp/m68k/mvme162/console/console.c b/c/src/lib/libbsp/m68k/mvme162/console/console.c index a639df941d..ab700fe613 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme162/console/console.c @@ -25,7 +25,7 @@ #include <rtems/libio.h> #include <ringbuf.h> -Ring_buffer_t Buffer[2]; +Ring_buffer_t Console_Buffer[2]; /* * Interrupt handler for receiver interrupts @@ -43,7 +43,7 @@ rtems_isr C_Receive_ISR(rtems_vector_number vector) else if (ipend == 0x20) port = 1; /* channel A intr pending */ else return; - Ring_buffer_Add_character(&Buffer[port], ZREADD(port)); + Ring_buffer_Add_character(&Console_Buffer[port], ZREADD(port)); if (ZREAD(port, 1) & 0x70) { /* check error stat */ ZWRITE0(port, 0x30); /* reset error */ @@ -64,7 +64,7 @@ rtems_device_driver console_initialize( */ for (i = 0; i <= 1; i++) { - Ring_buffer_Initialize( &Buffer[i] ); + Ring_buffer_Initialize( &Console_Buffer[i] ); ZWRITE(i, 2, SCC_VECTOR); ZWRITE(i, 10, 0); ZWRITE(i, 1, 0x10); /* int on all Rx chars or special condition */ @@ -113,10 +113,10 @@ rtems_device_driver console_initialize( rtems_boolean char_ready(int port, char *ch) { - if ( Ring_buffer_Is_empty( &Buffer[port] ) ) + if ( Ring_buffer_Is_empty( &Console_Buffer[port] ) ) return FALSE; - Ring_buffer_Remove_character( &Buffer[port], *ch ); + Ring_buffer_Remove_character( &Console_Buffer[port], *ch ); return TRUE; } diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in index 46f7aac927..bef0aa637b 100644 --- a/c/src/lib/wrapup/Makefile.in +++ b/c/src/lib/wrapup/Makefile.in @@ -13,27 +13,59 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg -LIB=$(PROJECT_RELEASE)/lib/librtemsall.a +LIB=$(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libka9q$(LIB_VARIANT).a) \ + $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \ $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) \ $(wildcard $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a) -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += $(ARCH)/check CLOBBER_ADDITIONS += all: $(ARCH) $(LIB) - -$(LIB): $(SRCS) - PROJECT_RELEASE=$(PROJECT_RELEASE) \ - $(PROJECT_RELEASE)/build-tools/rtems-glom \ - -d $(PROJECT_RELEASE)/lib -v -V "$(LIB_VARIANT)" \ - -a $(AR) - + install: all +$(ARCH)/check:: $(SRCS) + @$(RM) $@; touch $@; + @for f in $(SRCS); do \ + case $$f in \ + *.o) echo " `basename $$f`" >> $@ \ + ;; \ + *.rel) echo " `basename $$f`" >> $@ \ + ;; \ + *.a) \ + ( list=`$(AR) t $$f`;\ + for i in $$list; do \ + if grep " $$i" $@; then \ + echo "ERROR -- $$i in multiple files"; exit 1; \ + fi;\ + echo " $$i" >> $@;\ + done; ) \ + ;; \ + esac; \ + done; + +$(LIB):: $(ARCH)/check + @for f in $(SRCS); do \ + case $$f in \ + *.o) $(AR) ru $@ $$f \ + ;;\ + *.rel) $(AR) ru $@ $$f \ + ;;\ + *.a) \ + (cd $(ARCH); \ + list=`$(AR) t $$f`; \ + $(AR) x $$f $$list; $(AR) ru $@ $$list; \ + $(RM) $$list ;)\ + ;; \ + esac; \ + done; + @$(RANLIB) $@ + @echo "*** Glommed $@" |