diff options
| author | Paolo Bonzini | 2013-04-18 18:43:58 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-04-29 19:16:36 +0200 |
| commit | 36cd6f6f20724d49aac1910e310f81a43e0cb657 (patch) | |
| tree | 2e6e7d689d79dfb2da14684e1415cd3003cb89ec /include/hw/audio | |
| parent | adlib: qdev-ify (diff) | |
| download | qemu-36cd6f6f20724d49aac1910e310f81a43e0cb657.tar.gz qemu-36cd6f6f20724d49aac1910e310f81a43e0cb657.tar.xz qemu-36cd6f6f20724d49aac1910e310f81a43e0cb657.zip | |
audio: remove the need for audio card CONFIG_* symbols
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1366303444-24620-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/hw/audio')
| -rw-r--r-- | include/hw/audio/audio.h | 23 | ||||
| -rw-r--r-- | include/hw/audio/pcspk.h | 2 |
2 files changed, 4 insertions, 21 deletions
diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h index 428274f929..b28abdd3f7 100644 --- a/include/hw/audio/audio.h +++ b/include/hw/audio/audio.h @@ -1,25 +1,10 @@ #ifndef HW_AUDIODEV_H #define HW_AUDIODEV_H 1 -/* es1370.c */ -int es1370_init(PCIBus *bus); +void isa_register_soundhw(const char *name, const char *descr, + int (*init_isa)(ISABus *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); +void pci_register_soundhw(const char *name, const char *descr, + int (*init_pci)(PCIBus *bus)); #endif diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index b60c000bd9..7625137991 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -42,6 +42,4 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) return dev; } -int pcspk_audio_init(ISABus *bus); - #endif /* !HW_PCSPK_H */ |