Changeset 411b6a6 in mainline for kernel/genarch/include/drivers

Timestamp:

2009-03-07T16:08:40Z (17 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.

Location:

kernel/genarch/include/drivers

Files:

• i8042/i8042.h (moved) (moved from kernel/genarch/include/kbd/i8042.h ) (2 diffs)
• ns16550/ns16550.h (moved) (moved from kernel/genarch/include/kbd/ns16550.h ) (3 diffs)
• z8530/z8530.h (moved) (moved from kernel/genarch/include/kbd/z8530.h ) (4 diffs)

kernel/genarch/include/drivers/i8042/i8042.h

@@ -38 +38 @@
 #include <ddi/irq.h>
 #include <arch/types.h>
+#include <console/chardev.h>
 #include <typedefs.h>
 
@@ -51 +52 @@
         irq_t irq;
         i8042_t *i8042;
+        chardev_t *devout;
 } i8042_instance_t;
 
-extern bool i8042_init(i8042_t *, devno_t, inr_t);
+extern bool i8042_init(i8042_t *, devno_t, inr_t, chardev_t *);
 
 #endif

kernel/genarch/include/drivers/ns16550/ns16550.h

@@ -32 +32 @@
 /**
  * @file
- * @brief       Headers for NS 16550 serial port / keyboard driver.
+ * @brief       Headers for NS 16550 serial controller.
  */
 
@@ -40 +40 @@
 #include <ddi/irq.h>
 #include <arch/types.h>
-#include <arch/drivers/kbd.h>
+#include <console/chardev.h>
 
 #define IER_ERBFI       0x01    /** Enable Receive Buffer Full Interrupt. */
@@ -67 +67 @@
         ns16550_t *ns16550;
         irq_t irq;
+        chardev_t *devout;
 } ns16550_instance_t;
 
-extern bool ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *);
+extern bool ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *,
+    chardev_t *);
 extern irq_ownership_t ns16550_claim(irq_t *);
 extern void ns16550_irq_handler(irq_t *);

kernel/genarch/include/drivers/z8530/z8530.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -32 +32 @@
 /**
  * @file
- * @brief       Headers for Zilog 8530 serial port / keyboard driver.
+ * @brief       Headers for Zilog 8530 serial controller.
  */
 
@@ -40 +40 @@
 #include <ddi/irq.h>
 #include <arch/types.h>
+#include <console/chardev.h>
 
 #define WR0     0
@@ -118 +119 @@
         irq_t irq;
         z8530_t *z8530;
+        chardev_t *devout;
 } z8530_instance_t;
 
-extern bool z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *);
+extern bool z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *, chardev_t *);
 extern irq_ownership_t z8530_claim(irq_t *);
 extern void z8530_irq_handler(irq_t *);