Changeset 04803bf in mainline for kernel/generic/src/console/chardev.c

Timestamp:

2011-03-21T22:00:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/src/console/chardev.c (modified) (5 diffs)

kernel/generic/src/console/chardev.c

@@ -47 +47 @@
  *
  */
-void indev_initialize(char *name, indev_t *indev,
+void indev_initialize(const char *name, indev_t *indev,
     indev_operations_t *op)
 {
         indev->name = name;
         waitq_initialize(&indev->wq);
-        spinlock_initialize(&indev->lock, "indev");
+        irq_spinlock_initialize(&indev->lock, "chardev.indev.lock");
         indev->counter = 0;
         indev->index = 0;
@@ -68 +68 @@
         ASSERT(indev);
         
-        spinlock_lock(&indev->lock);
+        irq_spinlock_lock(&indev->lock, true);
         if (indev->counter == INDEV_BUFLEN - 1) {
                 /* Buffer full */
-                spinlock_unlock(&indev->lock);
+                irq_spinlock_unlock(&indev->lock, true);
                 return;
         }
@@ -81 +81 @@
         indev->index = indev->index % INDEV_BUFLEN;
         waitq_wakeup(&indev->wq, WAKEUP_FIRST);
-        spinlock_unlock(&indev->lock);
+        irq_spinlock_unlock(&indev->lock, true);
 }
 
@@ -114 +114 @@
         
         waitq_sleep(&indev->wq);
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&indev->lock);
+        irq_spinlock_lock(&indev->lock, true);
         wchar_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
         indev->counter--;
-        spinlock_unlock(&indev->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&indev->lock, true);
         
         return ch;
@@ -130 +128 @@
  *
  */
-void outdev_initialize(char *name, outdev_t *outdev,
+void outdev_initialize(const char *name, outdev_t *outdev,
     outdev_operations_t *op)
 {
         outdev->name = name;
-        spinlock_initialize(&outdev->lock, "outdev");
+        spinlock_initialize(&outdev->lock, "chardev.outdev.lock");
         link_initialize(&outdev->link);
         list_initialize(&outdev->list);