david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

es1370: more fixes for ADC_FRAMEADR and ADC_FRAMECNT

Browse Source 
They are not consecutive with DAC1_FRAME* and DAC2_FRAME*; Coverity
still complains about es1370_read, while es1370_write was fixed in
commit cf9270e5220671f49cc238deaf6136669cc07ae1.

Fixes: 154c1d1f960c5147a3f8ef00907504112f271cd8
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-08-24 17:03:41 +02:00
parent 77f7c74719
commit 24f7973b67
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/audio/es1370.c
View File

@ -585,10 +585,13 @@ static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size)
#endif #endif
break; break;
case ES1370_REG_ADC_FRAMECNT:
d += 2;
goto framecnt;
case ES1370_REG_DAC1_FRAMECNT: case ES1370_REG_DAC1_FRAMECNT:
case ES1370_REG_DAC2_FRAMECNT: case ES1370_REG_DAC2_FRAMECNT:
case ES1370_REG_ADC_FRAMECNT:
d += (addr - ES1370_REG_DAC1_FRAMECNT) >> 3; d += (addr - ES1370_REG_DAC1_FRAMECNT) >> 3;
framecnt:
val = d->frame_cnt; val = d->frame_cnt;
#ifdef DEBUG_ES1370 #ifdef DEBUG_ES1370
{ {
@ -602,10 +605,13 @@ static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size)
#endif #endif
break; break;
case ES1370_REG_ADC_FRAMEADR:
d += 2;
goto frameadr;
case ES1370_REG_DAC1_FRAMEADR: case ES1370_REG_DAC1_FRAMEADR:
case ES1370_REG_DAC2_FRAMEADR: case ES1370_REG_DAC2_FRAMEADR:
case ES1370_REG_ADC_FRAMEADR:
d += (addr - ES1370_REG_DAC1_FRAMEADR) >> 3; d += (addr - ES1370_REG_DAC1_FRAMEADR) >> 3;
frameadr:
val = d->frame_addr; val = d->frame_addr;
break; break;