Changeset 305 for asp3_wo_tecs/trunk/test/bit_kernel.c

Timestamp:

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

Author:

ertl-honda

Message:

3.0.0のリリース版に追従

File:

• asp3_wo_tecs/trunk/test/bit_kernel.c (modified) (6 diffs)

asp3_wo_tecs/trunk/test/bit_kernel.c

@@ -4 +4 @@
  *      Advanced Standard Profile Kernel
  * 
- *  Copyright (C) 2005-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2016 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -51 +51 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: bit_kernel.c 456 2015-08-16 06:11:51Z ertl-hiro $
+ *  $Id: bit_kernel.c 554 2016-01-17 13:21:59Z ertl-hiro $
  */
 
@@ -167 +167 @@
 #endif /* PRIMAP_BIT */
 
+Inline bool_t
+primap_empty(void)
+{
+#ifndef PRIMAP_LEVEL_2
+        return(ready_primap == 0U);
+#else /* PRIMAP_LEVEL_2 */
+        return(ready_primap1 == 0U);
+#endif /* PRIMAP_LEVEL_2 */
+}
+
+Inline uint16_t
+primap_extract_bit(uint_t pri)
+{
+#ifndef PRIMAP_LEVEL_2
+        return(ready_primap & PRIMAP_BIT(pri));
+#else /* PRIMAP_LEVEL_2 */
+        return(ready_primap2[pri / TBIT_PRIMAP] & PRIMAP_BIT(pri % TBIT_PRIMAP));
+#endif /* PRIMAP_LEVEL_2 */
+}
+
 static ER
 bit_schedcb(void)
@@ -178 +198 @@
          */
         if (enadsp) {
-                if (ready_primap == 0U) {
+                if (primap_empty()) {
                         if (p_schedtsk != NULL) {
                                 return(E_SYS_LINENO);
@@ -189 +209 @@
                 }
         }
+
+#ifdef PRIMAP_LEVEL_2
+        /*
+         *  ready_primap1とready_primap2の整合性の検査
+         */
+        for (pri = 0; pri < TNUM_TPRI; pri += TBIT_PRIMAP) {
+                if (ready_primap2[pri / TBIT_PRIMAP] == 0U) {
+                        if ((ready_primap1 & PRIMAP_BIT(pri / TBIT_PRIMAP)) != 0U) {
+                                return(E_SYS_LINENO);
+                        }
+                }
+                else {
+                        if ((ready_primap1 & PRIMAP_BIT(pri / TBIT_PRIMAP)) == 0U) {
+                                return(E_SYS_LINENO);
+                        }
+                }
+        }
+#endif /* PRIMAP_LEVEL_2 */
 
         /*
@@ -196 +234 @@
                 p_queue = ready_queue[pri].p_next;
                 if (p_queue == &ready_queue[pri]) {
-                        if ((ready_primap & PRIMAP_BIT(pri)) != 0U) {
+                        if (primap_extract_bit(pri) != 0U) {
                                 return(E_SYS_LINENO);
                         }
                 }
                 else {
-                        if ((ready_primap & PRIMAP_BIT(pri)) == 0U) {
+                        if (primap_extract_bit(pri) == 0U) {
                                 return(E_SYS_LINENO);
                         }