Changes in kernel/generic/src/console/chardev.c [da1bafb:a000878c] in mainline

File:

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

kernel/generic/src/console/chardev.c

@@ -52 +52 @@
         indev->name = name;
         waitq_initialize(&indev->wq);
-        irq_spinlock_initialize(&indev->lock, "chardev.indev.lock");
+        spinlock_initialize(&indev->lock, "indev");
         indev->counter = 0;
         indev->index = 0;
@@ -68 +68 @@
         ASSERT(indev);
         
-        irq_spinlock_lock(&indev->lock, true);
+        spinlock_lock(&indev->lock);
         if (indev->counter == INDEV_BUFLEN - 1) {
                 /* Buffer full */
-                irq_spinlock_unlock(&indev->lock, true);
+                spinlock_unlock(&indev->lock);
                 return;
         }
@@ -81 +81 @@
         indev->index = indev->index % INDEV_BUFLEN;
         waitq_wakeup(&indev->wq, WAKEUP_FIRST);
-        irq_spinlock_unlock(&indev->lock, true);
+        spinlock_unlock(&indev->lock);
 }
 
@@ -114 +114 @@
         
         waitq_sleep(&indev->wq);
-        irq_spinlock_lock(&indev->lock, true);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&indev->lock);
         wchar_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
         indev->counter--;
-        irq_spinlock_unlock(&indev->lock, true);
+        spinlock_unlock(&indev->lock);
+        interrupts_restore(ipl);
         
         return ch;
@@ -132 +134 @@
 {
         outdev->name = name;
-        spinlock_initialize(&outdev->lock, "chardev.outdev.lock");
+        spinlock_initialize(&outdev->lock, "outdev");
         link_initialize(&outdev->link);
         list_initialize(&outdev->list);