summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-19 11:54:00 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-19 11:54:00 +0000
commite7f38e82377f907539214d1a2557ca9e7c7226f7 (patch)
tree0e370d1b9b7688ab5568cd8c6de422844d4b5eb0 /cpukit
parent2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-e7f38e82377f907539214d1a2557ca9e7c7226f7.tar.bz2
2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* monitor/symbols.h: Convert to private header. * monitor/monitor.h: Don't include symbols.h. Add forward decls. for symbols from symbols.h. * monitor/Makefile.am: Don't install symbols.h. * monitor/mon-symbols.c: Include "symbols.h".
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libmisc/ChangeLog8
-rw-r--r--cpukit/libmisc/monitor/Makefile.am4
-rw-r--r--cpukit/libmisc/monitor/mon-symbols.c2
-rw-r--r--cpukit/libmisc/monitor/monitor.h5
-rw-r--r--cpukit/libmisc/monitor/symbols.h10
5 files changed, 21 insertions, 8 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index ec8a29cbd9..97dd175128 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * monitor/symbols.h: Convert to private header.
+ * monitor/monitor.h: Don't include symbols.h.
+ Add forward decls. for symbols from symbols.h.
+ * monitor/Makefile.am: Don't install symbols.h.
+ * monitor/mon-symbols.c: Include "symbols.h".
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* cpuuse/cpuuse.c, cpuuse/cpuuse.h, devnull/devnull.c,
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index 68245791f2..d111656297 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -20,9 +20,9 @@ if HAS_MP
OBJS += $(MP_C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
endif
-include_rtems_HEADERS = monitor.h symbols.h
+include_rtems_HEADERS = monitor.h
-noinst_HEADERS = config.h
+noinst_HEADERS = config.h symbols.h
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c
index 6c1d286793..0b8560c4fc 100644
--- a/cpukit/libmisc/monitor/mon-symbols.c
+++ b/cpukit/libmisc/monitor/mon-symbols.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <rtems/monitor.h>
-#include <rtems/symbols.h>
+#include "symbols.h"
rtems_symbol_table_t *
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h
index c6eb3c5cfe..3fd82c2552 100644
--- a/cpukit/libmisc/monitor/monitor.h
+++ b/cpukit/libmisc/monitor/monitor.h
@@ -12,13 +12,16 @@
#ifndef __MONITOR_H
#define __MONITOR_H
-#include <rtems/symbols.h>
#include <rtems/error.h> /* rtems_error() */
#ifdef __cplusplus
extern "C" {
#endif
+/* Forward decls from symbols.h */
+typedef struct _rtems_symbol_t rtems_symbol_t ;
+typedef struct _rtems_symbol_table_t rtems_symbol_table_t;
+
/*
* Monitor types are derived from rtems object classes
*/
diff --git a/cpukit/libmisc/monitor/symbols.h b/cpukit/libmisc/monitor/symbols.h
index 119c879d54..978b2eb4ff 100644
--- a/cpukit/libmisc/monitor/symbols.h
+++ b/cpukit/libmisc/monitor/symbols.h
@@ -14,14 +14,16 @@
#ifndef _INCLUDE_SYMBOLS_H
#define _INCLUDE_SYMBOLS_H
+#include <rtems/monitor.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct {
+struct _rtems_symbol_t {
rtems_unsigned32 value;
char *name;
-} rtems_symbol_t;
+} ;
#define SYMBOL_STRING_BLOCK_SIZE 4080
typedef struct rtems_symbol_string_block_s {
@@ -29,7 +31,7 @@ typedef struct rtems_symbol_string_block_s {
char buffer[SYMBOL_STRING_BLOCK_SIZE];
} rtems_symbol_string_block_t;
-typedef struct {
+struct _rtems_symbol_table_t {
rtems_unsigned32 sorted; /* are symbols sorted right now? */
rtems_unsigned32 growth_factor; /* % to grow by when needed */
@@ -50,7 +52,7 @@ typedef struct {
rtems_symbol_string_block_t *string_buffer_current;
rtems_unsigned32 strings_next; /* next byte to use in this block */
-} rtems_symbol_table_t;
+} ;
#define rtems_symbol_name(sp) ((sp)->name)
#define rtems_symbol_value(sp) ((sp)->value)