Diff for /qemu/hw/arm_timer.c between versions 1.1.1.5 and 1.1.1.6

version 1.1.1.5, 2018/04/24 17:24:03 version 1.1.1.6, 2018/04/24 17:38:10
Line 223  static void sp804_write(void *opaque, ta Line 223  static void sp804_write(void *opaque, ta
     }      }
 }  }
   
 static CPUReadMemoryFunc *sp804_readfn[] = {  static CPUReadMemoryFunc * const sp804_readfn[] = {
    sp804_read,     sp804_read,
    sp804_read,     sp804_read,
    sp804_read     sp804_read
 };  };
   
 static CPUWriteMemoryFunc *sp804_writefn[] = {  static CPUWriteMemoryFunc * const sp804_writefn[] = {
    sp804_write,     sp804_write,
    sp804_write,     sp804_write,
    sp804_write     sp804_write
Line 254  static int sp804_load(QEMUFile *f, void  Line 254  static int sp804_load(QEMUFile *f, void 
     return 0;      return 0;
 }  }
   
 static void sp804_init(SysBusDevice *dev)  static int sp804_init(SysBusDevice *dev)
 {  {
     int iomemtype;      int iomemtype;
     sp804_state *s = FROM_SYSBUS(sp804_state, dev);      sp804_state *s = FROM_SYSBUS(sp804_state, dev);
Line 272  static void sp804_init(SysBusDevice *dev Line 272  static void sp804_init(SysBusDevice *dev
                                        sp804_writefn, s);                                         sp804_writefn, s);
     sysbus_init_mmio(dev, 0x1000, iomemtype);      sysbus_init_mmio(dev, 0x1000, iomemtype);
     register_savevm("sp804", -1, 1, sp804_save, sp804_load, s);      register_savevm("sp804", -1, 1, sp804_save, sp804_load, s);
       return 0;
 }  }
   
   
Line 311  static void icp_pit_write(void *opaque,  Line 312  static void icp_pit_write(void *opaque, 
 }  }
   
   
 static CPUReadMemoryFunc *icp_pit_readfn[] = {  static CPUReadMemoryFunc * const icp_pit_readfn[] = {
    icp_pit_read,     icp_pit_read,
    icp_pit_read,     icp_pit_read,
    icp_pit_read     icp_pit_read
 };  };
   
 static CPUWriteMemoryFunc *icp_pit_writefn[] = {  static CPUWriteMemoryFunc * const icp_pit_writefn[] = {
    icp_pit_write,     icp_pit_write,
    icp_pit_write,     icp_pit_write,
    icp_pit_write     icp_pit_write
 };  };
   
 static void icp_pit_init(SysBusDevice *dev)  static int icp_pit_init(SysBusDevice *dev)
 {  {
     int iomemtype;      int iomemtype;
     icp_pit_state *s = FROM_SYSBUS(icp_pit_state, dev);      icp_pit_state *s = FROM_SYSBUS(icp_pit_state, dev);
Line 343  static void icp_pit_init(SysBusDevice *d Line 344  static void icp_pit_init(SysBusDevice *d
     sysbus_init_mmio(dev, 0x1000, iomemtype);      sysbus_init_mmio(dev, 0x1000, iomemtype);
     /* This device has no state to save/restore.  The component timers will      /* This device has no state to save/restore.  The component timers will
        save themselves.  */         save themselves.  */
       return 0;
 }  }
   
 static void arm_timer_register_devices(void)  static void arm_timer_register_devices(void)

Removed from v.1.1.1.5  
changed lines
  Added in v.1.1.1.6


unix.superglobalmegacorp.com