summaryrefslogtreecommitdiffstats
path: root/cpukit/sapi/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/sapi/include')
-rw-r--r--cpukit/sapi/include/confdefs.h9
-rw-r--r--cpukit/sapi/include/rtems/config.h10
2 files changed, 4 insertions, 15 deletions
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index d4f21ca376..09edc97770 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -901,11 +901,11 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
* RAM to the malloc family implementation so sbrk()'ing to get
* more memory would always fail anyway.
*/
- rtems_malloc_sbrk_functions_t *rtems_malloc_sbrk_helpers =
- #ifndef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
- NULL;
+ const rtems_heap_extend_handler rtems_malloc_extend_handler =
+ #ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ rtems_heap_extend_via_sbrk;
#else
- &rtems_malloc_sbrk_helpers_table;
+ rtems_heap_null_extend;
#endif
#endif
@@ -2318,7 +2318,6 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
* This is the primary Configuration Table for this application.
*/
rtems_configuration_table Configuration = {
- NULL, /* filled in by BSP */
CONFIGURE_EXECUTIVE_RAM_SIZE, /* required RTEMS workspace */
CONFIGURE_STACK_SPACE_SIZE, /* required stack space */
CONFIGURE_MAXIMUM_USER_EXTENSIONS, /* maximum dynamic extensions */
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h
index 58b350da76..d0e181c781 100644
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/sapi/include/rtems/config.h
@@ -124,10 +124,6 @@ typedef void (*rtems_stack_free_hook)( void *addr );
* + required number of each object type for each API configured
*/
typedef struct {
- /** This field specifies the base address of the RTEMS Workspace.
- */
- void *work_space_start;
-
/** This field specifies the size in bytes of the RTEMS Workspace.
*/
uintptr_t work_space_size;
@@ -266,12 +262,6 @@ extern rtems_configuration_table Configuration;
#define rtems_configuration_set_stack_space_size( _size ) \
do { Configuration.stack_space_size = (_size); } while (0)
-#define rtems_configuration_get_work_space_start() \
- (Configuration.work_space_start)
-
-#define rtems_configuration_set_work_space_start( _start ) \
- do { Configuration.work_space_start = (_start); } while (0)
-
#define rtems_configuration_get_work_space_size() \
(Configuration.work_space_size + \
(rtems_configuration_get_stack_allocator_avoids_work_space() ? \