Changeset 3c79afe in mainline for kernel/genarch/include/drivers/i8042/i8042.h

Timestamp:

2009-03-12T17:54:24Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3a1c048

Parents:

a0e1b48

Message:

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

File:

• kernel/genarch/include/drivers/i8042/i8042.h (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -41 +41 @@
 #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