mips/genmongoosev: Fix warnings

5 files changed, 27 insertions, 49 deletions

diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c b/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c
index 87df736cde..8a4cf992b4 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c
+++ b/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c
@@ -76,7 +76,8 @@ console_tbl     Console_Configuration_Ports[] = {
  *  Declare some information used by the console driver
  */
 
-#define NUM_CONSOLE_PORTS (sizeof(Console_Configuration_Ports)/sizeof(console_tbl))
+#define NUM_CONSOLE_PORTS \
+  (sizeof(Console_Configuration_Ports)/sizeof(console_tbl))
 
 unsigned long  Console_Configuration_Count = NUM_CONSOLE_PORTS;
 
@@ -86,7 +87,7 @@ unsigned long  Console_Configuration_Count = NUM_CONSOLE_PORTS;
 
 #include <rtems/bspIo.h>
 
-void GENMG5_output_char(char c) { write( 2, &c, 1 ); }
+static void GENMG5_output_char(char c) { write( 2, &c, 1 ); }
 
 BSP_output_char_function_type           BSP_output_char = GENMG5_output_char;
 BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.c b/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.c
index e3243adf9d..af463d95da 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.c
+++ b/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.c
@@ -44,12 +44,8 @@ typedef struct _mg5uart_context
  *  Define MG5UART_STATIC to nothing while debugging so the entry points
  *  will show up in the symbol table.
  */
-
-#define MG5UART_STATIC
-
-/* #define MG5UART_STATIC static */
-
-
+/* #define MG5UART_STATIC */
+#define MG5UART_STATIC static
 
 #define MG5UART_SETREG( _base, _register, _value ) \
         MONGOOSEV_WRITE_REGISTER( _base, _register, _value )
@@ -57,7 +53,6 @@ typedef struct _mg5uart_context
 #define MG5UART_GETREG( _base, _register ) \
         MONGOOSEV_READ_REGISTER( _base, _register )
 
-
 /*
  *  Console Device Driver Support Functions
  */
@@ -83,8 +78,6 @@ MG5UART_STATIC void mg5uart_enable_interrupts(
  *  NOTE: Yes .. this is ugly but it provides 5 interrupt source
  *  wrappers which are nearly functionally identical.
  */
-
-
 extern void mips_default_isr(int vector);
 
 #define __ISR(_TYPE, _OFFSET) \
@@ -121,7 +114,6 @@ __ISR(rx_ready, MG5UART_IRQ_RX_READY)
  *  This function sets the UART channel to reflect the requested termios
  *  port settings.
  */
-
 MG5UART_STATIC int mg5uart_set_attributes(
   int minor,
   const struct termios *t
@@ -233,7 +225,6 @@ MG5UART_STATIC int mg5uart_set_attributes(
  *
  *  This function sets the default values of the per port context structure.
  */
-
 MG5UART_STATIC void mg5uart_initialize_context(
   int               minor,
   mg5uart_context  *pmg5uartContext
@@ -263,10 +254,8 @@ MG5UART_STATIC void mg5uart_initialize_context(
  *
  *  This function initializes the DUART to a quiecsent state.
  */
-
 MG5UART_STATIC void mg5uart_init(int minor)
 {
-  uint32_t              pMG5UART_port;
   uint32_t              pMG5UART;
   uint32_t  		cmdSave;
   uint32_t  		shift;
@@ -280,7 +269,6 @@ MG5UART_STATIC void mg5uart_init(int minor)
   mg5uart_initialize_context( minor, pmg5uartContext );
 
   pMG5UART      = Console_Port_Tbl[minor]->ulCtrlPort1;
-  pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
 
   if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
      shift = MONGOOSEV_UART0_CMD_SHIFT;
@@ -308,7 +296,6 @@ MG5UART_STATIC void mg5uart_init(int minor)
  *
  *  Default state is 9600 baud, 8 bits, No parity, and 1 stop bit.
  */
-
 MG5UART_STATIC int mg5uart_open(
   int      major,
   int      minor,
@@ -317,7 +304,6 @@ MG5UART_STATIC int mg5uart_open(
 {
   uint32_t      pMG5UART;
   uint32_t      pMG5UART_port;
-  uint32_t  	vector;
   uint32_t      cmd, cmdSave;
   uint32_t      baudcmd;
   uint32_t      shift;
@@ -326,14 +312,12 @@ MG5UART_STATIC int mg5uart_open(
 
   pMG5UART      = Console_Port_Tbl[minor]->ulCtrlPort1;
   pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
-  vector        = Console_Port_Tbl[minor]->ulIntVector;
 
   if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
     shift = MONGOOSEV_UART0_CMD_SHIFT;
   else
     shift = MONGOOSEV_UART1_CMD_SHIFT;
 
-
   /* XXX default baud rate could be from configuration table */
 
   (void) mg5uart_baud_rate( minor, B19200, &baudcmd );
@@ -365,7 +349,6 @@ MG5UART_STATIC int mg5uart_open(
  *
  *  This function shuts down the requested port.
  */
-
 MG5UART_STATIC int mg5uart_close(
   int      major,
   int      minor,
@@ -373,13 +356,11 @@ MG5UART_STATIC int mg5uart_close(
 )
 {
   uint32_t      pMG5UART;
-  uint32_t      pMG5UART_port;
   uint32_t  	cmd, cmdSave;
   uint32_t      shift;
   rtems_interrupt_level  Irql;
 
   pMG5UART      = Console_Port_Tbl[minor]->ulCtrlPort1;
-  pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
 
   /*
    *  Disable interrupts from this channel and then disable it totally.
@@ -406,15 +387,11 @@ MG5UART_STATIC int mg5uart_close(
   return(RTEMS_SUCCESSFUL);
 }
 
-
-
-
 /*
  *  mg5uart_write_polled
  *
  *  This routine polls out the requested character.
  */
-
 MG5UART_STATIC void mg5uart_write_polled(
   int   minor,
   char  c
@@ -494,7 +471,6 @@ MG5UART_STATIC void mg5uart_process_isr_rx_error(
      mask << shift );
 }
 
-
 MG5UART_STATIC void mg5uart_process_isr_rx_frame_error(
   int  minor
 )
@@ -509,13 +485,6 @@ MG5UART_STATIC void mg5uart_process_isr_rx_overrun_error(
    mg5uart_process_isr_rx_error( minor, MONGOOSEV_UART_RX_OVERRUN_ERROR );
 }
 
-
-
-
-
-
-
-
 MG5UART_STATIC void mg5uart_process_tx_isr(
    int        minor,
    uint32_t   source
@@ -554,8 +523,6 @@ MG5UART_STATIC void mg5uart_process_tx_isr(
    /* mg5uart_enable_interrupts(minor, MG5UART_ENABLE_ALL_EXCEPT_TX); */
 }
 
-
-
 MG5UART_STATIC void mg5uart_process_isr_tx_empty(
   int  minor
 )
@@ -570,10 +537,6 @@ MG5UART_STATIC void mg5uart_process_isr_tx_ready(
    mg5uart_process_tx_isr( minor, MONGOOSEV_UART_TX_READY );
 }
 
-
-
-
-
 MG5UART_STATIC void mg5uart_process_isr_rx_ready(
   int  minor
 )
@@ -589,7 +552,9 @@ MG5UART_STATIC void mg5uart_process_isr_rx_ready(
 
   rtems_termios_enqueue_raw_characters(
      Console_Port_Data[minor].termios_data,
-     &c, 1 );
+     &c,
+    1
+  );
 }
 
 static rtems_irq_connect_data mg5uart_rx_frame_error_cd  = {  \
@@ -680,7 +645,6 @@ MG5UART_STATIC void mg5uart_initialize_interrupts(int minor)
  *
  *  Console Termios output entry point when using interrupt driven output.
  */
-
 MG5UART_STATIC int mg5uart_write_support_int(
   int         minor,
   const char *buf,
diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h b/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h
index fa7bed6522..b9e69f27ba 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h
+++ b/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h
@@ -1,5 +1,4 @@
 /*
- *
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -81,12 +80,12 @@ extern const console_fns mg5uart_fns_polled;
  */
 
 uint32_t   mg5uart_get_register(    /* registers are on 32-bit boundaries */
-  uint32_t    ulCtrlPort,           /*   and accessed as word             */
+  uintptr_t   ulCtrlPort,           /*   and accessed as word             */
   uint32_t    ucRegNum
 );
 
 void  mg5uart_set_register(
-  uint32_t    ulCtrlPort,
+  uintptr_t   ulCtrlPort,
   uint32_t    ucRegNum,
   uint32_t    ucData
 );
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
index 5146b7f303..06debfe921 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
+++ b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
@@ -59,6 +59,12 @@ extern void assertSoftwareInterrupt(uint32_t);
 extern void promCopyIcacheFlush(void);
 extern void promCopyDcacheFlush(void);
 
+/*
+ * Called from user programs wanting to use the GDB stub.
+ */
+void mg5rdbgCloseGDBuart(void);
+int mg5rdbgOpenGDBuart(int);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c b/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c
index 481774e3d4..6d064de4d2 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c
+++ b/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c
@@ -1,7 +1,9 @@
 /*
  *  GDB Support Routines for the Mongoose-V
- *
- *  COPYRIGHT (c) 1989-2002.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -9,7 +11,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems.h>
+#include <bsp.h>
 #include <rtems/bspIo.h>
 #include <bsp/mongoose-v.h>
 #include "gdb_if.h"
@@ -35,6 +37,12 @@ extern int mg5uart_close(int major,int minor, void *arg);
 extern void mg5uart_write_polled(int minor, char c );
 extern int mg5uart_inbyte_nonblocking_polled(int minor);
 
+/*
+ *  Prototypes for methods assumed to exist by the gdb stub
+ */
+char getDebugChar (void);
+void putDebugChar (char c);
+
 static int debugUartEnabled = 0;
 
 int mg5rdbgOpenGDBuart(int breakoninit)