Changeset c263c77 in mainline for kernel/genarch/src/fb/fb.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/fb/fb.c (modified) (5 diffs)

kernel/genarch/src/fb/fb.c

@@ -80 +80 @@
 
 typedef struct {
-        mutex_t mtx;
+        SPINLOCK_DECLARE(lock);
         
         uint8_t *addr;
@@ -365 +365 @@
 {
         fb_instance_t *instance = (fb_instance_t *) dev->data;
-        mutex_lock(&instance->mtx);
+        spinlock_lock(&instance->lock);
         
         switch (ch) {
@@ -406 +406 @@
         cursor_put(instance, silent);
         
-        mutex_unlock(&instance->mtx);
+        spinlock_unlock(&instance->lock);
 }
 
@@ -473 +473 @@
         fb_instance_t *instance = (fb_instance_t *) dev->data;
         
-        mutex_lock(&instance->mtx);
+        spinlock_lock(&instance->lock);
         fb_redraw_internal(instance);
-        mutex_unlock(&instance->mtx);
+        spinlock_unlock(&instance->lock);
 }
 
@@ -554 +554 @@
         fbdev->data = instance;
         
-        mutex_initialize(&instance->mtx, MUTEX_PASSIVE);
+        spinlock_initialize(&instance->lock, "*fb.instance.lock");
         instance->rgb_conv = rgb_conv;
         instance->pixelbytes = pixelbytes;