(none)

diff --git a/kernel/build/arm/aduc7000/armcc/gmake.mak b/kernel/build/arm/aduc7000/armcc/gmake.mak
index 9c0ecfb..40487be 100755 (executable)
--- a/kernel/build/arm/aduc7000/armcc/gmake.mak
+++ b/kernel/build/arm/aduc7000/armcc/gmake.mak
@@ -101,11 +101,4 @@ include $(KERNEL_MAKINC_DIR)/armcc_rul.inc
 include $(KERNEL_MAKINC_DIR)/knldep.inc
 
 
-# %jp{固有の依存関係}
-$(OBJS_DIR)/kini_irc.(EXT_OBJ):        $(SRC_IRC_DIR)/kini_irc.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/kexe_irc.(EXT_OBJ):        $(SRC_IRC_DIR)/kexe_irc.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/ena_int.(EXT_OBJ): $(SRC_IRC_DIR)/ena_int.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/dis_int.(EXT_OBJ): $(SRC_IRC_DIR)/dis_int.c $(SRC_IRC_DIR)/aduc7000.h
-
-
 # end of file

diff --git a/kernel/build/arm/aduc7000/gcc/gmake.mak b/kernel/build/arm/aduc7000/gcc/gmake.mak
index 3445cb9..fb3754a 100755 (executable)
--- a/kernel/build/arm/aduc7000/gcc/gmake.mak
+++ b/kernel/build/arm/aduc7000/gcc/gmake.mak
@@ -110,11 +110,4 @@ include $(KERNEL_MAKINC_DIR)/gcc_rul.inc
 include $(KERNEL_MAKINC_DIR)/knldep.inc
 
 
-# %jp{固有の依存関係}
-$(OBJS_DIR)/kini_irc.(EXT_OBJ):        $(SRC_IRC_DIR)/kini_irc.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/kexe_irc.(EXT_OBJ):        $(SRC_IRC_DIR)/kexe_irc.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/ena_int.(EXT_OBJ): $(SRC_IRC_DIR)/ena_int.c $(SRC_IRC_DIR)/aduc7000.h
-$(OBJS_DIR)/dis_int.(EXT_OBJ): $(SRC_IRC_DIR)/dis_int.c $(SRC_IRC_DIR)/aduc7000.h
-
-
 # end of file

diff --git a/kernel/include/arch/irc/arm/aduc7000/irc.h b/kernel/include/arch/irc/arm/aduc7000/irc.h
index 0be4698..1ce0eda 100755 (executable)
--- a/kernel/include/arch/irc/arm/aduc7000/irc.h
+++ b/kernel/include/arch/irc/arm/aduc7000/irc.h
@@ -13,14 +13,24 @@
 #define _KERNEL__arch__irc__aduc7000__irc_h__
 
 
+/* %jp{メモリマップドレジスタ定義} */
+#define _KERNEL_IRC_IRQSTA             ((volatile UW *)0xffff0000)
+#define _KERNEL_IRC_IRQSIG             ((volatile UW *)0xffff0004)
+#define _KERNEL_IRC_IRQEN              ((volatile UW *)0xffff0008)
+#define _KERNEL_IRC_IRQCLR             ((volatile UW *)0xffff000c)
+
+#define _KERNEL_IRC_FIQSTA             ((volatile UW *)0xffff0100)
+#define _KERNEL_IRC_FIQSIG             ((volatile UW *)0xffff0104)
+#define _KERNEL_IRC_FIQEN              ((volatile UW *)0xffff0108)
+#define _KERNEL_IRC_FIQCLR             ((volatile UW *)0xffff010c)
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void _kernel_ini_irc(void);                    /**< %jp{割込みコントローラの初期化} */
-void _kernel_exe_irc(INHNO inhno);
-void _kernel_arm_irq(void);                    /**< %jp{割り込み処理の実施} */
-void _kernel_arm_fiq(void);                    /**< %jp{割り込み処理の実施} */
+void _kernel_exe_irc(INHNO inhno);     /**< %jp{割込み処理} */
 
 #ifdef __cplusplus
 }

diff --git a/kernel/include/arch/irc/arm/aduc7000/ircatr.h b/kernel/include/arch/irc/arm/aduc7000/ircatr.h
index 6168312..7fb086f 100755 (executable)
--- a/kernel/include/arch/irc/arm/aduc7000/ircatr.h
+++ b/kernel/include/arch/irc/arm/aduc7000/ircatr.h
@@ -16,8 +16,8 @@
 
 #define _KERNEL_IRCATR_IRC                                     TRUE            /**< %jp{IRCの有無} */
 
-#define _KERNEL_IRCATR_TMIN_INTNO                      1                       /**< %jp{割込み番号の最小値} */
-#define _KERNEL_IRCATR_TMAX_INTNO                      23                      /**< %jp{割込み番号の最大値} */
+#define _KERNEL_IRCATR_TMIN_INTNO                      0                       /**< %jp{割込み番号の最小値} */
+#define _KERNEL_IRCATR_TMAX_INTNO                      31                      /**< %jp{割込み番号の最大値} */
 
 
 #endif /* _KERNEL__arch__irc__aduc7000__ircatr_h__ */

diff --git a/kernel/source/arch/irc/arm/aduc7000/aduc7000.h b/kernel/source/arch/irc/arm/aduc7000/aduc7000.h
deleted file mode 100755 (executable)
index e29f684..0000000
--- a/kernel/source/arch/irc/arm/aduc7000/aduc7000.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/** 
- *  Hyper Operating System V4 Advance
- *
- * @file  aduc7000.h
- * @brief %jp{ADuC7000シリーズ用割込みコントローラ操作}%en{ADuC7000 series}
- *
- * Copyright (C) 1998-2007 by Project HOS
- * http://sourceforge.jp/projects/hos/
- */
-
-
-#ifndef _kernel__aduc7000_h__
-#define _kernel__aduc7000_h__
-
-
-#define IRQSTA         (*(volatile UW *)0xffff0000)
-#define IRQSIG         (*(volatile UW *)0xffff0004)
-#define IRQEN          (*(volatile UW *)0xffff0008)
-#define IRQCLR         (*(volatile UW *)0xffff000c)
-
-#define FIQSTA         (*(volatile UW *)0xffff0100)
-#define FIQSIG         (*(volatile UW *)0xffff0104)
-#define FIQEN          (*(volatile UW *)0xffff0108)
-#define FIQCLR         (*(volatile UW *)0xffff010c)
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void _kernel_arm_irq(void);
-void _kernel_arm_fiq(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /*  _kernel__aduc7000_h__ */
-
-
-/* end of file */

diff --git a/kernel/source/arch/irc/arm/aduc7000/dis_int.c b/kernel/source/arch/irc/arm/aduc7000/dis_int.c
index 460cb1f..83f449a 100755 (executable)
--- a/kernel/source/arch/irc/arm/aduc7000/dis_int.c
+++ b/kernel/source/arch/irc/arm/aduc7000/dis_int.c
@@ -12,14 +12,12 @@
 #include "core/core.h"
 #include "object/inhobj.h"
 #include "object/isrobj.h"
-#include "aduc7000.h"
-
 
 
 /* 割り込みの禁止 */
 ER dis_int(INTNO intno)
 {
-       IRQCLR = (1 << intno);
+       *_KERNEL_IRC_IRQCLR = (1 << intno);
 
        return E_OK;
 }

diff --git a/kernel/source/arch/irc/arm/aduc7000/ena_int.c b/kernel/source/arch/irc/arm/aduc7000/ena_int.c
index 52e4783..fdd20db 100755 (executable)
--- a/kernel/source/arch/irc/arm/aduc7000/ena_int.c
+++ b/kernel/source/arch/irc/arm/aduc7000/ena_int.c
@@ -12,13 +12,12 @@
 #include "core/core.h"
 #include "object/inhobj.h"
 #include "object/isrobj.h"
-#include "aduc7000.h"
 
 
 /* 割り込みの許可 */
 ER ena_int(INTNO intno)
 {
-       IRQEN |= (1 << intno);
+       *_KERNEL_IRC_IRQEN |= (1 << intno);
        
        return E_OK;
 }

diff --git a/kernel/source/arch/irc/arm/aduc7000/kexe_irc.c b/kernel/source/arch/irc/arm/aduc7000/kexe_irc.c
index f7158c3..1c1dcc0 100755 (executable)
--- a/kernel/source/arch/irc/arm/aduc7000/kexe_irc.c
+++ b/kernel/source/arch/irc/arm/aduc7000/kexe_irc.c
@@ -12,7 +12,6 @@
 #include "core/core.h"
 #include "object/inhobj.h"
 #include "object/isrobj.h"
-#include "aduc7000.h"
 
 
 /** %jp{割込みコントローラの割込み処理} */
@@ -24,11 +23,11 @@ void _kernel_exe_irc(INHNO inhno)
        switch ( inhno )
        {
        case _KERNEL_ARM_INHNO_IRQ:
-               intsta = IRQSTA;
+               intsta = *_KERNEL_IRC_IRQSTA;
                break;
 
        case _KERNEL_ARM_INHNO_FIQ:
-               intsta = FIQSTA;
+               intsta = *_KERNEL_IRC_FIQSTA;
                break;
        
        default:

diff --git a/kernel/source/arch/irc/arm/aduc7000/kini_irc.c b/kernel/source/arch/irc/arm/aduc7000/kini_irc.c
index e780554..697ead6 100755 (executable)
--- a/kernel/source/arch/irc/arm/aduc7000/kini_irc.c
+++ b/kernel/source/arch/irc/arm/aduc7000/kini_irc.c
@@ -12,14 +12,13 @@
 #include "core/core.h"
 #include "object/inhobj.h"
 #include "object/isrobj.h"
-#include "aduc7000.h"
 
 
 /** %jp{割込みコントローラの初期化} */
 void _kernel_ini_irc(void)
 {
-       IRQCLR = 0x00ffffff;
-       FIQCLR = 0x00ffffff;
+       *_KERNEL_IRC_IRQCLR = 0x00ffffff;
+       *_KERNEL_IRC_FIQCLR = 0x00ffffff;
 }