diff options
| author | Peter Maydell | 2018-02-02 16:33:57 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-02 16:33:57 +0100 |
| commit | fabbd691fd7db2e71c6702089c9656e7047eac24 (patch) | |
| tree | 57b8c2b9a2e318cebc9c745bf4cb8b65bb490b13 /include/hw/i2c/i2c.h | |
| parent | Merge remote-tracking branch 'remotes/cminyard/tags/for-release-20180201' int... (diff) | |
| parent | hw/audio/sb16.c: change dolog() to qemu_log_mask() (diff) | |
| download | qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.tar.gz qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.tar.xz qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180202-pull-request' into staging
audio: two small fixes.
# gpg: Signature made Fri 02 Feb 2018 07:49:20 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/audio-20180202-pull-request:
hw/audio/sb16.c: change dolog() to qemu_log_mask()
hw/audio/wm8750: move WM8750 declarations from i2c/i2c.h to audio/wm8750.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/i2c/i2c.h')
| -rw-r--r-- | include/hw/i2c/i2c.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 2ce611d4c8..24e95d0155 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -70,15 +70,6 @@ int i2c_recv(I2CBus *bus); DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); -/* wm8750.c */ -void wm8750_data_req_set(DeviceState *dev, - void (*data_req)(void *, int, int), void *opaque); -void wm8750_dac_dat(void *opaque, uint32_t sample); -uint32_t wm8750_adc_dat(void *opaque); -void *wm8750_dac_buffer(void *opaque, int samples); -void wm8750_dac_commit(void *opaque); -void wm8750_set_bclk_in(void *opaque, int new_hz); - /* lm832x.c */ void lm832x_key_event(DeviceState *dev, int key, int state); |