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

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.c (modified) (4 diffs)

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

@@ -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.c 355 2015-07-25 10:26:02Z ertl-hiro $
+ *  $Id: gic_kernel_impl.c 522 2016-01-14 06:56:53Z ertl-hiro $
  */
 
@@ -177 +177 @@
          */
         for (i = GIC_INTNO_PPI0 / 16; i < GIC_TNUM_INTNO / 16; i++) {
-#ifdef GIC_ARM11MOCORE
+#ifdef GIC_ARM11MPCORE
                 sil_wrw_mem(GICD_ICFGR(i), 0x55555555U);
-#else /* GIC_ARM11MOCORE */
+#else /* GIC_ARM11MPCORE */
                 sil_wrw_mem(GICD_ICFGR(i), 0x00000000U);
-#endif /* GIC_ARM11MOCORE */
+#endif /* GIC_ARM11MPCORE */
         }
 
@@ -229 +229 @@
 
         if ((intatr & TA_EDGE) != 0U) {
-#ifdef GIC_ARM11MOCORE
+#ifdef GIC_ARM11MPCORE
                 gicd_config(intno, GICD_ICFGRn_EDGE|GICD_ICFGRn_1_N);
-#else /* GIC_ARM11MOCORE */
+#else /* GIC_ARM11MPCORE */
                 gicd_config(intno, GICD_ICFGRn_EDGE);
-#endif /* GIC_ARM11MOCORE */
+#endif /* GIC_ARM11MPCORE */
                 clear_int(intno);
         }
         else {
-#ifdef GIC_ARM11MOCORE
+#ifdef GIC_ARM11MPCORE
                 gicd_config(intno, GICD_ICFGRn_LEVEL|GICD_ICFGRn_1_N);
-#else /* GIC_ARM11MOCORE */
+#else /* GIC_ARM11MPCORE */
                 gicd_config(intno, GICD_ICFGRn_LEVEL);
-#endif /* GIC_ARM11MOCORE */
+#endif /* GIC_ARM11MPCORE */
         }