Changeset 0b9ac3c in mainline for kernel/generic/include

Timestamp:

2010-02-23T19:03:28Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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.

Location:

kernel/generic/include

Files:

• atomic.h (modified) (2 diffs)
• console/console.h (modified) (1 diff)
• context.h (modified) (4 diffs)
• cpu.h (modified) (1 diff)
• func.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)
• ipc/ipc.h (modified) (1 diff)
• macros.h (modified) (1 diff)
• panic.h (modified) (4 diffs)
• smp/ipi.h (modified) (2 diffs)
• stacktrace.h (modified) (1 diff)

kernel/generic/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_ATOMIC_H_
 
+#include <arch/types.h>
+
 typedef struct atomic {
-        volatile long count;
+        volatile atomic_count_t count;
 } atomic_t;
 
 #include <arch/atomic.h>
 
-static inline void atomic_set(atomic_t *val, long i)
+static inline void atomic_set(atomic_t *val, atomic_count_t i)
 {
         val->count = i;
 }
 
-static inline long atomic_get(atomic_t *val)
+static inline atomic_count_t atomic_get(atomic_t *val)
 {
         return val->count;

kernel/generic/include/console/console.h

@@ -41 +41 @@
 extern indev_t *stdin;
 extern outdev_t *stdout;
-extern bool silent;
 
 extern indev_t *stdin_wire(void);

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);
 }
 

kernel/generic/include/cpu.h

@@ -48 +48 @@
  * There is one structure like this for every processor.
  */
-typedef struct {
+typedef struct cpu {
         SPINLOCK_DECLARE(lock);
 

kernel/generic/include/func.h

@@ -41 +41 @@
 extern atomic_t haltstate;
 
-extern void halt(void);
+extern void halt(void) __attribute__((noreturn));
 extern unative_t atoi(const char *text);
 extern void order(const uint64_t val, uint64_t *rv, char *suffix);

kernel/generic/include/interrupt.h

@@ -51 +51 @@
 void exc_init(void);
 
+extern void irq_initialize_arch(irq_t *irq);
+
 #endif
 

kernel/generic/include/ipc/ipc.h

@@ -227 +227 @@
 #ifdef KERNEL
 
-#define IPC_MAX_PHONES  16
+#define IPC_MAX_PHONES  32
 
 #include <synch/spinlock.h>

kernel/generic/include/macros.h

@@ -84 +84 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
 
 #define MERGE_LOUP32(lo, up) \

kernel/generic/include/panic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_PANIC_H_
 
+#include <typedefs.h>
 #include <stacktrace.h>
 #include <print.h>
@@ -42 +43 @@
 #       define panic(format, ...) \
                 do { \
+                        silent = false; \
                         printf("Kernel panic in %s() at %s:%u.\n", \
                             __func__, __FILE__, __LINE__); \
@@ -50 +52 @@
 #else
 #       define panic(format, ...) \
-                panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__);
+                do { \
+                        silent = false; \
+                        panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__); \
+                } while (0)
 #endif
+
+extern bool silent;
 
 extern void panic_printf(char *fmt, ...) __attribute__((noreturn));

kernel/generic/include/smp/ipi.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -37 +37 @@
 
 #ifdef CONFIG_SMP
-extern void ipi_broadcast(int ipi);
-extern void ipi_broadcast_arch(int ipi);
+
+extern void ipi_broadcast(int);
+extern void ipi_broadcast_arch(int);
+
 #else
-#define ipi_broadcast(x)        ;
+
+        #define ipi_broadcast(ipi)
+
 #endif /* CONFIG_SMP */
 

kernel/generic/include/stacktrace.h

@@ -60 +60 @@
  */
 extern uintptr_t frame_pointer_get(void);
-extern uintptr_t program_counter_get();
+extern uintptr_t program_counter_get(void);
 
 extern bool kernel_frame_pointer_validate(uintptr_t);