Changeset 46c20c8 in mainline for kernel/generic/include/console/chardev.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

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

kernel/generic/include/console/chardev.h

@@ -37 +37 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
@@ -53 +53 @@
 /** Character input device. */
 typedef struct indev {
-        char *name;
+        const char *name;
         waitq_t wq;
         
         /** Protects everything below. */
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
         wchar_t buffer[INDEV_BUFLEN];
         size_t counter;
@@ -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,
-    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 indev_initialize(const char *, indev_t *,
+    indev_operations_t *);
+extern void indev_push_character(indev_t *, wchar_t);
+extern wchar_t indev_pop_character(indev_t *);
 
-extern void outdev_initialize(char *name, outdev_t *outdev,
-    outdev_operations_t *op);
+extern void outdev_initialize(const char *, outdev_t *,
+    outdev_operations_t *);
 
-extern bool check_poll(indev_t *indev);
+extern bool check_poll(indev_t *);
 
 #endif /* KERN_CHARDEV_H_ */