Changed the naming rules.

diff --git a/firm/09/os/Makefile b/firm/09/os/Makefile
index 1a966bc..5a6da13 100644 (file)
--- a/firm/09/os/Makefile
+++ b/firm/09/os/Makefile
@@ -20,21 +20,25 @@ KZ_XMODEM_SERDEV = /dev/ttyUSB0
 
 OBJS  = startup.o main.o interrupt.o
 OBJS += lib.o serial.o timer.o
-OBJS += led.o
-OBJS += re.o
-OBJS += sw.o
-OBJS += lcd.o
-OBJS += remocon.o
+OBJS += led.o lcd.o
+OBJS += re.o sw.o
 OBJS += mmc.o pff.o
 OBJS += vs1011e.o
 
-# sources of kozos
-OBJS += kozos.o syscall.o memory.o command.o clock.o
-OBJS += consdrv.o
-OBJS += timerdrv.o
-OBJS += lcddrv.o
-OBJS += audiodrv.o
-OBJS += leddrv.o
+# Tasks
+OBJS += task_ir.o
+OBJS += task_userinput.o
+OBJS += task_command.o
+
+# Kernel
+OBJS += kozos.o syscall.o memory.o
+
+# Drivers
+OBJS += driver_console.o
+OBJS += driver_timer.o
+OBJS += driver_lcd.o
+OBJS += driver_led.o
+OBJS += driver_audio.o
 
 TARGET = kozos
 

diff --git a/firm/09/os/driver.h b/firm/09/os/driver.h
new file mode 100644 (file)
index 0000000..4d11539
--- /dev/null
+++ b/firm/09/os/driver.h
@@ -0,0 +1,11 @@
+#ifndef DRIVER_H
+#define DRIVER_H
+
+#include "driver_audio.h"
+#include "driver_console.h"
+#include "driver_lcd.h"
+#include "driver_led.h"
+#include "driver_timer.h"
+
+#endif
+

diff --git a/firm/09/os/driver/consdrv.h b/firm/09/os/driver/consdrv.h
deleted file mode 100644 (file)
index da92111..0000000
--- a/firm/09/os/driver/consdrv.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _CONSDRV_H_INCLUDED_
-#define _CONSDRV_H_INCLUDED_
-
-#define CONSDRV_DEVICE_NUM 1
-
-void consdrv_use(int index);
-void consdrv_write(char *str);
-
-#endif

diff --git a/firm/09/os/driver/audiodrv.c b/firm/09/os/driver/driver_audio.c
similarity index 84%
rename from firm/09/os/driver/audiodrv.c
rename to firm/09/os/driver/driver_audio.c
index 900d0e9..db56759 100644 (file)
--- a/firm/09/os/driver/audiodrv.c
+++ b/firm/09/os/driver/driver_audio.c
@@ -1,11 +1,10 @@
-#include "audiodrv.h"
+#include "driver_audio.h"
 #include "vs1011e.h"
 #include "kozos.h"
-#include "consdrv.h"
 
 #define AUDIODRV_CMD_PULSE  'p'
 
-void audiodrv_pulse(void)
+void audio_pulse(void)
 {
   char *p;
   p = kz_kmalloc(1);
@@ -31,7 +30,7 @@ static int audiodrv_command(char *p)
   return 0;
 }
 
-int audiodrv_main(int argc, char *argv[])
+int driver_audio(int argc, char *argv[])
 {
   int size;
   char *p;

diff --git a/firm/09/os/driver/audiodrv.h b/firm/09/os/driver/driver_audio.h
similarity index 51%
rename from firm/09/os/driver/audiodrv.h
rename to firm/09/os/driver/driver_audio.h
index f637124..9c5c394 100644 (file)
--- a/firm/09/os/driver/audiodrv.h
+++ b/firm/09/os/driver/driver_audio.h
@@ -1,7 +1,8 @@
 #ifndef _AUDIODRV_H_INCLUDED_
 #define _AUDIODRV_H_INCLUDED_
 
-void audiodrv_pulse(void);
+void audio_pulse(void);
+int driver_audio(int argc, char *argv[]);
 
 #endif
 

diff --git a/firm/09/os/driver/consdrv.c b/firm/09/os/driver/driver_console.c
similarity index 97%
rename from firm/09/os/driver/consdrv.c
rename to firm/09/os/driver/driver_console.c
index 016f854..811e689 100644 (file)
--- a/firm/09/os/driver/consdrv.c
+++ b/firm/09/os/driver/driver_console.c
@@ -4,7 +4,7 @@
 #include "interrupt.h"
 #include "serial.h"
 #include "lib.h"
-#include "consdrv.h"
+#include "driver_console.h"
 
 #define CONS_BUFFER_SIZE 32
 
@@ -25,7 +25,7 @@ static struct consreg {
 } consreg[CONSDRV_DEVICE_NUM];
 
 /* ¥³¥ó¥½¡¼¥ë¡¦¥É¥é¥¤¥Ð¤Î»ÈÍѳ«»Ï¤ò¥³¥ó¥½¡¼¥ë¡¦¥É¥é¥¤¥Ð¤Ë°ÍÍꤹ¤ë */
-void consdrv_use(int index)
+void console_use(int index)
 {
   char *p;
   p = kz_kmalloc(3);
@@ -36,7 +36,7 @@ void consdrv_use(int index)
 }
 
 /* ¥³¥ó¥½¡¼¥ë¤Ø¤Îʸ»úÎó½ÐÎϤò¥³¥ó¥½¡¼¥ë¡¦¥É¥é¥¤¥Ð¤Ë°ÍÍꤹ¤ë */
-void consdrv_write(char *str)
+void console_write(char *str)
 {
   char *p;
   int len;
@@ -194,7 +194,7 @@ static int consdrv_command(struct consreg *cons, kz_thread_id_t id,
   return 0;
 }
 
-int consdrv_main(int argc, char *argv[])
+int driver_console(int argc, char *argv[])
 {
   int size, index;
   kz_thread_id_t id;

diff --git a/firm/09/os/driver/driver_console.h b/firm/09/os/driver/driver_console.h
new file mode 100644 (file)
index 0000000..4cc7341
--- /dev/null
+++ b/firm/09/os/driver/driver_console.h
@@ -0,0 +1,11 @@
+#ifndef _CONSDRV_H_INCLUDED_
+#define _CONSDRV_H_INCLUDED_
+
+#define CONSDRV_DEVICE_NUM 1
+
+void console_use(int index);
+void console_write(char *str);
+
+int driver_console(int argc, char *argv[]);
+
+#endif

diff --git a/firm/09/os/driver/lcddrv.c b/firm/09/os/driver/driver_lcd.c
similarity index 98%
rename from firm/09/os/driver/lcddrv.c
rename to firm/09/os/driver/driver_lcd.c
index b629b70..1007e1c 100644 (file)
--- a/firm/09/os/driver/lcddrv.c
+++ b/firm/09/os/driver/driver_lcd.c
@@ -1,4 +1,4 @@
-#include "lcddrv.h"
+#include "driver_lcd.h"
 #include "lcd.h"
 #include "kozos.h"
 #include "lib.h"
@@ -198,7 +198,7 @@ static int lcddrv_command(char *p)
   return 0;
 }
 
-int lcddrv_main(int argc, char *argv[])
+int driver_lcd(int argc, char *argv[])
 {
   int size;
   char *p;

diff --git a/firm/09/os/driver/lcddrv.h b/firm/09/os/driver/driver_lcd.h
similarity index 85%
rename from firm/09/os/driver/lcddrv.h
rename to firm/09/os/driver/driver_lcd.h
index 0a82feb..94895f7 100644 (file)
--- a/firm/09/os/driver/lcddrv.h
+++ b/firm/09/os/driver/driver_lcd.h
@@ -6,4 +6,6 @@ void lcddrv_draw_box(int x1, int y1, int x2, int y2, int on);
 void lcddrv_draw_logo(int x, int y, int size);
 void lcddrv_draw_text(int x, int y, char *str);
 
+int driver_lcd(int argc, char *argv[]);
+
 #endif

diff --git a/firm/09/os/driver/leddrv.c b/firm/09/os/driver/driver_led.c
similarity index 94%
rename from firm/09/os/driver/leddrv.c
rename to firm/09/os/driver/driver_led.c
index de64f98..533b4dd 100644 (file)
--- a/firm/09/os/driver/leddrv.c
+++ b/firm/09/os/driver/driver_led.c
@@ -1,4 +1,4 @@
-#include "leddrv.h"
+#include "driver_led.h"
 #include "led.h"
 #include "kozos.h"
 
@@ -47,7 +47,7 @@ static int leddrv_command(char *p)
   return 0;
 }
 
-int leddrv_main(int argc, char *argv[])
+int driver_led(int argc, char *argv[])
 {
   int size;
   char *p;

diff --git a/firm/09/os/driver/leddrv.h b/firm/09/os/driver/driver_led.h
similarity index 77%
rename from firm/09/os/driver/leddrv.h
rename to firm/09/os/driver/driver_led.h
index ad673b7..4df8ce3 100644 (file)
--- a/firm/09/os/driver/leddrv.h
+++ b/firm/09/os/driver/driver_led.h
@@ -4,4 +4,6 @@
 void leddrv_write(int target, int state);
 void leddrv_toggle(int target);
 
+int driver_led(int argc, char *argv[]);
+
 #endif

diff --git a/firm/09/os/driver/timerdrv.c b/firm/09/os/driver/driver_timer.c
similarity index 97%
rename from firm/09/os/driver/timerdrv.c
rename to firm/09/os/driver/driver_timer.c
index 054ab4f..b9d698f 100644 (file)
--- a/firm/09/os/driver/timerdrv.c
+++ b/firm/09/os/driver/driver_timer.c
@@ -4,7 +4,7 @@
 #include "interrupt.h"
 #include "timer.h"
 #include "lib.h"
-#include "timerdrv.h"
+#include "driver_timer.h"
 
 #define TIMERDRV_CMD_EXPIRE 'e' /* ¥¿¥¤¥ÞËþλ */
 #define TIMERDRV_CMD_START  's' /* ¥¿¥¤¥Þ¤Î¥¹¥¿¡¼¥È */
@@ -124,7 +124,7 @@ static int timerdrv_command(struct timerreg *tim, int cmd, char *p)
   return 0;
 }
 
-int timerdrv_main(int argc, char *argv[])
+int driver_timer(int argc, char *argv[])
 {
   int cmd;
   char *p;

diff --git a/firm/09/os/driver/timerdrv.h b/firm/09/os/driver/driver_timer.h
similarity index 85%
rename from firm/09/os/driver/timerdrv.h
rename to firm/09/os/driver/driver_timer.h
index 982067c..dd44593 100644 (file)
--- a/firm/09/os/driver/timerdrv.h
+++ b/firm/09/os/driver/driver_timer.h
@@ -11,4 +11,6 @@ struct timerreq {
   int msec;
 };
 
+int driver_timer(int argc, char *argv[]);
+
 #endif

diff --git a/firm/09/os/serial.c b/firm/09/os/driver/serial.c
similarity index 100%
rename from firm/09/os/serial.c
rename to firm/09/os/driver/serial.c

diff --git a/firm/09/os/serial.h b/firm/09/os/driver/serial.h
similarity index 100%
rename from firm/09/os/serial.h
rename to firm/09/os/driver/serial.h

diff --git a/firm/09/os/kozos.h b/firm/09/os/kozos.h
index 8c91939..e36eefa 100644 (file)
--- a/firm/09/os/kozos.h
+++ b/firm/09/os/kozos.h
@@ -4,6 +4,8 @@
 #include "defines.h"
 #include "interrupt.h"
 #include "syscall.h"
+#include "driver.h"
+#include "task.h"
 
 /* ¥·¥¹¥Æ¥à¡¦¥³¡¼¥ë */
 kz_thread_id_t kz_run(kz_func_t func, char *name, int priority, int stacksize,
@@ -33,16 +35,4 @@ 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);
 
-/* ¥·¥¹¥Æ¥à¡¦¥¿¥¹¥¯ */
-int consdrv_main(int argc, char *argv[]);
-int timerdrv_main(int argc, char *argv[]);
-int leddrv_main(int argc, char *argv[]);
-int lcddrv_main(int argc, char *argv[]);
-int audiodrv_main(int argc, char *argv[]);
-
-/* ¥æ¡¼¥¶¡¦¥¿¥¹¥¯ */
-int command_main(int argc, char *argv[]);
-int clock_main(int argc, char *argv[]);
-int remocon_main(int argc, char *argv[]);
-
 #endif

diff --git a/firm/09/os/main.c b/firm/09/os/main.c
index b2096ac..6cdfc45 100644 (file)
--- a/firm/09/os/main.c
+++ b/firm/09/os/main.c
@@ -6,14 +6,14 @@
 /* ¥·¥¹¥Æ¥à¡¦¥¿¥¹¥¯¤È¥æ¡¼¥¶¡¦¥¿¥¹¥¯¤Îµ¯Æ° */
 static int start_threads(int argc, char *argv[])
 {
-  kz_run(consdrv_main,  "consdrv",   1, 0x200, 0, NULL);
-  kz_run(timerdrv_main, "timerdrv",  2, 0x200, 0, NULL);
-  kz_run(leddrv_main,   "leddrv",    7, 0x200, 0, NULL);
-  kz_run(command_main,  "command",   8, 0x200, 0, NULL);
-  kz_run(lcddrv_main,   "lcddrv",    9, 0x200, 0, NULL);
-  kz_run(audiodrv_main, "audiodrv", 10, 0x200, 0, NULL);
-  kz_run(clock_main,    "clock",    11, 0x200, 0, NULL);
-  kz_run(remocon_main,  "remocon",  12, 0x200, 0, NULL);
+  kz_run(driver_console,    "dConsole",      1, 0x200, 0, NULL);
+  kz_run(driver_timer,      "dTimer",        2, 0x200, 0, NULL);
+  kz_run(driver_led,        "dLed",          7, 0x200, 0, NULL);
+  kz_run(task_command,      "tCommand",      8, 0x200, 0, NULL);
+  kz_run(driver_lcd,        "dLcd",          9, 0x200, 0, NULL);
+  kz_run(driver_audio,      "dAudio",       10, 0x200, 0, NULL);
+  kz_run(task_userinput,    "tUserinput",   11, 0x200, 0, NULL);
+  kz_run(task_ir,           "tIr",          12, 0x200, 0, NULL);
 
   kz_chpri(15); /* Í¥Àè½ç°Ì¤ò²¼¤²¤Æ¡¤¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤Ë°Ü¹Ô¤¹¤ë */
   INTR_ENABLE; /* ³ä¹þ¤ßÍ­¸ú¤Ë¤¹¤ë */

diff --git a/firm/09/os/remocon.h b/firm/09/os/remocon.h
deleted file mode 100644 (file)
index 488bc2b..0000000
--- a/firm/09/os/remocon.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#ifndef _REMOCON_H_
-#define _REMOCON_H_
-void remocon_init(void);
-#endif

diff --git a/firm/09/os/task.h b/firm/09/os/task.h
new file mode 100644 (file)
index 0000000..b2568b6
--- /dev/null
+++ b/firm/09/os/task.h
@@ -0,0 +1,8 @@
+#ifndef TASK_H
+#define TASK_H
+
+#include "task_userinput.h"
+#include "task_ir.h"
+#include "task_command.h"
+
+#endif

diff --git a/firm/09/os/re.c b/firm/09/os/task/re.c
similarity index 100%
rename from firm/09/os/re.c
rename to firm/09/os/task/re.c

diff --git a/firm/09/os/re.h b/firm/09/os/task/re.h
similarity index 100%
rename from firm/09/os/re.h
rename to firm/09/os/task/re.h

diff --git a/firm/09/os/sw.c b/firm/09/os/task/sw.c
similarity index 100%
rename from firm/09/os/sw.c
rename to firm/09/os/task/sw.c

diff --git a/firm/09/os/sw.h b/firm/09/os/task/sw.h
similarity index 100%
rename from firm/09/os/sw.h
rename to firm/09/os/task/sw.h

diff --git a/firm/09/os/command.c b/firm/09/os/task/task_command.c
similarity index 64%
rename from firm/09/os/command.c
rename to firm/09/os/task/task_command.c
index 05c3dfd..b07d4be 100644 (file)
--- a/firm/09/os/command.c
+++ b/firm/09/os/task/task_command.c
@@ -1,30 +1,30 @@
 #include "defines.h"
 #include "kozos.h"
-#include "consdrv.h"
-#include "leddrv.h"
+#include "driver_console.h"
+#include "driver_led.h"
 #include "lib.h"
 
-int command_main(int argc, char *argv[])
+int task_command(int argc, char *argv[])
 {
   char *p;
   int size;
 
-  consdrv_use(SERIAL_DEFAULT_DEVICE);
+  console_use(SERIAL_DEFAULT_DEVICE);
 
   while (1) {
-    consdrv_write("command> "); /* ¥×¥í¥ó¥×¥Èɽ¼¨ */
+    console_write("command> "); /* ¥×¥í¥ó¥×¥Èɽ¼¨ */
 
     /* ¥³¥ó¥½¡¼¥ë¤«¤é¤Î¼õ¿®Ê¸»úÎó¤ò¼õ¤±¼è¤ë */
     kz_recv(MSGBOX_ID_CONSINPUT, &size, &p);
     if (p == NULL) {
-      consdrv_write("expired.\n");
+      console_write("expired.\n");
       continue;
     }
     p[size] = '\0';
 
     if (!strncmp(p, "echo", 4)) { /* echo¥³¥Þ¥ó¥É */
-      consdrv_write(p + 4); /* echo¤Ë³¤¯Ê¸»úÎó¤ò½ÐÎϤ¹¤ë */
-      consdrv_write("\n");
+      console_write(p + 4); /* echo¤Ë³¤¯Ê¸»úÎó¤ò½ÐÎϤ¹¤ë */
+      console_write("\n");
     } else if (!strncmp(p, "led1", 4)) {
       leddrv_toggle(0);
     } else if (!strncmp(p, "led2", 4)) {
@@ -34,7 +34,7 @@ int command_main(int argc, char *argv[])
     } else if (!strncmp(p, "ledr", 4)) {
       leddrv_toggle(3);
     } else {
-      consdrv_write("unknown.\n");
+      console_write("unknown.\n");
     }
 
     kz_kmfree(p);

diff --git a/firm/09/os/task/task_command.h b/firm/09/os/task/task_command.h
new file mode 100644 (file)
index 0000000..4c580bd
--- /dev/null
+++ b/firm/09/os/task/task_command.h
@@ -0,0 +1,5 @@
+
+#ifndef _TASK_COMMAND_H_
+#define _TASK_COMMAND_H_
+int task_command(int argc, char *argv[]);
+#endif

diff --git a/firm/09/os/remocon.c b/firm/09/os/task/task_ir.c
similarity index 91%
rename from firm/09/os/remocon.c
rename to firm/09/os/task/task_ir.c
index c28dfe5..58024c1 100644 (file)
--- a/firm/09/os/remocon.c
+++ b/firm/09/os/task/task_ir.c
@@ -1,11 +1,11 @@
-#include "remocon.h"
+#include "task_ir.h"
 #include "defines.h"
 #include "kozos.h"
 #include "intr.h"
 #include "led.h"
 #include "lib.h"
-#include "consdrv.h"
-#include "audiodrv.h"
+#include "driver_console.h"
+#include "driver_audio.h"
 
 #define H8_3069F_ISCR       ((volatile uint8 *)0xFEE014)
 #define H8_3069F_IER        ((volatile uint8 *)0xFEE015)
@@ -82,7 +82,7 @@ static void remocon_intr_tovf(void)
   *H8_3069F_TSTR &= ~(1 << 0);
 }
 
-int remocon_main(int argc, char *argv[])
+int task_ir(int argc, char *argv[])
 {
   kz_setintr(SOFTVEC_TYPE_IR_EDGE, remocon_intr_edge);
   kz_setintr(SOFTVEC_TYPE_IR_TOVF, remocon_intr_tovf);
@@ -98,13 +98,13 @@ int remocon_main(int argc, char *argv[])
         int i;
         for (i = 0; i < bitcnt; i++) {
           if (data[i / 8] & (1 << (i % 8))) {
-            consdrv_write("1");
+            console_write("1");
           } else {
-            consdrv_write("0");
+            console_write("0");
           }
         }
-        consdrv_write("\n");
-        audiodrv_pulse();
+        console_write("\n");
+        audio_pulse();
       }
       bitcnt = 0;
       tmrovf = 0;

diff --git a/firm/09/os/task/task_ir.h b/firm/09/os/task/task_ir.h
new file mode 100644 (file)
index 0000000..f6d53b9
--- /dev/null
+++ b/firm/09/os/task/task_ir.h
@@ -0,0 +1,5 @@
+
+#ifndef _TASK_IR_H_
+#define _TASK_IR_H_
+int task_ir(int argc, char *argv[]);
+#endif

diff --git a/firm/09/os/clock.c b/firm/09/os/task/task_userinput.c
similarity index 89%
rename from firm/09/os/clock.c
rename to firm/09/os/task/task_userinput.c
index d9e8cc6..0f46458 100644 (file)
--- a/firm/09/os/clock.c
+++ b/firm/09/os/task/task_userinput.c
@@ -1,13 +1,13 @@
 #include "defines.h"
 #include "kozos.h"
-#include "timerdrv.h"
-#include "leddrv.h"
-#include "lcddrv.h"
+#include "driver_timer.h"
+#include "driver_led.h"
+#include "driver_lcd.h"
 #include "lib.h"
 #include "sw.h"
 #include "re.h"
 
-int clock_main(int argc, char *argv[])
+int task_userinput(int argc, char *argv[])
 {
   int nx = 40, ny = 12;
   re_init();

diff --git a/firm/09/os/task/task_userinput.h b/firm/09/os/task/task_userinput.h
new file mode 100644 (file)
index 0000000..db06351
--- /dev/null
+++ b/firm/09/os/task/task_userinput.h
@@ -0,0 +1,5 @@
+
+#ifndef _TASK_USERINPUT_H_
+#define _TASK_USERINPUT_H_
+int task_userinput(int argc, char *argv[]);
+#endif