Changeset 411b6a6 in mainline for kernel/genarch/src/drivers/z8530/z8530.c

Timestamp:

2009-03-07T16:08:40Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c84368e

Parents:

e06da7e

Message:

Complete emancipation of kernel serial controller drivers (i8042, ns16550 and
z8530). Provide a common keyboard module for PC and Sun keyboards. The serial
line module is still to follow.

File:

• kernel/genarch/src/drivers/z8530/z8530.c (moved) (moved from kernel/genarch/src/kbd/z8530.c ) (6 diffs)

kernel/genarch/src/drivers/z8530/z8530.c

@@ -32 +32 @@
 /**
  * @file
- * @brief       Zilog 8530 serial port driver.
+ * @brief       Zilog 8530 serial controller driver.
  */
 
-#include <genarch/kbd/z8530.h>
-#include <genarch/kbd/key.h>
-#include <genarch/kbd/scanc.h>
-#include <genarch/kbd/scanc_sun.h>
-#include <arch/drivers/kbd.h>
-#include <console/console.h>
+#include <genarch/drivers/z8530/z8530.h>
 #include <console/chardev.h>
 #include <ddi/irq.h>
@@ -66 +61 @@
 }
 
-/*
- * These codes read from z8530 data register are silently ignored.
- */
-#define IGNORE_CODE     0x7f            /* all keys up */
-
-static void z8530_suspend(chardev_t *);
-static void z8530_resume(chardev_t *);
-
-static chardev_operations_t ops = {
-        .suspend = z8530_suspend,
-        .resume = z8530_resume,
-};
-
 /** Initialize z8530. */
 bool
-z8530_init(z8530_t *dev, devno_t devno, inr_t inr, cir_t cir, void *cir_arg)
+z8530_init(z8530_t *dev, devno_t devno, inr_t inr, cir_t cir, void *cir_arg,
+    chardev_t *devout)
 {
         z8530_instance_t *instance;
-
-        chardev_initialize("z8530_kbd", &kbrd, &ops);
-        stdin = &kbrd;
 
         instance = malloc(sizeof(z8530_instance_t), FRAME_ATOMIC);
@@ -94 +74 @@
         instance->devno = devno;
         instance->z8530 = dev;
+        instance->devout = devout;
 
         irq_initialize(&instance->irq);
@@ -125 +106 @@
 }
 
-/* Called from getc(). */
-void z8530_resume(chardev_t *d)
-{
-}
-
-/* Called from getc(). */
-void z8530_suspend(chardev_t *d)
-{
-}
-
 irq_ownership_t z8530_claim(irq_t *irq)
 {
@@ -140 +111 @@
         z8530_t *dev = instance->z8530;
 
-        return (z8530_read(&dev->ctl_a, RR0) & RR0_RCA);
+        if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA)
+                return IRQ_ACCEPT;
+        else
+                return IRQ_DECLINE;
 }
 
@@ -151 +125 @@
         if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA) {
                 x = z8530_read(&dev->ctl_a, RR8);
-                if (x != IGNORE_CODE) {
-                        if (x & KEY_RELEASE)
-                                key_released(x ^ KEY_RELEASE);
-                        else
-                                key_pressed(x);
-                }
+                if (instance->devout)
+                        chardev_push_character(instance->devout, x);
         }
 }