Changeset f9a56c0 in mainline for kernel/genarch/src

Timestamp:

2006-08-17T11:39:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee289cf0

Parents:

ec2c55a

Message:

sparc64 work.
interrupt_vector trap experimental handling.
Minimal reverse-engineered FireHose Controller driver (documentation needed!).
Keyboard on Sun Enterprise is now interrupt driven. Keyboard on Sun Ultra
is still polled.

File:

• kernel/genarch/src/kbd/z8530.c (modified) (6 diffs)

kernel/genarch/src/kbd/z8530.c

@@ -39 +39 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
+#include <arch/drivers/fhc.h>
 #include <arch/drivers/z8530.h>
-#include <arch/drivers/kbd.h>
 #include <arch/interrupt.h>
 #include <cpu.h>
@@ -65 +65 @@
 };
 
-void z8530_interrupt(int n, istate_t *istate);
 void z8530_wait(void);
 
@@ -72 +71 @@
 {
 }
+
 /** Resume the former interrupt vector */
 void z8530_release(void)
 {
 }
-
-#include <print.h>
 
 /** Initialize z8530. */
@@ -85 +83 @@
         stdin = &kbrd;
 
+        (void) z8530_read_a(RR8);
+
         z8530_write_a(WR1, WR1_IARCSC); /* interrupt on all characters */
-        z8530_write_a(WR2, 12);         /* FIXME: IRQ12 ??? */
 
         /* 8 bits per character and enable receiver */
@@ -92 +91 @@
         
         z8530_write_a(WR9, WR9_MIE);    /* Master Interrupt Enable. */
+        
+        /*
+         * We need to initialize the FireHose Controller,
+         * to which is this z8530 attached. Otherwise
+         * interrupts generated by the z8530 would not
+         * be forwarded to the CPU.
+         */
+        fhc_init();
 }
 
@@ -99 +106 @@
  * @param istate Interrupted state.
  */
-void z8530_interrupt(int n, istate_t *istate)
+void z8530_interrupt(void)
 {
+        z8530_poll();
 }