From fc137e7d91c001b20cf0187233b4a5b8c9220284 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Tue, 14 Oct 2014 16:50:45 -0500
Subject: [PATCH] arm/csb337: Fix warnings

---
 c/src/lib/libbsp/arm/csb337/console/sed1356.c  |  6 ++++--
 c/src/lib/libbsp/arm/csb337/startup/bspreset.c | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/c/src/lib/libbsp/arm/csb337/console/sed1356.c b/c/src/lib/libbsp/arm/csb337/console/sed1356.c
index f86e2a2e04..f87a322a01 100644
--- a/c/src/lib/libbsp/arm/csb337/console/sed1356.c
+++ b/c/src/lib/libbsp/arm/csb337/console/sed1356.c
@@ -3,7 +3,9 @@
  *
  *  Based upon code from MicroMonitor 1.17 from http://www.umonfw.com/
  *  which includes this notice:
- *
+ */
+
+/*
  **************************************************************************
  *  General notice:
  *  This code is part of a boot-monitor package developed as a generic base
@@ -359,7 +361,7 @@ void sed_writechar(uint8_t c)
   }
 } /* sed_writechar() */
 
-void sed_update_fb_offset(void)
+static void sed_update_fb_offset(void)
 {
   /* write the new sed_fb_offset value */
   if (sed_disp_mode_crt) {
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c b/c/src/lib/libbsp/arm/csb337/startup/bspreset.c
index f194d43205..a4605dcaf3 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/bspreset.c
@@ -1,6 +1,8 @@
 /*
  * Cogent CSB337 - AT91RM9200 Startup code
- *
+ */
+
+/*
  * Copyright (c) 2004 by Cogent Computer Systems
  * Written by Jay Monkman <jtm@lopingdog.com>
  *
@@ -19,9 +21,11 @@ void bsp_reset(void)
   rtems_interrupt_level level;
 
   rtems_interrupt_disable(level);
+    (void) level; /* avoid set but not used warning */
 
-  /* Enable the watchdog timer, then wait for the world to end. */
-  ST_REG(ST_WDMR) = ST_WDMR_RSTEN | 1;
+    /* Enable the watchdog timer, then wait for the world to end. */
+    ST_REG(ST_WDMR) = ST_WDMR_RSTEN | 1;
 
-  while(1);
+    while(1)
+      ;
 }