diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/es1370.c | |
parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
download | hqemu-9423a2e8dd362a271bfe194ec131062814557b95.zip hqemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/es1370.c')
-rw-r--r-- | hw/es1370.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/es1370.c b/hw/es1370.c index c5c16b0..6a3ba55 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -788,7 +788,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, int cnt = d->frame_cnt >> 16; int size = d->frame_cnt & 0xffff; int left = ((size - cnt + 1) << 2) + d->leftover; - int transfered = 0; + int transferred = 0; int temp = audio_MIN (max, audio_MIN (left, csc_bytes)); int index = d - &s->chan[0]; @@ -807,7 +807,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, temp -= acquired; addr += acquired; - transfered += acquired; + transferred += acquired; } } else { @@ -823,11 +823,11 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, break; temp -= copied; addr += copied; - transfered += copied; + transferred += copied; } } - if (csc_bytes == transfered) { + if (csc_bytes == transferred) { *irq = 1; d->scount = sc | (sc << 16); ldebug ("sc = %d, rate = %f\n", @@ -836,10 +836,10 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, } else { *irq = 0; - d->scount = sc | (((csc_bytes - transfered - 1) >> d->shift) << 16); + d->scount = sc | (((csc_bytes - transferred - 1) >> d->shift) << 16); } - cnt += (transfered + d->leftover) >> 2; + cnt += (transferred + d->leftover) >> 2; if (s->sctl & loop_sel) { /* Bah, how stupid is that having a 0 represent true value? @@ -853,7 +853,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, d->frame_cnt |= cnt << 16; } - d->leftover = (transfered + d->leftover) & 3; + d->leftover = (transferred + d->leftover) & 3; } static void es1370_run_channel (ES1370State *s, size_t chan, int free_or_avail) |