From: Shinichiro Nakamura <shinta.main.jp@gmail.com>
Date: Sun, 15 Jul 2012 22:29:36 +0000 (+0900)
Subject: Added task ID variables.
X-Git-Url: http://git.osdn.net/view?p=kozos-expbrd%2Fkozos_expbrd.git;a=commitdiff_plain;h=e3ae1c918196cc32e47d409f4eb2ef654493cc09

Added task ID variables.
---

diff --git a/firm/sample/sample1/os/kozos.h b/firm/sample/sample1/os/kozos.h
index 9109d9e..6b61bc7 100644
--- a/firm/sample/sample1/os/kozos.h
+++ b/firm/sample/sample1/os/kozos.h
@@ -39,4 +39,10 @@ void kz_sysdown(void);
 void kz_syscall(kz_syscall_type_t type, kz_syscall_param_t *param);
 void kz_srvcall(kz_syscall_type_t type, kz_syscall_param_t *param);
 
+extern kz_thread_id_t tskid_audio;
+extern kz_thread_id_t tskid_display;
+extern kz_thread_id_t tskid_menu;
+extern kz_thread_id_t tskid_input;
+extern kz_thread_id_t tskid_command;
+
 #endif
diff --git a/firm/sample/sample1/os/main.c b/firm/sample/sample1/os/main.c
index efeac67..e95b309 100644
--- a/firm/sample/sample1/os/main.c
+++ b/firm/sample/sample1/os/main.c
@@ -3,6 +3,12 @@
 #include "interrupt.h"
 #include "lib.h"
 
+kz_thread_id_t tskid_audio;
+kz_thread_id_t tskid_display;
+kz_thread_id_t tskid_menu;
+kz_thread_id_t tskid_input;
+kz_thread_id_t tskid_command;
+
 /* ¥·¥¹¥Æ¥à¡¦¥¿¥¹¥¯¤È¥æ¡¼¥¶¡¦¥¿¥¹¥¯¤Îµ¯Æ° */
 static int start_threads(int argc, char *argv[])
 {
@@ -15,11 +21,11 @@ static int start_threads(int argc, char *argv[])
   /*
    * Tasks
    */
-  kz_run(task_audio,        "tAudio",    5, 0x800, 0, NULL);
-  kz_run(task_display,      "tDisplay",  5, 0x800, 0, NULL);
-  kz_run(task_menu,         "tMenu",     6, 0x800, 0, NULL);
-  kz_run(task_input,        "tInput",    6, 0x800, 0, NULL);
-  kz_run(task_command,      "tCommand",  9, 0x800, 0, NULL);
+  tskid_audio   = kz_run(task_audio,    "tAudio",    3, 0x800, 0, NULL);
+  tskid_display = kz_run(task_display,  "tDisplay",  3, 0x800, 0, NULL);
+  tskid_menu    = kz_run(task_menu,     "tMenu",     4, 0x800, 0, NULL);
+  tskid_input   = kz_run(task_input,    "tInput",    4, 0x800, 0, NULL);
+  tskid_command = kz_run(task_command,  "tCommand",  4, 0x800, 0, NULL);
 
   kz_chpri(15); /* Í¥Àè½ç°Ì¤ò²¼¤²¤Æ¡¤¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤Ë°Ü¹Ô¤¹¤ë */
   INTR_ENABLE; /* ³ä¹þ¤ßÍ­¸ú¤Ë¤¹¤ë */
diff --git a/firm/sample/sample1/os/task_input.c b/firm/sample/sample1/os/task_input.c
index 59c271d..1562356 100644
--- a/firm/sample/sample1/os/task_input.c
+++ b/firm/sample/sample1/os/task_input.c
@@ -156,7 +156,11 @@ int task_input(int argc, char *argv[])
     /*
      * $B%9%$%C%AF~NO=hM}(B
      */
+    // @todo
 
+    /*
+     *
+     */
     kz_wait();
   }
 
diff --git a/firm/sample/sample1/os/task_menu.c b/firm/sample/sample1/os/task_menu.c
index d431ebc..52e684b 100644
--- a/firm/sample/sample1/os/task_menu.c
+++ b/firm/sample/sample1/os/task_menu.c
@@ -26,11 +26,14 @@ static int play(const char *filename)
     int cnt = 0;
     while (audio_play(readfunc)) {
         if (((cnt++) % 32) == 0) {
-            display_draw_progressbar(5, 20, 121 - 5, 25, 0, 100, fatfs.fptr * 100 / fatfs.fsize);
+            display_draw_progressbar(
+                    5, 20, 121 - 5, 25,
+                    0, 100, fatfs.fptr * 100 / fatfs.fsize);
         }
-        kz_wait();
     }
-    display_draw_progressbar(5, 20, 121 - 5, 25, 0, 100, fatfs.fptr * 100 / fatfs.fsize);
+    display_draw_progressbar(
+            5, 20, 121 - 5, 25,
+            0, 100, fatfs.fptr * 100 / fatfs.fsize);
     return 0;
 }