Changeset 8e7c9fe in mainline for kernel/generic/include/console/chardev.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

kernel/generic/include/console/chardev.h

@@ -43 +43 @@
 #define INDEV_BUFLEN  512
 
+/** Input character device out-of-band signal type. */
+typedef enum {
+        INDEV_SIGNAL_SCROLL_UP = 0,
+        INDEV_SIGNAL_SCROLL_DOWN
+} indev_signal_t;
+
 struct indev;
 
-/* Input character device operations interface. */
+/** Input character device operations interface. */
 typedef struct {
         /** Read character directly from device, assume interrupts disabled. */
         wchar_t (* poll)(struct indev *);
+        
+        /** Signal out-of-band condition. */
+        void (* signal)(struct indev *, indev_signal_t);
 } indev_operations_t;
 
@@ -67 +76 @@
 } indev_t;
 
-
 struct outdev;
 
-/* Output character device operations interface. */
+/** Output character device operations interface. */
 typedef struct {
         /** Write character to output. */
@@ -77 +85 @@
         /** Redraw any previously cached characters. */
         void (* redraw)(struct outdev *);
+        
+        /** Scroll up in the device cache. */
+        void (* scroll_up)(struct outdev *);
+        
+        /** Scroll down in the device cache. */
+        void (* scroll_down)(struct outdev *);
 } outdev_operations_t;
 
@@ -99 +113 @@
 extern void indev_push_character(indev_t *, wchar_t);
 extern wchar_t indev_pop_character(indev_t *);
+extern void indev_signal(indev_t *, indev_signal_t);
 
 extern void outdev_initialize(const char *, outdev_t *,