diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-18 14:10:07 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-18 14:10:07 +0000 |
| commit | b66116e85f35c5fd0066a30cfd1711d4e147779d (patch) | |
| tree | dda8e4141dfb94a472a1b5657bd0fb511b7ad983 /c/src/lib | |
| parent | 2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-b66116e85f35c5fd0066a30cfd1711d4e147779d.tar.bz2 | |
2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_BSPOPTS_* for SERIAL_INPUT, HIF_INPUT,
SERIAL_OUTPUT, HIF_OUTPUT.
* console/console.c: Remove NO_BSP_INIT, SERIAL_INPUT, HIF_INPUT,
SERIAL_OUTPUT, HIF_OUTPUT, add #include <bsp.h>.
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/a29k/portsw/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/a29k/portsw/configure.ac | 14 | ||||
| -rw-r--r-- | c/src/lib/libbsp/a29k/portsw/console/console.c | 12 |
3 files changed, 22 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/a29k/portsw/ChangeLog b/c/src/lib/libbsp/a29k/portsw/ChangeLog index b38ea88f42..3a69fdd6cb 100644 --- a/c/src/lib/libbsp/a29k/portsw/ChangeLog +++ b/c/src/lib/libbsp/a29k/portsw/ChangeLog @@ -1,3 +1,10 @@ +2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Add RTEMS_BSPOPTS_* for SERIAL_INPUT, HIF_INPUT, + SERIAL_OUTPUT, HIF_OUTPUT. + * console/console.c: Remove NO_BSP_INIT, SERIAL_INPUT, HIF_INPUT, + SERIAL_OUTPUT, HIF_OUTPUT, add #include <bsp.h>. + 2001-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Introduce RTEMS_BSP_CONFIGURE. diff --git a/c/src/lib/libbsp/a29k/portsw/configure.ac b/c/src/lib/libbsp/a29k/portsw/configure.ac index 797626dd84..1a62294114 100644 --- a/c/src/lib/libbsp/a29k/portsw/configure.ac +++ b/c/src/lib/libbsp/a29k/portsw/configure.ac @@ -15,7 +15,21 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS +/* only one of the "INPUT"-defines can be defined */ +RTEMS_BSPOPTS_SET([SERIAL_INPUT],[*],[1]) +RTEMS_BSPOPTS_HELP([SERIAL_INPUT],[use serial input]) +RTEMS_BSPOPTS_SET([HIF_INPUT],[*],[]) +RTEMS_BSPOPTS_HELP([HIF_INPUT],[use HIF input]) + +/* both of the following can be defined */ +RTEMS_BSPOPTS_SET([SERIAL_OUTPUT],[*],[1]) +RTEMS_BSPOPTS_HELP([SERIAL_OUTPUT], +[use serial console output]) + +RTEMS_BSPOPTS_SET([HIF_OUTPUT],[*],[]) +RTEMS_BSPOPTS_HELP([HIF_OUTPUT], +[use HIF console output]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/c/src/lib/libbsp/a29k/portsw/console/console.c b/c/src/lib/libbsp/a29k/portsw/console/console.c index 8c08201b07..d4f4031c67 100644 --- a/c/src/lib/libbsp/a29k/portsw/console/console.c +++ b/c/src/lib/libbsp/a29k/portsw/console/console.c @@ -11,22 +11,12 @@ * $Id$ */ -#define NO_BSP_INIT - - -/* only one of the following can be defined */ -#define SERIAL_INPUT /* use serial input */ -/* #define HIF_INPUT */ /* use HIF input */ +#include <bsp.h> #if defined(SERIAL_INPUT) && defined(HIF_INPUT) #error SERIAL_INPUT and HIF_INPUT cannot both be defined!!! #endif -/* both of the following can be defined */ -#define SERIAL_OUTPUT /* remove to disable serial port console output */ -/* #define HIF_OUTPUT */ /* remove to disable HIF console output */ - -#include <bsp.h> #include <rtems/libio.h> #include "serial.h" #include "concntl.h" |