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

Merge pull request #6097 from win2kgamer/dell-p60-fix

Browse Source 
Fix the Dell XPS P60 and boot hangs on the Ambras
This commit is contained in:
Miran Grča
2025-08-29 13:42:29 +02:00
committed by GitHub
parent 827650d02b bd11947815
commit 94d45bfa5b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/m_at_socket4.c
View File

@@ -291,7 +291,7 @@ static const device_config_t batman_config[] = {
{ .name = "AMBRA DP60 PCI", .internal_name = "ambradp60", .bios_type = BIOS_NORMAL,
.files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/batman/1004AF1P.BIO", "roms/machines/batman/1004AF1P.BI1", "" } },
{ .name = "Dell Dimension XPS P60", .internal_name = "dellxp60", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/batman/aptiva510_$IMAGES.USF", "" } },
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/batman/XP60-A08.ROM", "" } },
{ .name = "Intel Premiere/PCI (Batman)", .internal_name = "batman", .bios_type = BIOS_NORMAL,
.files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/batman/1008AF1_.BIO", "roms/machines/batman/1008AF1_.BI1", "" } },
{ .files_no = 0 }
@@ -330,7 +330,7 @@ machine_at_batman_init(const machine_t *model)
int is_dell = !strcmp(device_get_config_bios("bios"), "dellxp60");
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
if (is_dell)
ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
ret = bios_load_linear_inverted(fn, 0x000e0000, 131072, 0);
else {
fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
ret = bios_load_linear_combined(fn, fn2, 0x1c000, 128);

4
src/machine/machine_table.c
View File

@@ -11390,7 +11390,7 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00012900,
.kbc_p1 = 0x00001010,
.kbc_p1 = 0x00001030,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &batman_device,
@@ -11976,7 +11976,7 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00012900,
.kbc_p1 = 0x00001010,
.kbc_p1 = 0x00001030,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &plato_device,