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

Timestamp:

2011-05-20T23:12:26Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0c33b1d5

Parents:

b6f3e7e

Message:

revert poisonous part of changeset mainline,971
(sadly, this reopens #243)

File:

• kernel/genarch/src/drivers/ega/ega.c (modified) (7 diffs)

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

@@ -40 +40 @@
 #include <mm/as.h>
 #include <mm/slab.h>
-#include <synch/mutex.h>
 #include <arch/mm/page.h>
 #include <typedefs.h>
@@ -63 +62 @@
 
 typedef struct {
-        mutex_t mtx;
+        IRQ_SPINLOCK_DECLARE(lock);
         
         uint32_t cursor;
@@ -540 +539 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        mutex_lock(&instance->mtx);
+        irq_spinlock_lock(&instance->lock, true);
         
         switch (ch) {
@@ -563 +562 @@
         ega_move_cursor(instance, silent);
         
-        mutex_unlock(&instance->mtx);
+        irq_spinlock_unlock(&instance->lock, true);
 }
 
@@ -570 +569 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        mutex_lock(&instance->mtx);
+        irq_spinlock_lock(&instance->lock, true);
         
         memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE);
@@ -576 +575 @@
         ega_show_cursor(instance, silent);
         
-        mutex_unlock(&instance->mtx);
+        irq_spinlock_unlock(&instance->lock, true);
 }
 
@@ -594 +593 @@
         egadev->data = instance;
         
-        mutex_initialize(&instance->mtx, MUTEX_PASSIVE);
+        irq_spinlock_initialize(&instance->lock, "*ega.instance.lock");
         
         instance->base = base;