Changeset 306 for asp3_wo_tecs/trunk/sample

Timestamp:

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

Author:

ertl-honda

Message:

3.1.0を反映

Location:

asp3_wo_tecs/trunk/sample

Files:

• Makefile (modified) (2 diffs)
• sample1.c (modified) (3 diffs)
• sample1.cfg (modified) (1 diff)
• sample1.h (modified) (3 diffs)

asp3_wo_tecs/trunk/sample/Makefile

@@ -208 +208 @@
 CFG_OBJS := $(CFG_ASMOBJS) $(CFG_COBJS)
 CFG2_OUT_SRCS := kernel_cfg.h kernel_cfg.c $(CFG2_OUT_SRCS)
-CFG_CFLAGS := $(CFG_CFLAGS)
+CFG_CFLAGS := -DTOPPERS_CB_TYPE_ONLY $(CFG_CFLAGS)
 
 #
@@ -272 +272 @@
 ALL_OBJS = $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                                                                                         $(END_OBJS) $(HIDDEN_OBJS)
+ALL_LIBS = -lkernel $(LIBS)
 ifdef KERNEL_LIB
-        ALL_LIBS = -lkernel $(LIBS)
         LIBS_DEP = $(KERNEL_LIB)/libkernel.a $(filter %.a,$(LIBS))
         OBJ_LDFLAGS := $(OBJ_LDFLAGS) -L$(KERNEL_LIB)
         REALCLEAN_FILES := libkernel.a $(REALCLEAN_FILES)
 else
-        ALL_LIBS = libkernel.a $(LIBS)
         LIBS_DEP = libkernel.a $(filter %.a,$(LIBS))
+        OBJ_LDFLAGS := $(OBJ_LDFLAGS) -L.
 endif
 

asp3_wo_tecs/trunk/sample/sample1.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2004-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2004-2016 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -53 +53 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: sample1.c 346 2015-07-18 02:12:08Z ertl-hiro $
+ *  $Id: sample1.c 711 2016-03-29 14:45:54Z ertl-hiro $
  */
 
@@ -237 +237 @@
 
 /*
+ *  割込みハンドラ
+ */
+#ifdef INTNO1
+
+void intno1_isr(intptr_t exinf)
+{
+        intno1_clear();
+        SVC_PERROR(rot_rdq(HIGH_PRIORITY));
+        SVC_PERROR(rot_rdq(MID_PRIORITY));
+        SVC_PERROR(rot_rdq(LOW_PRIORITY));
+}
+
+#endif /* INTNO1 */
+
+/*
  *  CPU例外ハンドラ
  */

asp3_wo_tecs/trunk/sample/sample1.cfg

@@ -17 +17 @@
 CRE_CYC(CYCHDR1, { TA_NULL, { TNFY_HANDLER, 0, cyclic_handler }, 2000000, 0 });
 CRE_ALM(ALMHDR1, { TA_NULL, { TNFY_HANDLER, 0, alarm_handler }});
+#ifdef INTNO1
+CFG_INT(INTNO1, { INTNO1_INTATR, INTNO1_INTPRI });
+CRE_ISR(INTNO1_ISR, { TA_NULL, 0, INTNO1, intno1_isr, 1 });
+#endif /* INTNO1 */
 #ifdef CPUEXC1
 DEF_EXC(CPUEXC1, { TA_NULL, cpuexc_handler });

asp3_wo_tecs/trunk/sample/sample1.h

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2004-2014 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2004-2016 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  *
@@ -53 +53 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  *
- *  $Id: sample1.h 286 2014-11-29 07:51:11Z ertl-hiro $
+ *  $Id: sample1.h 705 2016-03-29 14:16:41Z ertl-hiro $
  */
 
@@ -108 +108 @@
 extern void     main_task(intptr_t exinf);
 extern void exc_task(intptr_t exinf);
+#ifdef INTNO1
+extern void intno1_isr(intptr_t exinf);
+#endif /* INTNO1 */
 #ifdef CPUEXC1
 extern void     cpuexc_handler(void *p_excinf);