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

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_kernel_impl.c (modified) (10 diffs)

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

@@ -1 +1 @@
 /*
- *  TOPPERS/ASP Kernel
- *      Toyohashi Open Platform for Embedded Real-Time Systems/
- *      Advanced Standard Profile Kernel
+ *  TOPPERS Software
+ *      Toyohashi Open Platform for Embedded Real-Time Systems
  *
  *  Copyright (C) 2006-2016 by Embedded and Real-Time Systems Laboratory
@@ -51 +50 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: gic_kernel_impl.c 522 2016-01-14 06:56:53Z ertl-hiro $
+ *  $Id: gic_kernel_impl.c 714 2016-03-31 05:52:19Z ertl-hiro $
  */
 
@@ -138 +137 @@
          *  すべての割込みをグループ1（IRQ）に設定
          */
-        for (i = 0; i < GIC_TNUM_INTNO / 32; i++) {
+        for (i = 0; i < (GIC_TNUM_INTNO + 31) / 32; i++) {
                 sil_wrw_mem(GICD_IGROUPR(i), 0xffffffffU);
         }
@@ -146 +145 @@
          *  すべての割込みを禁止
          */
-        for (i = 0; i < GIC_TNUM_INTNO / 32; i++) {
+        for (i = 0; i < (GIC_TNUM_INTNO + 31) / 32; i++) {
                 sil_wrw_mem(GICD_ICENABLER(i), 0xffffffffU);
         }
@@ -153 +152 @@
          *  すべての割込みペンディングをクリア
          */
-        for (i = 0; i < GIC_TNUM_INTNO / 32; i++) {
+        for (i = 0; i < (GIC_TNUM_INTNO + 31) / 32; i++) {
                 sil_wrw_mem(GICD_ICPENDR(i), 0xffffffffU);
         }
@@ -161 +160 @@
 ˆåº¦ã«è¨­å®š
          */
-        for (i = 0; i < GIC_TNUM_INTNO / 4; i++){
+        for (i = 0; i < (GIC_TNUM_INTNO + 3) / 4; i++){
                 sil_wrw_mem(GICD_IPRIORITYR(i), 0xffffffffU);
         }
@@ -169 +168 @@
 ±æœ‰ãƒšãƒªãƒ•ã‚§ãƒ©ãƒ«å‰²è¾¼ã¿ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã‚’プロセッサ0に設定
          */
-        for (i = GIC_INTNO_SPI0 / 4; i < GIC_TNUM_INTNO / 4; i++) {
+        for (i = GIC_INTNO_SPI0 / 4; i < (GIC_TNUM_INTNO + 3) / 4; i++) {
                 sil_wrw_mem(GICD_ITARGETSR(i), 0x01010101U);
         }
@@ -176 +175 @@
          *  すべてのペリフェラル割込みをレベルトリガに設定
          */
-        for (i = GIC_INTNO_PPI0 / 16; i < GIC_TNUM_INTNO / 16; i++) {
+        for (i = GIC_INTNO_PPI0 / 16; i < (GIC_TNUM_INTNO + 15) / 16; i++) {
 #ifdef GIC_ARM11MPCORE
                 sil_wrw_mem(GICD_ICFGR(i), 0x55555555U);
@@ -198 +197 @@
         sil_wrw_mem(GICD_CTLR, GICD_CTLR_DISABLE);
 }
+
+#ifndef OMIT_GIC_INITIALIZE_INTERRUPT
 
 /*
@@ -273 +274 @@
         }
 }
+
+#endif /* OMIT_GIC_INITIALIZE_INTERRUPT */