HOS-V4 Advance の開発リポジトリ
Revisão | c8290bce27788e07657cd30e9579b219a5faa9c4 (tree) |
---|---|
Hora | 2014-06-08 09:57:12 |
Autor | Ryuji Fuchikami <ryuz@user...> |
Commiter | Ryuji Fuchikami |
update jelly sample (MIPS)
@@ -19,11 +19,15 @@ | ||
19 | 19 | #include "system/file/console.h" |
20 | 20 | #include "system/process/process.h" |
21 | 21 | #include "system/command/command.h" |
22 | -#include "driver/serial/xilinxuartdrv/xilinxuartdrv.h" | |
22 | +#include "driver/i2c/jelly/jellyi2cdrv.h" | |
23 | +#include "driver/serial/jelly/jellyuartdrv.h" | |
23 | 24 | #include "driver/console/vt100/vt100drv.h" |
24 | -#include "application//syscmd/shell/shell.h" | |
25 | -#include "application//syscmd/commandlist/commandlist.h" | |
26 | -#include "application//syscmd/processlist/processlist.h" | |
25 | +#include "driver/volume/fat/fatvol.h" | |
26 | +#include "application/syscmd/shell/shell.h" | |
27 | +#include "application/syscmd/commandlist/commandlist.h" | |
28 | +#include "application/syscmd/processlist/processlist.h" | |
29 | +#include "application/filecmd/filelist/filelist.h" | |
30 | +#include "application/filecmd/filecopy/filecopy.h" | |
27 | 31 | #include "application/utility/timecmd/timecmd.h" |
28 | 32 | #include "application/utility/memdump/memdump.h" |
29 | 33 | #include "application/utility/memwrite/memwrite.h" |
@@ -34,10 +38,21 @@ | ||
34 | 38 | #include "ostimer.h" |
35 | 39 | |
36 | 40 | |
41 | +int dhrystone_main(int argc, char *argv[]); | |
37 | 42 | |
38 | -#define SYSTEM_HEAP_ADDR ((void *)0xc0000000) | |
43 | + | |
44 | +#if 0 | |
45 | + | |
46 | +long g_SystemHeap[128 * 1024 / sizeof(long)]; | |
47 | +#define SYSTEM_HEAP_ADDR ((void *)g_SystemHeap) | |
48 | +#define SYSTEM_HEAP_SIZE sizeof(g_SystemHeap) | |
49 | + | |
50 | +#else | |
51 | + | |
52 | +#define SYSTEM_HEAP_ADDR ((void *)0x01300000) | |
39 | 53 | #define SYSTEM_HEAP_SIZE 0x00100000 |
40 | 54 | |
55 | +#endif | |
41 | 56 | |
42 | 57 | |
43 | 58 | extern SYSTIM_CPUTIME SysTim_TimeCounter; /* デフォルトのタイマカウンタ */ |
@@ -87,8 +102,8 @@ int Boot_Process(VPARAM Param) | ||
87 | 102 | /* タイマ初期化 */ |
88 | 103 | OsTimer_Initialize(); |
89 | 104 | |
90 | - /* UART デバドラ生成 (/dev/com0 に登録) */ | |
91 | - hDriver = XilinxUartDrv_Create((void *)0x40600000, 1, 64); | |
105 | + /* Jelly UART デバドラ生成 (/dev/com0 に登録) */ | |
106 | + hDriver = JellyUartDrv_Create((void *)0xfffff200, 1, 2, 256); | |
92 | 107 | File_AddDevice("com0", hDriver); |
93 | 108 | |
94 | 109 | /* シリアルを開く */ |
@@ -102,6 +117,7 @@ int Boot_Process(VPARAM Param) | ||
102 | 117 | hCon = File_Open("/dev/con0", FILE_OPEN_READ | FILE_OPEN_WRITE); |
103 | 118 | |
104 | 119 | |
120 | + | |
105 | 121 | /*************************/ |
106 | 122 | /* 標準入出力設定 */ |
107 | 123 | /*************************/ |
@@ -126,17 +142,21 @@ int Boot_Process(VPARAM Param) | ||
126 | 142 | Command_AddCommand("memtest", MemTest_Main); |
127 | 143 | Command_AddCommand("keytest", KeyTest_Main); |
128 | 144 | Command_AddCommand("hello", Hello_Main); |
145 | + Command_AddCommand("ls", FileList_Main); | |
146 | + Command_AddCommand("cp", FileCopy_Main); | |
147 | + | |
129 | 148 | |
130 | 149 | |
131 | 150 | /*************************/ |
132 | 151 | /* 起動メッセージ */ |
133 | 152 | /*************************/ |
153 | + | |
134 | 154 | StdIo_PutString( |
135 | 155 | "\n\n" |
136 | 156 | "================================================================\n" |
137 | 157 | " Hyper Operating System Application Framework\n" |
138 | 158 | "\n" |
139 | - " Copyright (C) 1998-2011 by Project HOS\n" | |
159 | + " Copyright (C) 1998-2014 by Project HOS\n" | |
140 | 160 | " http://sourceforge.jp/projects/hos/\n" |
141 | 161 | "================================================================\n" |
142 | 162 | "\n"); |
@@ -148,7 +168,7 @@ int Boot_Process(VPARAM Param) | ||
148 | 168 | |
149 | 169 | /* プロセスの生成*/ |
150 | 170 | ProcInf.pszCommandLine = "sh -i"; /* 実行コマンド */ |
151 | - ProcInf.pszCurrentDir = ""; /* 起動ディレクトリ */ | |
171 | + ProcInf.pszCurrentDir = "/"; /* 起動ディレクトリ */ | |
152 | 172 | ProcInf.pfncEntry = NULL; /* 起動アドレス */ |
153 | 173 | ProcInf.Param = 0; /* ユーザーパラメータ */ |
154 | 174 | ProcInf.StackSize = 2048; /* スタックサイズ */ |
@@ -24,7 +24,7 @@ CMD_OBJCNV ?= $(GCC_ARCH)objcopy | ||
24 | 24 | |
25 | 25 | |
26 | 26 | # %jp{ディレクトリ定義}%en{directories} |
27 | -TOP_DIR = ../../../../.. | |
27 | +TOP_DIR = $(HOME)/hos-v4a | |
28 | 28 | KERNEL_DIR = $(TOP_DIR)/kernel |
29 | 29 | KERNEL_CFGRTR_DIR = $(TOP_DIR)/cfgrtr/build/gcc |
30 | 30 | KERNEL_MAKINC_DIR = $(KERNEL_DIR)/build/common/gmake |
@@ -59,15 +59,18 @@ endif | ||
59 | 59 | |
60 | 60 | |
61 | 61 | # %jp{メモリマップ} |
62 | -ifeq ($(MEMMAP),ram) | |
63 | -# %jp{内蔵RAM} | |
64 | -TARGET := $(TARGET)_ram | |
65 | -LINK_SCRIPT = ram.lds | |
66 | -else | |
62 | +ifeq ($(MEMMAP),rom) | |
67 | 63 | # %jp{内蔵ROM} |
64 | +TARGET := $(TARGET)_rom | |
68 | 65 | LINK_SCRIPT = rom.lds |
66 | +else | |
67 | +# %jp{内蔵RAM} | |
68 | +LINK_SCRIPT = ram.lds | |
69 | 69 | endif |
70 | 70 | |
71 | +# loader COM port | |
72 | +COMPORT ?= 1 | |
73 | + | |
71 | 74 | |
72 | 75 | # %jp{フラグ設定} |
73 | 76 | CFLAGS = -march=mips1 -msoft-float -G 0 |
@@ -123,7 +126,7 @@ all: kernel_make make_subprj makeexe_all $(TARGET_EXE) $(TARGET_MOT) $(TARGET_HE | ||
123 | 126 | |
124 | 127 | .PHONY : run |
125 | 128 | run: $(TARGET_BIN) |
126 | - jelly_loader -r $(TARGET_BIN) | |
129 | + jelly_loader -c $(COMPORT) -r $(TARGET_BIN) | |
127 | 130 | |
128 | 131 | |
129 | 132 | .PHONY : make_subprj |
@@ -3,8 +3,8 @@ ENTRY(_reset_handler) | ||
3 | 3 | |
4 | 4 | MEMORY |
5 | 5 | { |
6 | - ro : o = 0x00000000, l = 0x00020000 | |
7 | - rw : o = 0x00020000, l = 0x000e0000 | |
6 | + rom : o = 0x00000000, l = 0x00100000 | |
7 | + ram : o = 0x00100000, l = 0x00100000 | |
8 | 8 | } |
9 | 9 | |
10 | 10 | SECTIONS |
@@ -18,7 +18,7 @@ SECTIONS | ||
18 | 18 | *(.rodata*) |
19 | 19 | *(.glue*) |
20 | 20 | ___text_end = . ; |
21 | - } > ro | |
21 | + } > rom | |
22 | 22 | .tors : |
23 | 23 | { |
24 | 24 | . = ALIGN(4); |
@@ -28,7 +28,7 @@ SECTIONS | ||
28 | 28 | ___dtors = . ; |
29 | 29 | *(.dtors) |
30 | 30 | ___dtors_end = . ; |
31 | - } > ro | |
31 | + } > rom | |
32 | 32 | data : AT (ADDR(.tors) + SIZEOF(.tors)) |
33 | 33 | { |
34 | 34 | ___data_rom = ADDR(.tors) + SIZEOF(.tors); |
@@ -38,7 +38,7 @@ SECTIONS | ||
38 | 38 | *(.sdata) |
39 | 39 | *(.eh_frame) |
40 | 40 | ___data_end = . ; |
41 | - } > rw | |
41 | + } > ram | |
42 | 42 | .bss : |
43 | 43 | { |
44 | 44 | ___bss = . ; |
@@ -47,6 +47,6 @@ SECTIONS | ||
47 | 47 | *(COMMON) |
48 | 48 | *(.scommon) |
49 | 49 | ___bss_end = . ; |
50 | - } > rw | |
50 | + } > ram | |
51 | 51 | } |
52 | 52 |
@@ -3,8 +3,8 @@ ENTRY(_reset_handler) | ||
3 | 3 | |
4 | 4 | MEMORY |
5 | 5 | { |
6 | - ro : o = 0x00000000, l = 0x00010000 | |
7 | - ra : o = 0x01000000, l = 0x00100000 | |
6 | + rom : o = 0x00000000, l = 0x00100000 | |
7 | + ram : o = 0x10000000, l = 0x00100000 | |
8 | 8 | } |
9 | 9 | |
10 | 10 | SECTIONS |
@@ -18,7 +18,7 @@ SECTIONS | ||
18 | 18 | *(.rodata*) |
19 | 19 | *(.glue*) |
20 | 20 | ___text_end = . ; |
21 | - } > ro | |
21 | + } > rom | |
22 | 22 | .tors : |
23 | 23 | { |
24 | 24 | . = ALIGN(4); |
@@ -28,7 +28,7 @@ SECTIONS | ||
28 | 28 | ___dtors = . ; |
29 | 29 | *(.dtors) |
30 | 30 | ___dtors_end = . ; |
31 | - } > ro | |
31 | + } > rom | |
32 | 32 | data : AT (ADDR(.tors) + SIZEOF(.tors)) |
33 | 33 | { |
34 | 34 | ___data_rom = ADDR(.tors) + SIZEOF(.tors); |
@@ -38,7 +38,7 @@ SECTIONS | ||
38 | 38 | *(.sdata) |
39 | 39 | *(.eh_frame) |
40 | 40 | ___data_end = . ; |
41 | - } > rw | |
41 | + } > ram | |
42 | 42 | .bss : |
43 | 43 | { |
44 | 44 | ___bss = . ; |
@@ -47,6 +47,6 @@ SECTIONS | ||
47 | 47 | *(COMMON) |
48 | 48 | *(.scommon) |
49 | 49 | ___bss_end = . ; |
50 | - } > rw | |
50 | + } >ram | |
51 | 51 | } |
52 | 52 |
@@ -14,9 +14,9 @@ | ||
14 | 14 | #include "ostimer.h" |
15 | 15 | |
16 | 16 | |
17 | -#define TIMER0_CONTROL ((volatile unsigned long *)0xf1000000) | |
18 | -#define TIMER0_COMPARE ((volatile unsigned long *)0xf1000004) | |
19 | -#define TIMER0_COUNTER ((volatile unsigned long *)0xf100000c) | |
17 | +#define TIMER0_CONTROL ((volatile unsigned long *)0xfffff100) | |
18 | +#define TIMER0_COMPARE ((volatile unsigned long *)0xfffff104) | |
19 | +#define TIMER0_COUNTER ((volatile unsigned long *)0xfffff10c) | |
20 | 20 | |
21 | 21 | #define INTNO_TIMER0 0 |
22 | 22 |
@@ -11,14 +11,14 @@ | ||
11 | 11 | |
12 | 12 | /* %jp{カーネル独自の設定}%en{kernel} */ |
13 | 13 | /* KERNEL_HEP_MEM(65536, NULL); */ |
14 | -KERNEL_HEP_MEM(0x100000, 0x100000); | |
14 | +KERNEL_HEP_MEM(0x100000, 0x01200000); | |
15 | 15 | KERNEL_INT_STK(2048, NULL); |
16 | 16 | KERNEL_SYS_STK(2048, NULL); |
17 | 17 | KERNEL_MAX_TSKID(32); |
18 | 18 | KERNEL_MAX_SEMID(32); |
19 | 19 | KERNEL_MAX_FLGID(32); |
20 | -KERNEL_MAX_MBXID(32); | |
21 | 20 | KERNEL_MAX_MTXID(32); |
21 | +KERNEL_MAX_MBXID(32); | |
22 | 22 | KERNEL_MAX_MPFID(32); |
23 | 23 | KERNEL_MAX_ISRID(32); |
24 | 24 |
@@ -16,12 +16,12 @@ TARGET ?= sample | ||
16 | 16 | |
17 | 17 | |
18 | 18 | # %jp{ツール定義}%en{tools} |
19 | -GCC_ARCH ?= mips-elf- | |
20 | -CMD_CC ?= $(GCC_ARCH)gcc | |
21 | -CMD_ASM ?= $(GCC_ARCH)gcc | |
22 | -CMD_LINK ?= $(GCC_ARCH)gcc | |
23 | -CMD_OBJCNV ?= $(GCC_ARCH)objcopy | |
24 | - | |
19 | +GCC_ARCH ?= mips-elf- | |
20 | +CMD_CC ?= $(GCC_ARCH)gcc | |
21 | +CMD_ASM ?= $(GCC_ARCH)gcc | |
22 | +CMD_LINK ?= $(GCC_ARCH)gcc | |
23 | +CMD_OBJCNV ?= $(GCC_ARCH)objcopy | |
24 | +CMD_OBJDUMP ?= $(GCC_ARCH)objdump | |
25 | 25 | |
26 | 26 | # %jp{アーキテクチャ定義}%en{architecture} |
27 | 27 | ARCH_NAME ?= jelly |
@@ -106,10 +106,11 @@ CSRCS += ../ostimer.c | ||
106 | 106 | # %jp{ALL}%en{all} |
107 | 107 | .PHONY : all |
108 | 108 | all: kernel_make makeexe_all $(TARGET_EXE) $(TARGET_MOT) $(TARGET_HEX) $(TARGET_BIN) |
109 | + $(CMD_OBJDUMP) -D $(TARGET_EXE) > $(TARGET)_disas.txt | |
109 | 110 | |
110 | 111 | .PHONY : run |
111 | 112 | run: $(TARGET_BIN) |
112 | - jelly_loader -r $(TARGET_BIN) | |
113 | + jelly_loader -c 4 -r $(TARGET_BIN) | |
113 | 114 | |
114 | 115 | # %jp{クリーン}%en{clean} |
115 | 116 | .PHONY : clean |
@@ -13,9 +13,9 @@ | ||
13 | 13 | #include "ostimer.h" |
14 | 14 | |
15 | 15 | |
16 | -#define TIMER0_CONTROL ((volatile UW *)0xf1000000) | |
17 | -#define TIMER0_COMPARE ((volatile UW *)0xf1000004) | |
18 | -#define TIMER0_COUNTER ((volatile UW *)0xf100000c) | |
16 | +#define TIMER0_CONTROL ((volatile UW *)0xfffff100) | |
17 | +#define TIMER0_COMPARE ((volatile UW *)0xfffff104) | |
18 | +#define TIMER0_COUNTER ((volatile UW *)0xfffff10c) | |
19 | 19 | |
20 | 20 | #define INTNO_TIMER0 0 |
21 | 21 |
@@ -12,8 +12,8 @@ | ||
12 | 12 | #include "kernel.h" |
13 | 13 | |
14 | 14 | |
15 | -#define UART0_DATA ((volatile UW *)0xf2000000) | |
16 | -#define UART0_STAT ((volatile UW *)0xf2000004) | |
15 | +#define UART0_DATA ((volatile UW *)0xfffff200) | |
16 | +#define UART0_STAT ((volatile UW *)0xfffff204) | |
17 | 17 | |
18 | 18 | |
19 | 19 |