From d6c8a0c735e69130cf094e0ac0c91a770054e055 Mon Sep 17 00:00:00 2001
From: ryuz <ryuz>
Date: Sun, 26 Oct 2008 07:33:46 +0000
Subject: [PATCH] (none)

---
 kernel/build/mips/jelly/gcc/gmake.mak         | 147 ++++++++++++++++++++++++++
 kernel/include/arch/irc/mips/jelly/irc.h      |   8 --
 kernel/include/arch/proc/mips/mips1/procatr.h |   2 -
 kernel/source/arch/irc/mips/jelly/kini_irc.c  |   2 -
 4 files changed, 147 insertions(+), 12 deletions(-)
 create mode 100755 kernel/build/mips/jelly/gcc/gmake.mak

diff --git a/kernel/build/mips/jelly/gcc/gmake.mak b/kernel/build/mips/jelly/gcc/gmake.mak
new file mode 100755
index 0000000..911a1c1
--- /dev/null
+++ b/kernel/build/mips/jelly/gcc/gmake.mak
@@ -0,0 +1,147 @@
+# ----------------------------------------------------------------------------
+# Hyper Operating System V4 Advance
+#  makefile for Philips LPC2000 family
+#
+# Copyright (C) 1998-2008 by Project HOS
+# http://sourceforge.jp/projects/hos/
+# ----------------------------------------------------------------------------
+
+
+
+# --------------------------------------
+#  %jp{各種設定}{setting}
+# --------------------------------------
+
+# %jp{ターゲットライブラリ名}%en{target library name}
+TARGET ?= libhosv4a
+
+
+# %jp{ツール定義}%en{tools}
+GCC_ARCH ?= mips-elf-
+CMD_CC   ?= $(GCC_ARCH)gcc
+CMD_ASM  ?= $(GCC_ARCH)gcc
+CMD_LIBR ?= $(GCC_ARCH)ar
+
+
+# %jp{アーキテクチャ定義}%en{architecture}
+ARCH_NAME ?= mips1
+ARCH_PROC ?= mips/mips1
+ARCH_IRC  ?= mips/jelly
+ARCH_CC   ?= gcc
+
+
+# %jp{ディレクトリ定義}%en{directories}
+TOP_DIR           = ../../../../..
+KERNEL_DIR        = $(TOP_DIR)/kernel
+KERNEL_MAKINC_DIR = $(KERNEL_DIR)/build/common/gmake
+INC_PROC_DIR      = $(KERNEL_DIR)/include/arch/proc/$(ARCH_PROC)
+INC_IRC_DIR       = $(KERNEL_DIR)/include/arch/irc/$(ARCH_IRC)
+SRC_PROC_DIR      = $(KERNEL_DIR)/source/arch/proc/$(ARCH_PROC)
+SRC_PROC_CC_DIR   = $(KERNEL_DIR)/source/arch/proc/$(ARCH_PROC)/$(ARCH_CC)
+SRC_IRC_DIR       = $(KERNEL_DIR)/source/arch/irc/$(ARCH_IRC)
+SRC_IRC_CC_DIR    = $(KERNEL_DIR)/source/arch/irc/$(ARCH_IRC)/$(ARCH_CC)
+CFGRTR_DIR        = $(TOP_DIR)/cfgrtr/build/gcc
+
+
+# %jp{コンフィギュレータ定義}%en{kernel configurator}
+CFGRTR = h4acfg-$(ARCH_NAME)
+
+
+# %jp{カーネル指定}%en{kernel flag}
+KERNEL = Yes
+
+
+# %jp{共通定義読込み}%en{common setting}
+include $(KERNEL_MAKINC_DIR)/common.inc
+
+
+# %jp{パス設定}%en{add source directories}
+INC_DIRS += $(INC_PROC_DIR) $(INC_IRC_DIR)
+SRC_DIRS += $(SRC_PROC_DIR) $(SRC_PROC_DIR) $(SRC_PROC_CC_DIR) $(SRC_IRC_DIR) $(SRC_IRC_CC_DIR)
+
+
+# %jp{オプションフラグ}%en{option flags}
+AFLAGS  = -march=mips1
+CFLAGS  = -march=mips1
+ARFLAGS = 
+
+
+# %jp{コンパイラ依存の設定読込み}%en{compiler dependent definitions}
+include $(KERNEL_MAKINC_DIR)/$(ARCH_CC)_d.inc
+
+# %jp{ライブラリ生成用設定読込み}%en{definitions for library}
+include $(KERNEL_MAKINC_DIR)/maklib_d.inc
+
+
+
+
+# --------------------------------------
+#  %jp{ソースファイル}%en{source files}
+# --------------------------------------
+
+# %jp{アセンブラファイルの追加}%en{assembry sources}
+ASRCS += $(SRC_PROC_CC_DIR)/kdis_int.S
+ASRCS += $(SRC_PROC_CC_DIR)/kena_int.S
+ASRCS += $(SRC_PROC_CC_DIR)/kwai_int.S
+ASRCS += $(SRC_PROC_CC_DIR)/kcre_ctx.S
+ASRCS += $(SRC_PROC_CC_DIR)/kswi_ctx.S
+ASRCS += $(SRC_PROC_CC_DIR)/krst_ctx.S
+ASRCS += $(SRC_PROC_CC_DIR)/kexc_hdr.S
+
+# %jp{C言語ファイルの追加}%en{C sources}
+CSRCS += $(SRC_PROC_DIR)/val_int.c
+CSRCS += $(SRC_IRC_DIR)/kini_irc.c
+CSRCS += $(SRC_IRC_DIR)/kexe_irc.c
+CSRCS += $(SRC_IRC_DIR)/dis_int.c
+CSRCS += $(SRC_IRC_DIR)/ena_int.c
+CSRCS += $(SRC_IRC_DIR)/vclr_int.c
+
+# %jp{カーネル共通ソースの追加}%en{kernel common sources}
+include $(KERNEL_MAKINC_DIR)/knlsrc.inc
+
+
+
+
+# --------------------------------------
+#  %jp{ルール定義}%en{rules}
+# --------------------------------------
+
+# %jp{ALL}%en{all}
+.PHONY : all
+all: makelib_all
+	$(MAKE) -C $(CFGRTR_DIR) -f gmake.mak TARGET=$(CFGRTR) ARCH_PROC=$(ARCH_PROC) ARCH_IRC=$(ARCH_IRC)
+
+# %jp{クリーン}%en{clean}
+.PHONY : clean
+clean: makelib_clean
+	$(MAKE) -C $(CFGRTR_DIR) -f gmake.mak TARGET=$(CFGRTR) ARCH_PROC=$(ARCH_PROC) ARCH_IRC=$(ARCH_IRC) clean
+	$(RM) -f *.lst
+
+# %jp{依存関係更新}%en{make depend}
+.PHONY : depend
+depend: makelib_depend
+
+# %jp{ソース一括コピー}%en{source files copy}
+.PHONY : srccpy
+srccpy: makelib_srccpy
+
+
+# %jp{ライブラリ生成用設定読込み}%en{rules for library}
+include $(KERNEL_MAKINC_DIR)/maklib_r.inc
+
+# %jp{コンパイラ依存のルール定義読込み}%en{rules for compiler}
+include $(KERNEL_MAKINC_DIR)/$(ARCH_CC)_r.inc
+
+
+
+
+# --------------------------------------
+#  %jp{依存関係}%en{dependency}
+# --------------------------------------
+
+# %jp{カーネル依存関係読込み}{dependency list of kernel sources}
+include $(KERNEL_MAKINC_DIR)/knldep.inc
+
+
+
+# end of file
diff --git a/kernel/include/arch/irc/mips/jelly/irc.h b/kernel/include/arch/irc/mips/jelly/irc.h
index 0f47043..021c564 100755
--- a/kernel/include/arch/irc/mips/jelly/irc.h
+++ b/kernel/include/arch/irc/mips/jelly/irc.h
@@ -28,14 +28,6 @@
 #define _KERNEL_IRC_FACTOR_PRIORITY(n)	((volatile       UW *)(_KERNEL_IRC_BASE + 0x2c + ((n) * 0x10)))
 
 
-typedef struct _kernel_t_irccb
-{
-	UB	ptr;
-	UB	mask[8];
-} _KERNEL_T_IRCCB;
-
-extern	_KERNEL_T_IRCCB		_kernel_irccb;
-
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/kernel/include/arch/proc/mips/mips1/procatr.h b/kernel/include/arch/proc/mips/mips1/procatr.h
index 1a22f77..930a1d1 100755
--- a/kernel/include/arch/proc/mips/mips1/procatr.h
+++ b/kernel/include/arch/proc/mips/mips1/procatr.h
@@ -57,8 +57,6 @@
 
 
 
-
-
 #endif	/* _KERNEL__arch__proc__mips__mips1__procatr_h__ */
 
 
diff --git a/kernel/source/arch/irc/mips/jelly/kini_irc.c b/kernel/source/arch/irc/mips/jelly/kini_irc.c
index c4abee3..17bc261 100755
--- a/kernel/source/arch/irc/mips/jelly/kini_irc.c
+++ b/kernel/source/arch/irc/mips/jelly/kini_irc.c
@@ -35,8 +35,6 @@ void _kernel_ini_irc(void)
 		*_KERNEL_IRC_FACTOR_PENDING(i)  = 0;
 		*_KERNEL_IRC_FACTOR_PRIORITY(i) = pri;
 	}
-	_kernel_irccb.ptr = 0;
-	
 	
 	*_KERNEL_IRC_ENABLE = 1;
 }
-- 
2.11.0