Revision a1b6abe7 hw/es1370.c
| b/hw/es1370.c | ||
|---|---|---|
| 788 | 788 |
int cnt = d->frame_cnt >> 16; |
| 789 | 789 |
int size = d->frame_cnt & 0xffff; |
| 790 | 790 |
int left = ((size - cnt + 1) << 2) + d->leftover; |
| 791 |
int transfered = 0; |
|
| 791 |
int transferred = 0;
|
|
| 792 | 792 |
int temp = audio_MIN (max, audio_MIN (left, csc_bytes)); |
| 793 | 793 |
int index = d - &s->chan[0]; |
| 794 | 794 |
|
| ... | ... | |
| 807 | 807 |
|
| 808 | 808 |
temp -= acquired; |
| 809 | 809 |
addr += acquired; |
| 810 |
transfered += acquired; |
|
| 810 |
transferred += acquired;
|
|
| 811 | 811 |
} |
| 812 | 812 |
} |
| 813 | 813 |
else {
|
| ... | ... | |
| 823 | 823 |
break; |
| 824 | 824 |
temp -= copied; |
| 825 | 825 |
addr += copied; |
| 826 |
transfered += copied; |
|
| 826 |
transferred += copied;
|
|
| 827 | 827 |
} |
| 828 | 828 |
} |
| 829 | 829 |
|
| 830 |
if (csc_bytes == transfered) {
|
|
| 830 |
if (csc_bytes == transferred) {
|
|
| 831 | 831 |
*irq = 1; |
| 832 | 832 |
d->scount = sc | (sc << 16); |
| 833 | 833 |
ldebug ("sc = %d, rate = %f\n",
|
| ... | ... | |
| 836 | 836 |
} |
| 837 | 837 |
else {
|
| 838 | 838 |
*irq = 0; |
| 839 |
d->scount = sc | (((csc_bytes - transfered - 1) >> d->shift) << 16); |
|
| 839 |
d->scount = sc | (((csc_bytes - transferred - 1) >> d->shift) << 16);
|
|
| 840 | 840 |
} |
| 841 | 841 |
|
| 842 |
cnt += (transfered + d->leftover) >> 2; |
|
| 842 |
cnt += (transferred + d->leftover) >> 2;
|
|
| 843 | 843 |
|
| 844 | 844 |
if (s->sctl & loop_sel) {
|
| 845 | 845 |
/* Bah, how stupid is that having a 0 represent true value? |
| ... | ... | |
| 853 | 853 |
d->frame_cnt |= cnt << 16; |
| 854 | 854 |
} |
| 855 | 855 |
|
| 856 |
d->leftover = (transfered + d->leftover) & 3; |
|
| 856 |
d->leftover = (transferred + d->leftover) & 3;
|
|
| 857 | 857 |
} |
| 858 | 858 |
|
| 859 | 859 |
static void es1370_run_channel (ES1370State *s, size_t chan, int free_or_avail) |
Also available in: Unified diff