claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2025-07-16 01:37:18 +02:00
parent 14d1dd99ae e8c8e7f703
commit f19ca464c9
11 changed files with 508 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/floppy/fdc_compaticard.c
View File

@@ -214,7 +214,7 @@ static const device_config_t compaticard_ii_config[] = {
}, },
{ {
.name = "dma", .name = "dma",
.description = "DMA channel", .description = "DMA",
.type = CONFIG_SELECTION, .type = CONFIG_SELECTION,
.default_string = NULL, .default_string = NULL,
.default_int = 2, .default_int = 2,
@@ -272,7 +272,7 @@ static const device_config_t compaticard_iv_config[] = {
}, },
{ {
.name = "dma", .name = "dma",
.description = "DMA channel", .description = "DMA",
.type = CONFIG_SELECTION, .type = CONFIG_SELECTION,
.default_string = NULL, .default_string = NULL,
.default_int = 2, .default_int = 2,

8
src/machine/m_at_286_386sx.c
View File

@@ -180,9 +180,9 @@ static const device_config_t pbl300sx_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "1991", .internal_name = "pbl300sx_1991", .bios_type = BIOS_NORMAL, { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision 19910723091302", .internal_name = "pbl300sx_1991", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/V1.10_1113_910723.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/V1.10_1113_910723.bin", "" } },
{ .name = "1992", .internal_name = "pbl300sx", .bios_type = BIOS_NORMAL, { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision 19920910", .internal_name = "pbl300sx", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/pb_l300sx_1992.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/pb_l300sx_1992.bin", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },
@@ -859,9 +859,9 @@ static const device_config_t dells333sl_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "J01 (Jostens Learning Corporation OEM)", .internal_name = "dells333sl_j01", .bios_type = BIOS_NORMAL, { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision J01 (Jostens Learning Corporation OEM)", .internal_name = "dells333sl_j01", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/DELL386.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/DELL386.BIN", "" } },
{ .name = "A02", .internal_name = "dells333sl", .bios_type = BIOS_NORMAL, { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision A02", .internal_name = "dells333sl", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/Dell_386SX_30807_UBIOS_B400_VLSI_VL82C311_Cirrus_Logic_GD5420.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/Dell_386SX_30807_UBIOS_B400_VLSI_VL82C311_Cirrus_Logic_GD5420.bin", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },

16
src/machine/m_at_386dx_486.c
View File

@@ -860,11 +860,11 @@ static const device_config_t pb450_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "PCI 1.0A", .internal_name = "pb450a" /*"pci10a"*/, .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.03 - Revision PCI 1.0A", .internal_name = "pb450a_pci10a" /*"pci10a"*/, .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/OPTI802.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/OPTI802.bin", "" } },
{ .name = "PNP 1.1A", .internal_name = "pnp11a", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.03 - Revision PNP 1.1A", .internal_name = "pb450a", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/PNP11A.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/PNP11A.bin", "" } },
{ .name = "P4HS20 (Micro Firmware/Phoenix 4.05)", .internal_name = "p4hs20", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.05 - Revision P4HS20 (by Micro Firmware)", .internal_name = "pb450a_p4hs20", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/p4hs20.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/p4hs20.bin", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },
@@ -1769,11 +1769,11 @@ static const device_config_t sb486pv_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "AMI 062594 (0108)", .internal_name = "sb486pv", .bios_type = BIOS_NORMAL, { .name = "AMI WinBIOS (062594) - Revision 0108", .internal_name = "sb486pv_0108", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/41-0108-062594-SATURN2.rom", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/41-0108-062594-SATURN2.rom", "" } },
{ .name = "AMI 062594 (0301)", .internal_name = "sb486pv_94", .bios_type = BIOS_NORMAL, { .name = "AMI WinBIOS (062594) - Revision 0301", .internal_name = "sb486pv_0301", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/0301-062594-SATURN2.rom", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/0301-062594-SATURN2.rom", "" } },
{ .name = "AMI 071595 (1301)", .internal_name = "sb486pv_95", .bios_type = BIOS_NORMAL, { .name = "AMIBIOS 6 (071595) - Revision 1301", .internal_name = "sb486pv", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/amiboot.rom", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/amiboot.rom", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },
@@ -2296,9 +2296,9 @@ static const device_config_t hot433a_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "AMI", .internal_name = "hot433a", .bios_type = BIOS_NORMAL, { .name = "AMIBIOS 5 (101094) - Revision 433AUS33", .internal_name = "hot433a", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/433AUS33.ROM", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/433AUS33.ROM", "" } },
{ .name = "Award (eSupport update)", .internal_name = "hot433a_award", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.51PG - Revision 2.5 (by eSupport)", .internal_name = "hot433a_v451pg", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/2A4X5H21.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/2A4X5H21.BIN", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },

20
src/machine/m_at_socket4.c
View File

@@ -53,7 +53,7 @@ machine_at_v12p_init(const machine_t *model)
return ret; return ret;
device_context(model->device); device_context(model->device);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios_versions"), 0); fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
ret = bios_load_linear(fn, 0x000e0000, 131072, 0); ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
device_context_restore(); device_context_restore();
@@ -79,30 +79,28 @@ machine_at_v12p_init(const machine_t *model)
static const device_config_t v12p_config[] = { static const device_config_t v12p_config[] = {
// clang-format off // clang-format off
{ {
.name = "bios_versions", .name = "bios",
.description = "BIOS Versions", .description = "BIOS Version",
.type = CONFIG_BIOS, .type = CONFIG_BIOS,
.default_string = "v12p_14", .default_string = "v12p",
.default_int = 0, .default_int = 0,
.file_filter = "", .file_filter = "",
.spinner = { 0 }, /*W1*/ .spinner = { 0 }, /*W1*/
.bios = { .bios = {
{ .name = "Core Version 1.2 Version R1.4", .internal_name = "v12p_14", .bios_type = BIOS_NORMAL, { .name = "Acer BIOS V1.2 - Revision R1.4", .internal_name = "v12p_r14", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_14.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_14.bin", "" } },
{ .name = "Core Version 1.2 Version R1.6", .internal_name = "v12p_16", .bios_type = BIOS_NORMAL, { .name = "Acer BIOS V1.2 - Revision R1.6", .internal_name = "v12p", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_16.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_16.bin", "" } },
{ .files_no = 0 }
}, },
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
// clang-format on // clang-format on
}; };
const device_t v12p_device = { const device_t v12p_device = {
.name = "Acer V12P", .name = "Acer V12P",
.internal_name = "v12p", .internal_name = "v12p_device",
.flags = 0, .flags = 0,
.local = 0, .local = 0,
.init = NULL, .init = NULL,
@@ -111,7 +109,7 @@ const device_t v12p_device = {
.available = NULL, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = &v12p_config[0] .config = v12p_config
}; };
void void

31
src/machine/m_at_socket5.c
View File

@@ -92,7 +92,7 @@ machine_at_d842_init(const machine_t *model)
return ret; return ret;
device_context(model->device); device_context(model->device);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios_versions"), 0); fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
ret = bios_load_linear(fn, 0x000e0000, 131072, 0); ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
device_context_restore(); device_context_restore();
@@ -118,37 +118,36 @@ machine_at_d842_init(const machine_t *model)
static const device_config_t d842_config[] = { static const device_config_t d842_config[] = {
// clang-format off // clang-format off
{ {
.name = "bios_versions", .name = "bios",
.description = "BIOS Versions", .description = "BIOS Version",
.type = CONFIG_BIOS, .type = CONFIG_BIOS,
.default_string = "d842", .default_string = "d842",
.default_int = 0, .default_int = 0,
.file_filter = "", .file_filter = "",
.spinner = { 0 }, /*W1*/ .spinner = { 0 }, /*W1*/
.bios = { .bios = {
{ .name = "Version 1.03 Revision 1.03.842 (11/24/1994)", .internal_name = "d842", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.03.842", .internal_name = "d842_103", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842.BIN", "" } },
{ .name = "Version 4.04 Revision 1.05.842 (03/15/1996)", .internal_name = "d842_mar96", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.09.842", .internal_name = "d842_109", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_mar96.bin", "" } },
{ .name = "Version 4.04 Revision 1.06.842 (04/03/1998)", .internal_name = "d842_apr98", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_apr98.bin", "" } },
{ .name = "Version 4.04 Revision 1.07.842 (06/02/1998)", .internal_name = "d842_jun98", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98.BIN", "" } },
{ .name = "Version 1.03 Revision 1.09.842 (07/08/1996)", .internal_name = "d842_jul96", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jul96.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jul96.bin", "" } },
{ .name = "Version 1.03 Revision 1.10.842 (06/04/1998)", .internal_name = "d842_jun98_1", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.10.842", .internal_name = "d842", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98_1.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98_1.bin", "" } },
{ .name = "PhoenixBIOS 4.04 - Revision 1.05.842", .internal_name = "d842_105", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_mar96.bin", "" } },
{ .name = "PhoenixBIOS 4.04 - Revision 1.06.842", .internal_name = "d842_106", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_apr98.bin", "" } },
{ .name = "PhoenixBIOS 4.04 - Revision 1.07.842", .internal_name = "d842_107", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98.BIN", "" } },
{ .files_no = 0 }
}, },
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
// clang-format on // clang-format on
}; };
const device_t d842_device = { const device_t d842_device = {
.name = "Siemens-Nixdorf D842", .name = "Siemens-Nixdorf D842",
.internal_name = "d842", .internal_name = "d842_device",
.flags = 0, .flags = 0,
.local = 0, .local = 0,
.init = NULL, .init = NULL,
@@ -157,7 +156,7 @@ const device_t d842_device = {
.available = NULL, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = &d842_config[0] .config = d842_config
}; };
int int

33
src/machine/m_at_socket7_3v.c
View File

@@ -624,7 +624,7 @@ machine_at_d943_init(const machine_t *model)
return ret; return ret;
device_context(model->device); device_context(model->device);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios_versions"), 0); fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
ret = bios_load_linear(fn, 0x000e0000, 131072, 0); ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
device_context_restore(); device_context_restore();
@@ -657,22 +657,23 @@ machine_at_d943_init(const machine_t *model)
static const device_config_t d943_config[] = { static const device_config_t d943_config[] = {
// clang-format off // clang-format off
{ {
.name = "bios_versions", .name = "bios",
.description = "BIOS Versions", .description = "BIOS Version",
.type = CONFIG_BIOS, .type = CONFIG_BIOS,
.default_string = "d943_oct96", .default_string = "d943",
.default_int = 0, .default_int = 0,
.file_filter = "", .file_filter = "",
.spinner = { 0 }, /*W1*/ .spinner = { 0 }, /*W1*/
.bios = { .bios = {
{ .name = "Version 4.05 Revision 1.02.943 (10/28/1996)", .internal_name = "d943_oct96", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.05 - Revision 1.02.943", .internal_name = "d943_oct96", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct96.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct96.bin", "" } },
{ .name = "Version 4.05 Revision 1.03.943 (12/12/1996)", .internal_name = "d943_dec96", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.05 - Revision 1.03.943", .internal_name = "d943_dec96", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_dec96.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_dec96.bin", "" } },
{ .name = "Version 4.05 Revision 1.05.943 (09/04/1997)", .internal_name = "d943_sept97", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.05 - Revision 1.05.943", .internal_name = "d943_sept97", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_sept97.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_sept97.bin", "" } },
{ .name = "Version 4.05 Revision 1.06.943 (10/29/1997)", .internal_name = "d943_oct97", .bios_type = BIOS_NORMAL, { .name = "PhoenixBIOS 4.05 - Revision 1.06.943", .internal_name = "d943", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct97.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct97.bin", "" } },
{ .files_no = 0 }
}, },
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
@@ -683,7 +684,7 @@ static const device_config_t d943_config[] = {
const device_t d943_device = { const device_t d943_device = {
.name = "Siemens-Nixdorf D943", .name = "Siemens-Nixdorf D943",
.internal_name = "d943", .internal_name = "d943_device",
.flags = 0, .flags = 0,
.local = 0, .local = 0,
.init = NULL, .init = NULL,
@@ -692,7 +693,7 @@ const device_t d943_device = {
.available = NULL, .available = NULL,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = &d943_config[0] .config = d943_config
}; };
int int
@@ -800,11 +801,11 @@ static const device_config_t ap5s_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "04/22/96 1.20 4.50PG", .internal_name = "ap5s_450pg", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.50PG - Revision R1.20", .internal_name = "ap5s_450pg", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s120.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s120.bin", "" } },
{ .name = "11/13/96 1.50 4.51PG", .internal_name = "ap5s", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.51PG - Revision R1.50", .internal_name = "ap5s_r150", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/AP5S150.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/AP5S150.BIN", "" } },
{ .name = "06/25/97 1.60 4.51PG", .internal_name = "ap5s_latest", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.51PG - Revision R1.60", .internal_name = "ap5s", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s160.bin", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s160.bin", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },
@@ -961,11 +962,11 @@ static const device_config_t c5sbm2_config[] = {
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.bios = { .bios = {
{ .name = "4.50GP (07/17/1995)", .internal_name = "5sbm2", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.50GP - Revision 07/17/1995", .internal_name = "5sbm2_v450gp", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0717.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0717.BIN", "" } },
{ .name = "4.50PG (03/21/1996)", .internal_name = "5sbm2_450pg", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.50PG - Revision 03/26/1996", .internal_name = "5sbm2", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0326.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0326.BIN", "" } },
{ .name = "4.51PG (03/15/2000 Unicore Upgrade)", .internal_name = "5sbm2_451pg", .bios_type = BIOS_NORMAL, { .name = "AwardBIOS v4.51PG - Revision 2.2 (by Unicore Software)", .internal_name = "5sbm2_451pg", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/2A5ICC3A.BIN", "" } }, .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/2A5ICC3A.BIN", "" } },
{ .files_no = 0 } { .files_no = 0 }
}, },

2
src/machine/machine_table.c
View File

@@ -7480,7 +7480,7 @@ const machine_t machines[] = {
.min_multi = 0, .min_multi = 0,
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_PS2_VLB, .bus_flags = MACHINE_VLB,
.flags = MACHINE_IDE | MACHINE_APM, .flags = MACHINE_IDE | MACHINE_APM,
.ram = { .ram = {
.min = 2048, .min = 2048,

24
src/qt/languages/pt-BR.po
View File

@@ -387,6 +387,15 @@ msgstr "Ativar (UTC)"
msgid "Dynamic Recompiler" msgid "Dynamic Recompiler"
msgstr "Recompilador dinâmico" msgstr "Recompilador dinâmico"
msgid "CPU frame size"
msgstr "Tamanho de quadro do CPU"
msgid "Larger frames (less smooth)"
msgstr "Quadros largos (menos suave)"
msgid "Smaller frames (smoother)"
msgstr "Quadros menores (mais suave)"
msgid "Video:" msgid "Video:"
msgstr "Vídeo:" msgstr "Vídeo:"
@@ -804,12 +813,18 @@ msgstr "Joystick padrão de 4 eixos, 4 botões"
msgid "CH Flightstick Pro" msgid "CH Flightstick Pro"
msgstr "CH Flightstick Pro" msgstr "CH Flightstick Pro"
msgid "CH Flightstick Pro + CH Pedals"
msgstr "CH Flightstick Pro + CH Pedais"
msgid "Microsoft SideWinder Pad" msgid "Microsoft SideWinder Pad"
msgstr "Microsoft SideWinder Pad" msgstr "Microsoft SideWinder Pad"
msgid "Thrustmaster Flight Control System" msgid "Thrustmaster Flight Control System"
msgstr "Sistema de Controle de Voo Thrustmaster" msgstr "Sistema de Controle de Voo Thrustmaster"
msgid "Thrustmaster FCS + Rudder Control System"
msgstr "Thrustmaster SCV + Sistema de Controle de Leme"
msgid "2-button gamepad(s)" msgid "2-button gamepad(s)"
msgstr "Gamepad(s) de 2 botões" msgstr "Gamepad(s) de 2 botões"
@@ -1425,6 +1440,9 @@ msgstr "Mouse de barramento Microsoft (InPort)"
msgid "Mouse Systems Serial Mouse" msgid "Mouse Systems Serial Mouse"
msgstr "Mouse serial Mouse Systems" msgstr "Mouse serial Mouse Systems"
msgid "Mouse Systems Bus Mouse"
msgstr "Mouse de barramento Mouse Systems"
msgid "Microsoft Serial Mouse" msgid "Microsoft Serial Mouse"
msgstr "Mouse serial Microsoft" msgstr "Mouse serial Microsoft"
@@ -1725,6 +1743,12 @@ msgstr "DMA baixo"
msgid "Enable Game port" msgid "Enable Game port"
msgstr "Ativar a porta do jogo" msgstr "Ativar a porta do jogo"
msgid "SID Model"
msgstr "Modelo do SID"
msgid "SID Filter Strength"
msgstr "Força do Filtro SID"
msgid "Surround module" msgid "Surround module"
msgstr "Módulo surround" msgstr "Módulo surround"

60
src/qt/languages/ru-RU.po
View File

@@ -390,6 +390,15 @@ msgstr "Включено (UTC)"
msgid "Dynamic Recompiler" msgid "Dynamic Recompiler"
msgstr "Динамический рекомпилятор" msgstr "Динамический рекомпилятор"
msgid "CPU frame size"
msgstr "Размер кадра ЦП"
msgid "Larger frames (less smooth)"
msgstr "Большие кадры (менее плавные)"
msgid "Smaller frames (smoother)"
msgstr "Меньшие кадры (более плавные)"
msgid "Video:" msgid "Video:"
msgstr "Видеокарта 1:" msgstr "Видеокарта 1:"
@@ -765,9 +774,21 @@ msgstr "Неверное устройство PCap"
msgid "2-axis, 2-button joystick(s)" msgid "2-axis, 2-button joystick(s)"
msgstr "2-осевой, 2-кнопочный джойстик" msgstr "2-осевой, 2-кнопочный джойстик"
msgid "2-button gamepad(s)"
msgstr "2-кнопочный геймпад"
msgid "2-button flight yoke"
msgstr "2-кнопочный flight yoke"
msgid "2-axis, 4-button joystick" msgid "2-axis, 4-button joystick"
msgstr "2-осевой, 4-кнопочный джойстик" msgstr "2-осевой, 4-кнопочный джойстик"
msgid "4-button gamepad"
msgstr "4-кнопочный геймпад"
msgid "4-button flight yoke"
msgstr "4-кнопочный flight yoke"
msgid "2-axis, 6-button joystick" msgid "2-axis, 6-button joystick"
msgstr "2-осевой, 6-кнопочный джойстик" msgstr "2-осевой, 6-кнопочный джойстик"
@@ -777,21 +798,36 @@ msgstr "2-осевой, 8-кнопочный джойстик"
msgid "3-axis, 2-button joystick" msgid "3-axis, 2-button joystick"
msgstr "3-осевой, 2-кнопочный джойстик" msgstr "3-осевой, 2-кнопочный джойстик"
msgid "2-button flight yoke with throttle"
msgstr "2-кнопочный flight yoke с дросселем"
msgid "3-axis, 4-button joystick" msgid "3-axis, 4-button joystick"
msgstr "3-осевой, 4-кнопочный джойстик" msgstr "3-осевой, 4-кнопочный джойстик"
msgid "Win95 Steering Wheel (3-axis, 4-button)"
msgstr "Руль Win95 (3-осевой, 4-кнопочный)"
msgid "4-button flight yoke with throttle"
msgstr "4-кнопочный flight yoke с дросселем"
msgid "4-axis, 4-button joystick" msgid "4-axis, 4-button joystick"
msgstr "4-осевой, 4-кнопочный джойстик" msgstr "4-осевой, 4-кнопочный джойстик"
msgid "CH Flightstick Pro" msgid "CH Flightstick Pro"
msgstr "CH Flightstick Pro" msgstr "CH Flightstick Pro"
msgid "CH Flightstick Pro + CH Pedals"
msgstr "CH Flightstick Pro + CH Педали"
msgid "Microsoft SideWinder Pad" msgid "Microsoft SideWinder Pad"
msgstr "Microsoft SideWinder Pad" msgstr "Microsoft SideWinder Pad"
msgid "Thrustmaster Flight Control System" msgid "Thrustmaster Flight Control System"
msgstr "Система управления полётом Thrustmaster" msgstr "Система управления полётом Thrustmaster"
msgid "Thrustmaster FCS + Rudder Control System"
msgstr "Thrustmaster FCS + Система управления рулем"
msgid "None" msgid "None"
msgstr "Нет" msgstr "Нет"
@@ -1386,6 +1422,9 @@ msgstr "Bus-мышь Microsoft (InPort)"
msgid "Mouse Systems Serial Mouse" msgid "Mouse Systems Serial Mouse"
msgstr "COM-мышь Mouse Systems" msgstr "COM-мышь Mouse Systems"
msgid "Mouse Systems Bus Mouse"
msgstr "Bus-мышь Mouse Systems"
msgid "Microsoft Serial Mouse" msgid "Microsoft Serial Mouse"
msgstr "COM-мышь Microsoft" msgstr "COM-мышь Microsoft"
@@ -1686,6 +1725,12 @@ msgstr "Низкий DMA"
msgid "Enable Game port" msgid "Enable Game port"
msgstr "Включить игровой порт" msgstr "Включить игровой порт"
msgid "SID Model"
msgstr "Модель SID"
msgid "SID Filter Strength"
msgstr "Сила фильтра SID"
msgid "Surround module" msgid "Surround module"
msgstr "Модуль объёмного звучания" msgstr "Модуль объёмного звучания"
@@ -1788,6 +1833,18 @@ msgstr "Смесь"
msgid "Font" msgid "Font"
msgstr "Шрифт" msgstr "Шрифт"
msgid "Has secondary 8x8 character set"
msgstr "Вторичный набор символов 8x8"
msgid "Has Quadcolor II daughter board"
msgstr "Дочерняя плата Quadcolor II"
msgid "Alternate monochrome contrast"
msgstr "Альтернативный монохромный контраст"
msgid "Video chroma-keying"
msgstr "Видео хромакеинг"
msgid "Bilinear filtering" msgid "Bilinear filtering"
msgstr "Билинейная фильтрация" msgstr "Билинейная фильтрация"
@@ -2154,6 +2211,9 @@ msgstr "Скорость передачи данных через канал"
msgid "Named Pipe (Server)" msgid "Named Pipe (Server)"
msgstr "Именованный пайп (Сервер)" msgstr "Именованный пайп (Сервер)"
msgid "Named Pipe (Client)"
msgstr "Именованный пайп (Клиент)"
msgid "Host Serial Passthrough" msgid "Host Serial Passthrough"
msgstr "Последовательный порт хоста" msgstr "Последовательный порт хоста"

647
src/qt/languages/tr-TR.po
View File

File diff suppressed because it is too large Load Diff

10
src/qt/qt_rendererstack.cpp
View File

@@ -166,6 +166,10 @@ int ignoreNextMouseEvent = 1;
void void
RendererStack::mouseReleaseEvent(QMouseEvent *event) RendererStack::mouseReleaseEvent(QMouseEvent *event)
{ {
#ifdef Q_OS_WINDOWS
rw_hwnd = (HWND) this->winId();
#endif
if (!dopause && this->geometry().contains(m_monitor_index >= 1 ? event->globalPos() : event->pos()) && if (!dopause && this->geometry().contains(m_monitor_index >= 1 ? event->globalPos() : event->pos()) &&
(event->button() == Qt::LeftButton) && !mouse_capture && (event->button() == Qt::LeftButton) && !mouse_capture &&
(isMouseDown & 1) && (kbd_req_capture || (mouse_get_buttons() != 0)) && (isMouseDown & 1) && (kbd_req_capture || (mouse_get_buttons() != 0)) &&
@@ -410,14 +414,8 @@ RendererStack::createRenderer(Renderer renderer)
#endif #endif
} }
if (current.get() == nullptr) { if (current.get() == nullptr) {
#ifdef Q_OS_WINDOWS
rw_hwnd = NULL;
#endif
return; return;
} }
#ifdef Q_OS_WINDOWS
rw_hwnd = (HWND) this->winId();
#endif
current->setFocusPolicy(Qt::NoFocus); current->setFocusPolicy(Qt::NoFocus);
current->setFocusProxy(this); current->setFocusProxy(this);
current->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); current->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);