diff options
| author | Peter Maydell | 2015-10-19 11:06:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-19 11:06:56 +0200 |
| commit | aedc8806172dd1ae904f04169ee3b19fce1d7893 (patch) | |
| tree | 22136b7e0c7ce70ce507ecbbe3707130fed83baa /hw/audio/gus.c | |
| parent | hw/ide/ahci.c: Fix shift left into sign bit (diff) | |
| parent | Remove macros IO_READ_PROTO and IO_WRITE_PROTO (diff) | |
| download | qemu-aedc8806172dd1ae904f04169ee3b19fce1d7893.tar.gz qemu-aedc8806172dd1ae904f04169ee3b19fce1d7893.tar.xz 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/gus.c')
| -rw-r--r-- | hw/audio/gus.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 86223a9544..e0c8a4ee1e 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -41,11 +41,6 @@ #define GUS_ENDIANNESS 0 #endif -#define IO_READ_PROTO(name) \ - static uint32_t name (void *opaque, uint32_t nport) -#define IO_WRITE_PROTO(name) \ - static void name (void *opaque, uint32_t nport, uint32_t val) - #define TYPE_GUS "gus" #define GUS(obj) OBJECT_CHECK (GUSState, (obj), TYPE_GUS) @@ -64,14 +59,14 @@ typedef struct GUSState { qemu_irq pic; } GUSState; -IO_READ_PROTO (gus_readb) +static uint32_t gus_readb(void *opaque, uint32_t nport) { GUSState *s = opaque; return gus_read (&s->emu, nport, 1); } -IO_WRITE_PROTO (gus_writeb) +static void gus_writeb(void *opaque, uint32_t nport, uint32_t val) { GUSState *s = opaque; |