From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FROM_EXCESS_BASE64,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C584C74A36 for ; Wed, 10 Jul 2019 20:01:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B8AB12064B for ; Wed, 10 Jul 2019 20:01:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iCpkeAwW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8AB12064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlIlx-00078v-T4 for qemu-devel@archiver.kernel.org; Wed, 10 Jul 2019 16:01:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50253) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlIjj-0003Fr-L6 for qemu-devel@nongnu.org; Wed, 10 Jul 2019 15:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlIjg-0002gT-Gl for qemu-devel@nongnu.org; Wed, 10 Jul 2019 15:58:43 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlIjg-0002ep-66 for qemu-devel@nongnu.org; Wed, 10 Jul 2019 15:58:40 -0400 Received: by mail-wr1-x441.google.com with SMTP id r1so3735090wrl.7 for ; Wed, 10 Jul 2019 12:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=sDOcTQYR0OyQTJGzu+18Z6yQomK9WC2kMLHOXO4d+As=; b=iCpkeAwWOqdzRx2i1RX2Hhd5gJh48VJNZAMC9SVmvAbQq/wioKpWhU/NubzYavbPxe CTSuov/2/gQl5VM07qEjm91mEc4zop7BLP0eyZXZdHVl3few+bnJ2Ls3Dw2tjopvVaiy Tyu/ULArJajO/BU/GCEb4fCIBSGAqc5VodlD9K9vLsf8RhKMcH+L6QRPewK/LYRIvJLq u6J4LDx6vfza0atFCAbxySxCrnkQ7QY0Asy+qysLDL9gEcR9Uo4Nru0TxnqqHAUEqsVT SKQDcME06yfTFZy4uKlz297urJtpHo66Mz3me1QWbpoH4calTBUs3ykRdz8OENTC6G6h Dhtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=sDOcTQYR0OyQTJGzu+18Z6yQomK9WC2kMLHOXO4d+As=; b=NmsXVZWQNYVhj4QU6Ezq3PpjAGVaoClTYCGVokVVABPZ5/Q41xIadcGt/Ro704toXR 5PghuFleKh71jYXy+eY/CFYuXZlEV3qzUxmvlBYjz1GMf+mDnSZwugVrFsKupyoYNg3q UAQ5cbYLQSArzR8vEXXafss+ZCHVGORuX2n+lcurXPErj2z1KHL4vblYexqz8XcZN4HB ebelFIEU+AQePlYExAlXTBBx8/VOGHHwHV11oJqv/P1IfeDXXF8l1Q4hywpoqXMY125D MqtiGulPRdw+M2sGFVIDg3DFdKFCCq+HPx54FTn0bnZX/91dGoLfk2xL2teJBEyW+yjD 76xQ== X-Gm-Message-State: APjAAAV/piomjCCJNI9+jxsAnE2hUmCnHaLMLGzsjkNBJs+usSw9fuSk 7ODGSq7GvuWAquQHFADJh8kRxId0EDfiZG9nuWphJhww X-Google-Smtp-Source: APXvYqzo/arERqdRSelXfhVd3fgO8lV1Qc/yzlLdbRYV5vMNOPpAiWMIv9Sh6VuAmjVGnskGj3AaZvpcZ1xtX9pVrLs= X-Received: by 2002:a5d:6650:: with SMTP id f16mr884330wrw.89.1562788718759; Wed, 10 Jul 2019 12:58:38 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Wed, 10 Jul 2019 23:58:26 +0400 Message-ID: To: =?UTF-8?B?S8WRdsOhZ8OzLCBab2x0w6Fu?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: Re: [Qemu-devel] [PATCH 07/11] audio: remove audio_MIN, audio_MAX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Walle , QEMU , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jul 9, 2019 at 11:08 PM K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n wrote: > > There's already a MIN and MAX macro in include/qemu/osdep.h, use them > instead. > > Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n Reviewed-by: Marc-Andr=C3=A9 Lureau > --- > audio/audio.h | 17 ----------------- > audio/alsaaudio.c | 6 +++--- > audio/audio.c | 20 ++++++++++---------- > audio/coreaudio.c | 2 +- > audio/dsoundaudio.c | 2 +- > audio/noaudio.c | 10 +++++----- > audio/ossaudio.c | 6 +++--- > audio/paaudio.c | 12 ++++++------ > audio/sdlaudio.c | 6 +++--- > audio/spiceaudio.c | 10 +++++----- > audio/wavaudio.c | 4 ++-- > hw/audio/ac97.c | 10 +++++----- > hw/audio/adlib.c | 4 ++-- > hw/audio/cs4231a.c | 4 ++-- > hw/audio/es1370.c | 6 +++--- > hw/audio/gus.c | 6 +++--- > hw/audio/hda-codec.c | 16 ++++++++-------- > hw/audio/milkymist-ac97.c | 8 ++++---- > hw/audio/pcspk.c | 2 +- > hw/audio/sb16.c | 2 +- > hw/audio/wm8750.c | 4 ++-- > 21 files changed, 70 insertions(+), 87 deletions(-) > > diff --git a/audio/audio.h b/audio/audio.h > index c0722a5cda..4a95758516 100644 > --- a/audio/audio.h > +++ b/audio/audio.h > @@ -146,23 +146,6 @@ static inline void *advance (void *p, int incr) > return (d + incr); > } > > -#ifdef __GNUC__ > -#define audio_MIN(a, b) ( __extension__ ({ \ > - __typeof (a) ta =3D a; \ > - __typeof (b) tb =3D b; \ > - ((ta)>(tb)?(tb):(ta)); \ > -})) > - > -#define audio_MAX(a, b) ( __extension__ ({ \ > - __typeof (a) ta =3D a; \ > - __typeof (b) tb =3D b; \ > - ((ta)<(tb)?(tb):(ta)); \ > -})) > -#else > -#define audio_MIN(a, b) ((a)>(b)?(b):(a)) > -#define audio_MAX(a, b) ((a)<(b)?(b):(a)) > -#endif > - > int wav_start_capture(AudioState *state, CaptureState *s, const char *pa= th, > int freq, int bits, int nchannels); > > diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c > index 3745c823ad..6b9e0f06af 100644 > --- a/audio/alsaaudio.c > +++ b/audio/alsaaudio.c > @@ -634,7 +634,7 @@ static void alsa_write_pending (ALSAVoiceOut *alsa) > > while (alsa->pending) { > int left_till_end_samples =3D hw->samples - alsa->wpos; > - int len =3D audio_MIN (alsa->pending, left_till_end_samples); > + int len =3D MIN (alsa->pending, left_till_end_samples); > char *src =3D advance (alsa->pcm_buf, alsa->wpos << hw->info.shi= ft); > > while (len) { > @@ -697,7 +697,7 @@ static int alsa_run_out (HWVoiceOut *hw, int live) > return 0; > } > > - decr =3D audio_MIN (live, avail); > + decr =3D MIN (live, avail); > decr =3D audio_pcm_hw_clip_out (hw, alsa->pcm_buf, decr, alsa->pendi= ng); > alsa->pending +=3D decr; > alsa_write_pending (alsa); > @@ -915,7 +915,7 @@ static int alsa_run_in (HWVoiceIn *hw) > } > } > > - decr =3D audio_MIN (dead, avail); > + decr =3D MIN (dead, avail); > if (!decr) { > return 0; > } > diff --git a/audio/audio.c b/audio/audio.c > index 82dd0e3e13..6bf30ac9b3 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -533,7 +533,7 @@ static int audio_pcm_hw_find_min_in (HWVoiceIn *hw) > > for (sw =3D hw->sw_head.lh_first; sw; sw =3D sw->entries.le_next) { > if (sw->active) { > - m =3D audio_MIN (m, sw->total_hw_samples_acquired); > + m =3D MIN (m, sw->total_hw_samples_acquired); > } > } > return m; > @@ -553,14 +553,14 @@ int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pc= m_buf, > int live, int pending) > { > int left =3D hw->samples - pending; > - int len =3D audio_MIN (left, live); > + int len =3D MIN (left, live); > int clipped =3D 0; > > while (len) { > struct st_sample *src =3D hw->mix_buf + hw->rpos; > uint8_t *dst =3D advance (pcm_buf, hw->rpos << hw->info.shift); > int samples_till_end_of_buf =3D hw->samples - hw->rpos; > - int samples_to_clip =3D audio_MIN (len, samples_till_end_of_buf)= ; > + int samples_to_clip =3D MIN (len, samples_till_end_of_buf); > > hw->clip (dst, src, samples_to_clip); > > @@ -614,7 +614,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int = size) > } > > swlim =3D (live * sw->ratio) >> 32; > - swlim =3D audio_MIN (swlim, samples); > + swlim =3D MIN (swlim, samples); > > while (swlim) { > src =3D hw->conv_buf + rpos; > @@ -662,7 +662,7 @@ static int audio_pcm_hw_find_min_out (HWVoiceOut *hw,= int *nb_livep) > > for (sw =3D hw->sw_head.lh_first; sw; sw =3D sw->entries.le_next) { > if (sw->active || !sw->empty) { > - m =3D audio_MIN (m, sw->total_hw_samples_mixed); > + m =3D MIN (m, sw->total_hw_samples_mixed); > nb_live +=3D 1; > } > } > @@ -725,7 +725,7 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, in= t size) > > dead =3D hwsamples - live; > swlim =3D ((int64_t) dead << 32) / sw->ratio; > - swlim =3D audio_MIN (swlim, samples); > + swlim =3D MIN (swlim, samples); > if (swlim) { > sw->conv (sw->buf, buf, swlim); > > @@ -737,7 +737,7 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, in= t size) > while (swlim) { > dead =3D hwsamples - live; > left =3D hwsamples - wpos; > - blck =3D audio_MIN (dead, left); > + blck =3D MIN (dead, left); > if (!blck) { > break; > } > @@ -1029,7 +1029,7 @@ static void audio_capture_mix_and_clear (HWVoiceOut= *hw, int rpos, int samples) > n =3D samples; > while (n) { > int till_end_of_hw =3D hw->samples - rpos2; > - int to_write =3D audio_MIN (till_end_of_hw, n); > + int to_write =3D MIN (till_end_of_hw, n); > int bytes =3D to_write << hw->info.shift; > int written; > > @@ -1047,7 +1047,7 @@ static void audio_capture_mix_and_clear (HWVoiceOut= *hw, int rpos, int samples) > } > } > > - n =3D audio_MIN (samples, hw->samples - rpos); > + n =3D MIN (samples, hw->samples - rpos); > mixeng_clear (hw->mix_buf + rpos, n); > mixeng_clear (hw->mix_buf, samples - n); > } > @@ -1203,7 +1203,7 @@ static void audio_run_capture (AudioState *s) > rpos =3D hw->rpos; > while (live) { > int left =3D hw->samples - rpos; > - int to_capture =3D audio_MIN (live, left); > + int to_capture =3D MIN (live, left); > struct st_sample *src; > struct capture_callback *cb; > > diff --git a/audio/coreaudio.c b/audio/coreaudio.c > index 4bec6c8c5c..f0ab4014a8 100644 > --- a/audio/coreaudio.c > +++ b/audio/coreaudio.c > @@ -413,7 +413,7 @@ static int coreaudio_run_out (HWVoiceOut *hw, int liv= e) > core->live); > } > > - decr =3D audio_MIN (core->decr, live); > + decr =3D MIN (core->decr, live); > core->decr -=3D decr; > > core->live =3D live - decr; > diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c > index 5da4c864c3..07260f881e 100644 > --- a/audio/dsoundaudio.c > +++ b/audio/dsoundaudio.c > @@ -707,7 +707,7 @@ static int dsound_run_in (HWVoiceIn *hw) > if (!len) { > return 0; > } > - len =3D audio_MIN (len, dead); > + len =3D MIN (len, dead); > > err =3D dsound_lock_in ( > dscb, > diff --git a/audio/noaudio.c b/audio/noaudio.c > index 9b195dc52c..14a0e4ab29 100644 > --- a/audio/noaudio.c > +++ b/audio/noaudio.c > @@ -52,11 +52,11 @@ static int no_run_out (HWVoiceOut *hw, int live) > now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > ticks =3D now - no->old_ticks; > bytes =3D muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER= _SECOND); > - bytes =3D audio_MIN(bytes, INT_MAX); > + bytes =3D MIN(bytes, INT_MAX); > samples =3D bytes >> hw->info.shift; > > no->old_ticks =3D now; > - decr =3D audio_MIN (live, samples); > + decr =3D MIN (live, samples); > hw->rpos =3D (hw->rpos + decr) % hw->samples; > return decr; > } > @@ -111,9 +111,9 @@ static int no_run_in (HWVoiceIn *hw) > muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_S= ECOND); > > no->old_ticks =3D now; > - bytes =3D audio_MIN (bytes, INT_MAX); > + bytes =3D MIN (bytes, INT_MAX); > samples =3D bytes >> hw->info.shift; > - samples =3D audio_MIN (samples, dead); > + samples =3D MIN (samples, dead); > } > return samples; > } > @@ -124,7 +124,7 @@ static int no_read (SWVoiceIn *sw, void *buf, int siz= e) > * useless resampling/mixing */ > int samples =3D size >> sw->info.shift; > int total =3D sw->hw->total_samples_captured - sw->total_hw_samples_= acquired; > - int to_clear =3D audio_MIN (samples, total); > + int to_clear =3D MIN (samples, total); > sw->total_hw_samples_acquired +=3D total; > audio_pcm_info_clear_buf (&sw->info, buf, to_clear); > return to_clear << sw->info.shift; > diff --git a/audio/ossaudio.c b/audio/ossaudio.c > index c0af065b6f..29139ef1f5 100644 > --- a/audio/ossaudio.c > +++ b/audio/ossaudio.c > @@ -388,7 +388,7 @@ static void oss_write_pending (OSSVoiceOut *oss) > int samples_written; > ssize_t bytes_written; > int samples_till_end =3D hw->samples - oss->wpos; > - int samples_to_write =3D audio_MIN (oss->pending, samples_till_e= nd); > + int samples_to_write =3D MIN (oss->pending, samples_till_end); > int bytes_to_write =3D samples_to_write << hw->info.shift; > void *pcm =3D advance (oss->pcm_buf, oss->wpos << hw->info.shift= ); > > @@ -437,7 +437,7 @@ static int oss_run_out (HWVoiceOut *hw, int live) > > pos =3D hw->rpos << hw->info.shift; > bytes =3D audio_ring_dist (cntinfo.ptr, pos, bufsize); > - decr =3D audio_MIN (bytes >> hw->info.shift, live); > + decr =3D MIN (bytes >> hw->info.shift, live); > } > else { > err =3D ioctl (oss->fd, SNDCTL_DSP_GETOSPACE, &abinfo); > @@ -456,7 +456,7 @@ static int oss_run_out (HWVoiceOut *hw, int live) > return 0; > } > > - decr =3D audio_MIN (abinfo.bytes >> hw->info.shift, live); > + decr =3D MIN (abinfo.bytes >> hw->info.shift, live); > if (!decr) { > return 0; > } > diff --git a/audio/paaudio.c b/audio/paaudio.c > index 490bcd770e..9d46f11b0a 100644 > --- a/audio/paaudio.c > +++ b/audio/paaudio.c > @@ -235,7 +235,7 @@ static void *qpa_thread_out (void *arg) > } > } > > - decr =3D to_mix =3D audio_MIN(pa->live, pa->samples >> 5); > + decr =3D to_mix =3D MIN(pa->live, pa->samples >> 5); > rpos =3D pa->rpos; > > if (audio_pt_unlock(&pa->pt, __func__)) { > @@ -244,7 +244,7 @@ static void *qpa_thread_out (void *arg) > > while (to_mix) { > int error; > - int chunk =3D audio_MIN (to_mix, hw->samples - rpos); > + int chunk =3D MIN (to_mix, hw->samples - rpos); > struct st_sample *src =3D hw->mix_buf + rpos; > > hw->clip (pa->pcm_buf, src, chunk); > @@ -282,7 +282,7 @@ static int qpa_run_out (HWVoiceOut *hw, int live) > return 0; > } > > - decr =3D audio_MIN (live, pa->decr); > + decr =3D MIN (live, pa->decr); > pa->decr -=3D decr; > pa->live =3D live - decr; > hw->rpos =3D pa->rpos; > @@ -327,7 +327,7 @@ static void *qpa_thread_in (void *arg) > } > } > > - incr =3D to_grab =3D audio_MIN(pa->dead, pa->samples >> 5); > + incr =3D to_grab =3D MIN(pa->dead, pa->samples >> 5); > wpos =3D pa->wpos; > > if (audio_pt_unlock(&pa->pt, __func__)) { > @@ -336,7 +336,7 @@ static void *qpa_thread_in (void *arg) > > while (to_grab) { > int error; > - int chunk =3D audio_MIN (to_grab, hw->samples - wpos); > + int chunk =3D MIN (to_grab, hw->samples - wpos); > void *buf =3D advance (pa->pcm_buf, wpos); > > if (qpa_simple_read (pa, buf, > @@ -375,7 +375,7 @@ static int qpa_run_in (HWVoiceIn *hw) > > live =3D audio_pcm_hw_get_live_in (hw); > dead =3D hw->samples - live; > - incr =3D audio_MIN (dead, pa->incr); > + incr =3D MIN (dead, pa->incr); > pa->incr -=3D incr; > pa->dead =3D dead - incr; > hw->wpos =3D pa->wpos; > diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c > index e7179ff1d4..42f7614124 100644 > --- a/audio/sdlaudio.c > +++ b/audio/sdlaudio.c > @@ -193,10 +193,10 @@ static void sdl_callback (void *opaque, Uint8 *buf,= int len) > > /* dolog ("in callback samples=3D%d live=3D%d\n", samples, sdl->live= ); */ > > - to_mix =3D audio_MIN(samples, sdl->live); > + to_mix =3D MIN(samples, sdl->live); > decr =3D to_mix; > while (to_mix) { > - int chunk =3D audio_MIN(to_mix, hw->samples - hw->rpos); > + int chunk =3D MIN(to_mix, hw->samples - hw->rpos); > struct st_sample *src =3D hw->mix_buf + hw->rpos; > > /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); *= / > @@ -236,7 +236,7 @@ static int sdl_run_out (HWVoiceOut *hw, int live) > sdl->live); > } > > - decr =3D audio_MIN (sdl->decr, live); > + decr =3D MIN (sdl->decr, live); > sdl->decr -=3D decr; > > sdl->live =3D live; > diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c > index 0ead5ae43a..6f4a0558f8 100644 > --- a/audio/spiceaudio.c > +++ b/audio/spiceaudio.c > @@ -164,20 +164,20 @@ static int line_out_run (HWVoiceOut *hw, int live) > } > > decr =3D rate_get_samples (&hw->info, &out->rate); > - decr =3D audio_MIN (live, decr); > + decr =3D MIN (live, decr); > > samples =3D decr; > rpos =3D hw->rpos; > while (samples) { > int left_till_end_samples =3D hw->samples - rpos; > - int len =3D audio_MIN (samples, left_till_end_samples); > + int len =3D MIN (samples, left_till_end_samples); > > if (!out->frame) { > spice_server_playback_get_buffer (&out->sin, &out->frame, &o= ut->fsize); > out->fpos =3D out->frame; > } > if (out->frame) { > - len =3D audio_MIN (len, out->fsize); > + len =3D MIN (len, out->fsize); > hw->clip (out->fpos, hw->mix_buf + rpos, len); > out->fsize -=3D len; > out->fpos +=3D len; > @@ -295,7 +295,7 @@ static int line_in_run (HWVoiceIn *hw) > } > > delta_samp =3D rate_get_samples (&hw->info, &in->rate); > - num_samples =3D audio_MIN (num_samples, delta_samp); > + num_samples =3D MIN (num_samples, delta_samp); > > ready =3D spice_server_record_get_samples (&in->sin, in->samples, nu= m_samples); > samples =3D in->samples; > @@ -305,7 +305,7 @@ static int line_in_run (HWVoiceIn *hw) > ready =3D LINE_IN_SAMPLES; > } > > - num_samples =3D audio_MIN (ready, num_samples); > + num_samples =3D MIN (ready, num_samples); > > if (hw->wpos + num_samples > hw->samples) { > len[0] =3D hw->samples - hw->wpos; > diff --git a/audio/wavaudio.c b/audio/wavaudio.c > index 803b6cb1f3..bbf3f3b346 100644 > --- a/audio/wavaudio.c > +++ b/audio/wavaudio.c > @@ -59,12 +59,12 @@ static int wav_run_out (HWVoiceOut *hw, int live) > } > > wav->old_ticks =3D now; > - decr =3D audio_MIN (live, samples); > + decr =3D MIN (live, samples); > samples =3D decr; > rpos =3D hw->rpos; > while (samples) { > int left_till_end_samples =3D hw->samples - rpos; > - int convert_samples =3D audio_MIN (samples, left_till_end_sample= s); > + int convert_samples =3D MIN (samples, left_till_end_samples); > > src =3D hw->mix_buf + rpos; > dst =3D advance (wav->pcm_buf, rpos << hw->info.shift); > diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c > index 0d8e524233..060bafdac3 100644 > --- a/hw/audio/ac97.c > +++ b/hw/audio/ac97.c > @@ -964,7 +964,7 @@ static int write_audio (AC97LinkState *s, AC97BusMast= erRegs *r, > uint32_t temp =3D r->picb << 1; > uint32_t written =3D 0; > int to_copy =3D 0; > - temp =3D audio_MIN (temp, max); > + temp =3D MIN (temp, max); > > if (!temp) { > *stop =3D 1; > @@ -973,7 +973,7 @@ static int write_audio (AC97LinkState *s, AC97BusMast= erRegs *r, > > while (temp) { > int copied; > - to_copy =3D audio_MIN (temp, sizeof (tmpbuf)); > + to_copy =3D MIN (temp, sizeof (tmpbuf)); > pci_dma_read (&s->dev, addr, tmpbuf, to_copy); > copied =3D AUD_write (s->voice_po, tmpbuf, to_copy); > dolog ("write_audio max=3D%x to_copy=3D%x copied=3D%x\n", > @@ -1019,7 +1019,7 @@ static void write_bup (AC97LinkState *s, int elapse= d) > } > > while (elapsed) { > - int temp =3D audio_MIN (elapsed, sizeof (s->silence)); > + int temp =3D MIN (elapsed, sizeof (s->silence)); > while (temp) { > int copied =3D AUD_write (s->voice_po, s->silence, temp); > if (!copied) > @@ -1040,7 +1040,7 @@ static int read_audio (AC97LinkState *s, AC97BusMas= terRegs *r, > int to_copy =3D 0; > SWVoiceIn *voice =3D (r - s->bm_regs) =3D=3D MC_INDEX ? s->voice_mc = : s->voice_pi; > > - temp =3D audio_MIN (temp, max); > + temp =3D MIN (temp, max); > > if (!temp) { > *stop =3D 1; > @@ -1049,7 +1049,7 @@ static int read_audio (AC97LinkState *s, AC97BusMas= terRegs *r, > > while (temp) { > int acquired; > - to_copy =3D audio_MIN (temp, sizeof (tmpbuf)); > + to_copy =3D MIN (temp, sizeof (tmpbuf)); > acquired =3D AUD_read (voice, tmpbuf, to_copy); > if (!acquired) { > *stop =3D 1; > diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c > index df2e781788..1b32c4ff7f 100644 > --- a/hw/audio/adlib.c > +++ b/hw/audio/adlib.c > @@ -195,7 +195,7 @@ static void adlib_callback (void *opaque, int free) > return; > } > > - to_play =3D audio_MIN (s->left, samples); > + to_play =3D MIN (s->left, samples); > while (to_play) { > written =3D write_audio (s, to_play); > > @@ -210,7 +210,7 @@ static void adlib_callback (void *opaque, int free) > } > } > > - samples =3D audio_MIN (samples, s->samples - s->pos); > + samples =3D MIN (samples, s->samples - s->pos); > if (!samples) { > return; > } > diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c > index e3ea830b47..ca3af8a987 100644 > --- a/hw/audio/cs4231a.c > +++ b/hw/audio/cs4231a.c > @@ -535,7 +535,7 @@ static int cs_write_audio (CSState *s, int nchan, int= dma_pos, > int copied; > size_t to_copy; > > - to_copy =3D audio_MIN (temp, left); > + to_copy =3D MIN (temp, left); > if (to_copy > sizeof (tmpbuf)) { > to_copy =3D sizeof (tmpbuf); > } > @@ -578,7 +578,7 @@ static int cs_dma_read (void *opaque, int nchan, int = dma_pos, int dma_len) > till =3D (s->dregs[Playback_Lower_Base_Count] > | (s->dregs[Playback_Upper_Base_Count] << 8)) << s->shift; > till -=3D s->transferred; > - copy =3D audio_MIN (till, copy); > + copy =3D MIN (till, copy); > } > > if ((copy <=3D 0) || (dma_len <=3D 0)) { > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index 7589671d20..50b144ded0 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -645,7 +645,7 @@ static void es1370_transfer_audio (ES1370State *s, st= ruct chan *d, int loop_sel, > int size =3D d->frame_cnt & 0xffff; > int left =3D ((size - cnt + 1) << 2) + d->leftover; > int transferred =3D 0; > - int temp =3D audio_MIN (max, audio_MIN (left, csc_bytes)); > + int temp =3D MIN (max, MIN (left, csc_bytes)); > int index =3D d - &s->chan[0]; > > addr +=3D (cnt << 2) + d->leftover; > @@ -654,7 +654,7 @@ static void es1370_transfer_audio (ES1370State *s, st= ruct chan *d, int loop_sel, > while (temp) { > int acquired, to_copy; > > - to_copy =3D audio_MIN ((size_t) temp, sizeof (tmpbuf)); > + to_copy =3D MIN ((size_t) temp, sizeof (tmpbuf)); > acquired =3D AUD_read (s->adc_voice, tmpbuf, to_copy); > if (!acquired) > break; > @@ -672,7 +672,7 @@ static void es1370_transfer_audio (ES1370State *s, st= ruct chan *d, int loop_sel, > while (temp) { > int copied, to_copy; > > - to_copy =3D audio_MIN ((size_t) temp, sizeof (tmpbuf)); > + to_copy =3D MIN ((size_t) temp, sizeof (tmpbuf)); > pci_dma_read (&s->dev, addr, tmpbuf, to_copy); > copied =3D AUD_write (voice, tmpbuf, to_copy); > if (!copied) > diff --git a/hw/audio/gus.c b/hw/audio/gus.c > index 566864bc9e..325efd8df7 100644 > --- a/hw/audio/gus.c > +++ b/hw/audio/gus.c > @@ -117,7 +117,7 @@ static void GUS_callback (void *opaque, int free) > GUSState *s =3D opaque; > > samples =3D free >> s->shift; > - to_play =3D audio_MIN (samples, s->left); > + to_play =3D MIN (samples, s->left); > > while (to_play) { > int written =3D write_audio (s, to_play); > @@ -132,7 +132,7 @@ static void GUS_callback (void *opaque, int free) > net +=3D written; > } > > - samples =3D audio_MIN (samples, s->samples); > + samples =3D MIN (samples, s->samples); > if (samples) { > gus_mixvoices (&s->emu, s->freq, samples, s->mixbuf); > > @@ -192,7 +192,7 @@ static int GUS_read_DMA (void *opaque, int nchan, int= dma_pos, int dma_len) > ldebug ("read DMA %#x %d\n", dma_pos, dma_len); > mode =3D k->has_autoinitialization(s->isa_dma, s->emu.gusdma); > while (left) { > - int to_copy =3D audio_MIN ((size_t) left, sizeof (tmpbuf)); > + int to_copy =3D MIN ((size_t) left, sizeof (tmpbuf)); > int copied; > > ldebug ("left=3D%d to_copy=3D%d pos=3D%d\n", left, to_copy, pos)= ; > diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c > index 967a10f189..c8f513d3ff 100644 > --- a/hw/audio/hda-codec.c > +++ b/hw/audio/hda-codec.c > @@ -234,10 +234,10 @@ static void hda_audio_input_timer(void *opaque) > goto out_timer; > } > > - int64_t to_transfer =3D audio_MIN(wpos - rpos, wanted_rpos - rpos); > + int64_t to_transfer =3D MIN(wpos - rpos, wanted_rpos - rpos); > while (to_transfer) { > uint32_t start =3D (rpos & B_MASK); > - uint32_t chunk =3D audio_MIN(B_SIZE - start, to_transfer); > + uint32_t chunk =3D MIN(B_SIZE - start, to_transfer); > int rc =3D hda_codec_xfer( > &st->state->hda, st->stream, false, st->buf + start, chu= nk); > if (!rc) { > @@ -262,13 +262,13 @@ static void hda_audio_input_cb(void *opaque, int av= ail) > int64_t wpos =3D st->wpos; > int64_t rpos =3D st->rpos; > > - int64_t to_transfer =3D audio_MIN(B_SIZE - (wpos - rpos), avail); > + int64_t to_transfer =3D MIN(B_SIZE - (wpos - rpos), avail); > > hda_timer_sync_adjust(st, -((wpos - rpos) + to_transfer - (B_SIZE >>= 1))); > > while (to_transfer) { > uint32_t start =3D (uint32_t) (wpos & B_MASK); > - uint32_t chunk =3D (uint32_t) audio_MIN(B_SIZE - start, to_trans= fer); > + uint32_t chunk =3D (uint32_t) MIN(B_SIZE - start, to_transfer); > uint32_t read =3D AUD_read(st->voice.in, st->buf + start, chunk)= ; > wpos +=3D read; > to_transfer -=3D read; > @@ -298,10 +298,10 @@ static void hda_audio_output_timer(void *opaque) > goto out_timer; > } > > - int64_t to_transfer =3D audio_MIN(B_SIZE - (wpos - rpos), wanted_wpo= s - wpos); > + int64_t to_transfer =3D MIN(B_SIZE - (wpos - rpos), wanted_wpos - wp= os); > while (to_transfer) { > uint32_t start =3D (wpos & B_MASK); > - uint32_t chunk =3D audio_MIN(B_SIZE - start, to_transfer); > + uint32_t chunk =3D MIN(B_SIZE - start, to_transfer); > int rc =3D hda_codec_xfer( > &st->state->hda, st->stream, true, st->buf + start, chun= k); > if (!rc) { > @@ -326,7 +326,7 @@ static void hda_audio_output_cb(void *opaque, int ava= il) > int64_t wpos =3D st->wpos; > int64_t rpos =3D st->rpos; > > - int64_t to_transfer =3D audio_MIN(wpos - rpos, avail); > + int64_t to_transfer =3D MIN(wpos - rpos, avail); > > if (wpos - rpos =3D=3D B_SIZE) { > /* drop buffer, reset timer adjust */ > @@ -341,7 +341,7 @@ static void hda_audio_output_cb(void *opaque, int ava= il) > > while (to_transfer) { > uint32_t start =3D (uint32_t) (rpos & B_MASK); > - uint32_t chunk =3D (uint32_t) audio_MIN(B_SIZE - start, to_trans= fer); > + uint32_t chunk =3D (uint32_t) MIN(B_SIZE - start, to_transfer); > uint32_t written =3D AUD_write(st->voice.out, st->buf + start, c= hunk); > rpos +=3D written; > to_transfer -=3D written; > diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c > index 4835229326..929b856587 100644 > --- a/hw/audio/milkymist-ac97.c > +++ b/hw/audio/milkymist-ac97.c > @@ -184,7 +184,7 @@ static void ac97_in_cb(void *opaque, int avail_b) > MilkymistAC97State *s =3D opaque; > uint8_t buf[4096]; > uint32_t remaining =3D s->regs[R_U_REMAINING]; > - int temp =3D audio_MIN(remaining, avail_b); > + int temp =3D MIN(remaining, avail_b); > uint32_t addr =3D s->regs[R_U_ADDR]; > int transferred =3D 0; > > @@ -198,7 +198,7 @@ static void ac97_in_cb(void *opaque, int avail_b) > while (temp) { > int acquired, to_copy; > > - to_copy =3D audio_MIN(temp, sizeof(buf)); > + to_copy =3D MIN(temp, sizeof(buf)); > acquired =3D AUD_read(s->voice_in, buf, to_copy); > if (!acquired) { > break; > @@ -227,7 +227,7 @@ static void ac97_out_cb(void *opaque, int free_b) > MilkymistAC97State *s =3D opaque; > uint8_t buf[4096]; > uint32_t remaining =3D s->regs[R_D_REMAINING]; > - int temp =3D audio_MIN(remaining, free_b); > + int temp =3D MIN(remaining, free_b); > uint32_t addr =3D s->regs[R_D_ADDR]; > int transferred =3D 0; > > @@ -241,7 +241,7 @@ static void ac97_out_cb(void *opaque, int free_b) > while (temp) { > int copied, to_copy; > > - to_copy =3D audio_MIN(temp, sizeof(buf)); > + to_copy =3D MIN(temp, sizeof(buf)); > cpu_physical_memory_read(addr, buf, to_copy); > copied =3D AUD_write(s->voice_out, buf, to_copy); > if (!copied) { > diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c > index 01127304c2..6bb1455c1b 100644 > --- a/hw/audio/pcspk.c > +++ b/hw/audio/pcspk.c > @@ -103,7 +103,7 @@ static void pcspk_callback(void *opaque, int free) > } > > while (free > 0) { > - n =3D audio_MIN(s->samples - s->play_pos, (unsigned int)free); > + n =3D MIN(s->samples - s->play_pos, (unsigned int)free); > n =3D AUD_write(s->voice, &s->sample_buf[s->play_pos], n); > if (!n) > break; > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > index 6b604979cf..5182eba8eb 100644 > --- a/hw/audio/sb16.c > +++ b/hw/audio/sb16.c > @@ -1168,7 +1168,7 @@ static int write_audio (SB16State *s, int nchan, in= t dma_pos, > int copied; > size_t to_copy; > > - to_copy =3D audio_MIN (temp, left); > + to_copy =3D MIN (temp, left); > if (to_copy > sizeof (tmpbuf)) { > to_copy =3D sizeof (tmpbuf); > } > diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c > index dfb4156ff4..ab04bfa2c3 100644 > --- a/hw/audio/wm8750.c > +++ b/hw/audio/wm8750.c > @@ -69,7 +69,7 @@ static inline void wm8750_in_load(WM8750State *s) > { > if (s->idx_in + s->req_in <=3D sizeof(s->data_in)) > return; > - s->idx_in =3D audio_MAX(0, (int) sizeof(s->data_in) - s->req_in); > + s->idx_in =3D MAX(0, (int) sizeof(s->data_in) - s->req_in); > AUD_read(*s->in[0], s->data_in + s->idx_in, > sizeof(s->data_in) - s->idx_in); > } > @@ -100,7 +100,7 @@ static void wm8750_audio_out_cb(void *opaque, int fre= e_b) > wm8750_out_flush(s); > } else > s->req_out =3D free_b - s->idx_out; > - > + > s->data_req(s->opaque, s->req_out >> 2, s->req_in >> 2); > } > > -- > 2.22.0 > > -- Marc-Andr=C3=A9 Lureau