diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-19 10:06:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-19 10:06:56 +0100 |
| commit | aedc8806172dd1ae904f04169ee3b19fce1d7893 (patch) | |
| tree | 22136b7e0c7ce70ce507ecbbe3707130fed83baa /hw/audio/adlib.c | |
| parent | 40fe17bea478793fc9106a630fa3610dad51f939 (diff) | |
| parent | 8307c294a355bbf3c5352e00877365b0cda66d52 (diff) | |
| download | focaccia-qemu-aedc8806172dd1ae904f04169ee3b19fce1d7893.tar.gz focaccia-qemu-aedc8806172dd1ae904f04169ee3b19fce1d7893.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20151019-1' into staging
Remove macros IO_READ_PROTO and IO_WRITE_PROTO # gpg: Signature made Mon 19 Oct 2015 09:19:21 BST using RSA key ID D3E87138 # 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>" * remotes/kraxel/tags/pull-audio-20151019-1: Remove macros IO_READ_PROTO and IO_WRITE_PROTO Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/audio/adlib.c')
| -rw-r--r-- | hw/audio/adlib.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 656eb3773a..334935f8d9 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -57,11 +57,6 @@ void YMF262UpdateOneQEMU (int which, INT16 *dst, int length); #define SHIFT 1 #endif -#define IO_READ_PROTO(name) \ - uint32_t name (void *opaque, uint32_t nport) -#define IO_WRITE_PROTO(name) \ - void name (void *opaque, uint32_t nport, uint32_t val) - #define TYPE_ADLIB "adlib" #define ADLIB(obj) OBJECT_CHECK(AdlibState, (obj), TYPE_ADLIB) @@ -124,7 +119,7 @@ static void adlib_kill_timers (AdlibState *s) } } -static IO_WRITE_PROTO (adlib_write) +static void adlib_write(void *opaque, uint32_t nport, uint32_t val) { AdlibState *s = opaque; int a = nport & 3; @@ -141,7 +136,7 @@ static IO_WRITE_PROTO (adlib_write) #endif } -static IO_READ_PROTO (adlib_read) +static uint32_t adlib_read(void *opaque, uint32_t nport) { AdlibState *s = opaque; uint8_t data; |