diff options
| author | Peter Maydell | 2018-11-27 12:21:38 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-27 12:21:38 +0100 |
| commit | 4822f1ee9efa8df56e29db0a68323b484bdb0335 (patch) | |
| tree | e6b6aefcccf8d46f4c758d1b699abaef21bd0cff /hw/audio/fmopl.h | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request'... (diff) | |
| parent | qapi: add query-display-options command (diff) | |
| download | qemu-4822f1ee9efa8df56e29db0a68323b484bdb0335.tar.gz qemu-4822f1ee9efa8df56e29db0a68323b484bdb0335.tar.xz qemu-4822f1ee9efa8df56e29db0a68323b484bdb0335.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181127-pull-request' into staging
various bugfixes for 3.1: fmops, ps2, cirrus, hda, usb-host, qapi
# gpg: Signature made Tue 27 Nov 2018 06:49:13 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-31-20181127-pull-request:
qapi: add query-display-options command
usb-host: set ifs.detached as true if kernel driver is not active
audio/hda: fix guest triggerable assert
cirrus_vga/migration: update the bank offset before use
ps2kbd: default to scan enabled after reset
fmops: fix off-by-one in AR_TABLE and DR_TABLE array size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/audio/fmopl.h')
| -rw-r--r-- | hw/audio/fmopl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index e7e578a48e..e008e72d7a 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -72,8 +72,8 @@ typedef struct fm_opl_f { /* Rhythm sention */ uint8_t rhythm; /* Rhythm mode , key flag */ /* time tables */ - int32_t AR_TABLE[75]; /* atttack rate tables */ - int32_t DR_TABLE[75]; /* decay rate tables */ + int32_t AR_TABLE[76]; /* attack rate tables */ + int32_t DR_TABLE[76]; /* decay rate tables */ uint32_t FN_TABLE[1024]; /* fnumber -> increment counter */ /* LFO */ int32_t *ams_table; |