summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-08 21:44:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-08 21:44:02 +0000
commit6c7928bba3a0f871b7bf66767056313d4506059a (patch)
tree8237f3010cab868ca620dfea547dd94316ffb268 /cpukit
parent2007-03-08 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-6c7928bba3a0f871b7bf66767056313d4506059a.tar.bz2
2007-03-08 Joel Sherrill <joel@OARcorp.com>
* libfs/src/imfs/imfs.h: Fix comment.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/libfs/src/imfs/imfs.h6
-rw-r--r--cpukit/sapi/include/confdefs.h26
3 files changed, 7 insertions, 29 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e9cf423cc8..0b3bfa205c 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -4,6 +4,10 @@
2007-03-08 Joel Sherrill <joel@OARcorp.com>
+ * libfs/src/imfs/imfs.h: Fix comment.
+
+2007-03-08 Joel Sherrill <joel@OARcorp.com>
+
* libmisc/stackchk/check.c, libmisc/stackchk/internal.h,
libmisc/stackchk/stackchk.h: Change dump usage to report usage.
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h
index 4e68fc8ac9..2f69537b83 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/libfs/src/imfs/imfs.h
@@ -1,7 +1,7 @@
/*
* Header file for the In-Memory File System
*
- * COPYRIGHT (c) 1989-1999.
+ * COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -82,10 +82,6 @@ typedef struct {
#define IMFS_MEMFILE_DEFAULT_BYTES_PER_BLOCK 128
extern int imfs_rq_memfile_bytes_per_block;
- /*
- * FIXME: make and use derivates from this,
- * a shift count and a mask
- */
extern int imfs_memfile_bytes_per_block;
#define IMFS_MEMFILE_BYTES_PER_BLOCK imfs_memfile_bytes_per_block
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index dea039ee24..ea70b7aa25 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -253,29 +253,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
#endif
/*
- * Map obsolete names to current ones
- *
- * NOTE: These should be obsoleted in a future release.
- */
-
-#ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_RTC_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
-#endif
-
-
-/*
* Default Device Driver Table. Each driver needed by the test is explicitly
* choosen by that test. There is always a null driver entry.
*/
@@ -1097,7 +1074,8 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = {
#ifdef CONFIGURE_GNAT_RTEMS
#define CONFIGURE_GNAT_MUTEXES 10
-#define CONFIGURE_GNAT_KEYS 1
+/* GNAT/RTEMS provides an optimized Ada self and does not use POSIX Keys */
+#define CONFIGURE_GNAT_KEYS 0
/* 20 are required to run all tests in the ACVC */
#ifndef CONFIGURE_MAXIMUM_ADA_TASKS