← Back to branch summary

~ubuntu-branches/debian/jessie/qemu/jessie

« back to all changes in this revision

Viewing changes to hw/soc_dma.c

  • Committer: Package Import Robot
  • Author(s): Vagrant Cascadian
  • Date: 2011-10-03 12:29:18 UTC
  • mfrom: (1.2.13) (10.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20111003122918-zc4kv6epchrbgdta
Tags: 0.15.0+dfsg-1
* New upstream version.
* Install new qemu-system, qemu-user and qemu-user-static variants: 
  lm32, microblazeel, s390x, unicore32
* Patch from upstream to set QEMU_INCLUDES before QEMU_CFLAGS.
* Update debian/watch to check http://qemu.org/download.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/soc_dma.c
84
84
 
85
85
static void soc_dma_ch_schedule(struct soc_dma_ch_s *ch, int delay_bytes)
86
86
{
87
 
    int64_t now = qemu_get_clock(vm_clock);
 
87
    int64_t now = qemu_get_clock_ns(vm_clock);
88
88
    struct dma_s *dma = (struct dma_s *) ch->dma;
89
89
 
90
90
    qemu_mod_timer(ch->timer, now + delay_bytes / dma->channel_freq);
246
246
    for (i = 0; i < n; i ++) {
247
247
        s->ch[i].dma = &s->soc;
248
248
        s->ch[i].num = i;
249
 
        s->ch[i].timer = qemu_new_timer(vm_clock, soc_dma_ch_run, &s->ch[i]);
 
249
        s->ch[i].timer = qemu_new_timer_ns(vm_clock, soc_dma_ch_run, &s->ch[i]);
250
250
    }
251
251
 
252
252
    soc_dma_reset(&s->soc);