From 2bb4004590250c7d5daff51b9fb26a2ef1e8ccdc Mon Sep 17 00:00:00 2001
From: Shinichiro Nakamura <shinta.main.jp@gmail.com>
Date: Mon, 16 Jul 2012 17:20:49 +0900
Subject: [PATCH] Renamed central task to system from menu.

---
 firm/sample/sample1/os/Makefile                       |  2 +-
 firm/sample/sample1/os/defines.h                      |  1 +
 firm/sample/sample1/os/kozos.h                        |  2 +-
 firm/sample/sample1/os/main.c                         |  4 ++--
 firm/sample/sample1/os/task.h                         |  2 +-
 firm/sample/sample1/os/task_menu.h                    |  8 --------
 firm/sample/sample1/os/{task_menu.c => task_system.c} | 12 +++---------
 firm/sample/sample1/os/task_system.h                  |  8 ++++++++
 8 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 firm/sample/sample1/os/task_menu.h
 rename firm/sample/sample1/os/{task_menu.c => task_system.c} (90%)
 create mode 100644 firm/sample/sample1/os/task_system.h

diff --git a/firm/sample/sample1/os/Makefile b/firm/sample/sample1/os/Makefile
index d44417f..f90a69c 100644
--- a/firm/sample/sample1/os/Makefile
+++ b/firm/sample/sample1/os/Makefile
@@ -32,7 +32,7 @@ OBJS += task_input.o
 OBJS += task_command.o
 OBJS += task_display.o
 OBJS += task_audio.o
-OBJS += task_menu.o
+OBJS += task_system.o
 
 # Kernel
 OBJS += kozos.o syscall.o memory.o
diff --git a/firm/sample/sample1/os/defines.h b/firm/sample/sample1/os/defines.h
index 750f1b4..1f31139 100644
--- a/firm/sample/sample1/os/defines.h
+++ b/firm/sample/sample1/os/defines.h
@@ -23,6 +23,7 @@ typedef enum {
   MSGBOX_ID_TIMEXPIRE,
   MSGBOX_ID_DISPLAY,
   MSGBOX_ID_AUDIO,
+  MSGBOX_ID_SYSTEM,
   MSGBOX_ID_NUM
 } kz_msgbox_id_t;
 
diff --git a/firm/sample/sample1/os/kozos.h b/firm/sample/sample1/os/kozos.h
index 6b61bc7..90ac31d 100644
--- a/firm/sample/sample1/os/kozos.h
+++ b/firm/sample/sample1/os/kozos.h
@@ -41,7 +41,7 @@ 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_system;
 extern kz_thread_id_t tskid_input;
 extern kz_thread_id_t tskid_command;
 
diff --git a/firm/sample/sample1/os/main.c b/firm/sample/sample1/os/main.c
index e95b309..a4e0dbf 100644
--- a/firm/sample/sample1/os/main.c
+++ b/firm/sample/sample1/os/main.c
@@ -5,7 +5,7 @@
 
 kz_thread_id_t tskid_audio;
 kz_thread_id_t tskid_display;
-kz_thread_id_t tskid_menu;
+kz_thread_id_t tskid_system;
 kz_thread_id_t tskid_input;
 kz_thread_id_t tskid_command;
 
@@ -23,7 +23,7 @@ static int start_threads(int argc, char *argv[])
    */
   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_system  = kz_run(task_system,   "tSystem",   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);
 
diff --git a/firm/sample/sample1/os/task.h b/firm/sample/sample1/os/task.h
index f4c99ca..c77f0d0 100644
--- a/firm/sample/sample1/os/task.h
+++ b/firm/sample/sample1/os/task.h
@@ -5,6 +5,6 @@
 #include "task_command.h"
 #include "task_audio.h"
 #include "task_display.h"
-#include "task_menu.h"
+#include "task_system.h"
 
 #endif
diff --git a/firm/sample/sample1/os/task_menu.h b/firm/sample/sample1/os/task_menu.h
deleted file mode 100644
index 0b933c9..0000000
--- a/firm/sample/sample1/os/task_menu.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#ifndef _TASK_MENU_H_
-#define _TASK_MENU_H_
-
-int task_menu(int argc, char *argv[]);
-
-#endif
-
diff --git a/firm/sample/sample1/os/task_menu.c b/firm/sample/sample1/os/task_system.c
similarity index 90%
rename from firm/sample/sample1/os/task_menu.c
rename to firm/sample/sample1/os/task_system.c
index 52e684b..8b6e8c5 100644
--- a/firm/sample/sample1/os/task_menu.c
+++ b/firm/sample/sample1/os/task_system.c
@@ -1,5 +1,5 @@
 
-#include "task_menu.h"
+#include "task_system.h"
 #include "task_audio.h"
 #include "task_display.h"
 #include "pff.h"
@@ -46,21 +46,15 @@ static int is_music_file(const char *filename)
     if (strcmp(filename + len - 4, ".MP3") == 0) {
         return 1;
     }
-    if (strcmp(filename + len - 4, ".mp3") == 0) {
-        return 1;
-    }
     if (strcmp(filename + len - 4, ".WAV") == 0) {
         return 1;
     }
-    if (strcmp(filename + len - 4, ".wav") == 0) {
-        return 1;
-    }
     return 0;
 }
 
-int task_menu(int argc, char *argv[])
+int task_system(int argc, char *argv[])
 {
-#if 0
+#if 1
   display_clear();
   display_draw_logo(  0, 0, 2);
   display_draw_box(0, 0, 121, 31, 1);
diff --git a/firm/sample/sample1/os/task_system.h b/firm/sample/sample1/os/task_system.h
new file mode 100644
index 0000000..dcbbf70
--- /dev/null
+++ b/firm/sample/sample1/os/task_system.h
@@ -0,0 +1,8 @@
+
+#ifndef _TASK_SYSTEM_H_
+#define _TASK_SYSTEM_H_
+
+int task_system(int argc, char *argv[]);
+
+#endif
+
-- 
2.11.0