Diff for /qemu/hw/baum.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2018/04/24 18:29:45 version 1.1.1.5, 2018/04/24 19:01:06
Line 335  static int baum_eat_packet(BaumDriverSta Line 335  static int baum_eat_packet(BaumDriverSta
         int i;          int i;
   
         /* Allow 100ms to complete the DisplayData packet */          /* Allow 100ms to complete the DisplayData packet */
         qemu_mod_timer(baum->cellCount_timer, qemu_get_clock(vm_clock) +          qemu_mod_timer(baum->cellCount_timer, qemu_get_clock_ns(vm_clock) +
                        get_ticks_per_sec() / 10);                         get_ticks_per_sec() / 10);
         for (i = 0; i < baum->x * baum->y ; i++) {          for (i = 0; i < baum->x * baum->y ; i++) {
             EAT(c);              EAT(c);
Line 576  static void baum_close(struct CharDriver Line 576  static void baum_close(struct CharDriver
     qemu_free(baum);      qemu_free(baum);
 }  }
   
 CharDriverState *chr_baum_init(QemuOpts *opts)  int chr_baum_init(QemuOpts *opts, CharDriverState **_chr)
 {  {
     BaumDriverState *baum;      BaumDriverState *baum;
     CharDriverState *chr;      CharDriverState *chr;
Line 604  CharDriverState *chr_baum_init(QemuOpts  Line 604  CharDriverState *chr_baum_init(QemuOpts 
         goto fail_handle;          goto fail_handle;
     }      }
   
     baum->cellCount_timer = qemu_new_timer(vm_clock, baum_cellCount_timer_cb, baum);      baum->cellCount_timer = qemu_new_timer_ns(vm_clock, baum_cellCount_timer_cb, baum);
   
     if (brlapi__getDisplaySize(handle, &baum->x, &baum->y) == -1) {      if (brlapi__getDisplaySize(handle, &baum->x, &baum->y) == -1) {
         brlapi_perror("baum_init: brlapi_getDisplaySize");          brlapi_perror("baum_init: brlapi_getDisplaySize");
Line 629  CharDriverState *chr_baum_init(QemuOpts  Line 629  CharDriverState *chr_baum_init(QemuOpts 
   
     qemu_chr_generic_open(chr);      qemu_chr_generic_open(chr);
   
     return chr;      *_chr = chr;
       return 0;
   
 fail:  fail:
     qemu_free_timer(baum->cellCount_timer);      qemu_free_timer(baum->cellCount_timer);
Line 638  fail_handle: Line 639  fail_handle:
     qemu_free(handle);      qemu_free(handle);
     qemu_free(chr);      qemu_free(chr);
     qemu_free(baum);      qemu_free(baum);
     return NULL;      return -EIO;
 }  }

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


unix.superglobalmegacorp.com