Changeset 04803bf in mainline for kernel/generic/include/arch.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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:

Merge mainline changes (needs fixes).

File:

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

kernel/generic/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -39 +39 @@
 #include <proc/thread.h>
 #include <proc/task.h>
+#include <mm/as.h>
 
-#define DEFAULT_CONTEXT         0
+#define DEFAULT_CONTEXT  0
 
-#define CPU                     THE->cpu
-#define THREAD                  THE->thread
-#define TASK                    THE->task
-#define AS                      THE->as
-#define CONTEXT         (THE->task ? THE->task->context : DEFAULT_CONTEXT)
-#define PREEMPTION_DISABLED     THE->preemption_disabled
+#define CPU                  THE->cpu
+#define THREAD               THE->thread
+#define TASK                 THE->task
+#define AS                   THE->as
+#define CONTEXT              (THE->task ? THE->task->context : DEFAULT_CONTEXT)
+#define PREEMPTION_DISABLED  THE->preemption_disabled
 
-#define context_check(ctx1, ctx2)       ((ctx1) == (ctx2))
+#define context_check(ctx1, ctx2)  ((ctx1) == (ctx2))
 
 /**
@@ -57 +58 @@
  */
 typedef struct {
-        size_t preemption_disabled;     /**< Preemption disabled counter. */
-        thread_t *thread;               /**< Current thread. */
-        task_t *task;                   /**< Current task. */
-        cpu_t *cpu;                     /**< Executing cpu. */
-        as_t *as;                       /**< Current address space. */
+        size_t preemption_disabled;  /**< Preemption disabled counter. */
+        thread_t *thread;            /**< Current thread. */
+        task_t *task;                /**< Current task. */
+        cpu_t *cpu;                  /**< Executing cpu. */
+        as_t *as;                    /**< Current address space. */
 } the_t;
 
+/*
+ * THE is not an abbreviation, but the English definite article written in
+ * capital letters. It means the current pointer to something, e.g. thread,
+ * processor or address space. Kind reader of this comment shall appreciate
+ * the wit of constructs like THE->thread and similar.
+ */
 #define THE  ((the_t * )(get_stack_base()))
 
-extern void the_initialize(the_t *the);
-extern void the_copy(the_t *src, the_t *dst);
+extern void the_initialize(the_t *);
+extern void the_copy(the_t *, the_t *);
 
 extern void arch_pre_mm_init(void);
@@ -79 +86 @@
 extern void reboot(void);
 extern void arch_reboot(void);
-extern void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller);
+extern void *arch_construct_function(fncptr_t *, void *, void *);
 
 #endif