From 66e565000f81df09f73e7aea248695346ca6af3f Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Wed, 16 Mar 2022 00:46:25 -0300
Subject: [PATCH] Change struct initializers on new devices

---
 src/sound/snd_cmi8x38.c | 100 ++++++++++++++++++++++------------------
 src/sound/snd_sb.c      |  38 ++++++++-------
 2 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/src/sound/snd_cmi8x38.c b/src/sound/snd_cmi8x38.c
index 3e1bb6997..bcfb7ba21 100644
--- a/src/sound/snd_cmi8x38.c
+++ b/src/sound/snd_cmi8x38.c
@@ -1431,61 +1431,71 @@ static const device_config_t cmi8738_config[] = {
 };
 
 const device_t cmi8338_device = {
-    "C-Media CMI8338",
-    "cmi8338",
-    DEVICE_PCI,
-    CMEDIA_CMI8338,
-    cmi8x38_init, cmi8x38_close, cmi8x38_reset,
-    { NULL },
-    cmi8x38_speed_changed,
-    NULL,
-    cmi8x38_config
+    .name = "C-Media CMI8338",
+    .internal_name = "cmi8338",
+    .flags = DEVICE_PCI,
+    .local = CMEDIA_CMI8338,
+    .init = cmi8x38_init,
+    .close = cmi8x38_close,
+    .reset = cmi8x38_reset,
+    { .available = NULL },
+    .speed_changed = cmi8x38_speed_changed,
+    .force_redraw = NULL,
+    .config = cmi8x38_config
 };
 
 const device_t cmi8338_onboard_device = {
-    "C-Media CMI8338 (On-Board)",
-    "cmi8338_onboard",
-    DEVICE_PCI,
-    CMEDIA_CMI8338 | (1 << 13),
-    cmi8x38_init, cmi8x38_close, cmi8x38_reset,
-    { NULL },
-    cmi8x38_speed_changed,
-    NULL,
-    cmi8x38_config
+    .name = "C-Media CMI8338 (On-Board)",
+    .internal_name = "cmi8338_onboard",
+    .flags = DEVICE_PCI,
+    .local = CMEDIA_CMI8338 | (1 << 13),
+    .init = cmi8x38_init,
+    .close = cmi8x38_close,
+    .reset = cmi8x38_reset,
+    { .available = NULL },
+    .speed_changed = cmi8x38_speed_changed,
+    .force_redraw = NULL,
+    .config = cmi8x38_config
 };
 
 const device_t cmi8738_device = {
-    "C-Media CMI8738",
-    "cmi8738",
-    DEVICE_PCI,
-    CMEDIA_CMI8738_6CH,
-    cmi8x38_init, cmi8x38_close, cmi8x38_reset,
-    { NULL },
-    cmi8x38_speed_changed,
-    NULL,
-    cmi8738_config
+    .name = "C-Media CMI8738",
+    .internal_name = "cmi8738",
+    .flags = DEVICE_PCI,
+    .local = CMEDIA_CMI8738_6CH,
+    .init = cmi8x38_init,
+    .close = cmi8x38_close,
+    .reset = cmi8x38_reset,
+    { .available = NULL },
+    .speed_changed = cmi8x38_speed_changed,
+    .force_redraw = NULL,
+    .config = cmi8738_config
 };
 
 const device_t cmi8738_onboard_device = {
-    "C-Media CMI8738 (On-Board)",
-    "cmi8738_onboard",
-    DEVICE_PCI,
-    CMEDIA_CMI8738_4CH | (1 << 13),
-    cmi8x38_init, cmi8x38_close, cmi8x38_reset,
-    { NULL },
-    cmi8x38_speed_changed,
-    NULL,
-    cmi8x38_config
+    .name = "C-Media CMI8738 (On-Board)",
+    .internal_name = "cmi8738_onboard",
+    .flags = DEVICE_PCI,
+    .local = CMEDIA_CMI8738_4CH | (1 << 13),
+    .init = cmi8x38_init,
+    .close = cmi8x38_close,
+    .reset = cmi8x38_reset,
+    { .available = NULL },
+    .speed_changed = cmi8x38_speed_changed,
+    .force_redraw = NULL,
+    .config = cmi8x38_config
 };
 
 const device_t cmi8738_6ch_onboard_device = {
-    "C-Media CMI8738-6CH (On-Board)",
-    "cmi8738_6ch_onboard",
-    DEVICE_PCI,
-    CMEDIA_CMI8738_6CH | (1 << 13),
-    cmi8x38_init, cmi8x38_close, cmi8x38_reset,
-    { NULL },
-    cmi8x38_speed_changed,
-    NULL,
-    cmi8x38_config
+    .name = "C-Media CMI8738-6CH (On-Board)",
+    .internal_name = "cmi8738_6ch_onboard",
+    .flags = DEVICE_PCI,
+    .local = CMEDIA_CMI8738_6CH | (1 << 13),
+    .init = cmi8x38_init,
+    .close = cmi8x38_close,
+    .reset = cmi8x38_reset,
+    { .available = NULL },
+    .speed_changed = cmi8x38_speed_changed,
+    .force_redraw = NULL,
+    .config = cmi8x38_config
 };
diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c
index 2029bdd89..5f5aa5899 100644
--- a/src/sound/snd_sb.c
+++ b/src/sound/snd_sb.c
@@ -2566,26 +2566,32 @@ const device_t sb_16_pnp_device = {
 
 const device_t sb_16_compat_device =
 {
-    "Sound Blaster 16 (Compatibility)",
-    "sb16_compat",
-    DEVICE_ISA | DEVICE_AT,
-    1,
-    sb_16_compat_init, sb_close, NULL, { NULL },
-    sb_speed_changed,
-    NULL,
-    NULL
+    .name = "Sound Blaster 16 (Compatibility)",
+    .internal_name = "sb16_compat",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 1,
+    .init = sb_16_compat_init,
+    .close = sb_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = sb_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t sb_16_compat_nompu_device =
 {
-    "Sound Blaster 16 (Compatibility - MPU-401 Off)",
-    "sb16_compat",
-    DEVICE_ISA | DEVICE_AT,
-    0,
-    sb_16_compat_init, sb_close, NULL, { NULL },
-    sb_speed_changed,
-    NULL,
-    NULL
+    .name = "Sound Blaster 16 (Compatibility - MPU-401 Off)",
+    .internal_name = "sb16_compat",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 0,
+    .init = sb_16_compat_init,
+    .close = sb_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed =sb_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t sb_32_pnp_device = {