2009-11-30 Fernando Nicodemos <fgnicodemos@terra.com.br>

	* umon/cli.h, umon/monlib.c, umon/monlib.h, umon/tfs.h,
	umon/tfsDriver.c, umon/umon.h, umon/umonrtemsglue.c: Update to match
	development version.

8 files changed, 149 insertions, 89 deletions

diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index 538623f3f6..39d750b77f 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-30	Fernando Nicodemos <fgnicodemos@terra.com.br>
+
+	* umon/cli.h, umon/monlib.c, umon/monlib.h, umon/tfs.h,
+	umon/tfsDriver.c, umon/umon.h, umon/umonrtemsglue.c: Update to match
+	development version.
+
 2009-11-23	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* clockdrv_shell.h: Clean up.
diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/c/src/lib/libbsp/shared/umon/cli.h
index cedb295efe..31adda5d3a 100644
--- a/c/src/lib/libbsp/shared/umon/cli.h
+++ b/c/src/lib/libbsp/shared/umon/cli.h
@@ -1,23 +1,38 @@
-/* cli.h:
- * Header file for Command Line Interface related stuff.
+/*
+ *  cli.h - Header file for Command Line Interface related stuff
  *
- *	General notice:
- *	This code is part of a boot-monitor package developed as a generic base
- *	platform for embedded system designs.  As such, it is likely to be
- *	distributed to various projects beyond the control of the original
- *	author.  Please notify the author of any enhancements made or bugs found
- *	so that all may benefit from the changes.  In addition, notification back
- *	to the author will allow the new user to pick up changes that may have
- *	been made by other users after this version of the code was distributed.
+ *  Based upon code from MicroMonitor 1.17 from http://www.umonfw.com/
+ *  which includes this notice:
  *
- *	Note1: the majority of this code was edited with 4-space tabs.
- *	Note2: as more and more contributions are accepted, the term "author"
- *		   is becoming a mis-representation of credit.
+ **************************************************************************
+ *  General notice:
+ *  This code is part of a boot-monitor package developed as a generic base
+ *  platform for embedded system designs.  As such, it is likely to be
+ *  distributed to various projects beyond the control of the original
+ *  author.  Please notify the author of any enhancements made or bugs found
+ *  so that all may benefit from the changes.  In addition, notification back
+ *  to the author will allow the new user to pick up changes that may have
+ *  been made by other users after this version of the code was distributed.
  *
- *	Original author:	Ed Sutter
- *	Email:				esutter@lucent.com
- *	Phone:				908-582-2351
+ *  Note1: the majority of this code was edited with 4-space tabs.
+ *  Note2: as more and more contributions are accepted, the term "author"
+ *         is becoming a mis-representation of credit.
+ *
+ *  Original author:    Ed Sutter
+ *  Email:              esutter@alcatel-lucent.com
+ *  Phone:              908-582-2351
+ **************************************************************************
+ *
+ *  Ed Sutter has been informed that this code is being used in RTEMS.
+ *
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
+ *
+ *  $Id$
  */
+
 #ifndef _cli_h
 #define _cli_h
 
diff --git a/c/src/lib/libbsp/shared/umon/monlib.c b/c/src/lib/libbsp/shared/umon/monlib.c
index 0e315d15c9..5f7dca5585 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.c
+++ b/c/src/lib/libbsp/shared/umon/monlib.c
@@ -1,37 +1,50 @@
-/* monlib.c:
- *	This file is part of the monitor code, but it is actually linked into
- *	the application.  It is built with (but not linked with) the monitor,
- *	then the monlib.o file is linked with the application.
- *	The only requirement on the application is that it know where the address
- *	of the monCom function is in the monitor's space.
- *	The monCom function will be accessible in some "well-known" way (processor
- *	and platform dependent) so that this will not be a problem.
+/*
+ *  monlib.c -
+ *  This file is part of the monitor code, but it is actually linked into
+ *  the application.  It is built with (but not linked with) the monitor,
+ *  then the monlib.o file is linked with the application.
+ *  The only requirement on the application is that it know where the address
+ *  of the monCom function is in the monitor's space.
+ *  The monCom function will be accessible in some "well-known" way (processor
+ *  and platform dependent) so that this will not be a problem.
  *
- *	This monlib.c file is a replacement for the older mechanism that was
- *	a bit more error-prone...  A table of function pointers existed at some
- *	well-known location in the monitor, and the content of that table was
- *	assumed to also be "well-known".  This new version only assumes that the
- *	pointer to monCom is well-known; everything else will work based on the
- *	fact that the monitor and application will share the monlib.h header
- *	file.
+ *  This monlib.c file is a replacement for the older mechanism that was
+ *  a bit more error-prone...  A table of function pointers existed at some
+ *  well-known location in the monitor, and the content of that table was
+ *  assumed to also be "well-known".  This new version only assumes that the
+ *  pointer to monCom is well-known; everything else will work based on the
+ *  fact that the monitor and application will share the monlib.h header
+ *  file.
  *
- *	General notice:
- *	This code is part of a boot-monitor package developed as a generic base
- *	platform for embedded system designs.  As such, it is likely to be
- *	distributed to various projects beyond the control of the original
- *	author.  Please notify the author of any enhancements made or bugs found
- *	so that all may benefit from the changes.  In addition, notification back
- *	to the author will allow the new user to pick up changes that may have
- *	been made by other users after this version of the code was distributed.
+ **************************************************************************
+ *  General notice:
+ *  This code is part of a boot-monitor package developed as a generic base
+ *  platform for embedded system designs.  As such, it is likely to be
+ *  distributed to various projects beyond the control of the original
+ *  author.  Please notify the author of any enhancements made or bugs found
+ *  so that all may benefit from the changes.  In addition, notification back
+ *  to the author will allow the new user to pick up changes that may have
+ *  been made by other users after this version of the code was distributed.
  *
- *	Note1: the majority of this code was edited with 4-space tabs.
- *	Note2: as more and more contributions are accepted, the term "author"
- *		   is becoming a mis-representation of credit.
+ *  Note1: the majority of this code was edited with 4-space tabs.
+ *  Note2: as more and more contributions are accepted, the term "author"
+ *         is becoming a mis-representation of credit.
  *
- *	Original author:	Ed Sutter
- *	Email:				esutter@lucent.com
- *	Phone:				908-582-2351
+ *  Original author:    Ed Sutter
+ *  Email:              esutter@alcatel-lucent.com
+ *  Phone:              908-582-2351
+ **************************************************************************
+ *
+ *  Ed Sutter has been informed that this code is being used in RTEMS.
+ *
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
+ *
+ *  $Id$
  */
+
 #include <umon/monlib.h>
 
 static int		(*_tfsseek)(int,int,int);
diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/c/src/lib/libbsp/shared/umon/monlib.h
index cb252628ad..c4acd81439 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.h
+++ b/c/src/lib/libbsp/shared/umon/monlib.h
@@ -1,23 +1,39 @@
-/* monlib.h:
- *	This header file is used by both the monitor and the application that
- *	may reside on top of the monitor.
- *	General notice:
- *	This code is part of a boot-monitor package developed as a generic base
- *	platform for embedded system designs.  As such, it is likely to be
- *	distributed to various projects beyond the control of the original
- *	author.  Please notify the author of any enhancements made or bugs found
- *	so that all may benefit from the changes.  In addition, notification back
- *	to the author will allow the new user to pick up changes that may have
- *	been made by other users after this version of the code was distributed.
+/*
+ *  monlib.h - Used by both the monitor and the application that
+ *             may reside on top of the monitor
  *
- *	Note1: the majority of this code was edited with 4-space tabs.
- *	Note2: as more and more contributions are accepted, the term "author"
- *		   is becoming a mis-representation of credit.
+ *  Based upon code from MicroMonitor 1.17 from http://www.umonfw.com/
+ *  which includes this notice:
  *
- *	Original author:	Ed Sutter
- *	Email:				esutter@lucent.com
- *	Phone:				908-582-2351
+ **************************************************************************
+ *  General notice:
+ *  This code is part of a boot-monitor package developed as a generic base
+ *  platform for embedded system designs.  As such, it is likely to be
+ *  distributed to various projects beyond the control of the original
+ *  author.  Please notify the author of any enhancements made or bugs found
+ *  so that all may benefit from the changes.  In addition, notification back
+ *  to the author will allow the new user to pick up changes that may have
+ *  been made by other users after this version of the code was distributed.
+ *
+ *  Note1: the majority of this code was edited with 4-space tabs.
+ *  Note2: as more and more contributions are accepted, the term "author"
+ *         is becoming a mis-representation of credit.
+ *
+ *  Original author:    Ed Sutter
+ *  Email:              esutter@alcatel-lucent.com
+ *  Phone:              908-582-2351
+ **************************************************************************
+ *
+ *  Ed Sutter has been informed that this code is being used in RTEMS.
+ *
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
+ *
+ *  $Id$
  */
+
 #ifndef _MONLIB_H_
 #define _MONLIB_H_
 
diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/c/src/lib/libbsp/shared/umon/tfs.h
index 9f8aa9804c..63696dd8f2 100644
--- a/c/src/lib/libbsp/shared/umon/tfs.h
+++ b/c/src/lib/libbsp/shared/umon/tfs.h
@@ -1,23 +1,24 @@
 /* tfs.h:
- *	Header file for TFS transactions, used by both application and monitor.
+ * Header file for TFS transactions, used by both application and monitor.
  *
- *	General notice:
- *	This code is part of a boot-monitor package developed as a generic base
- *	platform for embedded system designs.  As such, it is likely to be
- *	distributed to various projects beyond the control of the original
- *	author.  Please notify the author of any enhancements made or bugs found
- *	so that all may benefit from the changes.  In addition, notification back
- *	to the author will allow the new user to pick up changes that may have
- *	been made by other users after this version of the code was distributed.
+ * General notice:
+ * This code is part of a boot-monitor package developed as a generic base
+ * platform for embedded system designs.  As such, it is likely to be
+ * distributed to various projects beyond the control of the original
+ * author.  Please notify the author of any enhancements made or bugs found
+ * so that all may benefit from the changes.  In addition, notification back
+ * to the author will allow the new user to pick up changes that may have
+ * been made by other users after this version of the code was distributed.
  *
- *	Note1: the majority of this code was edited with 4-space tabs.
- *	Note2: as more and more contributions are accepted, the term "author"
- *		   is becoming a mis-representation of credit.
+ * Note1: the majority of this code was edited with 4-space tabs.
+ * Note2: as more and more contributions are accepted, the term "author"
+ *     is becoming a mis-representation of credit.
  *
- *	Original author:	Ed Sutter
- *	Email:				esutter@lucent.com
- *	Phone:				908-582-2351
+ * Original author: Ed Sutter
+ * Email:           esutter@lucent.com
+ * Phone:           908-582-2351
  */
+
 #ifndef _tfs_h
 #define _tfs_h
 
diff --git a/c/src/lib/libbsp/shared/umon/tfsDriver.c b/c/src/lib/libbsp/shared/umon/tfsDriver.c
index aaf5cd6a28..a390d791e0 100644
--- a/c/src/lib/libbsp/shared/umon/tfsDriver.c
+++ b/c/src/lib/libbsp/shared/umon/tfsDriver.c
@@ -1,12 +1,19 @@
 /*
- * MicroMonitor TFS Hookup to RTEMS FS
+ *  tfsDriver.c - MicroMonitor TFS Hookup to RTEMS FS
  *
- * Initial release: Oct 1, 2004   by Ed Sutter
+ *  Initial release: Oct 1, 2004   by Ed Sutter
  *
  *  This code was derived from the tftpDriver.c code written by
  *  W. Eric Norum, which was apparently derived from the IMFS driver.
  *
- *  This code was updated and merged with RTEMS CVS by Joel Sherrill, 2009.
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
+ *
+ *  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$
  */
diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/c/src/lib/libbsp/shared/umon/umon.h
index d6b7eb45c5..d690d5f92f 100644
--- a/c/src/lib/libbsp/shared/umon/umon.h
+++ b/c/src/lib/libbsp/shared/umon/umon.h
@@ -1,19 +1,18 @@
-/**
- * @file rtems/umon.h
- *
- *  This file contains the RTEMS specific interface to MicroMonitor.
- */
-
 /*
- *  COPYRIGHT (c) 1989-2007.
+ * umon.h - RTEMS specific interface to MicroMonitor.
+ *
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
  *  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
diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
index 782395117e..82392405de 100644
--- a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
+++ b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
@@ -2,12 +2,15 @@
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
  *  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$
- */
+*/
 
 #include <rtems/umon.h>