Cleaned up as part of adding the Monitor test.

18 files changed, 22 insertions, 28 deletions

diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in
index 0f6600f59c..4ecaa6da7d 100644
--- a/c/src/lib/libmisc/monitor/Makefile.in
+++ b/c/src/lib/libmisc/monitor/Makefile.in
@@ -54,4 +54,4 @@ ${LIB}: ${SRCS} ${OBJS}
 all:	preinstall ${ARCH} $(SRCS) $(LIB)
 
 preinstall: $(INSTALLED_H_FILES)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include/rtems
diff --git a/c/src/lib/libmisc/monitor/mon-command.c b/c/src/lib/libmisc/monitor/mon-command.c
index 87d31dfa2a..1fe495e0ae 100644
--- a/c/src/lib/libmisc/monitor/mon-command.c
+++ b/c/src/lib/libmisc/monitor/mon-command.c
@@ -8,7 +8,7 @@
 
 #include <rtems.h>
 
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/c/src/lib/libmisc/monitor/mon-config.c b/c/src/lib/libmisc/monitor/mon-config.c
index d7593dc912..5efd480b14 100644
--- a/c/src/lib/libmisc/monitor/mon-config.c
+++ b/c/src/lib/libmisc/monitor/mon-config.c
@@ -9,7 +9,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <stdlib.h>             /* strtoul() */
diff --git a/c/src/lib/libmisc/monitor/mon-dname.c b/c/src/lib/libmisc/monitor/mon-dname.c
index e6993e18f7..18b127fecf 100644
--- a/c/src/lib/libmisc/monitor/mon-dname.c
+++ b/c/src/lib/libmisc/monitor/mon-dname.c
@@ -22,7 +22,7 @@
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <stdlib.h>             /* strtoul() */
diff --git a/c/src/lib/libmisc/monitor/mon-driver.c b/c/src/lib/libmisc/monitor/mon-driver.c
index 065172534c..212c1cfc77 100644
--- a/c/src/lib/libmisc/monitor/mon-driver.c
+++ b/c/src/lib/libmisc/monitor/mon-driver.c
@@ -22,7 +22,7 @@
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <stdlib.h>             /* strtoul() */
diff --git a/c/src/lib/libmisc/monitor/mon-extension.c b/c/src/lib/libmisc/monitor/mon-extension.c
index 18f6cf2d47..107fd5184e 100644
--- a/c/src/lib/libmisc/monitor/mon-extension.c
+++ b/c/src/lib/libmisc/monitor/mon-extension.c
@@ -5,7 +5,7 @@
  */
 
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 
diff --git a/c/src/lib/libmisc/monitor/mon-itask.c b/c/src/lib/libmisc/monitor/mon-itask.c
index 0f7c2740ce..f6150642c5 100644
--- a/c/src/lib/libmisc/monitor/mon-itask.c
+++ b/c/src/lib/libmisc/monitor/mon-itask.c
@@ -6,7 +6,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 
diff --git a/c/src/lib/libmisc/monitor/mon-manager.c b/c/src/lib/libmisc/monitor/mon-manager.c
index 523fa6aded..497f0255a0 100644
--- a/c/src/lib/libmisc/monitor/mon-manager.c
+++ b/c/src/lib/libmisc/monitor/mon-manager.c
@@ -6,12 +6,10 @@
  */
 
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 
-#include <monitor.h>
-
 /*
  * "next" routine for all objects that are RTEMS manager objects
  */
diff --git a/c/src/lib/libmisc/monitor/mon-monitor.c b/c/src/lib/libmisc/monitor/mon-monitor.c
index 0025266e03..228522566a 100644
--- a/c/src/lib/libmisc/monitor/mon-monitor.c
+++ b/c/src/lib/libmisc/monitor/mon-monitor.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 /* set by trap handler */
 extern rtems_tcb       *debugger_interrupted_task;
diff --git a/c/src/lib/libmisc/monitor/mon-mpci.c b/c/src/lib/libmisc/monitor/mon-mpci.c
index cf88922b2b..5399f37555 100644
--- a/c/src/lib/libmisc/monitor/mon-mpci.c
+++ b/c/src/lib/libmisc/monitor/mon-mpci.c
@@ -9,7 +9,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <stdlib.h>             /* strtoul() */
diff --git a/c/src/lib/libmisc/monitor/mon-object.c b/c/src/lib/libmisc/monitor/mon-object.c
index 90de35ee7b..8d5a9c395f 100644
--- a/c/src/lib/libmisc/monitor/mon-object.c
+++ b/c/src/lib/libmisc/monitor/mon-object.c
@@ -17,14 +17,12 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <stdlib.h>             /* strtoul() */
 #include <string.h>             /* memcpy() */
 
-#include <monitor.h>
-
 #define NUMELEMS(arr)	(sizeof(arr) / sizeof(arr[0]))
 
 /*
diff --git a/c/src/lib/libmisc/monitor/mon-prmisc.c b/c/src/lib/libmisc/monitor/mon-prmisc.c
index 3c7dc62d9a..466de5e224 100644
--- a/c/src/lib/libmisc/monitor/mon-prmisc.c
+++ b/c/src/lib/libmisc/monitor/mon-prmisc.c
@@ -8,7 +8,7 @@
  */
 
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <rtems/assoc.h>
 
diff --git a/c/src/lib/libmisc/monitor/mon-queue.c b/c/src/lib/libmisc/monitor/mon-queue.c
index 08c1d9474e..b165062e28 100644
--- a/c/src/lib/libmisc/monitor/mon-queue.c
+++ b/c/src/lib/libmisc/monitor/mon-queue.c
@@ -3,7 +3,7 @@
  */
 
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 
diff --git a/c/src/lib/libmisc/monitor/mon-server.c b/c/src/lib/libmisc/monitor/mon-server.c
index af155684fb..3ae56058d3 100644
--- a/c/src/lib/libmisc/monitor/mon-server.c
+++ b/c/src/lib/libmisc/monitor/mon-server.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 /*
  * Various id's for the server
diff --git a/c/src/lib/libmisc/monitor/mon-symbols.c b/c/src/lib/libmisc/monitor/mon-symbols.c
index 6c6589d38f..401ad69d9c 100644
--- a/c/src/lib/libmisc/monitor/mon-symbols.c
+++ b/c/src/lib/libmisc/monitor/mon-symbols.c
@@ -17,8 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "monitor.h"
-#include "symbols.h"
+#include <rtems/monitor.h>
+#include <rtems/symbols.h>
 
 
 rtems_symbol_table_t *
diff --git a/c/src/lib/libmisc/monitor/mon-task.c b/c/src/lib/libmisc/monitor/mon-task.c
index 9592d9d99b..b6ca36ddd1 100644
--- a/c/src/lib/libmisc/monitor/mon-task.c
+++ b/c/src/lib/libmisc/monitor/mon-task.c
@@ -5,7 +5,7 @@
  */
 
 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>
 
 #include <stdio.h>
 #include <string.h>    /* memcpy() */
diff --git a/c/src/lib/libmisc/monitor/monitor.h b/c/src/lib/libmisc/monitor/monitor.h
index 1844add643..7634fc05a9 100644
--- a/c/src/lib/libmisc/monitor/monitor.h
+++ b/c/src/lib/libmisc/monitor/monitor.h
@@ -12,7 +12,7 @@
 #ifndef __MONITOR_H
 #define __MONITOR_H
 
-#include "symbols.h"
+#include <rtems/symbols.h>
 #include <rtems/error.h>		/* rtems_error() */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libmisc/monitor/symbols.h b/c/src/lib/libmisc/monitor/symbols.h
index 061ccdd952..119c879d54 100644
--- a/c/src/lib/libmisc/monitor/symbols.h
+++ b/c/src/lib/libmisc/monitor/symbols.h
@@ -31,12 +31,10 @@ typedef struct rtems_symbol_string_block_s {
 
 typedef struct {
 
-    rtems_unsigned32 sorted;            /* are symbols sorted right now? */
-
-    rtems_unsigned32 growth_factor;     /* % to grow by when needed */
-
-    rtems_unsigned32 next;              /* next symbol slot to use when adding */
-    rtems_unsigned32 size;              /* max # of symbols */
+    rtems_unsigned32 sorted;          /* are symbols sorted right now? */
+    rtems_unsigned32 growth_factor;   /* % to grow by when needed */
+    rtems_unsigned32 next;            /* next symbol slot to use when adding */
+    rtems_unsigned32 size;            /* max # of symbols */
 
     /*
      * Symbol list -- sorted by address (when we do a lookup)