Diff for /qemu/hw/pxa2xx_keypad.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 16:48:43 version 1.1.1.2, 2018/04/24 16:53:19
Line 80 Line 80
 #define PXAKBD_MAXCOL   8  #define PXAKBD_MAXCOL   8
   
 struct pxa2xx_keypad_s{  struct pxa2xx_keypad_s{
     target_phys_addr_t base;  
     qemu_irq    irq;      qemu_irq    irq;
     struct  keymap *map;      struct  keymap *map;
   
Line 159  static uint32_t pxa2xx_keypad_read(void  Line 158  static uint32_t pxa2xx_keypad_read(void 
 {  {
     struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;      struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
     uint32_t tmp;      uint32_t tmp;
     offset -= s->base;  
   
     switch (offset) {      switch (offset) {
     case KPC:      case KPC:
Line 222  static void pxa2xx_keypad_write(void *op Line 220  static void pxa2xx_keypad_write(void *op
                 target_phys_addr_t offset, uint32_t value)                  target_phys_addr_t offset, uint32_t value)
 {  {
     struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;      struct pxa2xx_keypad_s *s = (struct pxa2xx_keypad_s *) opaque;
     offset -= s->base;  
   
     switch (offset) {      switch (offset) {
     case KPC:      case KPC:
Line 316  struct pxa2xx_keypad_s *pxa27x_keypad_in Line 313  struct pxa2xx_keypad_s *pxa27x_keypad_in
     struct pxa2xx_keypad_s *s;      struct pxa2xx_keypad_s *s;
   
     s = (struct pxa2xx_keypad_s *) qemu_mallocz(sizeof(struct pxa2xx_keypad_s));      s = (struct pxa2xx_keypad_s *) qemu_mallocz(sizeof(struct pxa2xx_keypad_s));
     s->base = base;  
     s->irq = irq;      s->irq = irq;
   
     iomemtype = cpu_register_io_memory(0, pxa2xx_keypad_readfn,      iomemtype = cpu_register_io_memory(0, pxa2xx_keypad_readfn,

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com