[PATCH 24/42] mips/rbtx4925: Fix warnings
Joel Sherrill
joel.sherrill at oarcorp.com
Fri Oct 17 15:23:40 UTC 2014
---
.../lib/libbsp/mips/rbtx4925/console/console-io.c | 98 ++++------------------
c/src/lib/libbsp/mips/rbtx4925/include/bsp.h | 10 +++
c/src/lib/libbsp/mips/rbtx4925/start/start.S | 2 +
c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c | 1 +
4 files changed, 29 insertions(+), 82 deletions(-)
diff --git a/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c b/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c
index e85d6d0..da04957 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c
+++ b/c/src/lib/libbsp/mips/rbtx4925/console/console-io.c
@@ -1,6 +1,8 @@
/*
* This file contains the RBTX4925 console IO package.
- *
+ */
+
+/*
* Author: Craig Lebakken <craigl at transition.com>
*
* COPYRIGHT (c) 1996 by Transition Networks Inc.
@@ -26,36 +28,18 @@
* http://www.rtems.org/license/LICENSE.
*/
-
-/*
- * Rather than deleting this, it is commented out to (hopefully) help
- * the submitter send updates.
- *
- * static char _sccsid[] = "@(#)console.c 08/20/96 1.6\n";
- */
-
-
-
#include <bsp.h>
#include <rtems/libio.h>
#include <ctype.h>
/* PMON entry points */
-int mon_read(int fd, char *buf, int cnt); /* stdin is fd=0 */
-int mon_write(int fd, char *buf, int cnt); /* stdout is fd=1 */
-
+int mon_read(int fd, char *buf, int cnt); /* stdin is fd=0 */
+int mon_write(int fd, char *buf, int cnt); /* stdout is fd=1 */
/* console_initialize
*
* This routine initializes the console IO driver.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * Return values:
*/
-
rtems_device_driver console_initialize(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -76,118 +60,71 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL;
}
-
-/* is_character_ready
- *
- * This routine returns TRUE if a character is available.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * Return values:
- */
-
-bool is_character_ready(
- char *ch
-)
-{
- *ch = '\0'; /* return NULL for no particular reason */
- return true;
-}
-
/* inbyte
*
* This routine reads a character from the SOURCE.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * Return values:
- * character read from SOURCE
*/
-
-char inbyte( void )
+static char inbyte( void )
{
- char buf[10];
+ char buf[10];
+
/*
* If polling, wait until a character is available.
*/
- mon_read(0, buf, 1); /* stdin is fd=0, read 1 byte */
+ mon_read(0, buf, 1); /* stdin is fd=0, read 1 byte */
- return (buf[0]);
+ return (buf[0]);
}
/* outbyte
*
* This routine transmits a character out the SOURCE. It may support
* XON/XOFF flow control.
- *
- * Input parameters:
- * ch - character to be transmitted
- *
- * Output parameters: NONE
*/
-
-void outbyte(
+static void outbyte(
char ch
)
{
- char buf[10];
+ char buf[10];
+
/*
* If polling, wait for the transmitter to be ready.
* Check for flow control requests and process.
* Then output the character.
*/
- buf[0] = ch;
+ buf[0] = ch;
- mon_write( 1, buf, 1 ); /* stdout is fd=1, write 1 byte */
+ mon_write( 1, buf, 1 ); /* stdout is fd=1, write 1 byte */
}
-
-#if 0
-static int console_fd = -1;
-#endif
-
/*
* Open entry point
*/
-
rtems_device_driver console_open(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
-#if 0
- int console_fd = open("tty0", 2); /* open for read/write */
-#endif
return RTEMS_SUCCESSFUL;
}
/*
* Close entry point
*/
-
rtems_device_driver console_close(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
-#if 0
- if ( console_fd )
- close( console_fd );
-#endif
return RTEMS_SUCCESSFUL;
}
/*
* read bytes from the serial port. We only have stdin.
*/
-
rtems_device_driver console_read(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -219,7 +156,6 @@ rtems_device_driver console_read(
/*
* write bytes to the serial port. Stdout and stderr are the same.
*/
-
rtems_device_driver console_write(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -250,7 +186,6 @@ rtems_device_driver console_write(
/*
* IO Control entry point
*/
-
rtems_device_driver console_control(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -260,10 +195,9 @@ rtems_device_driver console_control(
return RTEMS_SUCCESSFUL;
}
-
#include <rtems/bspIo.h>
-void RBTX4925_output_char(char c) { outbyte( c ); }
+static void RBTX4925_output_char(char c) { outbyte( c ); }
BSP_output_char_function_type BSP_output_char = RBTX4925_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
index 4e0384d..1c380ad 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
+++ b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
@@ -16,6 +16,8 @@
#ifndef _BSP_H
#define _BSP_H
+#ifndef ASM
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -32,8 +34,16 @@ extern "C" {
#define BSP_FEATURE_IRQ_EXTENSION
#define BSP_SHARED_HANDLER_SUPPORT 1
+/*
+ * Prototypes for methods called from .S for dependency tracking
+ */
+void init_tlb(void);
+void resettlb(int i);
+
#ifdef __cplusplus
}
#endif
+#endif /* !ASM */
+
#endif
diff --git a/c/src/lib/libbsp/mips/rbtx4925/start/start.S b/c/src/lib/libbsp/mips/rbtx4925/start/start.S
index 7cf57f5..058426f 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/start/start.S
+++ b/c/src/lib/libbsp/mips/rbtx4925/start/start.S
@@ -33,6 +33,8 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
#include <rtems/mips/idtcpu.h>
#include <rtems/asm.h>
+#include <bsp.h>
+
.extern mon_flush_cache
#if 0
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c b/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c
index d82eff7..ab09e9c 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c
+++ b/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c
@@ -2,6 +2,7 @@
* inittlb.c
*/
+#include <bsp.h>
#include <rtems/mips/idtcpu.h>
extern void resettlb( int i );
--
1.9.3
More information about the devel
mailing list