RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* bootcard.c: Add support for optionally having a unified work area. In
	other words, the RTEMS Workspace and C Program Heap are the same pool
	of memory.
This commit is contained in:
Joel Sherrill
2008-09-17 18:38:05 +00:00
parent bd5984deb7
commit 1986152ec9
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/shared/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* bootcard.c: Add support for optionally having a unified work area. In
other words, the RTEMS Workspace and C Program Heap are the same pool
of memory.
2008-09-17 Miao Yan <yanmiaobest@gmail.com> 2008-09-17 Miao Yan <yanmiaobest@gmail.com>
* bsplibc.c, bsppost.c: Merge GSOC project code to add simple device * bsplibc.c, bsppost.c: Merge GSOC project code to add simple device

27
c/src/lib/libbsp/shared/bootcard.c
View File

@@ -52,6 +52,11 @@
*/ */
char *rtems_progname; char *rtems_progname;
/*
* Are we using a single heap for the RTEMS Workspace and C Program Heap?
*/
extern bool rtems_unified_work_area;
/* /*
* These are the prototypes and helper routines which are used * These are the prototypes and helper routines which are used
* when the BSP lets the framework handle RAM allocation between * when the BSP lets the framework handle RAM allocation between
@@ -67,7 +72,8 @@ char *rtems_progname;
{ {
size_t heap_size_default = 0; size_t heap_size_default = 0;
if (heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA) { if ( !rtems_unified_work_area &&
heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA) {
/* Use the work area start as heap start */ /* Use the work area start as heap start */
heap_start = work_area_start; heap_start = work_area_start;
@@ -165,8 +171,6 @@ int boot_card(
*/ */
#if defined(BSP_BOOTCARD_HANDLES_RAM_ALLOCATION) #if defined(BSP_BOOTCARD_HANDLES_RAM_ALLOCATION)
{ {
void *work_space_start = NULL;
bsp_get_work_area( bsp_get_work_area(
&work_area_start, &work_area_start,
&work_area_size, &work_area_size,
@@ -174,17 +178,20 @@ int boot_card(
&heap_size &heap_size
); );
work_space_start = (char *) work_area_start + work_area_size if ( work_area_size <= Configuration.work_space_size ) {
- rtems_configuration_get_work_space_size(); printk( "bootcard: Work space too big for work area!\n");
if ((uintptr_t) work_space_start <= (uintptr_t) work_area_start) {
printk( "bootcard: Work space to big for work area!\n");
bsp_cleanup(); bsp_cleanup();
return -1; return -1;
} }
Configuration.work_space_start = work_space_start; if ( rtems_unified_work_area ) {
Configuration.work_space_start = work_area_start;
Configuration.work_space_size = work_area_size;
} else {
Configuration.work_space_start = (char *) work_area_start +
work_area_size - rtems_configuration_get_work_space_size();
}
#if (BSP_DIRTY_MEMORY == 1) #if (BSP_DIRTY_MEMORY == 1)
memset( work_area_start, 0xCF, work_area_size); memset( work_area_start, 0xCF, work_area_size);
#endif #endif