Changeset 8d2760f in mainline for kernel/genarch/src/kbd/ns16550.c

Timestamp:

2008-11-29T20:24:47Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57e76cb

Parents:

dfd77382

Message:

Add additional members to the irq_t structure so that an interrupt-driven driver
does not need to know how to clear the level interrupt. The z8530 was modified
in this way and is much more generic. The ns16550 driver has also been modified,
but awaits testing. The sparc64 interrupt mapping and dispatch code is now using
the new info and calls the clear-interrupt-routine itself.

File:

• kernel/genarch/src/kbd/ns16550.c (modified) (2 diffs)

kernel/genarch/src/kbd/ns16550.c

@@ -108 +108 @@
 /** Initialize ns16550.
  *
- * @param devno Device number.
- * @param inr Interrupt number.
- * @param vaddr Virtual address of device's registers.
- */
-void ns16550_init(devno_t devno, inr_t inr, ioport_t port)
+ * @param devno         Device number.
+ * @param port          Virtual/IO address of device's registers.
+ * @param inr           Interrupt number.
+ * @param cir           Clear interrupt function.
+ * @param cir_arg       First argument to cir.
+ */
+void
+ns16550_init(devno_t devno, ioport_t port, inr_t inr, cir_t cir, void *cir_arg)
 {
         chardev_initialize("ns16550_kbd", &kbrd, &ops);
@@ -125 +128 @@
         ns16550_irq.claim = ns16550_claim;
         ns16550_irq.handler = ns16550_irq_handler;
+        ns16550_irq.cir = cir;
+        ns16550_irq.cir_arg = cir_arg;
         irq_register(&ns16550_irq);