Changeset da1bafb in mainline for kernel/genarch/src/drivers/ega/ega.c

Timestamp:

2010-05-24T18:57:31Z (14 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/genarch/src/drivers/ega/ega.c (modified) (7 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -63 +63 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
         
         uint32_t cursor;
@@ -71 +71 @@
 } ega_instance_t;
 
-static void ega_putchar(outdev_t *dev, wchar_t ch, bool silent);
-static void ega_redraw(outdev_t *dev);
+static void ega_putchar(outdev_t *, wchar_t, bool);
+static void ega_redraw(outdev_t *);
 
 static outdev_operations_t egadev_ops = {
@@ -540 +540 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&instance->lock);
+        irq_spinlock_lock(&instance->lock, true);
         
         switch (ch) {
@@ -564 +563 @@
         ega_move_cursor(instance, silent);
         
-        spinlock_unlock(&instance->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&instance->lock, true);
 }
 
@@ -572 +570 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&instance->lock);
+        irq_spinlock_lock(&instance->lock, true);
         
         memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE);
@@ -579 +576 @@
         ega_show_cursor(instance, silent);
         
-        spinlock_unlock(&instance->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&instance->lock, true);
 }
 
@@ -598 +594 @@
         egadev->data = instance;
         
-        spinlock_initialize(&instance->lock, "*ega_lock");
+        irq_spinlock_initialize(&instance->lock, "*ega.instance.lock");
         
         instance->base = base;