Changeset aa85487 in mainline for kernel/generic/include

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/generic/include

Files:

• atomic.h (modified) (2 diffs)
• bitops.h (modified) (1 diff)
• console/chardev.h (modified) (3 diffs)
• console/kconsole.h (modified) (1 diff)
• cpu.h (modified) (1 diff)
• errno.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)
• lib/elf.h (modified) (1 diff)
• mm/slab.h (modified) (2 diffs)
• panic.h (modified) (1 diff)
• proc/task.h (modified) (1 diff)
• proc/thread.h (modified) (2 diffs)
• stacktrace.h (modified) (1 diff)
• symtab.h (modified) (1 diff)
• synch/spinlock.h (modified) (2 diffs)

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/bitops.h

@@ -65 +65 @@
         }
         
-        if (arg >> 1) {
-                arg >>= 1;
+        if (arg >> 1)
                 n += 1;
-        }
         
         return n;

kernel/generic/include/console/chardev.h

@@ -53 +53 @@
 /** Character input device. */
 typedef struct indev {
-        char *name;
+        const char *name;
         waitq_t wq;
         
@@ -81 +81 @@
 /** Character output device. */
 typedef struct outdev {
-        char *name;
+        const char *name;
         
         /** Protects everything below. */
@@ -95 +95 @@
 } outdev_t;
 
-extern void indev_initialize(char *name, indev_t *indev,
+extern void indev_initialize(const char *name, indev_t *indev,
     indev_operations_t *op);
 extern void indev_push_character(indev_t *indev, wchar_t ch);
 extern wchar_t indev_pop_character(indev_t *indev);
 
-extern void outdev_initialize(char *name, outdev_t *outdev,
+extern void outdev_initialize(const char *name, outdev_t *outdev,
     outdev_operations_t *op);
 

kernel/generic/include/console/kconsole.h

@@ -94 +94 @@
 extern void kconsole_notify_init(void);
 extern bool kconsole_check_poll(void);
-extern void kconsole(char *prompt, char *msg, bool kcon);
+extern void kconsole(const char *prompt, const char *msg, bool kcon);
 extern void kconsole_thread(void *data);
 

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/errno.h

@@ -57 +57 @@
 #define EADDRNOTAVAIL   -12     /* Address not available. */
 #define ETIMEOUT        -13     /* Timeout expired */
-//MH
-#ifndef EINVAL
 #define EINVAL          -14     /* Invalid value */
-#endif
-#ifndef EBUSY
 #define EBUSY           -15     /* Resource is busy */
-#endif
 #define EOVERFLOW       -16     /* The result does not fit its size. */
 #define EINTR           -17     /* Operation was interrupted. */

kernel/generic/include/interrupt.h

@@ -46 +46 @@
 typedef void (* iroutine)(int n, istate_t *istate);
 
-extern void fault_if_from_uspace(istate_t *istate, char *fmt, ...);
+extern void fault_if_from_uspace(istate_t *istate, const char *fmt, ...);
 extern iroutine exc_register(int n, const char *name, iroutine f);
 extern void exc_dispatch(int n, istate_t *t);

kernel/generic/include/lib/elf.h

@@ -338 +338 @@
 #endif
 
-extern char *elf_error(unsigned int rc);
+extern const char *elf_error(unsigned int rc);
 
 /* Interpreter string used to recognize the program loader */

kernel/generic/include/mm/slab.h

@@ -86 +86 @@
 
 typedef struct {
-        char *name;
+        const char *name;
         
         link_t link;
@@ -123 +123 @@
 } slab_cache_t;
 
-extern slab_cache_t *slab_cache_create(char *, size_t, size_t,
+extern slab_cache_t *slab_cache_create(const char *, size_t, size_t,
     int (*)(void *, int), int (*)(void *), int);
 extern void slab_cache_destroy(slab_cache_t *);

kernel/generic/include/panic.h

@@ -60 +60 @@
 extern bool silent;
 
-extern void panic_printf(char *fmt, ...) __attribute__((noreturn));
+extern void panic_printf(const char *fmt, ...) __attribute__((noreturn));
 
 #endif

kernel/generic/include/proc/task.h

@@ -130 +130 @@
 extern void task_init(void);
 extern void task_done(void);
-extern task_t *task_create(as_t *as, char *name);
+extern task_t *task_create(as_t *as, const char *name);
 extern void task_destroy(task_t *t);
 extern task_t *task_find_by_id(task_id_t id);

kernel/generic/include/proc/thread.h

@@ -52 +52 @@
 #define THREAD_NAME_BUFLEN      20
 
-extern char *thread_states[];
+extern const char *thread_states[];
 
 /* Thread flags */
@@ -225 +225 @@
 
 extern void thread_init(void);
-extern thread_t *thread_create(void (*)(void *), void *, task_t *, int, char *,
-    bool);
+extern thread_t *thread_create(void (*)(void *), void *, task_t *, int,
+    const char *, bool);
 extern void thread_attach(thread_t *, task_t *);
 extern void thread_ready(thread_t *);

kernel/generic/include/stacktrace.h

@@ -46 +46 @@
         bool (* frame_pointer_prev)(uintptr_t, uintptr_t *);
         bool (* return_address_get)(uintptr_t, uintptr_t *);
-        bool (* symbol_resolve)(uintptr_t, char **, uintptr_t *);
+        bool (* symbol_resolve)(uintptr_t, const char **, uintptr_t *);
 } stack_trace_ops_t;
 

kernel/generic/include/symtab.h

@@ -45 +45 @@
 };
 
-extern int symtab_name_lookup(uintptr_t, char **, uintptr_t *);
-extern char *symtab_fmt_name_lookup(uintptr_t);
+extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *);
+extern const char *symtab_fmt_name_lookup(uintptr_t);
 extern int symtab_addr_lookup(const char *, uintptr_t *);
 extern void symtab_print_search(const char *);

kernel/generic/include/synch/spinlock.h

@@ -48 +48 @@
         
 #ifdef CONFIG_DEBUG_SPINLOCK
-        char *name;
+        const char *name;
 #endif
 } spinlock_t;
@@ -101 +101 @@
         SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, #lock_name)
 
-extern void spinlock_initialize(spinlock_t *lock, char *name);
+extern void spinlock_initialize(spinlock_t *lock, const char *name);
 extern int spinlock_trylock(spinlock_t *lock);
 extern void spinlock_lock_debug(spinlock_t *lock);