Skip to content

Commit

Permalink
hw/audio/es1370: change variable type and name
Browse files Browse the repository at this point in the history
Change the type of the variable temp to size_t to avoid a type
cast. While at it, rename the variable name to to_transfer. This
improves the readability of the code.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230917065813.6692-7-vr_qemu@t-online.de>
  • Loading branch information
Volker Rümelin authored and Patchew Applier committed Oct 10, 2023
1 parent 02e7de6 commit ca98851
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions hw/audio/es1370.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
int max, int *irq)
{
uint8_t tmpbuf[4096];
size_t to_transfer;
uint32_t addr = d->frame_addr;
int sc = d->scount & 0xffff;
int csc = d->scount >> 16;
Expand All @@ -616,40 +617,40 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
}
int left = ((size - cnt + 1) << 2) + d->leftover;
int transferred = 0;
int temp = MIN (max, MIN (left, csc_bytes));
int index = d - &s->chan[0];

to_transfer = MIN(max, MIN(left, csc_bytes));
addr += (cnt << 2) + d->leftover;

if (index == ADC_CHANNEL) {
while (temp > 0) {
while (to_transfer > 0) {
int acquired, to_copy;

to_copy = MIN ((size_t) temp, sizeof (tmpbuf));
to_copy = MIN(to_transfer, sizeof(tmpbuf));
acquired = AUD_read (s->adc_voice, tmpbuf, to_copy);
if (!acquired) {
break;
}

pci_dma_write (&s->dev, addr, tmpbuf, acquired);

temp -= acquired;
to_transfer -= acquired;
addr += acquired;
transferred += acquired;
}
} else {
SWVoiceOut *voice = s->dac_voice[index];

while (temp > 0) {
while (to_transfer > 0) {
int copied, to_copy;

to_copy = MIN ((size_t) temp, sizeof (tmpbuf));
to_copy = MIN(to_transfer, sizeof(tmpbuf));
pci_dma_read (&s->dev, addr, tmpbuf, to_copy);
copied = AUD_write (voice, tmpbuf, to_copy);
if (!copied) {
break;
}
temp -= copied;
to_transfer -= copied;
addr += copied;
transferred += copied;
}
Expand Down

0 comments on commit ca98851

Please sign in to comment.