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

Merge remote-tracking branch 'origin/master' into version/4.1

Browse Source
This commit is contained in:
OBattler
2023-10-12 02:07:58 +02:00
parent e441b3a4fc 49e7ee8adc
commit 4d87a5f86a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/m_at_socket7_3v.c
View File

@@ -373,7 +373,7 @@ machine_at_ms5119_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/ms5119/A37E.ROM", ret = bios_load_linear("roms/machines/ms5119/A37EB.ROM",
0x000e0000, 131072, 0); 0x000e0000, 131072, 0);
if (bios_only || !ret) if (bios_only || !ret)

10
src/sound/snd_sb.c
View File

@@ -3861,7 +3861,7 @@ const device_t sb_16_device = {
}; };
const device_t sb_vibra16s_onboard_device = { const device_t sb_vibra16s_onboard_device = {
.name = "Sound Blaster Vibra 16S (On-Board)", .name = "Sound Blaster ViBRA 16S (On-Board)",
.internal_name = "sb_vibra16s_onboard", .internal_name = "sb_vibra16s_onboard",
.flags = DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
.local = FM_YMF289B, .local = FM_YMF289B,
@@ -3875,7 +3875,7 @@ const device_t sb_vibra16s_onboard_device = {
}; };
const device_t sb_vibra16s_device = { const device_t sb_vibra16s_device = {
.name = "Sound Blaster Vibra 16S", .name = "Sound Blaster ViBRA 16S",
.internal_name = "sb_vibra16s", .internal_name = "sb_vibra16s",
.flags = DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
.local = FM_YMF289B, .local = FM_YMF289B,
@@ -3889,7 +3889,7 @@ const device_t sb_vibra16s_device = {
}; };
const device_t sb_vibra16xv_device = { const device_t sb_vibra16xv_device = {
.name = "Sound Blaster Vibra 16XV", .name = "Sound Blaster ViBRA 16XV",
.internal_name = "sb_vibra16xv", .internal_name = "sb_vibra16xv",
.flags = DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
.local = 0, .local = 0,
@@ -3903,7 +3903,7 @@ const device_t sb_vibra16xv_device = {
}; };
const device_t sb_vibra16c_onboard_device = { const device_t sb_vibra16c_onboard_device = {
.name = "Sound Blaster Vibra 16C (On-Board)", .name = "Sound Blaster ViBRA 16C (On-Board)",
.internal_name = "sb_vibra16c_onboard", .internal_name = "sb_vibra16c_onboard",
.flags = DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
.local = 1, .local = 1,
@@ -3917,7 +3917,7 @@ const device_t sb_vibra16c_onboard_device = {
}; };
const device_t sb_vibra16c_device = { const device_t sb_vibra16c_device = {
.name = "Sound Blaster Vibra 16C", .name = "Sound Blaster ViBRA 16C",
.internal_name = "sb_vibra16c", .internal_name = "sb_vibra16c",
.flags = DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
.local = 1, .local = 1,