diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-09-19 09:30:53 -0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-02 08:19:25 +0100 |
| commit | 7ab14c5ace7bce758dcf40c63f1eb4b44d915426 (patch) | |
| tree | d2b43685635b8a2aee29650a51ee8416db1f817d /hw/audio | |
| parent | b05631954d6dfe93340d516660397e2c1a2a5dd6 (diff) | |
| download | focaccia-qemu-7ab14c5ace7bce758dcf40c63f1eb4b44d915426.tar.gz focaccia-qemu-7ab14c5ace7bce758dcf40c63f1eb4b44d915426.zip | |
hw/audio/wm8750: move WM8750 declarations from i2c/i2c.h to audio/wm8750.h
while here use TYPE_WM8750 and declare a data_req_cb() typedef. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20170919123053.32675-1-f4bug@amsat.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/audio')
| -rw-r--r-- | hw/audio/marvell_88w8618.c | 1 | ||||
| -rw-r--r-- | hw/audio/wm8750.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 4f65f8c199..e546892d3c 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -13,6 +13,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/audio/wm8750.h" #include "audio/audio.h" #define MP_AUDIO_SIZE 0x00001000 diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index 6d8b728923..416a78e869 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -8,8 +8,8 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/audio/wm8750.h" #include "audio/audio.h" #define IN_PORT_N 3 @@ -24,7 +24,6 @@ typedef struct { int dac_hz; } WMRate; -#define TYPE_WM8750 "wm8750" #define WM8750(obj) OBJECT_CHECK(WM8750State, (obj), TYPE_WM8750) typedef struct WM8750State { @@ -639,8 +638,7 @@ static void wm8750_fini(I2CSlave *i2c) } #endif -void wm8750_data_req_set(DeviceState *dev, - void (*data_req)(void *, int, int), void *opaque) +void wm8750_data_req_set(DeviceState *dev, data_req_cb *data_req, void *opaque) { WM8750State *s = WM8750(dev); |