80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Change struct initializers on new devices

Browse Source
This commit is contained in:
RichardG867
2022-03-16 00:46:25 -03:00
parent 71ba610366
commit 66e565000f
2 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/sound/snd_cmi8x38.c
View File

@@ -1431,61 +1431,71 @@ static const device_config_t cmi8738_config[] = {
}; };
const device_t cmi8338_device = { const device_t cmi8338_device = {
"C-Media CMI8338", .name = "C-Media CMI8338",
"cmi8338", .internal_name = "cmi8338",
DEVICE_PCI, .flags = DEVICE_PCI,
CMEDIA_CMI8338, .local = CMEDIA_CMI8338,
cmi8x38_init, cmi8x38_close, cmi8x38_reset, .init = cmi8x38_init,
{ NULL }, .close = cmi8x38_close,
cmi8x38_speed_changed, .reset = cmi8x38_reset,
NULL, { .available = NULL },
cmi8x38_config .speed_changed = cmi8x38_speed_changed,
.force_redraw = NULL,
.config = cmi8x38_config
}; };
const device_t cmi8338_onboard_device = { const device_t cmi8338_onboard_device = {
"C-Media CMI8338 (On-Board)", .name = "C-Media CMI8338 (On-Board)",
"cmi8338_onboard", .internal_name = "cmi8338_onboard",
DEVICE_PCI, .flags = DEVICE_PCI,
CMEDIA_CMI8338 | (1 << 13), .local = CMEDIA_CMI8338 | (1 << 13),
cmi8x38_init, cmi8x38_close, cmi8x38_reset, .init = cmi8x38_init,
{ NULL }, .close = cmi8x38_close,
cmi8x38_speed_changed, .reset = cmi8x38_reset,
NULL, { .available = NULL },
cmi8x38_config .speed_changed = cmi8x38_speed_changed,
.force_redraw = NULL,
.config = cmi8x38_config
}; };
const device_t cmi8738_device = { const device_t cmi8738_device = {
"C-Media CMI8738", .name = "C-Media CMI8738",
"cmi8738", .internal_name = "cmi8738",
DEVICE_PCI, .flags = DEVICE_PCI,
CMEDIA_CMI8738_6CH, .local = CMEDIA_CMI8738_6CH,
cmi8x38_init, cmi8x38_close, cmi8x38_reset, .init = cmi8x38_init,
{ NULL }, .close = cmi8x38_close,
cmi8x38_speed_changed, .reset = cmi8x38_reset,
NULL, { .available = NULL },
cmi8738_config .speed_changed = cmi8x38_speed_changed,
.force_redraw = NULL,
.config = cmi8738_config
}; };
const device_t cmi8738_onboard_device = { const device_t cmi8738_onboard_device = {
"C-Media CMI8738 (On-Board)", .name = "C-Media CMI8738 (On-Board)",
"cmi8738_onboard", .internal_name = "cmi8738_onboard",
DEVICE_PCI, .flags = DEVICE_PCI,
CMEDIA_CMI8738_4CH | (1 << 13), .local = CMEDIA_CMI8738_4CH | (1 << 13),
cmi8x38_init, cmi8x38_close, cmi8x38_reset, .init = cmi8x38_init,
{ NULL }, .close = cmi8x38_close,
cmi8x38_speed_changed, .reset = cmi8x38_reset,
NULL, { .available = NULL },
cmi8x38_config .speed_changed = cmi8x38_speed_changed,
.force_redraw = NULL,
.config = cmi8x38_config
}; };
const device_t cmi8738_6ch_onboard_device = { const device_t cmi8738_6ch_onboard_device = {
"C-Media CMI8738-6CH (On-Board)", .name = "C-Media CMI8738-6CH (On-Board)",
"cmi8738_6ch_onboard", .internal_name = "cmi8738_6ch_onboard",
DEVICE_PCI, .flags = DEVICE_PCI,
CMEDIA_CMI8738_6CH | (1 << 13), .local = CMEDIA_CMI8738_6CH | (1 << 13),
cmi8x38_init, cmi8x38_close, cmi8x38_reset, .init = cmi8x38_init,
{ NULL }, .close = cmi8x38_close,
cmi8x38_speed_changed, .reset = cmi8x38_reset,
NULL, { .available = NULL },
cmi8x38_config .speed_changed = cmi8x38_speed_changed,
.force_redraw = NULL,
.config = cmi8x38_config
}; };

38
src/sound/snd_sb.c
View File

@@ -2566,26 +2566,32 @@ const device_t sb_16_pnp_device = {
const device_t sb_16_compat_device = const device_t sb_16_compat_device =
{ {
"Sound Blaster 16 (Compatibility)", .name = "Sound Blaster 16 (Compatibility)",
"sb16_compat", .internal_name = "sb16_compat",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
1, .local = 1,
sb_16_compat_init, sb_close, NULL, { NULL }, .init = sb_16_compat_init,
sb_speed_changed, .close = sb_close,
NULL, .reset = NULL,
NULL { .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = NULL
}; };
const device_t sb_16_compat_nompu_device = const device_t sb_16_compat_nompu_device =
{ {
"Sound Blaster 16 (Compatibility - MPU-401 Off)", .name = "Sound Blaster 16 (Compatibility - MPU-401 Off)",
"sb16_compat", .internal_name = "sb16_compat",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
0, .local = 0,
sb_16_compat_init, sb_close, NULL, { NULL }, .init = sb_16_compat_init,
sb_speed_changed, .close = sb_close,
NULL, .reset = NULL,
NULL { .available = NULL },
.speed_changed =sb_speed_changed,
.force_redraw = NULL,
.config = NULL
}; };
const device_t sb_32_pnp_device = { const device_t sb_32_pnp_device = {