[Cbe-oss-dev] [PATCH 14/17]MARS/modules/task: Rename define task elf vaddr

Yuji Mano yuji.mano at am.sony.com
Wed Dec 3 13:59:19 EST 2008


This renames MARS_TASK_ELF_VADDR to MARS_TASK_BASE_ADDR.

Signed-off-by: Yuji Mano <yuji.mano at am.sony.com>

---
 modules/task/include/common/mars/task_types.h |    4 ++--
 modules/task/src/host/lib/task.c              |    4 ++--
 modules/task/src/mpu/module/task_module.c     |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

--- a/modules/task/include/common/mars/task_types.h
+++ b/modules/task/include/common/mars/task_types.h
@@ -48,9 +48,9 @@
 
 /**
  * \ingroup group_mars_task
- * \brief Virtual Address of task elf
+ * \brief Base address of task
  */
-#define MARS_TASK_ELF_VADDR			0x8000
+#define MARS_TASK_BASE_ADDR			0x8000
 
 /**
  * \ingroup group_mars_task
--- a/modules/task/src/host/lib/task.c
+++ b/modules/task/src/host/lib/task.c
@@ -101,8 +101,8 @@ int mars_task_create(struct mars_context
 		((void *)ehdr_task + ehdr_task->e_phoff);
 
 	if (phdr_module->p_type != PT_LOAD || phdr_task->p_type != PT_LOAD ||
-		phdr_module->p_vaddr != MARS_WORKLOAD_MODULE_ELF_VADDR ||
-		phdr_task->p_vaddr != MARS_TASK_ELF_VADDR)
+		phdr_module->p_vaddr != MARS_WORKLOAD_MODULE_BASE_ADDR ||
+		phdr_task->p_vaddr != MARS_TASK_BASE_ADDR)
 		return MARS_ERROR_FORMAT;
 
 	/* begin process to add the task to the workload queue */
--- a/modules/task/src/mpu/module/task_module.c
+++ b/modules/task/src/mpu/module/task_module.c
@@ -208,7 +208,7 @@ static void __attribute__((noinline)) co
 			break;
 
 		/* request dma put of the context save unit specified */
-		mars_dma_large_put((void *)(MARS_TASK_ELF_VADDR + list[i].addr),
+		mars_dma_large_put((void *)(MARS_TASK_BASE_ADDR + list[i].addr),
 			task->context_save_area_ea + offset,
 			list[i].size, MARS_DMA_TAG);
 
@@ -235,7 +235,7 @@ static void __attribute__((noinline)) co
 			break;
 
 		/* request dma get of the context save unit specified */
-		mars_dma_large_get((void *)(MARS_TASK_ELF_VADDR + list[i].addr),
+		mars_dma_large_get((void *)(MARS_TASK_BASE_ADDR + list[i].addr),
 			task->context_save_area_ea + offset,
 			list[i].size, MARS_DMA_TAG);
 
@@ -424,11 +424,11 @@ void mars_module_main(void)
 	/* if stack pointer is uninitialized run fresh, otherwise resume */
 	if (!task->stack) {
 		/* dma the exec code into mpu storage from host storage */
-		mars_dma_large_get_and_wait((void *)MARS_TASK_ELF_VADDR,
+		mars_dma_large_get_and_wait((void *)MARS_TASK_BASE_ADDR,
 			task->exec_ea, task->exec_size, MARS_DMA_TAG);
 
 		/* 0 the bss section */
-		memset((void *)MARS_TASK_ELF_VADDR + task->exec_size, 0,
+		memset((void *)MARS_TASK_BASE_ADDR + task->exec_size, 0,
 			task->bss_size);
 
 		/* call entry function */






More information about the cbe-oss-dev mailing list