diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-15 15:38:38 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-15 15:38:38 +0000 |
commit | d09de3d1d1374d3d1d3c80307f089ae3656cf7eb (patch) | |
tree | 0775b83b69817aec6c9fc26753552eeedac4260e /c | |
parent | 2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-d09de3d1d1374d3d1d3c80307f089ae3656cf7eb.tar.bz2 |
2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* umon/monlib.h: Add umon.h to be installed as <rtems/umon.h> so umon
.h files are modified as little as possible.
* umon/umon.h: New file.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/umon/monlib.h | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/umon/umon.h | 58 |
3 files changed, 64 insertions, 24 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index c3bfd5602b..ad89b52b06 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,9 @@ +2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com> + + * umon/monlib.h: Add umon.h to be installed as <rtems/umon.h> so umon + .h files are modified as little as possible. + * umon/umon.h: New file. + 2009-06-12 Joel Sherrill <joel.sherrill@OARcorp.com> * umon/README, umon/cli.h, umon/monlib.c, umon/monlib.h, umon/tfs.h, diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/c/src/lib/libbsp/shared/umon/monlib.h index 6d52968f18..cb252628ad 100644 --- a/c/src/lib/libbsp/shared/umon/monlib.h +++ b/c/src/lib/libbsp/shared/umon/monlib.h @@ -28,30 +28,6 @@ extern "C" { #endif -/* - * The following additions are RTEMS specific. - */ -#if defined(__rtems__) - /* - * RTEMS uMonitor wrapper for monConnect(). This will deal with the - * getting MONCOMPTR as well as providing the locking routines. - */ - void rtems_umon_connect(void); - - /* - * BSP specific routine to help when calling monConnect(). This - * returns the value known to uMon as MONCOMPTR. - */ - void *rtems_bsp_get_umon_monptr(void); - - /* - * Initialize the TFS-RTEMS file system - */ - int rtems_initialize_tfs_filesystem( - const char *path - ); -#endif - extern int monConnect(int (*monptr)(int,void *,void *,void *), void (*lock)(void),void (*unlock)(void)); extern void mon_getargv(int *argc,char ***argv); diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/c/src/lib/libbsp/shared/umon/umon.h new file mode 100644 index 0000000000..d6b7eb45c5 --- /dev/null +++ b/c/src/lib/libbsp/shared/umon/umon.h @@ -0,0 +1,58 @@ +/** + * @file rtems/umon.h + * + * This file contains the RTEMS specific interface to MicroMonitor. + */ + +/* + * COPYRIGHT (c) 1989-2007. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#ifndef __rtems_umon_h +#define __rtems_umon_h + +#include <umon/monlib.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Connect RTEMS Application to MicroMonitor + * + * RTEMS uMonitor wrapper for monConnect(). This will deal with the + * getting MONCOMPTR as well as providing the locking routines. + */ +void rtems_umon_connect(void); + +/** + * @brief Obtain BSP specific pointer to MicroMonitor + * + * BSP specific routine to help when calling monConnect(). This + * returns the value known to uMon as MONCOMPTR. + * + * @return This method returns the address of the base area of MicroMonitor. + */ +void *rtems_bsp_get_umon_monptr(void); + +/** + * @brief Initialize the TFS-RTEMS file system + * + * This method initializes and mounts the TFS-RTEMS file system. + * + * @param[in] path is the mount point + * + * @return This method returns 0 on sucess. + */ +int rtems_initialize_tfs_filesystem( + const char *path +); + +#endif |