Changeset 8e7c9fe in mainline for kernel/generic/src/console/chardev.c

Timestamp:

2014-09-12T03:45:25Z (11 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/src/console/chardev.c (modified) (2 diffs)

kernel/generic/src/console/chardev.c

@@ -94 +94 @@
 {
         if (atomic_get(&haltstate)) {
-                /* If we are here, we are hopefully on the processor that
+                /*
+                 * If we are here, we are hopefully on the processor that
                  * issued the 'halt' command, so proceed to read the character
                  * directly from input
@@ -115 +116 @@
         waitq_sleep(&indev->wq);
         irq_spinlock_lock(&indev->lock, true);
-        wchar_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
+        wchar_t ch = indev->buffer[(indev->index - indev->counter) %
+            INDEV_BUFLEN];
         indev->counter--;
         irq_spinlock_unlock(&indev->lock, true);
         
         return ch;
+}
+
+/** Signal out-of-band condition
+ *
+ * @param indev  Input character device.
+ * @param signal Out-of-band condition to signal.
+ *
+ */
+void indev_signal(indev_t *indev, indev_signal_t signal)
+{
+        if ((indev != NULL) && (indev->op != NULL) &&
+            (indev->op->signal != NULL))
+                indev->op->signal(indev, signal);
 }