On 22/10/25 08:56, [email protected] wrote:
From: Marc-André Lureau <[email protected]>
All the functions are about "-audio model=" handling, a simpler
way to setup audio. Rename functions/variables to reflect this better.
audio_register_model_with_cb() dropped "pci" from the name, since it
will be generalized next.
Signed-off-by: Marc-André Lureau <[email protected]>
---
include/hw/audio/model.h | 13 +++++
include/hw/audio/soundhw.h | 13 -----
hw/audio/ac97.c | 5 +-
hw/audio/adlib.c | 4 +-
hw/audio/cs4231a.c | 4 +-
hw/audio/es1370.c | 5 +-
hw/audio/gus.c | 4 +-
hw/audio/intel-hda.c | 4 +-
hw/audio/{soundhw.c => model.c} | 58 +++++++++----------
hw/audio/pcspk.c | 2 +-
hw/audio/sb16.c | 5 +-
hw/audio/virtio-snd-pci.c | 4 +-
system/vl.c | 6 +-
hw/audio/meson.build | 2 +-
.../codeconverter/test_regexps.py | 2 +-
15 files changed, 64 insertions(+), 67 deletions(-)
create mode 100644 include/hw/audio/model.h
delete mode 100644 include/hw/audio/soundhw.h
rename hw/audio/{soundhw.c => model.c} (68%)
diff --git a/include/hw/audio/model.h b/include/hw/audio/model.h
new file mode 100644
index 0000000000..27ae7dcc31
--- /dev/null
+++ b/include/hw/audio/model.h
@@ -0,0 +1,13 @@
+#ifndef HW_AUDIO_MODEL_H
+#define HW_AUDIO_MODEL_H
Pre-existing, but add missing license tag?
+
+void audio_register_model_with_cb(const char *name, const char *descr,
+ int (*init_pci)(PCIBus *bus, const char
*audiodev));
+void audio_register_model(const char *name, const char *descr,
+ int isa, const char *typename);
+
+void audio_model_init(void);
+void audio_print_available_models(void);
+void audio_set_model(const char *name, const char *audiodev);
+
+#endif
diff --git a/include/hw/audio/soundhw.h b/include/hw/audio/soundhw.h
deleted file mode 100644
index 83b3011083..0000000000
--- a/include/hw/audio/soundhw.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef HW_SOUNDHW_H
-#define HW_SOUNDHW_H
-
-void pci_register_soundhw(const char *name, const char *descr,
- int (*init_pci)(PCIBus *bus, const char *audiodev));
-void deprecated_register_soundhw(const char *name, const char *descr,
- int isa, const char *typename);
Please mention in patch description why this interface is not
anymore deprecated.
Otherwise,
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
-
-void soundhw_init(void);
-void audio_print_available_models(void);
-void select_soundhw(const char *name, const char *audiodev);
-
-#endif
