Changeset 371bd7d in mainline for kernel/genarch/src

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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

Files:

• acpi/madt.c (modified) (2 diffs)
• drivers/dsrln/dsrlnout.c (modified) (1 diff)
• drivers/ega/ega.c (modified) (1 diff)
• drivers/i8042/i8042.c (modified) (1 diff)
• drivers/via-cuda/cuda.c (modified) (1 diff)
• fb/fb.c (modified) (2 diffs)
• kbrd/scanc_mac.c (modified) (1 diff)
• kbrd/scanc_pc.c (modified) (1 diff)
• kbrd/scanc_pl050.c (modified) (1 diff)
• kbrd/scanc_sun.c (modified) (1 diff)
• mm/as_ht.c (modified) (1 diff)
• mm/as_pt.c (modified) (1 diff)
• mm/page_ht.c (modified) (1 diff)
• mm/page_pt.c (modified) (1 diff)
• multiboot/multiboot.c (modified) (1 diff)
• ofw/ebus.c (modified) (1 diff)
• ofw/fhc.c (modified) (1 diff)
• ofw/ofw_tree.c (modified) (1 diff)
• ofw/pci.c (modified) (1 diff)
• srln/srln.c (modified) (1 diff)

kernel/genarch/src/acpi/madt.c

@@ -35 +35 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -72 +72 @@
 unsigned int madt_entries_index_cnt = 0;
 
-char *entry[] = {
+const char *entry[] = {
         "L_APIC",
         "IO_APIC",

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);

kernel/genarch/src/fb/fb.c

@@ -41 +41 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
+#include <mm/page.h>
 #include <mm/slab.h>
 #include <align.h>
@@ -48 +49 @@
 #include <bitops.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <ddi/ddi.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <byteorder.h>
 

kernel/genarch/src/kbrd/scanc_mac.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/kbrd/scanc_pc.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/kbrd/scanc_pl050.c

@@ -36 +36 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 

kernel/genarch/src/kbrd/scanc_sun.c

@@ -37 +37 @@
 #include <genarch/kbrd/scanc.h>
 #include <typedefs.h>
-#include <string.h>
+#include <str.h>
 
 /** Primary meaning of scancodes. */

kernel/genarch/src/mm/as_ht.c

@@ -41 +41 @@
 #include <mm/as.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <memstr.h>
 #include <adt/hash_table.h>

kernel/genarch/src/mm/as_pt.c

@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <memstr.h>
 #include <arch.h>

kernel/genarch/src/mm/page_ht.c

@@ -43 +43 @@
 #include <mm/as.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <synch/spinlock.h>

kernel/genarch/src/mm/page_pt.c

@@ -42 +42 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>

kernel/genarch/src/multiboot/multiboot.c

@@ -34 +34 @@
 
 #include <genarch/multiboot/multiboot.h>
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 

kernel/genarch/src/ofw/ebus.c

@@ -40 +40 @@
 #include <genarch/ofw/pci.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <debug.h>

kernel/genarch/src/ofw/fhc.c

@@ -40 +40 @@
 #include <arch/drivers/fhc.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -39 +39 @@
 #include <arch/memstr.h>
 #include <mm/slab.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <print.h>

kernel/genarch/src/ofw/pci.c

@@ -41 +41 @@
 #include <arch/trap/interrupt.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>
 
 #define PCI_SPACE_MASK          0x03000000
-#define PCI_ABS_MASK            0x80000000      
+#define PCI_ABS_MASK            0x80000000
 #define PCI_REG_MASK            0x000000ff
 

kernel/genarch/src/srln/srln.c

@@ -40 +40 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <string.h>
+#include <str.h>
 
 static indev_operations_t srln_raw_ops = {