summaryrefslogtreecommitdiffstats
path: root/c/src/exec/sapi
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-26 21:54:57 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-26 21:54:57 +0000
commit9c63d905616d4bb85bd58f6fcef2ec4f2eecf457 (patch)
treec139df0238c4d89c75a6e113526eb4d2b3ccdfb0 /c/src/exec/sapi
parentchanged version to ss-20010126 (diff)
downloadrtems-9c63d905616d4bb85bd58f6fcef2ec4f2eecf457.tar.bz2
2001-01-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/confdefs.h: include cpuopts.h, replace stubdr w/ devnull.
Diffstat (limited to 'c/src/exec/sapi')
-rw-r--r--c/src/exec/sapi/ChangeLog4
-rw-r--r--c/src/exec/sapi/include/confdefs.h13
2 files changed, 14 insertions, 3 deletions
diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog
index c085f2fb7a..78761abb24 100644
--- a/c/src/exec/sapi/ChangeLog
+++ b/c/src/exec/sapi/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/confdefs.h: include cpuopts.h, replace stubdr w/ devnull.
+
2000-10-30 Joel Sherrill <joel@OARcorp.com>
* POSIX include files merged into newlib. This resulted in
diff --git a/c/src/exec/sapi/include/confdefs.h b/c/src/exec/sapi/include/confdefs.h
index bec95066cb..697fb60701 100644
--- a/c/src/exec/sapi/include/confdefs.h
+++ b/c/src/exec/sapi/include/confdefs.h
@@ -38,7 +38,12 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
+/*
+ * Include the executive's configuration
+ */
+#include <rtems/score/cpuopts.h>
+
extern rtems_initialization_tasks_table Initialization_tasks[];
extern rtems_driver_address_table Device_drivers[];
extern rtems_configuration_table Configuration;
@@ -56,7 +61,9 @@ extern itron_api_configuration_table Configuration_ITRON_API;
* NOTE: This ends up defining these even when newlib is not used.
*/
+#ifdef RTEMS_NEWLIB
#define CONFIGURE_NEWLIB_EXTENSION 1
+#endif
#define CONFIGURE_MALLOC_REGION 1
/*
@@ -262,7 +269,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
#endif
#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
-#include <stubdrv.h>
+#include <rtems/devnull.h>
#endif
#ifndef CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE
@@ -276,7 +283,7 @@ rtems_driver_address_table Device_drivers[] = {
CLOCK_DRIVER_TABLE_ENTRY,
#endif
#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
- STUB_DRIVER_TABLE_ENTRY,
+ DEVNULL_DRIVER_TABLE_ENTRY,
#endif
NULL_DRIVER_TABLE_ENTRY
};