80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Calibrate hardware monitor values on the remaining boards

Browse Source
This commit is contained in:
RichardG867
2020-05-18 00:08:32 -03:00
parent 97b562815f
commit 671e532599
3 changed files with 53 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/machine/m_at_slot1.c
View File

@@ -154,13 +154,11 @@ machine_at_p2bls_init(const machine_t *model)
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */ 3000, /* Chassis */
3000, /* CPU */ 3000, /* CPU */
3000, /* Power */ 3000 /* Power */
0
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */ 30, /* MB */
0, /* unused */ 0, /* unused */
27, /* CPU */ 27 /* CPU */
0
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* VCORE (2.05V by default) */
0, /* unused */ 0, /* unused */
@@ -168,8 +166,7 @@ machine_at_p2bls_init(const machine_t *model)
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2) if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)
@@ -214,13 +211,11 @@ machine_at_p3bf_init(const machine_t *model)
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */ 3000, /* Chassis */
3000, /* CPU */ 3000, /* CPU */
3000, /* Power */ 3000 /* Power */
0
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */ 30, /* MB */
0, /* unused */ 0, /* unused */
30, /* CPU */ 30 /* CPU */
0
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* VCORE (2.05V by default) */
0, /* unused */ 0, /* unused */
@@ -228,8 +223,7 @@ machine_at_p3bf_init(const machine_t *model)
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 3, 1), /* +12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 3, 1), /* +12V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 59, 20), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 59, 20), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2) if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)
@@ -312,24 +306,21 @@ machine_at_p6sba_init(const machine_t *model)
hwm_values_t machine_hwm = { hwm_values_t machine_hwm = {
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */ 3000, /* CPU1 */
3000, /* CPU */ 0, /* CPU2 */
3000, /* Power */ 3000 /* Thermal Control */
0
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */
0, /* unused */ 0, /* unused */
28, /* CPU */ 30, /* CPU1 */
0 0 /* unused (CPU2?) */
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* CPU1 (2.05V by default) */
0, /* unused */ 0, /* CPU2 */
3300, /* +3.3V */ 3300, /* +3.3V */
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2) if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)

19
src/machine/m_at_slot2.c
View File

@@ -83,24 +83,21 @@ machine_at_s2dge_init(const machine_t *model)
hwm_values_t machine_hwm = { hwm_values_t machine_hwm = {
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */ 3000, /* CPU1 */
3000, /* CPU */ 0, /* CPU2 */
3000, /* Power */ 3000 /* Thermal Control */
0
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */
0, /* unused */ 0, /* unused */
28, /* CPU */ 30, /* CPU1 */
0 20 /* unused (CPU2?) */
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* CPU1 (2.05V by default) */
0, /* unused */ 0, /* CPU2 */
3300, /* +3.3V */ 3300, /* +3.3V */
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2) if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)

29
src/machine/m_at_socket370.c
View File

@@ -74,28 +74,23 @@ machine_at_s370slm_init(const machine_t *model)
hwm_values_t machine_hwm = { hwm_values_t machine_hwm = {
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */
3000, /* CPU */ 3000, /* CPU */
3000, /* Power */ 3000, /* Fan 2 */
0 3000 /* Chassis */
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */
0, /* unused */ 0, /* unused */
28, /* CPU */ 30, /* CPU */
0 0 /* unused */
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* CPU1 (2.05V by default) */
0, /* unused */ 0, /* unused */
3300, /* +3.3V */ 3300, /* +3.3V */
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)
machine_hwm.voltages[0] = 2800; /* set higher VCORE (2.8V) for Klamath */
hwm_set_values(machine_hwm); hwm_set_values(machine_hwm);
device_add(&w83781d_device); device_add(&w83781d_device);
@@ -137,13 +132,11 @@ machine_at_cubx_init(const machine_t *model)
{ /* fan speeds */ { /* fan speeds */
3000, /* Chassis */ 3000, /* Chassis */
3000, /* CPU */ 3000, /* CPU */
3000, /* Power */ 3000 /* Power */
0
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */ 30, /* MB */
0, /* unused */ 0, /* unused */
30, /* CPU */ 30 /* CPU */
0
}, { /* voltages */ }, { /* voltages */
2050, /* VCORE (2.05V by default) */ 2050, /* VCORE (2.05V by default) */
0, /* unused */ 0, /* unused */
@@ -151,8 +144,7 @@ machine_at_cubx_init(const machine_t *model)
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
RESISTOR_DIVIDER(12000, 59, 20), /* -12V (divider values bruteforced) */ RESISTOR_DIVIDER(12000, 59, 20), /* -12V (divider values bruteforced) */
RESISTOR_DIVIDER(5000, 1, 2), /* -5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 1, 2) /* -5V (divider values bruteforced) */
0
} }
}; };
hwm_set_values(machine_hwm); hwm_set_values(machine_hwm);
@@ -197,9 +189,6 @@ machine_at_atc7020bxii_init(const machine_t *model)
int int
machine_at_63a_init(const machine_t *model) machine_at_63a_init(const machine_t *model)
{ {
/* 440ZX Board. 440ZX is basically an underpowered 440BX. There no
difference between to chipsets other than the name. */
int ret; int ret;
ret = bios_load_linear(L"roms/machines/63a1/63a-q3.bin", ret = bios_load_linear(L"roms/machines/63a1/63a-q3.bin",