Changeset 305 for asp3_wo_tecs/trunk/arch/arm_gcc/common/core_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/core_kernel_impl.c (modified) (6 diffs)

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

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  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
  * 
@@ -53 +53 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: core_kernel_impl.c 430 2015-08-08 11:38:46Z ertl-hiro $
+ *  $Id: core_kernel_impl.c 541 2016-01-16 03:09:21Z ertl-hiro $
  */
 
@@ -76 +76 @@
 #ifdef USE_ARM_MMU
 
-#define D0_CLIENT       0x01U           /* 変換テーブルに従ってドメイン0にアクセス */
-#define USE_ASID        1                       /* 使用するASID */
+#define CP15_DACR_D0_CLIENT     0x01U   /* 変換テーブルに従いドメイン0にアクセス */
+#define DEFAULT_ASID            1               /* 使用するASID */
 
 /*
@@ -155 +155 @@
          * ドメインアクセス制御の設定
          */
-        CP15_WRITE_DACR(D0_CLIENT);
+        CP15_WRITE_DACR(CP15_DACR_D0_CLIENT);
 
         /*
@@ -161 +161 @@
          */
 #if __TARGET_ARCH_ARM >= 6
-        CP15_WRITE_CONTEXTIDR(USE_ASID);
+        CP15_WRITE_CONTEXTIDR(DEFAULT_ASID);
 #endif /* __TARGET_ARCH_ARM >= 6 */
 
@@ -197 +197 @@
          */ 
         excpt_nest_count = 1U;
+
+        /*
+         *  MMUを有効に
+         */
+#ifdef USE_ARM_MMU
+        arm_mmu_initialize();
+#endif /* USE_ARM_MMU */
 
         /*