Changeset 42742c5a in mainline for kernel

Timestamp:

2009-02-27T20:41:23Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a28812

Parents:

12081e6

Message:

Userspace driver for OBIO. This will make it possible to clear interrupts from
user space on UltraSPARC IIi and systems with Psycho. Not tested.

Location:

kernel/arch/sparc64/src/drivers

Files:

• fhc.c (modified) (1 diff)
• kbd.c (modified) (2 diffs)
• pci.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/fhc.c

@@ -93 +93 @@
         sysinfo_set_item_val("fhc.uart.size", NULL, reg->size);
         sysinfo_set_item_val("fhc.uart.physical", NULL, paddr);
+        sysinfo_set_item_val("kbd.cir.fhc", NULL, 1);
 
         return fhc;

kernel/arch/sparc64/src/drivers/kbd.c

@@ -117 +117 @@
                         return;
                 }
-                sysinfo_set_item_val("kbd.cir.fhc", NULL, 1);
                 break;
                 
@@ -134 +133 @@
                 };
                 break;
-                
         default:
                 panic("Unexpected keyboard type.");

kernel/arch/sparc64/src/drivers/pci.c

@@ -45 +45 @@
 #include <func.h>
 #include <arch/asm.h>
+#include <sysinfo/sysinfo.h>
 
 #define SABRE_INTERNAL_REG      0
@@ -109 +110 @@
         pci->reg = (uint64_t *) hw_map(paddr, reg[SABRE_INTERNAL_REG].size);
 
+        /*
+         * Set sysinfo data needed by the uspace OBIO driver.
+         */
+        sysinfo_set_item_val("obio.base.physical", NULL, paddr);
+        sysinfo_set_item_val("kbd.cir.obio", NULL, 1);
+
         return pci;
 }
@@ -149 +156 @@
         pci->op = &pci_psycho_ops;
         pci->reg = (uint64_t *) hw_map(paddr, reg[PSYCHO_INTERNAL_REG].size);
+
+        /*
+         * Set sysinfo data needed by the uspace OBIO driver.
+         */
+        sysinfo_set_item_val("obio.base.physical", NULL, paddr);
+        sysinfo_set_item_val("kbd.cir.obio", NULL, 1);
 
         return pci;