Changeset 1462d35 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2009-03-12T18:02:51Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

32ddab4e

Parents:

4df7d3a

Message:

update for the new scheme of wiring device drivers to keyboard/serial modules

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */
@@ -168 +168 @@
                 z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                kbrd_init(stdin);
-                (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin);
+                
+                indev_t *kbrdin = z8530_init(z8530, devno, inr, cir, cir_arg);
+                if (kbrdin)
+                        kbrd_init(kbrdin);
                 
                 /*
@@ -189 +191 @@
                 ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                kbrd_init(stdin);
-                (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin);
+                
+                indev_t *kbrdin = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                if (kbrdin)
+                        kbrd_init(kbrdin);
                 
                 /*