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

Timestamp:

2010-05-24T18:57:31Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

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);
-        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;
@@ -134 +132 @@
 {
         outdev->name = name;
-        spinlock_initialize(&outdev->lock, "outdev");
+        spinlock_initialize(&outdev->lock, "chardev.outdev.lock");
         link_initialize(&outdev->link);
         list_initialize(&outdev->list);