diff TaskManager/kernel/schedule/SchedTask.cc @ 625:60aa3f241b10

64bit mode worked on Mac OS X.
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 16 Nov 2009 10:59:55 +0900
parents 0decff4e867b
children 8843edf37c0e
line wrap: on
line diff
--- a/TaskManager/kernel/schedule/SchedTask.cc	Sun Nov 15 04:56:09 2009 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Mon Nov 16 10:59:55 2009 +0900
@@ -126,7 +126,7 @@
     scheduler->dma_wait(DMA_WRITE);
     free(writebuf);
 
-    scheduler->mail_write((int)task->self);
+    scheduler->mail_write((memaddr)task->self);
 }
 
 
@@ -152,7 +152,7 @@
         } else {
 	    // 新しいリストに取り掛かる
             return createSchedTaskList(nextList, scheduler,
-                                       SCHED_TASKLIST_NORMAL);
+                                       0);
         }
     }
 }
@@ -181,7 +181,7 @@
 /**
  * get_input(index) のアドレスを返す
  */
-uint32
+memaddr
 SchedTask::get_inputAddr(int index)
 {
     return inListData->element[index].addr;
@@ -212,7 +212,7 @@
 /**
  * get_output(index) のアドレスを返す
  */
-uint32
+memaddr
 SchedTask::get_outputAddr(int index)
 {
     return outListData->element[index].addr;
@@ -227,7 +227,7 @@
     return outListData->element[index].size;
 }
 
-int
+memaddr
 SchedTask::get_param(int index)
 {
     return task->param[index];
@@ -276,12 +276,12 @@
 
 
 void
-SchedTask::dma_load(void *buf, uint32 addr, uint32 size, uint32 mask) {
+SchedTask::dma_load(void *buf, memaddr addr, uint32 size, uint32 mask) {
     scheduler->dma_load(buf, addr, size, mask);
 }
 
 void
-SchedTask::dma_store(void *buf,uint32 addr, uint32 size, uint32 mask) {
+SchedTask::dma_store(void *buf,memaddr addr, uint32 size, uint32 mask) {
     scheduler->dma_store(buf, addr, size, mask);
 }