Changeset fc46884 in mainline

Timestamp:

2006-10-16T21:34:33Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d95f1e24

Parents:

5f9b4d9a

Message:

Support for grabbing and releasing z8530 keyboard for sparc64.
We might later add some locking.

File:

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

kernel/genarch/src/kbd/z8530.c

@@ -63 +63 @@
 static irq_t z8530_irq;         /**< z8530's IRQ. */ 
 
+static ipc_notif_cfg_t saved_notif_cfg;
+
 static void z8530_suspend(chardev_t *);
 static void z8530_resume(chardev_t *);
@@ -75 +77 @@
 void z8530_grab(void)
 {
+        (void) z8530_read_a(&z8530, RR8);
+
+        /*
+         * Clear any pending TX interrupts or we never manage
+         * to set FHC UART interrupt state to idle.
+         */
+        z8530_write_a(&z8530, WR0, WR0_TX_IP_RST);
+
+        z8530_write_a(&z8530, WR1, WR1_IARCSC);         /* interrupt on all characters */
+
+        /* 8 bits per character and enable receiver */
+        z8530_write_a(&z8530, WR3, WR3_RX8BITSCH | WR3_RX_ENABLE);
+        
+        z8530_write_a(&z8530, WR9, WR9_MIE);            /* Master Interrupt Enable. */
+        
+        if (z8530_irq.notif_cfg.answerbox) {
+                saved_notif_cfg = z8530_irq.notif_cfg;
+                z8530_irq.notif_cfg.answerbox = NULL;
+                z8530_irq.notif_cfg.code = NULL;
+                z8530_irq.notif_cfg.method = 0;
+                z8530_irq.notif_cfg.counter = 0;
+        }
 }
 
@@ -80 +104 @@
 void z8530_release(void)
 {
+        if (saved_notif_cfg.answerbox)
+                z8530_irq.notif_cfg = saved_notif_cfg;
 }
 
@@ -103 +129 @@
         sysinfo_set_item_val("kbd.address.virtual", NULL, vaddr);
 
-        (void) z8530_read_a(&z8530, RR8);
-
-        /*
-         * Clear any pending TX interrupts or we never manage
-         * to set FHC UART interrupt state to idle.
-         */
-        z8530_write_a(&z8530, WR0, WR0_TX_IP_RST);
-
-        z8530_write_a(&z8530, WR1, WR1_IARCSC);         /* interrupt on all characters */
-
-        /* 8 bits per character and enable receiver */
-        z8530_write_a(&z8530, WR3, WR3_RX8BITSCH | WR3_RX_ENABLE);
-        
-        z8530_write_a(&z8530, WR9, WR9_MIE);            /* Master Interrupt Enable. */
+        z8530_grab();
 }