Changeset c621f4aa in mainline for kernel/genarch/src/drivers

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

Location:

kernel/genarch/src/drivers

Files:

• dsrln/dsrlnout.c (modified) (1 diff)
• ega/ega.c (modified) (8 diffs)
• i8042/i8042.c (modified) (1 diff)
• s3c24xx_uart/s3c24xx_uart.c (added)
• via-cuda/cuda.c (modified) (1 diff)

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -41 +41 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 typedef struct {

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

@@ -42 +42 @@
 #include <arch/mm/page.h>
 #include <synch/spinlock.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>
-#include <string.h>
+#include <str.h>
 #include <console/chardev.h>
 #include <console/console.h>
@@ -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;

kernel/genarch/src/drivers/i8042/i8042.c

@@ -67 +67 @@
         i8042_instance_t *instance = irq->instance;
         i8042_t *dev = instance->i8042;
-        uint8_t status;
         
-        if (((status = pio_read_8(&dev->status)) & i8042_BUFFER_FULL_MASK)) {
+        if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) {
                 uint8_t data = pio_read_8(&dev->data);
                 indev_push_character(instance->kbrdin, data);

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -99 +99 @@
                 instance->snd_bytes = 0;
 
-                spinlock_initialize(&instance->dev_lock, "cuda_dev");
+                spinlock_initialize(&instance->dev_lock, "cuda.instance.dev_lock");
 
                 /* Disable all interrupts from CUDA. */