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

version 1.1.1.6, 2018/04/24 17:38:10 version 1.1.1.7, 2018/04/24 18:19:41
Line 71  static void arm_timer_recalibrate(arm_ti Line 71  static void arm_timer_recalibrate(arm_ti
 {  {
     uint32_t limit;      uint32_t limit;
   
     if ((s->control & TIMER_CTRL_PERIODIC) == 0) {      if ((s->control & (TIMER_CTRL_PERIODIC | TIMER_CTRL_ONESHOT)) == 0) {
         /* Free running.  */          /* Free running.  */
         if (s->control & TIMER_CTRL_32BIT)          if (s->control & TIMER_CTRL_32BIT)
             limit = 0xffffffff;              limit = 0xffffffff;
Line 113  static void arm_timer_write(void *opaque Line 113  static void arm_timer_write(void *opaque
         case 1: freq >>= 4; break;          case 1: freq >>= 4; break;
         case 2: freq >>= 8; break;          case 2: freq >>= 8; break;
         }          }
         arm_timer_recalibrate(s, 0);          arm_timer_recalibrate(s, s->control & TIMER_CTRL_ENABLE);
         ptimer_set_freq(s->timer, freq);          ptimer_set_freq(s->timer, freq);
         if (s->control & TIMER_CTRL_ENABLE) {          if (s->control & TIMER_CTRL_ENABLE) {
             /* Restart the timer if still enabled.  */              /* Restart the timer if still enabled.  */

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


unix.superglobalmegacorp.com