projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove syslog from nightly test.
[bertos.git]
/
bertos
/
kern
/
proc.h
diff --git
a/bertos/kern/proc.h
b/bertos/kern/proc.h
index 6aec28d3ea5d1627cc20bf4118df2fc1c2dd41a4..19bb5efaa23a4ec10338382ff61de286b238cc55 100644
(file)
--- a/
bertos/kern/proc.h
+++ b/
bertos/kern/proc.h
@@
-92,10
+92,10
@@
#ifndef KERN_PROC_H
#define KERN_PROC_H
#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 "cfg/cfg_proc.h"
#include "cfg/cfg_signal.h"
#include "cfg/cfg_monitor.h"
+#include "sem.h"
#include <struct/list.h> // Node, PriNode
#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
#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
/*
* 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
@@
-247,10
+254,20
@@
INLINE struct Process *proc_current(void)
#if CONFIG_KERN_PRI
void proc_setPri(struct Process *proc, int pri);
#if CONFIG_KERN_PRI
void proc_setPri(struct Process *proc, int pri);
+
+ INLINE int proc_pri(struct Process *proc)
+ {
+ return proc->link.pri;
+ }
#else
INLINE void proc_setPri(UNUSED_ARG(struct Process *,proc), UNUSED_ARG(int, pri))
{
}
#else
INLINE void proc_setPri(UNUSED_ARG(struct Process *,proc), UNUSED_ARG(int, pri))
{
}
+
+ INLINE int proc_pri(UNUSED_ARG(struct Process *, proc))
+ {
+ return 0;
+ }
#endif
#if CONFIG_KERN_PREEMPT
#endif
#if CONFIG_KERN_PREEMPT