Changeset 5b0ae4be in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2009-02-22T15:51:40Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

691eb52

Parents:

f9f9a13

Message:

The kernel i8042 driver should be instance-neutral.

File:

• kernel/arch/ia64/src/ia64.c (modified) (3 diffs)

kernel/arch/ia64/src/ia64.c

@@ -167 +167 @@
              NULL);
 #else
-        devno_t mouse = device_assign_devno();
-        i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+        (void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
 #endif
 #endif
@@ -223 +222 @@
 #ifdef SKI
         ski_kbd_grab();
-#else
-#ifdef CONFIG_NS16550
-        ns16550_grab();
-#else
-        i8042_grab();
-#endif
 #endif
 }
@@ -239 +232 @@
 #ifdef SKI
         ski_kbd_release();
-#else
-#ifdef CONFIG_NS16550
-        ns16550_release();
-#else
-        i8042_release();
-#endif
 #endif
 }