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

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

Browse Source
This commit is contained in:
OBattler
2024-03-20 22:22:43 +01:00
parent d2c5420a34 d54e5714ae
commit 976a9357ee
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/machine.h
View File

@@ -521,7 +521,7 @@ extern int machine_at_403tg_d_init(const machine_t *);
extern int machine_at_403tg_d_mr_init(const machine_t *);
extern int machine_at_pb450_init(const machine_t *);
extern int machine_at_pb450_init(const machine_t *);
extern int machine_at_aptiva_510_init(const machine_t *);
extern int machine_at_aptiva510_init(const machine_t *);
extern int machine_at_pc330_6573_init(const machine_t *);
extern int machine_at_mvi486_init(const machine_t *);

29
src/machine/m_at_386dx_486.c
View File

@@ -671,25 +671,26 @@ machine_at_pb450_init(const machine_t *model)
if (bios_only || !ret)
return ret;
machine_at_common_init(model);
machine_at_common_init_ex(model, 2);
device_add(&ide_vlb_2ch_device);
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x11, PCI_CARD_NORMAL, 5, 4, 3, 2);
pci_register_slot(0x12, PCI_CARD_NORMAL, 9, 8, 7, 6);
device_add(&opti895_device);
device_add(&opti822_device);
device_add(&keyboard_ps2_intel_ami_pci_device);
device_add(&fdc37c661_ide_device);
device_add(&ide_opti611_vlb_sec_device);
device_add(&ide_vlb_2ch_device);
device_add(&intel_flash_bxt_device);
device_add(&phoenix_486_jumper_pci_device);
pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x12, PCI_CARD_NORMAL, 5, 6, 7, 8);
if (gfxcard[0] == VID_INTERNAL)
device_add(&gd5428_vlb_onboard_device);
device_add(&opti602_device);
device_add(&opti895_device);
device_add(&opti822_device);
device_add(&keyboard_ps2_ami_device);
device_add(&fdc37c661_ide_device);
device_add(&ide_opti611_vlb_sec_device);
device_add(&intel_flash_bxt_device);
device_add(&phoenix_486_jumper_pci_device);
return ret;
}
@@ -722,11 +723,11 @@ machine_at_pc330_6573_common_init(const machine_t *model)
}
int
machine_at_aptiva_510_init(const machine_t *model)
machine_at_aptiva510_init(const machine_t *model)
{
int ret;
ret = bios_load_linear("roms/machines/aptiva_510/$IMAGES.USF",
ret = bios_load_linear("roms/machines/aptiva510/$IMAGES.USF",
0x000e0000, 131072, 0);
if (bios_only || !ret)

6
src/machine/machine_table.c
View File

@@ -6438,7 +6438,7 @@ const machine_t machines[] = {
.max = 65536,
.step = 1024
},
.nvrmask = 127,
.nvrmask = 255,
.kbc_device = NULL,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
@@ -7187,10 +7187,10 @@ const machine_t machines[] = {
/* Has IBM PS/2 Type 1 KBC firmware. */
{
.name = "[OPTi 802G] IBM Aptiva 510/710/Vision",
.internal_name = "aptiva_510",
.internal_name = "aptiva510",
.type = MACHINE_TYPE_486_S3,
.chipset = MACHINE_CHIPSET_OPTI_895_802G,
.init = machine_at_aptiva_510_init,
.init = machine_at_aptiva510_init,
.p1_handler = NULL,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,