diff options
author | Kővágó, Zoltán <dirty.ice.hu@gmail.com> | 2019-08-19 01:06:54 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-08-21 09:13:37 +0200 |
commit | 589359150365616de479866f8bc594c876480bd8 (patch) | |
tree | 3b0413edced2698cd97e18b6cc106df811c0cc2c /hw/audio/gus.c | |
parent | 8692bf7d978aee2329d9449e31043451a8fdb357 (diff) | |
download | qemu-589359150365616de479866f8bc594c876480bd8.zip qemu-589359150365616de479866f8bc594c876480bd8.tar.gz qemu-589359150365616de479866f8bc594c876480bd8.tar.bz2 |
audio: remove audio_MIN, audio_MAX
There's already a MIN and MAX macro in include/qemu/osdep.h, use them
instead.
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 303222477df6f7373217e0df768635fab5855745.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/audio/gus.c')
-rw-r--r-- | hw/audio/gus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/audio/gus.c b/hw/audio/gus.c index effec31..2b6b7c4 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -119,7 +119,7 @@ static void GUS_callback (void *opaque, int free) GUSState *s = opaque; samples = free >> s->shift; - to_play = audio_MIN (samples, s->left); + to_play = MIN (samples, s->left); while (to_play) { int written = write_audio (s, to_play); @@ -134,7 +134,7 @@ static void GUS_callback (void *opaque, int free) net += written; } - samples = audio_MIN (samples, s->samples); + samples = MIN (samples, s->samples); if (samples) { gus_mixvoices (&s->emu, s->freq, samples, s->mixbuf); @@ -194,7 +194,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 = k->has_autoinitialization(s->isa_dma, s->emu.gusdma); while (left) { - int to_copy = audio_MIN ((size_t) left, sizeof (tmpbuf)); + int to_copy = MIN ((size_t) left, sizeof (tmpbuf)); int copied; ldebug ("left=%d to_copy=%d pos=%d\n", left, to_copy, pos); |