From: lottaviano <lottaviano@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 17 May 2011 16:35:21 +0000 (+0000)
Subject: Remove warnings from nightly tests.
X-Git-Tag: 2.7.0~55
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=0983c6f23534b2388910506e4283bb77b3ebd23d;p=bertos.git

Remove warnings from nightly tests.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4911 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index 6aec28d3..1cacc2bc 100644
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -92,10 +92,10 @@
 #ifndef KERN_PROC_H
 #define KERN_PROC_H
 
-#include "sem.h"
 #include "cfg/cfg_proc.h"
 #include "cfg/cfg_signal.h"
 #include "cfg/cfg_monitor.h"
+#include "sem.h"
 
 #include <struct/list.h> // Node, PriNode
 
@@ -105,6 +105,13 @@
 #include <cpu/types.h> // cpu_stack_t
 #include <cpu/frame.h> // CPU_SAVED_REGS_CNT
 
+/* The following silents warnings on nightly tests. We need to regenerate
+ * all the projects before this can be removed.
+ */
+#ifndef CONFIG_KERN_PRI_INHERIT
+#define CONFIG_KERN_PRI_INHERIT 0
+#endif
+
 /*
  * WARNING: struct Process is considered private, so its definition can change any time
  * without notice. DO NOT RELY on any field defined here, use only the interface
diff --git a/bertos/kern/sem_test.c b/bertos/kern/sem_test.c
index e304dc37..abaa35a3 100644
--- a/bertos/kern/sem_test.c
+++ b/bertos/kern/sem_test.c
@@ -158,7 +158,7 @@ typedef enum ProcType {NONE, S1, S2, S1S2} ProcType;
  */
 #define PROC_INV_TEST(num) static void proc_semInvTest##num(void) \
 { \
-	ProcType p_type = (ProcType)((long) proc_currentUserData()); \
+	ProcType p_type = (ProcType)((int) proc_currentUserData()); \
 	int mult = p_type == NONE ? 5 : 1; \
 	unsigned int i, local_count = 0; \
 	ticks_t start; \
@@ -244,7 +244,7 @@ PROC_TEST_STACK(6)
 PROC_TEST_STACK(7)
 PROC_TEST_STACK(8)
 
-int sem_ser_test(void)
+static int sem_ser_test(void)
 {
 	ticks_t start_time = timer_clock();
 
@@ -290,7 +290,7 @@ int sem_ser_test(void)
 
 #if CONFIG_KERN_PRI
 
-int sem_inv_test(void)
+static int sem_inv_test(void)
 {
 	int i, orig_pri = proc_current()->link.pri;
 	ticks_t fake, start_time;
@@ -338,7 +338,7 @@ int sem_inv_test(void)
 		if (sem_attempt(&sem)) {
 			if (global_count >= loops*7 + loops*5) {
 				for (i = 0; i < 8; i++)
-					kprintf("> Main: I-O latency of %d = %dms\n", i+1, ms_to_ticks(finishing_time[i]));
+					kprintf("> Main: I-O latency of %d = %ldms\n", i+1, ms_to_ticks(finishing_time[i]));
 				kputs("> Main: Test Finished..Ok!\n");
 				return 0;
 			}