summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-04 14:26:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-04 14:26:16 +0000
commitbaee0fb6d5730eb50a13f74b8833ba8bab83e490 (patch)
tree95a3d12ecea4f1f132bf295aa377f4bc385a891e
parent202ed852af91a5b19baef6c8d99aff113796dc0a (diff)
downloadrtems-baee0fb6d5730eb50a13f74b8833ba8bab83e490.tar.bz2
2002-11-04 Joel Sherrill <joel@OARcorp.com>
* console/console.c, console/m340uart.c: Removed warnings.
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/console/console.c9
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/console/m340uart.c1
3 files changed, 11 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index ff0cef774b..e97a91529c 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-04 Joel Sherrill <joel@OARcorp.com>
+
+ * console/console.c, console/m340uart.c: Removed warnings.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c
index 4b519c226d..be5d2d5e47 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/console.c
+++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c
@@ -418,9 +418,12 @@ dbugInitialise ()
if (uart_config.nb<2) rtems_fatal_error_occurred (-1);
/* don't set DUACR twice! */
- if (!CHANNEL_ENABLED_A)
- if (uart_config.baud_speed_table[UART_CHANNEL_B].set==1) DUACR = m340_BRG_Set1;
- else DUACR = m340_BRG_Set2;
+ if (!CHANNEL_ENABLED_A) {
+ if (uart_config.baud_speed_table[UART_CHANNEL_B].set==1)
+ DUACR = m340_BRG_Set1;
+ else
+ DUACR = m340_BRG_Set2;
+ }
/*
* make OPCR an auxiliary function serving the communication channels
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
index 72befd04b5..8442f991f7 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
+++ b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
@@ -27,6 +27,7 @@
#include <m68340.h>
#include <m340uart.h>
#include <stdarg.h>
+#include <string.h>
/* this table shows compatible speed configurations for the MC68340:
the first row shows baud rates for baud speed set 1