Changes in kernel/generic/include/context.h [d99c1d2:b1c21c2] in mainline

File:

• kernel/generic/include/context.h (modified) (4 diffs)

kernel/generic/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */
@@ -36 +36 @@
 #define KERN_CONTEXT_H_
 
-#include <typedefs.h>
+#include <arch/types.h>
 #include <arch/context.h>
 
-#define context_set_generic(ctx, _pc, stack, size) \
-        (ctx)->pc = (uintptr_t) (_pc); \
-        (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
 
-extern int context_save_arch(context_t *ctx) __attribute__((returns_twice));
-extern void context_restore_arch(context_t *ctx) __attribute__((noreturn));
+#ifndef context_set
+#define context_set(c, _pc, stack, size)        \
+        (c)->pc = (uintptr_t) (_pc);            \
+        (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
+#endif /* context_set */
+
+extern int context_save_arch(context_t *c) __attribute__ ((returns_twice));
+extern void context_restore_arch(context_t *c) __attribute__ ((noreturn));
 
 /** Save register context.
@@ -70 +73 @@
  * saved like that would therefore lead to a disaster.
  *
- * @param ctx Context structure.
+ * @param c             Context structure.
  *
- * @return context_save() returns 1, context_restore() returns 0.
- *
+ * @return              context_save() returns 1, context_restore() returns 0.
  */
-#define context_save(ctx)  context_save_arch(ctx)
+#define context_save(c)   context_save_arch(c)
 
 /** Restore register context.
@@ -86 +88 @@
  * being return value.
  *
- * @param ctx Context structure.
+ * @param c             Context structure.
  */
-static inline void context_restore(context_t *ctx)
+static inline void context_restore(context_t *c)
 {
-        context_restore_arch(ctx);
+        context_restore_arch(c);
 }