Changeset 7f1669f in mainline

Timestamp:

2011-12-09T16:31:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

78aa0ab

Parents:

38ec02e

Message:

i8042: Rename structure.

Location:

uspace/drv/char/i8042

Files:

• i8042.c (modified) (3 diffs)
• i8042.h (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -108 +108 @@
 static uintptr_t i8042_physical;
 static uintptr_t i8042_kernel;
-static i8042_t * i8042;
+static i8042_regs_t * i8042;
 
 static i8042_port_t i8042_port[MAX_DEVS];
@@ -169 +169 @@
         
         void *vaddr;
-        if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
+        if (pio_enable((void *) i8042_physical, sizeof(i8042_regs_t), &vaddr) != 0)
                 return -1;
         
@@ -195 +195 @@
                 (void) pio_read_8(&i8042->data);
 
-        i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
-        i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
+        i8042_kbd.cmds[0].addr = (void *) &((i8042_regs_t *) i8042_kernel)->status;
+        i8042_kbd.cmds[3].addr = (void *) &((i8042_regs_t *) i8042_kernel)->data;
         register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);

uspace/drv/char/i8042/i8042.h

@@ -44 +44 @@
 
 /** i8042 HW I/O interface */
-struct i8042 {
+typedef struct {
         ioport8_t data;
         uint8_t pad[3];
         ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
+} __attribute__ ((packed)) i8042_regs_t;
 
 /** Softstate structure, one for each serial port (primary and aux). */