RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-03-28 Joel Sherrill <joel@OARcorp.com>

Browse Source 
PR 1233/bsps
	* Makefile.am, console/console.c, console/debugputs.c: Move printk
	support code into debug IO file so you do not get the entire console
	driver when you do not want it.
This commit is contained in:
Joel Sherrill
2007-03-28 18:08:38 +00:00
parent a185db71d8
commit e4f62d96b1
4 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/sparc/erc32/ChangeLog
View File

@@ -1,3 +1,10 @@
2007-03-28 Joel Sherrill <joel@OARcorp.com>
PR 1233/bsps
* Makefile.am, console/console.c, console/debugputs.c: Move printk
support code into debug IO file so you do not get the entire console
driver when you do not want it.
2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> 2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: New BUG-REPORT address. * configure.ac: New BUG-REPORT address.

23
c/src/lib/libbsp/sparc/erc32/Makefile.am
View File

@@ -43,11 +43,15 @@ gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += console.rel noinst_PROGRAMS += console.rel
console_rel_SOURCES = console/console.c console/consolereserveresources.c \ console_rel_SOURCES = console/console.c console/consolereserveresources.c
console/debugputs.c
console_rel_CPPFLAGS = $(AM_CPPFLAGS) console_rel_CPPFLAGS = $(AM_CPPFLAGS)
console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += debugio.rel
debugio_rel_SOURCES = console/debugputs.c
debugio_rel_CPPFLAGS = $(AM_CPPFLAGS)
debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += clock.rel noinst_PROGRAMS += clock.rel
clock_rel_SOURCES = clock/ckinit.c clock_rel_SOURCES = clock/ckinit.c
clock_rel_CPPFLAGS = $(AM_CPPFLAGS) clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -68,11 +72,24 @@ endif
noinst_LIBRARIES = libbsp.a noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = libbsp_a_SOURCES =
libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel gnatsupp.rel libbsp_a_LIBADD = console.rel clock.rel timer.rel gnatsupp.rel \
debugio.rel
if HAS_NETWORKING if HAS_NETWORKING
libbsp_a_LIBADD += erc32sonic.rel libbsp_a_LIBADD += erc32sonic.rel
endif endif
libbsp_a_LIBADD += \
startup_rel-boardinit.o \
startup_rel-bootcard.o \
startup_rel-bspclean.o \
startup_rel-bsplibc.o \
startup_rel-bsppost.o \
startup_rel-bspstart.o \
startup_rel-erc32mec.o \
startup_rel-sbrk.o \
startup_rel-setvec.o \
startup_rel-spurious.o
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
../../../libcpu/@RTEMS_CPU@/reg_win.rel \ ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
../../../libcpu/@RTEMS_CPU@/syscall.rel ../../../libcpu/@RTEMS_CPU@/syscall.rel

11
c/src/lib/libbsp/sparc/erc32/console/console.c
View File

@@ -416,14 +416,3 @@ rtems_device_driver console_control(
{ {
return rtems_termios_ioctl (arg); return rtems_termios_ioctl (arg);
} }
/*
* To support printk
*/
#include <rtems/bspIo.h>
void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = BSP_output_char_f;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

14
c/src/lib/libbsp/sparc/erc32/console/debugputs.c
View File

@@ -16,7 +16,6 @@
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h>
/* /*
* console_outbyte_polled * console_outbyte_polled
@@ -74,7 +73,7 @@ int console_inbyte_nonblocking( int port )
return (int) ERC32_MEC.UART_Channel_B; return (int) ERC32_MEC.UART_Channel_B;
default: default:
assert( 0 ); rtems_fatal_error_occurred( 'D' << 8 | (port & 0xffffff) );
} }
return -1; return -1;
@@ -110,3 +109,14 @@ void DEBUG_puts(
console_outbyte_polled( 0, '\n' ); console_outbyte_polled( 0, '\n' );
ERC32_Restore_interrupt( ERC32_INTERRUPT_UART_A_RX_TX, old_level ); ERC32_Restore_interrupt( ERC32_INTERRUPT_UART_A_RX_TX, old_level );
} }
/*
* To support printk
*/
#include <rtems/bspIo.h>
void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = BSP_output_char_f;
BSP_polling_getchar_function_type BSP_poll_char = NULL;