Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/interrupt.c

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/kernel/interrupt.c (modified) (8 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/interrupt.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2016 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2019 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -93 +93 @@
 #endif /* LOG_ENA_INT_LEAVE */
 
+#ifndef LOG_CLR_INT_ENTER
+#define LOG_CLR_INT_ENTER(intno)
+#endif /* LOG_CLR_INT_ENTER */
+
+#ifndef LOG_CLR_INT_LEAVE
+#define LOG_CLR_INT_LEAVE(ercd)
+#endif /* LOG_CLR_INT_LEAVE */
+
+#ifndef LOG_RAS_INT_ENTER
+#define LOG_RAS_INT_ENTER(intno)
+#endif /* LOG_RAS_INT_ENTER */
+
+#ifndef LOG_RAS_INT_LEAVE
+#define LOG_RAS_INT_LEAVE(ercd)
+#endif /* LOG_RAS_INT_LEAVE */
+
+#ifndef LOG_PRB_INT_ENTER
+#define LOG_PRB_INT_ENTER(intno)
+#endif /* LOG_PRB_INT_ENTER */
+
+#ifndef LOG_PRB_INT_LEAVE
+#define LOG_PRB_INT_LEAVE(ercd)
+#endif /* LOG_PRB_INT_LEAVE */
+
 #ifndef LOG_CHG_IPM_ENTER
 #define LOG_CHG_IPM_ENTER(intpri)
@@ -108 +132 @@
 #define LOG_GET_IPM_LEAVE(ercd, p_intpri)
 #endif /* LOG_GET_IPM_LEAVE */
+
+/*
+ *  割込み番号の範囲の判定
+ */
+#ifndef VALID_INTNO_DISINT
+#define VALID_INTNO_DISINT(intno)       VALID_INTNO(intno)
+#endif /* VALID_INTNO_DISINT */
+
+#ifndef VALID_INTNO_CLRINT
+#define VALID_INTNO_CLRINT(intno)       VALID_INTNO(intno)
+#endif /* VALID_INTNO_CLRINT */
+
+#ifndef VALID_INTNO_RASINT
+#define VALID_INTNO_RASINT(intno)       VALID_INTNO(intno)
+#endif /* VALID_INTNO_RASINT */
+
+#ifndef VALID_INTNO_PRBINT
+#define VALID_INTNO_PRBINT(intno)       VALID_INTNO(intno)
+#endif /* VALID_INTNO_PRBINT */
+
+#ifndef VALID_INTNO_CREISR
+#define VALID_INTNO_CREISR(intno)       VALID_INTNO(intno)
+#endif /* VALID_INTNO_CREISR */
+
+/*
+ *  割込み優先度の範囲の判定
+ */
+#ifndef VALID_INTPRI_CHGIPM
+#define VALID_INTPRI_CHGIPM(intpri)     \
+                                        (TMIN_INTPRI <= (intpri) && (intpri) <= TIPM_ENAALL)
+#endif /* VALID_INTPRI_CHGIPM */
 
 /*
@@ -266 +321 @@
         isrpri = pk_cisr->isrpri;
 
-        CHECK_RSATR(isratr, TARGET_ISRATR);
+        CHECK_VALIDATR(isratr, TARGET_ISRATR);
         CHECK_PAR(VALID_INTNO_CREISR(intno));
         CHECK_PAR(FUNC_ALIGN(isr));
@@ -384 +439 @@
                 lock_cpu();
         }
-        if (disable_int(intno)) {                                       /*［NGKI3086］*/
+        if (check_intno_cfg(intno)) {
+                disable_int(intno);                                             /*［NGKI3086］*/
                 ercd = E_OK;
         }
@@ -421 +477 @@
                 lock_cpu();
         }
-        if (enable_int(intno)) {                                        /*［NGKI3099］*/
+        if (check_intno_cfg(intno)) {
+                enable_int(intno);                                              /*［NGKI3099］*/
                 ercd = E_OK;
         }
@@ -438 +495 @@
 #endif /* TOPPERS_SUPPORT_ENA_INT */
 #endif /* TOPPERS_ena_int */
+
+/*
+ *  割込み要求のクリア［NGKI3920］
+ */
+#ifdef TOPPERS_clr_int
+#ifdef TOPPERS_SUPPORT_CLR_INT                                  /*［NGKI3927］*/
+
+ER
+clr_int(INTNO intno)
+{
+        bool_t  locked;
+        ER              ercd;
+
+        LOG_CLR_INT_ENTER(intno);
+        CHECK_PAR(VALID_INTNO_CLRINT(intno));           /*［NGKI3921］［NGKI3930］*/
+
+        locked = sense_lock();
+        if (!locked) {
+                lock_cpu();
+        }
+        if (check_intno_cfg(intno) && check_intno_clear(intno)) {
+                clear_int(intno);                                               /*［NGKI3924］*/
+                ercd = E_OK;
+        }
+        else {
+                ercd = E_OBJ;                                                   /*［NGKI3923］［NGKI3929］*/
+        }
+        if (!locked) {
+                unlock_cpu();
+        }
+
+  error_exit:
+        LOG_CLR_INT_LEAVE(ercd);
+        return(ercd);
+}
+
+#endif /* TOPPERS_SUPPORT_CLR_INT */
+#endif /* TOPPERS_clr_int */
+
+/*
+ *  割込みの要求［NGKI3932］
+ */
+#ifdef TOPPERS_ras_int
+#ifdef TOPPERS_SUPPORT_RAS_INT                                  /*［NGKI3939］*/
+
+ER
+ras_int(INTNO intno)
+{
+        bool_t  locked;
+        ER              ercd;
+
+        LOG_RAS_INT_ENTER(intno);
+        CHECK_PAR(VALID_INTNO_RASINT(intno));           /*［NGKI3933］［NGKI3942］*/
+
+        locked = sense_lock();
+        if (!locked) {
+                lock_cpu();
+        }
+        if (check_intno_cfg(intno) && check_intno_raise(intno)) {
+                raise_int(intno);                                               /*［NGKI3936］*/
+                ercd = E_OK;
+        }
+        else {
+                ercd = E_OBJ;                                                   /*［NGKI3935］［NGKI3941］*/
+        }
+        if (!locked) {
+                unlock_cpu();
+        }
+
+  error_exit:
+        LOG_RAS_INT_LEAVE(ercd);
+        return(ercd);
+}
+
+#endif /* TOPPERS_SUPPORT_RAS_INT */
+#endif /* TOPPERS_ras_int */
+
+/*
+ *  割込み要求のチェック［NGKI3944］
+ */
+#ifdef TOPPERS_prb_int
+#ifdef TOPPERS_SUPPORT_PRB_INT                                  /*［NGKI3951］*/
+
+ER_BOOL
+prb_int(INTNO intno)
+{
+        bool_t  locked;
+        ER_BOOL ercd;
+
+        LOG_PRB_INT_ENTER(intno);
+        CHECK_PAR(VALID_INTNO_PRBINT(intno));           /*［NGKI3945］［NGKI3952］*/
+
+        locked = sense_lock();
+        if (!locked) {
+                lock_cpu();
+        }
+        if (check_intno_cfg(intno)) {
+                ercd = (ER_BOOL) probe_int(intno);              /*［NGKI3948］*/
+        }
+        else {
+                ercd = E_OBJ;                                                   /*［NGKI3947］*/
+        }
+        if (!locked) {
+                unlock_cpu();
+        }
+
+  error_exit:
+        LOG_PRB_INT_LEAVE(ercd);
+        return(ercd);
+}
+
+#endif /* TOPPERS_SUPPORT_PRB_INT */
+#endif /* TOPPERS_prb_int */
 
 /*
@@ -456 +626 @@
         t_set_ipm(intpri);                                                      /*［NGKI3111］*/
         if (intpri == TIPM_ENAALL && enadsp) {
-                dspflg = true;
-                p_schedtsk = search_schedtsk();
+                set_dspflg();
                 if (p_runtsk->raster && p_runtsk->enater) {
                         task_terminate(p_runtsk);