Changeset 5cde90f in mainline for kernel/generic/include/context.h

Timestamp:

2010-02-19T17:16:46Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Synchronizing with head (which has just been synchronized with this branch).

File:

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

kernel/generic/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -39 +39 @@
 #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;
 
-#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));
+extern int context_save_arch(context_t *ctx) __attribute__((returns_twice));
+extern void context_restore_arch(context_t *ctx) __attribute__((noreturn));
 
 /** Save register context.
@@ -73 +70 @@
  * saved like that would therefore lead to a disaster.
  *
- * @param c             Context structure.
+ * @param ctx Context structure.
  *
- * @return              context_save() returns 1, context_restore() returns 0.
+ * @return context_save() returns 1, context_restore() returns 0.
+ *
  */
-#define context_save(c)   context_save_arch(c)
+#define context_save(ctx)  context_save_arch(ctx)
 
 /** Restore register context.
@@ -88 +86 @@
  * being return value.
  *
- * @param c             Context structure.
+ * @param ctx Context structure.
  */
-static inline void context_restore(context_t *c)
+static inline void context_restore(context_t *ctx)
 {
-        context_restore_arch(c);
+        context_restore_arch(ctx);
 }