Changeset a3b5831 in mainline

Timestamp:

2008-11-28T22:46:26Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df7a1c

Parents:

78ee8b0

Message:

More work on the psycho driver.

File:

• kernel/arch/sparc64/src/drivers/psycho.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include <arch/types.h>
 #include <genarch/ofw/ofw_tree.h>
+#include <byteorder.h>
 
-#define PSYCHO_IGN              0x7c0
-#define PSYCHO_KEYBOARD_INR     0x29
+#define PSYCHO_INTERNAL_REG     2
+
+#define PSYCHO_OBIO_IMR_BASE    (0x1000 / sizeof(uint64_t))
+#define PSYCHO_OBIO_IMR(ino)    (PSYCHO_OBIO_IMR_BASE + ((ino) & INO_MASK))
+
+#define PSYCHO_OBIO_CIR_BASE    (0x1800 / sizeof(uint64_t))
+#define PSYCHO_OBIO_CIR(ino)    (PSYCHO_OBIO_CIR_BASE + ((ino) & INO_MASK))
 
 psycho_t *psycho_a = NULL;
@@ -57 +63 @@
         if (!prop || !prop->value)
                 return NULL;
+        
+        count_t regs = prop->size / sizeof(ofw_upa_reg_t);
+        if (regs < PSYCHO_INTERNAL_REG + 1)
+                return NULL;
                 
-        ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[0]; /* XXX */
+        ofw_upa_reg_t *reg =
+            &((ofw_upa_reg_t *) prop->value)[PSYCHO_INTERNAL_REG];
 
         uintptr_t paddr;
@@ -75 +86 @@
 void psycho_enable_interrupt(psycho_t *psycho, int inr)
 {
-        inr -= PSYCHO_IGN;
-        switch (inr) {
-        case PSYCHO_KEYBOARD_INR:
-                psycho->regs[0] = 1;    /* XXX */
-                break;
-        default:
-                panic("Unexpected INR (%d)\n", inr);
-                break;
-        }
+        int ino = inr & ~IGN_MASK;
+        uint64_t imr = psycho->regs[PSYCHO_OBIO_IMR(ino)];
+        imr |= host2uint64_t_le(IMAP_V_MASK);
+        psycho->regs[PSYCHO_OBIO_IMR(ino)] = imr;
 }
 
 void psycho_clear_interrupt(psycho_t *psycho, int inr)
 {
-        inr -= PSYCHO_IGN;
-        switch (inr) {
-        case PSYCHO_KEYBOARD_INR:
-                psycho->regs[0] = 0;    /* XXX */
-                break;
-        default:
-                panic("Unexpected INR (%d)\n", inr);
-                break;
-        }
+        int ino = inr & ~IGN_MASK;
+        uint64_t idle = host2uint64_t_le(0);
+        psycho->regs[PSYCHO_OBIO_CIR(ino)] = idle;
 }