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

The first batch of machine file updates.

Browse Source
This commit is contained in:
OBattler
2025-08-23 00:13:05 +02:00
parent ae5f4d47a2
commit a11dfd5025
8 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/machine/m_at_286.c
View File

@@ -285,7 +285,7 @@ machine_at_portableii_init(const machine_t *model)
device_add(&compaq_device); device_add(&compaq_device);
machine_at_common_init(model); machine_at_common_init(model);
device_add(&kbc_at_compaq_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
return ret; return ret;
} }
@@ -316,7 +316,7 @@ machine_at_portableiii_init(const machine_t *model)
device_add(&compaq_device); device_add(&compaq_device);
machine_at_common_init(model); machine_at_common_init(model);
device_add(&kbc_at_compaq_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
return ret; return ret;
} }
@@ -333,7 +333,7 @@ machine_at_grid1520_init(const machine_t *model) {
machine_at_common_ide_init(model); machine_at_common_ide_init(model);
mem_remap_top(384); mem_remap_top(384);
device_add(&kbc_at_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
// for now just select CGA with amber monitor // for now just select CGA with amber monitor
//device_add(&cga_device); //device_add(&cga_device);
@@ -499,7 +499,7 @@ machine_at_mbc17_init(const machine_t *model)
machine_at_common_ide_init(model); machine_at_common_ide_init(model);
device_add(&sanyo_device); device_add(&sanyo_device);
device_add(&kbc_at_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -520,7 +520,7 @@ machine_at_ax286_init(const machine_t *model)
return ret; return ret;
machine_at_common_ide_init(model); machine_at_common_ide_init(model);
device_add(&kbc_at_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -562,7 +562,7 @@ machine_at_ctat_common_init(const machine_t *model)
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&kbc_at_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
} }
int int
@@ -735,7 +735,7 @@ machine_at_ataripc4_init(const machine_t *model)
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
return ret; return ret;
} }

2
src/machine/m_at_386dx.c
View File

@@ -363,7 +363,7 @@ machine_at_asus3863364k_init(const machine_t *model)
device_add(&rabbit_device); device_add(&rabbit_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);

2
src/machine/m_at_386dx_486.c
View File

@@ -93,7 +93,7 @@ machine_at_c747_init(const machine_t *model)
No idea what KBC it actually has but this produces the No idea what KBC it actually has but this produces the
desired behavior: command A9 does absolutely nothing. desired behavior: command A9 does absolutely nothing.
*/ */
device_add(&kbc_at_siemens_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI)); device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI));

6
src/machine/m_at_386sx.c
View File

@@ -152,7 +152,7 @@ machine_at_pbl300sx_init(const machine_t *model)
machine_at_common_init(model); machine_at_common_init(model);
device_add(&acc2036_device); device_add(&acc2036_device);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI)); device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI));
if (gfxcard[0] == VID_INTERNAL) if (gfxcard[0] == VID_INTERNAL)
@@ -434,7 +434,7 @@ machine_at_if386sx_init(const machine_t *model)
machine_at_common_init_ex(model, 2); machine_at_common_init_ex(model, 2);
device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */ device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
device_add(&kbc_at_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&neat_sx_device); device_add(&neat_sx_device);
@@ -467,7 +467,7 @@ machine_at_svc386sxp1_init(const machine_t *model)
machine_at_common_init(model); machine_at_common_init(model);
device_add(&opti283_device); device_add(&opti283_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);

2
src/machine/m_at_486slc.c
View File

@@ -63,7 +63,7 @@ machine_at_rycleopardlx_init(const machine_t *model)
machine_at_common_init(model); machine_at_common_init(model);
device_add(&opti283_device); device_add(&opti283_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);

34
src/machine/m_at_socket4.c
View File

@@ -102,7 +102,7 @@ machine_at_v12p_init(const machine_t *model)
pci_register_slot(0x04, PCI_CARD_NORMAL, 4, 0, 0, 0); pci_register_slot(0x04, PCI_CARD_NORMAL, 4, 0, 0, 0);
pci_register_slot(0x05, PCI_CARD_NORMAL, 0, 0, 0, 0); pci_register_slot(0x05, PCI_CARD_NORMAL, 0, 0, 0, 0);
device_add(&i430lx_device); device_add(&i430lx_device);
device_add(&kbc_ps2_acer_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&pc87310_device, (void *) (PC87310_ALI)); device_add_params(&pc87310_device, (void *) (PC87310_ALI));
device_add(&amd_am28f010_flash_device); device_add(&amd_am28f010_flash_device);
@@ -134,7 +134,7 @@ machine_at_ambradp60_init(const machine_t *model)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -165,7 +165,7 @@ machine_at_excaliburpci_init(const machine_t *model)
pci_register_slot(0x0D, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0D, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&ide_cmd640_pci_legacy_only_device); device_add(&ide_cmd640_pci_legacy_only_device);
device_add(&i430lx_device); device_add(&i430lx_device);
@@ -195,7 +195,7 @@ machine_at_p5mp3_init(const machine_t *model)
pci_register_slot(0x03, PCI_CARD_NORMAL, 3, 4, 1, 2); /* 03 = Slot 3 */ pci_register_slot(0x03, PCI_CARD_NORMAL, 3, 4, 1, 2); /* 03 = Slot 3 */
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&kbc_ps2_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430lx_device); device_add(&i430lx_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
@@ -230,7 +230,7 @@ machine_at_dellxp60_init(const machine_t *model)
pci_register_slot(0x06, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x06, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430lx_device); device_add(&i430lx_device);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -261,7 +261,7 @@ machine_at_opti560l_init(const machine_t *model)
pci_register_slot(0x08, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x08, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430lx_device); device_add(&i430lx_device);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&i82091aa_device, (void *) I82091AA_022); device_add_params(&i82091aa_device, (void *) I82091AA_022);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -286,7 +286,7 @@ machine_at_award_common_init(const machine_t *model)
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
} }
@@ -332,7 +332,7 @@ machine_at_valuepointp60_init(const machine_t *model)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&kbc_ps2_ps1_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_device); device_add(&sio_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -360,7 +360,7 @@ machine_at_premiere_common_init(const machine_t *model, int pci_switch)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&ide_rz1000_pci_single_channel_device); device_add(&ide_rz1000_pci_single_channel_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
@@ -408,7 +408,7 @@ machine_at_m5pi_init(const machine_t *model)
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430lx_device); device_add(&i430lx_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&kbc_ps2_phoenix_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&ide_w83769f_pci_single_channel_device); device_add(&ide_w83769f_pci_single_channel_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -444,7 +444,7 @@ machine_at_pb520r_init(const machine_t *model)
if (gfxcard[0] == VID_INTERNAL) if (gfxcard[0] == VID_INTERNAL)
device_add(&gd5434_onboard_pci_device); device_add(&gd5434_onboard_pci_device);
device_add(&kbc_ps2_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&i82091aa_device, (void *) (I82091AA_022 | I82091AA_IDE_PRI)); device_add_params(&i82091aa_device, (void *) (I82091AA_022 | I82091AA_IDE_PRI));
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -469,7 +469,7 @@ machine_at_excalibur_init(const machine_t *model)
device_add(&opti5x7_device); device_add(&opti5x7_device);
device_add(&ide_opti611_vlb_device); device_add(&ide_opti611_vlb_device);
device_add_params(&fdc37c6xx_device, (void *) FDC37C661); device_add_params(&fdc37c6xx_device, (void *) FDC37C661);
device_add(&kbc_ps2_intel_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
return ret; return ret;
} }
@@ -497,7 +497,7 @@ machine_at_globalyst330_p5_init(const machine_t *model)
device_add(&opti5x7_pci_device); device_add(&opti5x7_pci_device);
device_add(&opti822_device); device_add(&opti822_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -528,7 +528,7 @@ machine_at_p5vl_init(const machine_t *model)
device_add(&opti5x7_pci_device); device_add(&opti5x7_pci_device);
device_add(&opti822_device); device_add(&opti822_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -560,7 +560,7 @@ machine_at_excaliburpci2_init(const machine_t *model)
pci_register_slot(0x0C, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0C, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&ide_cmd640_pci_legacy_only_device); device_add(&ide_cmd640_pci_legacy_only_device);
device_add(&sis_85c50x_device); device_add(&sis_85c50x_device);
@@ -587,7 +587,7 @@ machine_at_sp4_common_init(const machine_t *model)
pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&sis_85c50x_device); device_add(&sis_85c50x_device);
device_add(&ide_cmd640_pci_device); device_add(&ide_cmd640_pci_device);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
} }
@@ -631,7 +631,7 @@ machine_at_ecs50x_init(const machine_t *model)
pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&sis_85c50x_device); device_add(&sis_85c50x_device);
device_add_params(&ide_cmd640_pci_device, (void *) 0x100000); device_add_params(&ide_cmd640_pci_device, (void *) 0x100000);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);

2
src/machine/m_at_socket4_5.c
View File

@@ -63,7 +63,7 @@ machine_at_pci56001_init(const machine_t *model)
device_add(&opti5x7_pci_device); device_add(&opti5x7_pci_device);
device_add(&opti822_device); device_add(&opti822_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);

35
src/machine/m_at_socket5.c
View File

@@ -83,7 +83,7 @@ machine_at_p54np4_init(const machine_t *model)
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430nx_device); device_add(&i430nx_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
@@ -215,7 +215,7 @@ machine_at_d842_init(const machine_t *model)
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); /* Slot 01 */ pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); /* Slot 01 */
pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); /* Slot 02 */ pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); /* Slot 02 */
device_add(&kbc_ps2_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430nx_device); device_add(&i430nx_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
@@ -244,7 +244,7 @@ machine_at_tek932_init(const machine_t *model)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
device_add(&kbc_ps2_intel_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430nx_device); device_add(&i430nx_device);
device_add(&sio_zb_device); device_add(&sio_zb_device);
device_add(&ide_vlb_device); device_add(&ide_vlb_device);
@@ -277,7 +277,7 @@ machine_at_acerv30_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add(&kbc_ps2_acer_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
@@ -306,7 +306,7 @@ machine_at_apollo_init(const machine_t *model)
pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398)); device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398));
@@ -342,7 +342,7 @@ machine_at_optiplexgxl_init(const machine_t *model)
if (sound_card_current[0] == SOUND_INTERNAL) if (sound_card_current[0] == SOUND_INTERNAL)
machine_snd = device_add(machine_get_snd_device(machine)); machine_snd = device_add(machine_get_snd_device(machine));
device_add(&kbc_ps2_phoenix_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_02E)); device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_02E));
@@ -405,8 +405,7 @@ machine_at_pt2000_init(const machine_t *model)
pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
/* Should be VIA, but we do not emulate that yet. */ device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&kbc_ps2_holtek_device);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398)); device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398));
@@ -463,7 +462,7 @@ machine_at_powermatev_init(const machine_t *model)
pci_register_slot(0x08, PCI_CARD_NORMAL, 0, 0, 0, 0); pci_register_slot(0x08, PCI_CARD_NORMAL, 0, 0, 0, 0);
pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
@@ -492,7 +491,7 @@ machine_at_hawk_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&kbc_ps2_tg_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430fx_device); device_add(&i430fx_device);
device_add(&piix_device); device_add(&piix_device);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
@@ -524,7 +523,7 @@ machine_at_ncselp90_init(const machine_t *model)
device_add(&opti5x7_pci_device); device_add(&opti5x7_pci_device);
device_add(&opti822_device); device_add(&opti822_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&ide_opti611_vlb_device); device_add(&ide_opti611_vlb_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
device_add(&ide_vlb_2ch_device); device_add(&ide_vlb_2ch_device);
@@ -554,7 +553,7 @@ machine_at_hot543_init(const machine_t *model)
device_add(&opti5x7_pci_device); device_add(&opti5x7_pci_device);
device_add(&opti822_device); device_add(&opti822_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_at_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -576,7 +575,7 @@ machine_at_pat54pv_init(const machine_t *model)
machine_at_common_init(model); machine_at_common_init(model);
device_add(&opti5x7_device); device_add(&opti5x7_device);
device_add(&kbc_ps2_intel_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
if (fdc_current[0] == FDC_INTERNAL) if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
@@ -625,7 +624,7 @@ machine_at_sq588_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&sis_85c50x_device); device_add(&sis_85c50x_device);
device_add(&ide_cmd640_pci_single_channel_device); device_add(&ide_cmd640_pci_single_channel_device);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC)); device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
@@ -654,7 +653,7 @@ machine_at_p54sps_init(const machine_t *model)
pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&sis_85c50x_device); device_add(&sis_85c50x_device);
device_add(&ide_pci_2ch_device); device_add(&ide_pci_2ch_device);
device_add(&kbc_at_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89)); device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
@@ -685,7 +684,7 @@ machine_at_ms5109_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3);
device_add(&sis_550x_85c503_device); device_add(&sis_550x_85c503_device);
device_add(&ide_w83769f_pci_device); device_add(&ide_w83769f_pci_device);
device_add(&kbc_ps2_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89)); device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
@@ -720,7 +719,7 @@ machine_at_torino_init(const machine_t *model)
device_add(&sis_550x_85c503_device); device_add(&sis_550x_85c503_device);
device_add(&ide_um8673f_device); device_add(&ide_um8673f_device);
device_add(&kbc_ps2_tg_ami_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&fdc37c6xx_device, (void *) FDC37C665); device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -753,7 +752,7 @@ machine_at_hot539_init(const machine_t *model)
device_add(&umc_8890_device); device_add(&umc_8890_device);
device_add(&umc_8886af_device); device_add(&umc_8886af_device);
device_add(&sst_flash_29ee010_device); device_add(&sst_flash_29ee010_device);
device_add(&kbc_ps2_ami_pci_device); device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&um866x_device, (void *) UM8663AF); device_add_params(&um866x_device, (void *) UM8663AF);
return ret; return ret;