projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: add doxygen documentation
[bertos.git]
/
bertos
/
kern
/
proc_p.h
diff --git
a/bertos/kern/proc_p.h
b/bertos/kern/proc_p.h
index 64fabb1290fef6052231bf3e682fb9c8a4830f49..975f9b8a0b0e5620da3935868795b35b5170efaf 100644
(file)
--- a/
bertos/kern/proc_p.h
+++ b/
bertos/kern/proc_p.h
@@
-33,7
+33,6
@@
*
* \brief Internal scheduler structures and definitions for processes.
*
*
* \brief Internal scheduler structures and definitions for processes.
*
- * \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
*/
* \author Bernie Innocenti <bernie@codewiz.org>
*/
@@
-181,7
+180,12
@@
void proc_schedInit(void);
void monitor_rename(Process *proc, const char *name);
#endif /* CONFIG_KERN_MONITOR */
void monitor_rename(Process *proc, const char *name);
#endif /* CONFIG_KERN_MONITOR */
-#if CONFIG_KERN_PREEMPT
+/*
+ * Quantum related macros are used in the
+ * timer module and must be empty when
+ * kernel is disabled.
+ */
+#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
INLINE int preempt_quantum(void)
{
extern int _proc_quantum;
INLINE int preempt_quantum(void)
{
extern int _proc_quantum;
@@
-200,7
+204,7
@@
INLINE void preempt_reset_quantum(void)
extern int _proc_quantum;
_proc_quantum = CONFIG_KERN_QUANTUM;
}
extern int _proc_quantum;
_proc_quantum = CONFIG_KERN_QUANTUM;
}
-#else /* !
CONFIG_KERN_PREEMPT
*/
+#else /* !
(CONFIG_KERN && CONFIG_KERN_PREEMPT)
*/
INLINE int preempt_quantum(void)
{
return 0;
INLINE int preempt_quantum(void)
{
return 0;
@@
-213,6
+217,6
@@
INLINE void proc_decQuantum(void)
INLINE void preempt_reset_quantum(void)
{
}
INLINE void preempt_reset_quantum(void)
{
}
-#endif /*
CONFIG_KERN_PREEMPT
*/
+#endif /*
(CONFIG_KERN && CONFIG_KERN_PREEMPT)
*/
#endif /* KERN_PROC_P_H */
#endif /* KERN_PROC_P_H */