From 17ba075f58e3abc67814435939284b0a56df6bb5 Mon Sep 17 00:00:00 2001
From: ryuz <ryuz>
Date: Sun, 8 Feb 2009 03:05:07 +0000
Subject: [PATCH] (none)

---
 sample/mips/jelly/gcc/ram.lds |  2 +-
 sample/mips/jelly/gcc/rom.lds |  2 +-
 sample/mips/jelly/main.c      |  1 -
 sample/mips/jelly/sample.c    | 16 ++--------------
 sample/mips/jelly/system.cfg  | 10 +++++-----
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/sample/mips/jelly/gcc/ram.lds b/sample/mips/jelly/gcc/ram.lds
index ff95e29..ef3e50c 100755
--- a/sample/mips/jelly/gcc/ram.lds
+++ b/sample/mips/jelly/gcc/ram.lds
@@ -4,7 +4,7 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	rom    : o = 0x00000000, l = 0x00010000
-	ram    : o = 0x00010000, l = 0x00010000
+	ram    : o = 0x00010000, l = 0x00001000
 }
 
 SECTIONS
diff --git a/sample/mips/jelly/gcc/rom.lds b/sample/mips/jelly/gcc/rom.lds
index 34554ed..39feb1a 100755
--- a/sample/mips/jelly/gcc/rom.lds
+++ b/sample/mips/jelly/gcc/rom.lds
@@ -4,7 +4,7 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	rom    : o = 0x00000000, l = 0x00010000
-	ram    : o = 0x01000000, l = 0x00002000
+	ram    : o = 0x01000000, l = 0x00001000
 }
 
 SECTIONS
diff --git a/sample/mips/jelly/main.c b/sample/mips/jelly/main.c
index 57cd2b7..4f7a4fd 100755
--- a/sample/mips/jelly/main.c
+++ b/sample/mips/jelly/main.c
@@ -12,7 +12,6 @@
 #include "kernel.h"
 #include "uart.h"
 
-#define SDRAM	((volatile UW*)0x02000000)
 
 
 /** %jp{メイン関数} */
diff --git a/sample/mips/jelly/sample.c b/sample/mips/jelly/sample.c
index 7421ea0..aed284f 100755
--- a/sample/mips/jelly/sample.c
+++ b/sample/mips/jelly/sample.c
@@ -20,20 +20,9 @@
 #define RIGHT(num)	((num) >= 5 ? 1 : (num) + 1)
 
 
-/** %jp{メッセージ構造体} */
-typedef struct t_print_msg
-{
-	T_MSG msg;
-	char  text[32];
-} T_PRINT_MSG;
-
-
 /** %jp{初期化ハンドラ} */
 void Sample_Initialize(VP_INT exinf)
 {
-	T_CMPF cmpf;
-	T_CMBX cmbx;
-	
 	/* %jp{UART初期化} */
 	Uart_Initialize();
 	
@@ -62,7 +51,7 @@ void Sample_RandWait(void)
 
 
 /** %jp{状態表示} */
-void Sample_PrintSatet(int num, char *text)
+void Sample_PrintSatet(int num, const char *text)
 {
 	int	i;
 	
@@ -77,8 +66,8 @@ void Sample_PrintSatet(int num, char *text)
 	{
 		Uart_PutChar(text[i]);
 	}
+	Uart_PutChar('\r');
 	Uart_PutChar('\n');
-	Uart_PutChar('\0');
 	
 	sig_sem(SEMID_UART);
 }
@@ -138,5 +127,4 @@ void Sample_Task(VP_INT exinf)
 }
 
 
-
 /* end of file */
diff --git a/sample/mips/jelly/system.cfg b/sample/mips/jelly/system.cfg
index f940be1..7bd4ec1 100755
--- a/sample/mips/jelly/system.cfg
+++ b/sample/mips/jelly/system.cfg
@@ -10,16 +10,16 @@
 
 
 /* %jp{カーネル独自の設定}%en{kernel} */
-KERNEL_HEP_MEM(512, NULL);
-KERNEL_SYS_STK(512, NULL);
-KERNEL_INT_STK(512, NULL);
-KERNEL_MAX_TSKID(5);
+KERNEL_HEP_MEM(256, NULL);
+KERNEL_SYS_STK(256, NULL);
+KERNEL_INT_STK(256, NULL);
+KERNEL_MAX_TSKID(6);
 KERNEL_MAX_SEMID(7);
 KERNEL_MAX_FLGID(1);
 KERNEL_MAX_MBXID(1);
 KERNEL_MAX_MPFID(1);
 KERNEL_MAX_MTXID(1);
-KERNEL_MAX_ISRID(1);
+KERNEL_MAX_ISRID(2);
 
 
 /* %jp{OSタイマの設定}%en{OS timer} */
-- 
2.11.0