Index: kernel/genarch/include/drivers/i8042/i8042.h
===================================================================
--- kernel/genarch/include/drivers/i8042/i8042.h	(revision 411b6a6f0339f865eaac5f492f2277fdfbbd5fcc)
+++ kernel/genarch/include/drivers/i8042/i8042.h	(revision 32ddab4e3c97ec2da367368b6a5ae66a60979eb9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch	
+/** @addtogroup genarch
  * @{
  */
@@ -41,19 +41,18 @@
 #include <typedefs.h>
 
-struct i8042 {
+typedef struct {
 	ioport8_t data;
 	uint8_t pad[3];
 	ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
+} __attribute__ ((packed)) i8042_t;
 
-typedef struct i8042_instance {
+typedef struct {
 	devno_t devno;
 	irq_t irq;
 	i8042_t *i8042;
-	chardev_t *devout;
+	indev_t kbrdin;
 } i8042_instance_t;
 
-extern bool i8042_init(i8042_t *, devno_t, inr_t, chardev_t *);
+extern indev_t *i8042_init(i8042_t *, devno_t, inr_t);
 
 #endif