diff options
| author | Allan Peramaki <aperamak@pp1.inet.fi> | 2020-06-18 12:36:23 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-06-19 11:20:09 +0200 |
| commit | 586803455b3fa44d949ecd42cd9c87e5a6287aef (patch) | |
| tree | dfb1691c4d645235e3ef69181d4b41328621e5f9 /hw/audio | |
| parent | bc81e6e56eeea88bb1e3b6105c80850ffb58841c (diff) | |
| download | qemu-586803455b3fa44d949ecd42cd9c87e5a6287aef.zip qemu-586803455b3fa44d949ecd42cd9c87e5a6287aef.tar.gz qemu-586803455b3fa44d949ecd42cd9c87e5a6287aef.tar.bz2 | |
hw/audio/gus: Fix registers 32-bit access
Fix audio on software that accesses DRAM above 64k via register
peek/poke and some cases when more than 16 voices are used.
Cc: qemu-stable@nongnu.org
Fixes: 135f5ae1974c ("audio: GUSsample is int16_t")
Signed-off-by: Allan Peramaki <aperamak@pp1.inet.fi>
Tested-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200618103623.6031-1-philmd@redhat.com
Message-Id: <20200615201757.16868-1-aperamak@pp1.inet.fi>
[PMD: Removed unrelated style changes]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/audio')
| -rw-r--r-- | hw/audio/gusemu_hal.c | 2 | ||||
| -rw-r--r-- | hw/audio/gusemu_mixer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c index ae40ca3..5b9a14e 100644 --- a/hw/audio/gusemu_hal.c +++ b/hw/audio/gusemu_hal.c @@ -32,7 +32,7 @@ #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) /* size given in bytes */ unsigned int gus_read(GUSEmuState * state, int port, int size) diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c index 00b9861..56300de 100644 --- a/hw/audio/gusemu_mixer.c +++ b/hw/audio/gusemu_mixer.c @@ -28,7 +28,7 @@ #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position))) -#define GUSregd(position) (*(uint16_t *)(gusptr+(position))) +#define GUSregd(position) (*(uint32_t *)(gusptr + (position))) #define GUSvoice(position) (*(uint16_t *)(voiceptr+(position))) |