Changeset 371bd7d in mainline for kernel/genarch/src/drivers

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 mainline changes.

Location:

kernel/genarch/src/drivers

Files:

• dsrln/dsrlnout.c (modified) (1 diff)
• ega/ega.c (modified) (1 diff)
• i8042/i8042.c (modified) (1 diff)
• 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>

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

@@ -41 +41 @@
 #include <ddi/device.h>
 #include <synch/spinlock.h>
+#include <memstr.h>
 
 static irq_ownership_t cuda_claim(irq_t *irq);