[PATCH 51/54] libbsp/shared/umon: Fix warnings
Joel Sherrill
joel.sherrill at oarcorp.com
Mon Oct 13 15:37:35 UTC 2014
---
c/src/lib/libbsp/shared/umon/monlib.c | 27 +++++++++++++++++++++++++++
c/src/lib/libbsp/shared/umon/tfsDriver.c | 4 ++--
c/src/lib/libbsp/shared/umon/umon.h | 11 ++++++++++-
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/c/src/lib/libbsp/shared/umon/monlib.c b/c/src/lib/libbsp/shared/umon/monlib.c
index 7477090..36f9158 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.c
+++ b/c/src/lib/libbsp/shared/umon/monlib.c
@@ -181,6 +181,31 @@ static int (*_moncom)(int,void *,void *, void *);
#define GENERIC_MONLOCK monLock
#define GENERIC_MONUNLOCK monUnlock
+/*
+ * Prototype these to avoid warnings but let them appear varargs to user.
+ */
+extern void mon_memtrace(
+ char *fmt,
+ int a1, int a2, int a3, int a4, int a5, int a6,
+ int a7, int a8, int a9, int a10, int a11, int a12
+);
+extern int mon_printf(
+ char *fmt,
+ int a1, int a2, int a3, int a4, int a5, int a6,
+ int a7, int a8, int a9, int a10, int a11, int a12
+);
+extern int mon_cprintf(
+ char *fmt,
+ int a1, int a2, int a3, int a4, int a5, int a6,
+ int a7, int a8, int a9, int a10, int a11, int a12
+);
+extern int mon_sprintf(
+ char *buf,
+ char *fmt,
+ int a1, int a2, int a3, int a4, int a5, int a6,
+ int a7, int a8, int a9, int a10, int a11, int a12
+);
+
/**************************************************************************
*
* monConnect():
@@ -311,6 +336,7 @@ monConnect(int (*mon)(int,void *,void *,void *),
*/
static int ignorelock = 0;
+#if KEEP_TO_STAY_IN_SYNC_WITH_UPSTREAM_BUT_UNUSED
static void
DisableMonLock(void)
{
@@ -322,6 +348,7 @@ EnableMonLock(void)
{
ignorelock = 0;
}
+#endif
/* monLock() & monUnlock():
* Used by all of the wrapper functions below this point to call
diff --git a/c/src/lib/libbsp/shared/umon/tfsDriver.c b/c/src/lib/libbsp/shared/umon/tfsDriver.c
index 0974ab1..d4b67a1 100644
--- a/c/src/lib/libbsp/shared/umon/tfsDriver.c
+++ b/c/src/lib/libbsp/shared/umon/tfsDriver.c
@@ -450,7 +450,7 @@ static int rtems_tfs_open(
static ssize_t rtems_tfs_read(
rtems_libio_t *iop,
void *buffer,
- uint32_t count
+ size_t count
)
{
int ret, fd;
@@ -511,7 +511,7 @@ static int rtems_tfs_close(
static ssize_t rtems_tfs_write(
rtems_libio_t *iop,
const void *buffer,
- uint32_t count
+ size_t count
)
{
int ret, fd;
diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/c/src/lib/libbsp/shared/umon/umon.h
index bff0f2b..3c5bdf9 100644
--- a/c/src/lib/libbsp/shared/umon/umon.h
+++ b/c/src/lib/libbsp/shared/umon/umon.h
@@ -46,10 +46,19 @@ void *rtems_bsp_get_umon_monptr(void);
*
* @param[in] path is the mount point
*
- * @return This method returns 0 on sucess.
+ * @return This method returns 0 on success.
*/
int rtems_initialize_tfs_filesystem(
const char *path
);
+/**
+ * @brief Read from MicroMonitor Port
+ *
+ * This method reads a character from the MicroMonitor console.
+ *
+ * @return This method returns a character.
+ */
+int umoncons_poll_read(int minor);
+
#endif
--
1.9.3
More information about the devel
mailing list