Cleaned up as part of adding the Monitor test.

2025-12-25 22:07:15 +00:00 · 1997-09-21 16:58:57 +00:00
parent f37e656d55
commit 5beb562450
53 changed files with 65 additions and 83 deletions
--- 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
--- 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>
--- 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() */
--- 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() */
--- 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() */
--- 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>

--- 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>

--- 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
 */
--- 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;
--- 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() */
--- 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]))

 /*
--- 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>

--- 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>

--- 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
--- 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 *
--- 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() */
--- 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
--- 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)
--- a/c/src/libmisc/monitor/Makefile.in
+++ b/c/src/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
--- a/c/src/libmisc/monitor/mon-command.c
+++ b/c/src/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>
--- a/c/src/libmisc/monitor/mon-config.c
+++ b/c/src/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() */
--- a/c/src/libmisc/monitor/mon-dname.c
+++ b/c/src/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() */
--- a/c/src/libmisc/monitor/mon-driver.c
+++ b/c/src/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() */
--- a/c/src/libmisc/monitor/mon-extension.c
+++ b/c/src/libmisc/monitor/mon-extension.c
@@ -5,7 +5,7 @@
 */

 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>

 #include <stdio.h>

--- a/c/src/libmisc/monitor/mon-itask.c
+++ b/c/src/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>

--- a/c/src/libmisc/monitor/mon-manager.c
+++ b/c/src/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
 */
--- a/c/src/libmisc/monitor/mon-monitor.c
+++ b/c/src/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;
--- a/c/src/libmisc/monitor/mon-mpci.c
+++ b/c/src/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() */
--- a/c/src/libmisc/monitor/mon-object.c
+++ b/c/src/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]))

 /*
--- a/c/src/libmisc/monitor/mon-prmisc.c
+++ b/c/src/libmisc/monitor/mon-prmisc.c
@@ -8,7 +8,7 @@
 */

 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>

 #include <rtems/assoc.h>

--- a/c/src/libmisc/monitor/mon-queue.c
+++ b/c/src/libmisc/monitor/mon-queue.c
@@ -3,7 +3,7 @@
 */

 #include <rtems.h>
-#include "monitor.h"
+#include <rtems/monitor.h>

 #include <stdio.h>

--- a/c/src/libmisc/monitor/mon-server.c
+++ b/c/src/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
--- a/c/src/libmisc/monitor/mon-symbols.c
+++ b/c/src/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 *
--- a/c/src/libmisc/monitor/mon-task.c
+++ b/c/src/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() */
--- a/c/src/libmisc/monitor/monitor.h
+++ b/c/src/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
--- a/c/src/libmisc/monitor/symbols.h
+++ b/c/src/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)