changeset 1014:58c3cbf6e3dd

merge
author tkaito
date Fri, 05 Nov 2010 01:06:51 +0900
parents 34a9ba655fbe (current diff) bba03a6843ba (diff)
children e4e96ab3044d
files
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/example/HelloWorld/Func.h	Fri Nov 05 01:05:39 2010 +0900
+++ b/example/HelloWorld/Func.h	Fri Nov 05 01:06:51 2010 +0900
@@ -1,6 +1,6 @@
 enum {
 #include "SysTasks.h"
-    HELLO_TASK,
+    Hello,
     RUN_FINISH,
 };
 
--- a/example/HelloWorld/main.cc	Fri Nov 05 01:05:39 2010 +0900
+++ b/example/HelloWorld/main.cc	Fri Nov 05 01:06:51 2010 +0900
@@ -38,7 +38,7 @@
 	 *   create_task(Task ID);
 	 */
 
-	HTask *hello = manager->create_task(HELLO_TASK);
+	HTask *hello = manager->create_task(Hello);
 
 	/**
 	 * Select CPU
--- a/example/HelloWorld/ppe/Hello.cc	Fri Nov 05 01:05:39 2010 +0900
+++ b/example/HelloWorld/ppe/Hello.cc	Fri Nov 05 01:06:51 2010 +0900
@@ -4,10 +4,10 @@
 #include "Func.h"
 
 /* これは必須 */
-SchedDefineTask(Hello);
+SchedDefineTask1(Hello,hello);
 
 static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
+hello(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     int task_id = (long)smanager->get_param(0);
 
--- a/example/HelloWorld/ppe/task_init.cc	Fri Nov 05 01:05:39 2010 +0900
+++ b/example/HelloWorld/ppe/task_init.cc	Fri Nov 05 01:06:51 2010 +0900
@@ -13,5 +13,5 @@
 void
 task_init()
 {
-  SchedRegisterTask(HELLO_TASK, Hello);
+  SchedRegister(Hello);
 }