summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-14 18:45:34 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-14 18:45:34 +0000
commitdc7fb59bb762bec93991633c02b6f67bad70fa8a (patch)
treefa50edc737584e7f3812a022325eb889d7d8273b /c/src
parent2002-05-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-dc7fb59bb762bec93991633c02b6f67bad70fa8a.tar.bz2
2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sys/utsname.h: Remove. * include/Makefile.am: Reflect changes above. * src/utsname.c: Remove. * src/Makefile.am: Reflect changes above.
Diffstat (limited to '')
-rw-r--r--c/src/exec/posix/ChangeLog7
-rw-r--r--c/src/exec/posix/include/Makefile.am9
-rw-r--r--c/src/exec/posix/include/sys/.cvsignore2
-rw-r--r--c/src/exec/posix/include/sys/utsname.h56
-rw-r--r--c/src/exec/posix/src/Makefile.am2
-rw-r--r--c/src/exec/posix/src/utsname.c53
6 files changed, 8 insertions, 121 deletions
diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog
index 70c30c603e..5eef673eb8 100644
--- a/c/src/exec/posix/ChangeLog
+++ b/c/src/exec/posix/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/sys/utsname.h: Remove.
+ * include/Makefile.am: Reflect changes above.
+ * src/utsname.c: Remove.
+ * src/Makefile.am: Reflect changes above.
+
2001-04-26 Joel Sherrill <joel@OARcorp.com>
* include/rtems/posix/mqueue.h, inline/rtems/posix/mqueue.inl,
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index 4fcc061597..eb2edf1d82 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -21,15 +21,6 @@ include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-# sys
-
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS = sys/utsname.h
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
- $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
# rtems/posix
include_rtems_posixdir = $(includedir)/rtems/posix
diff --git a/c/src/exec/posix/include/sys/.cvsignore b/c/src/exec/posix/include/sys/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/exec/posix/include/sys/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/exec/posix/include/sys/utsname.h b/c/src/exec/posix/include/sys/utsname.h
deleted file mode 100644
index 70d6dfc7cf..0000000000
--- a/c/src/exec/posix/include/sys/utsname.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* sys/utsname.h
- *
- * $Id$
- */
-
-#ifndef __POSIX_SYS_UTSNAME_h
-#define __POSIX_SYS_UTSNAME_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/times.h>
-#include <sys/types.h>
-
-/*
- * 4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90
- *
- * NOTE: The lengths of the strings in this structure are
- * just long enough to reliably contain the RTEMS information.
- * For example, the fields are not long enough to support
- * Internet hostnames.
- */
-
-struct utsname {
- char sysname[ 32 ]; /* Name of this implementation of the operating system */
- char nodename[ 32 ]; /* Name of this node within an implementation */
- /* specified communication network */
- char release[ 32 ]; /* Current release level of this implementation */
- char version[ 32 ]; /* Current version level of this release */
- char machine[ 32 ]; /* Name of the hardware type on which the system */
- /* is running */
-};
-
-/*
- * 4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
- struct utsname *name
-);
-
-/*
- * 4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
- struct tms *buffer
-);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* end of include file */
-
diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am
index 00abd9fc01..c5437ee1b4 100644
--- a/c/src/exec/posix/src/Makefile.am
+++ b/c/src/exec/posix/src/Makefile.am
@@ -81,7 +81,7 @@ C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
$(ID_C_FILES) $(KEY_C_FILES) $(MEMORY_C_FILES) $(MESSAGE_QUEUE_C_FILES) \
$(MUTEX_C_FILES) $(PTHREAD_C_FILES) $(PSIGNAL_C_FILES) sched.c \
$(SEMAPHORE_C_FILES) sysconf.c $(TIME_C_FILES) $(TIMER_C_FILES) types.c \
- $(ENOSYS_C_FILES) $(BUILD_FOR_NOW_C_FILES) utsname.c
+ $(ENOSYS_C_FILES) $(BUILD_FOR_NOW_C_FILES)
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
OBJS = $(C_O_FILES)
diff --git a/c/src/exec/posix/src/utsname.c b/c/src/exec/posix/src/utsname.c
deleted file mode 100644
index fe3fecac9f..0000000000
--- a/c/src/exec/posix/src/utsname.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * $Id$
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#include <errno.h>
-#include <sys/utsname.h>
-
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/sptables.h>
-
-#include <rtems/seterr.h>
-
-/*PAGE
- *
- * 4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
- struct utsname *name
-)
-{
- /* XXX: Here is what Solaris returns...
- sysname = SunOS
- nodename = node_name
- release = 5.3
- version = Generic_101318-12
- machine = sun4m
- */
-
- if ( !name )
- rtems_set_errno_and_return_minus_one( EFAULT );
-
- strcpy( name->sysname, "RTEMS" );
-
- sprintf( name->nodename, "Node %d", _Objects_Local_node );
-
- strcpy( name->release, RTEMS_VERSION );
-
- strcpy( name->version, "" );
-
- sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
-
- return 0;
-}