changeset 680:af0942d42de0

fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sun, 06 Dec 2009 13:17:42 +0900
parents 14d179ff1e9f
children b976bed4e46a
files TaskManager/Makefile.def TaskManager/kernel/ppe/Task.cc
diffstat 2 files changed, 62 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Sun Dec 06 11:33:09 2009 +0900
+++ b/TaskManager/Makefile.def	Sun Dec 06 13:17:42 2009 +0900
@@ -29,8 +29,8 @@
 
 ABIBIT = 32
 
-SIMPLE_TASK=-DSIMPLE_TASK
-# SIMPLE_TASK=
+# SIMPLE_TASK=-DSIMPLE_TASK
+SIMPLE_TASK=
 
 # OPT = -O9 
 OPT =  -g
--- a/TaskManager/kernel/ppe/Task.cc	Sun Dec 06 11:33:09 2009 +0900
+++ b/TaskManager/kernel/ppe/Task.cc	Sun Dec 06 13:17:42 2009 +0900
@@ -1,5 +1,6 @@
 #include "Task.h"
 
+#ifndef SIMPLE_TASK
 /**
  * タスクの入力データを追加する
  *
@@ -11,11 +12,7 @@
 int
 Task::add_inData_t(memaddr addr, int size)
 {
-#ifdef SIMPLE_TASK
-    return 0;
-#else
     return add_data(inData, addr, size);
-#endif
 }
 
 /**
@@ -29,11 +26,7 @@
 int
 Task::add_outData_t(memaddr addr, int size)
 {
-#ifdef SIMPLE_TASK
-    return 0;
-#else
     return add_data(outData, addr, size);
-#endif
 }
 
 /**
@@ -49,22 +42,18 @@
 int
 Task::add_param0(memaddr _param)
 {
-#ifndef SIMPLE_TASK
     if (param_size >= MAX_PARAMS) return -1;
     
     this->param[param_size++] = _param;
-#endif
     return 0;
 }
 
 int
 Task::set_param0(int index, memaddr _param)
 {
-#ifndef SIMPLE_TASK
     if (index >= MAX_PARAMS) return -1;
     
     this->param[index] = _param;
-#endif
     return 0;
 }
 
@@ -75,7 +64,6 @@
 int
 Task::add_data(ListData& list, memaddr addr, int size)
 {
-#ifndef SIMPLE_TASK
     if (list.length >= MAX_LIST_DMA_SIZE) return -1;
 
     list.bound[list.length] = list.size;
@@ -90,7 +78,64 @@
     elm->addr = addr;
 #endif
     elm->size = size;
+    return 0;
+}
+
+#else /* ifdef SIMPLE_TASK */
+
+int 
+Task::add_inData_t(memaddr addr, int size)
+{
+}
+  
+int 
+Task::add_outData_t(memaddr addr, int size)
+{
+}
+ 
+int 
+Task::set_inData_length(int length)
+{
+}
+
+int 
+Task::set_inData_t(int index, memaddr addr, int size)
+{
+}
+  
+int 
+Task::set_outData_length(int length)
+{
+}
+
+int 
+Task::set_outData_t(int index, memaddr addr, int size)
+{
+}
+ 
+int 
+Task::add_data(ListData &list, memaddr addr, int size)
+{
+}
+
+void 
+Task::set_param_length(int i)
+{
+}
+
+int 
+Task::add_param_t(memaddr param)
+{
+    this->param[param_size++] = _param;
+}
+  
+int 
+Task::set_param_t(int index, memaddr param)
+{
+    this->param[index] = _param;
+}
+
+
 #endif
 
-    return 0;
-}
+/* end */