diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c index da6d07e04..585d984ed 100644 --- a/src/machine/m_at_socket370.c +++ b/src/machine/m_at_socket370.c @@ -503,6 +503,7 @@ machine_at_cusl2c_init(const machine_t *model) device_add(&as99127f_device); /* ASUS Hardware Monitor */ ics9xxx_get(ICS9150_08); /* ICS Clock Chip */ intel_815ep_spd_init(); /* SPD */ +// spd_register(SPD_TYPE_SDRAM, 3, 256); /* SPD */ return ret; } @@ -512,7 +513,7 @@ machine_at_cusl2c_init(const machine_t *model) * * North Bridge: Intel 815E * Super I/O: National Semiconductor NSC366 (PC87366) - * BIOS: Award BIOS 6.00PG + * BIOS: AwardBIOS 6.00PG * Notes: No integrated ESS Solo & GPU */ int @@ -530,20 +531,24 @@ machine_at_m6tsl_init(const machine_t *model) pci_init(PCI_CONFIG_TYPE_1); pci_register_bus_slot(0, 0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); - pci_register_bus_slot(0, 0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0); + pci_register_bus_slot(0, 0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4); pci_register_bus_slot(0, 0x1e, PCI_CARD_BRIDGE, 0, 0, 0, 0); pci_register_bus_slot(0, 0x1f, PCI_CARD_SOUTHBRIDGE, 1, 2, 8, 4); pci_register_bus_slot(1, 0x01, PCI_CARD_AGP, 1, 2, 3, 4); - pci_register_bus_slot(2, 0x04, PCI_CARD_NORMAL, 3, 4, 5, 6); - pci_register_bus_slot(2, 0x05, PCI_CARD_NORMAL, 4, 5, 6, 7); - pci_register_bus_slot(2, 0x06, PCI_CARD_NORMAL, 5, 6, 7, 8); - pci_register_bus_slot(2, 0x07, PCI_CARD_NORMAL, 6, 7, 8, 1); + pci_register_bus_slot(2, 0x03, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_bus_slot(2, 0x04, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_bus_slot(2, 0x05, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_bus_slot(2, 0x06, PCI_CARD_NORMAL, 4, 1, 2, 3); + pci_register_bus_slot(2, 0x07, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_bus_slot(2, 0x08, PCI_CARD_NORMAL, 2, 3, 4, 1); - device_add(&intel_815ep_device); /* Intel 815EP MCH */ - device_add(&intel_ich2_device); /* Intel ICH2 */ - device_add(&nsc366_device); /* National Semiconductor NSC366 */ - device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ - intel_815ep_spd_init(); /* SPD */ + device_add(&intel_815ep_device); /* Intel 815E MCH (This board has normally an i815E but this doesn't matter on our implementation) */ + device_add(&intel_ich2_device); /* Intel ICH2 */ + device_add(&nsc366_device); /* National Semiconductor NSC366 */ + device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ + device_add(ics9xxx_get(ICS9250_08)); /* ICS Clock Chip */ + intel_815ep_spd_init(); /* SPD */ +// spd_register(SPD_TYPE_SDRAM, 0x7, 512); /* SPD */ return ret; } @@ -554,14 +559,15 @@ machine_at_m6tsl_init(const machine_t *model) * North Bridge: Intel 815EP * Super I/O: National Semiconductor NSC366 (PC87366) * BIOS: AwardBIOS 6.00PG - * Notes: + * Notes: CD Boot Bugs */ int machine_at_m6tss_init(const machine_t *model) { int ret; - ret = bios_load_linear("roms/machines/m6tss/tss0518b.bin", +// ret = bios_load_linear("roms/machines/m6tss/tss0518b.bin", + ret = bios_load_linear("roms/machines/m6tss/Tss0619f.bin", 0x00080000, 524288, 0); if (bios_only || !ret) @@ -578,15 +584,16 @@ machine_at_m6tss_init(const machine_t *model) pci_register_bus_slot(2, 0x03, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_bus_slot(2, 0x04, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_bus_slot(2, 0x05, PCI_CARD_NORMAL, 3, 4, 1, 2); - pci_register_bus_slot(2, 0x06, PCI_CARD_NORMAL, 4, 1, 2, 3); // 0x0a + pci_register_bus_slot(2, 0x06, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_bus_slot(2, 0x07, PCI_CARD_NORMAL, 1, 2, 3, 4); - device_add(&intel_815ep_device); /* Intel 815EP MCH */ - device_add(&intel_ich2_device); /* Intel ICH2 */ - device_add(&nsc366_device); /* National Semiconductor NSC366 */ - device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ - device_add(ics9xxx_get(ICS9250_08)); /* ICS Clock Chip */ - spd_register(SPD_TYPE_SDRAM, 0x7, 512); + device_add(&intel_815ep_device); /* Intel 815EP MCH */ + device_add(&intel_ich2_device); /* Intel ICH2 */ + device_add(&nsc366_device); /* National Semiconductor NSC366 */ + device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ + device_add(ics9xxx_get(ICS9250_08)); /* ICS Clock Chip */ + intel_815ep_spd_init(); /* SPD */ +// spd_register(SPD_TYPE_SDRAM, 0x7, 512); /* SPD */ return ret; } @@ -623,11 +630,12 @@ machine_at_s2080_init(const machine_t *model) pci_register_bus_slot(2, 0x06, PCI_CARD_NORMAL, 4, 5, 6, 7); pci_register_bus_slot(2, 0x07, PCI_CARD_NORMAL, 5, 6, 7, 8); - device_add(&intel_815ep_device); /* Intel 815EP MCH */ - device_add(&intel_ich2_device); /* Intel ICH2 */ - device_add(&nsc366_device); /* National Semiconductor NSC366 */ - device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ - intel_815ep_spd_init(); /* SPD */ + device_add(&intel_815ep_device); /* Intel 815EP MCH */ + device_add(&intel_ich2_device); /* Intel ICH2 */ + device_add(&nsc366_device); /* National Semiconductor NSC366 */ + device_add(&sst_flash_49lf004_device); /* SST 4Mbit Firmware Hub */ + intel_815ep_spd_init(); /* SPD */ +// spd_register(SPD_TYPE_SDRAM, 0x7, 512); /* SPD */ return ret; } diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index a2853a257..9187e9b37 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -11799,8 +11799,8 @@ const machine_t machines[] = { .pad2 = 0, .cpu = { .package = CPU_PKG_SOCKET370, - .block = CPU_BLOCK(CPU_CYRIX3S), - .min_bus = 66666667, + .block = CPU_BLOCK_NONE, + .min_bus = 66666666, .max_bus = 133333333, .min_voltage = 1300, .max_voltage = 3500, @@ -11808,7 +11808,7 @@ const machine_t machines[] = { .max_multi = 8.0 }, .bus_flags = MACHINE_PS2_NOISA, - .flags = MACHINE_IDE_DUAL, + .flags = MACHINE_IDE_DUAL | MACHINE_SOUND, .ram = { .min = 32768, .max = 524288, @@ -11871,7 +11871,7 @@ const machine_t machines[] = { .pad2 = 0, .cpu = { .package = CPU_PKG_SOCKET370, - .block = CPU_BLOCK(CPU_CYRIX3S), + .block = CPU_BLOCK_NONE, .min_bus = 66666667, .max_bus = 133333333, .min_voltage = 1300,