Changeset 305 for asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_kernel_impl.h

Timestamp:

Jun 26, 2017, 6:45:41 PM (7 years ago)

Author:

ertl-honda

Message:

3.0.0のリリース版に追従

File:

• asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_kernel_impl.h (modified) (5 diffs)

asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_kernel_impl.h

@@ -4 +4 @@
  *      Advanced Standard Profile Kernel
  * 
- *  Copyright (C) 2006-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2006-2016 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -51 +51 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: gic_kernel_impl.h 377 2015-07-31 00:48:14Z ertl-hiro $
+ *  $Id: gic_kernel_impl.h 535 2016-01-16 00:42:29Z ertl-hiro $
  */
 
@@ -100 +100 @@
 ˆåº¦ã®æ®µæ•°ãŒ256段階の時にあわせて表す．
  */
+#define GIC_PRI_LEVEL           (TMAX_INTPRI - TMIN_INTPRI + 2)
+
 #if GIC_PRI_LEVEL == 16
 #define GIC_PRI_SHIFT           4
@@ -128 +130 @@
                         (((uint_t)((ipm) + (GIC_PRI_LEVEL - 1))) << GIC_PRI_SHIFT)
 
-/* TMIN_INTPRI，TMAX_INTPRIとの整合性のチェック */
-#if TMAX_INTPRI - TMIN_INTPRI + 2 != GIC_PRI_LEVEL
-#error GIC_PRI_LEVEL does not match TMIN_INTPRI.
-#endif
-
 /*
  *  GICレジスタのアドレスを定義するためのマクロ
@@ -209 +206 @@
 #define GICD_ICFGRn_LEVEL       UINT_C(0x00)
 #define GICD_ICFGRn_EDGE        UINT_C(0x02)
-#ifdef GIC_ARM11MOCORE
+#ifdef GIC_ARM11MPCORE
 #define GICD_ICFGRn_N_N         UINT_C(0x00)
 #define GICD_ICFGRn_1_N         UINT_C(0x01)
-#endif /* GIC_ARM11MOCORE */
+#endif /* GIC_ARM11MPCORE */
 
 #ifndef TOPPERS_MACRO_ONLY