diff options
author | Paolo Bonzini | 2013-02-05 17:06:20 +0100 |
---|---|---|
committer | Paolo Bonzini | 2013-04-08 18:13:10 +0200 |
commit | 0d09e41a51aa0752b1ce525ce084f7cd210e461b (patch) | |
tree | dc92b5b32c1e3182afa9bfd16a46a0a089320102 /include/hw/audio | |
parent | build: enable using $(CONFIG_FOO) on the rhs of config files (diff) | |
download | qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.gz qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.xz qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.zip |
hw: move headers to include/
Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/hw/audio')
-rw-r--r-- | include/hw/audio/audio.h | 25 | ||||
-rw-r--r-- | include/hw/audio/pcspk.h | 45 |
2 files changed, 70 insertions, 0 deletions
diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h new file mode 100644 index 0000000000..428274f929 --- /dev/null +++ b/include/hw/audio/audio.h @@ -0,0 +1,25 @@ +#ifndef HW_AUDIODEV_H +#define HW_AUDIODEV_H 1 + +/* es1370.c */ +int es1370_init(PCIBus *bus); + +/* sb16.c */ +int SB16_init(ISABus *bus); + +/* adlib.c */ +int Adlib_init(ISABus *bus); + +/* gus.c */ +int GUS_init(ISABus *bus); + +/* ac97.c */ +int ac97_init(PCIBus *bus); + +/* cs4231a.c */ +int cs4231a_init(ISABus *bus); + +/* intel-hda.c + hda-audio.c */ +int intel_hda_and_codec_init(PCIBus *bus); + +#endif diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h new file mode 100644 index 0000000000..ce8ef4f9ea --- /dev/null +++ b/include/hw/audio/pcspk.h @@ -0,0 +1,45 @@ +/* + * QEMU PC speaker emulation + * + * Copyright (c) 2006 Joachim Henke + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef HW_PCSPK_H +#define HW_PCSPK_H + +#include "hw/hw.h" +#include "hw/isa/isa.h" + +static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) +{ + ISADevice *dev; + + dev = isa_create(bus, "isa-pcspk"); + qdev_prop_set_uint32(&dev->qdev, "iobase", 0x61); + qdev_prop_set_ptr(&dev->qdev, "pit", pit); + qdev_init_nofail(&dev->qdev); + + return dev; +} + +int pcspk_audio_init(ISABus *bus); + +#endif /* !HW_PCSPK_H */ |