Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7f1669f in mainline


Ignore:
Timestamp:
2011-12-09T16:31:07Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
78aa0ab
Parents:
38ec02e
Message:

i8042: Rename structure.

Location:
uspace/drv/char/i8042
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/char/i8042/i8042.c

    r38ec02e r7f1669f  
    108108static uintptr_t i8042_physical;
    109109static uintptr_t i8042_kernel;
    110 static i8042_t * i8042;
     110static i8042_regs_t * i8042;
    111111
    112112static i8042_port_t i8042_port[MAX_DEVS];
     
    169169       
    170170        void *vaddr;
    171         if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
     171        if (pio_enable((void *) i8042_physical, sizeof(i8042_regs_t), &vaddr) != 0)
    172172                return -1;
    173173       
     
    195195                (void) pio_read_8(&i8042->data);
    196196
    197         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
    198         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
     197        i8042_kbd.cmds[0].addr = (void *) &((i8042_regs_t *) i8042_kernel)->status;
     198        i8042_kbd.cmds[3].addr = (void *) &((i8042_regs_t *) i8042_kernel)->data;
    199199        register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
    200200        register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
  • uspace/drv/char/i8042/i8042.h

    r38ec02e r7f1669f  
    4444
    4545/** i8042 HW I/O interface */
    46 struct i8042 {
     46typedef struct {
    4747        ioport8_t data;
    4848        uint8_t pad[3];
    4949        ioport8_t status;
    50 } __attribute__ ((packed));
    51 typedef struct i8042 i8042_t;
     50} __attribute__ ((packed)) i8042_regs_t;
    5251
    5352/** Softstate structure, one for each serial port (primary and aux). */
Note: See TracChangeset for help on using the changeset viewer.