Changes in kernel/genarch/src/drivers/ega/ega.c [da1bafb:a71c158] in mainline

File:

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

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

@@ -42 +42 @@
 #include <arch/mm/page.h>
 #include <synch/spinlock.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <arch/asm.h>
 #include <memstr.h>
-#include <str.h>
+#include <string.h>
 #include <console/chardev.h>
 #include <console/console.h>
@@ -63 +63 @@
 
 typedef struct {
-        IRQ_SPINLOCK_DECLARE(lock);
+        SPINLOCK_DECLARE(lock);
         
         uint32_t cursor;
@@ -71 +71 @@
 } ega_instance_t;
 
-static void ega_putchar(outdev_t *, wchar_t, bool);
-static void ega_redraw(outdev_t *);
+static void ega_putchar(outdev_t *dev, wchar_t ch, bool silent);
+static void ega_redraw(outdev_t *dev);
 
 static outdev_operations_t egadev_ops = {
@@ -540 +540 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        irq_spinlock_lock(&instance->lock, true);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&instance->lock);
         
         switch (ch) {
@@ -563 +564 @@
         ega_move_cursor(instance, silent);
         
-        irq_spinlock_unlock(&instance->lock, true);
+        spinlock_unlock(&instance->lock);
+        interrupts_restore(ipl);
 }
 
@@ -570 +572 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        irq_spinlock_lock(&instance->lock, true);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&instance->lock);
         
         memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE);
@@ -576 +579 @@
         ega_show_cursor(instance, silent);
         
-        irq_spinlock_unlock(&instance->lock, true);
+        spinlock_unlock(&instance->lock);
+        interrupts_restore(ipl);
 }
 
@@ -594 +598 @@
         egadev->data = instance;
         
-        irq_spinlock_initialize(&instance->lock, "*ega.instance.lock");
+        spinlock_initialize(&instance->lock, "*ega_lock");
         
         instance->base = base;