rev |
line source |
pascal@24043
|
1 --- memtest86+-5.01/controller.c 2013-08-10 02:01:58.000000000 +0000
|
pascal@17225
|
2 +++ memtest86+-5.01/controller.c 2013-12-12 20:58:12.873555378 +0000
|
pascal@17225
|
3 @@ -292,7 +292,7 @@
|
pascal@17225
|
4
|
pascal@17225
|
5 /* First, locate the PCI bus where the MCH is located */
|
pascal@17225
|
6
|
pascal@17225
|
7 - for(i = 0; i < sizeof(possible_nhm_bus); i++) {
|
pascal@17225
|
8 + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
|
pascal@17225
|
9 pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
|
pascal@17225
|
10 pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
|
pascal@17225
|
11 vid &= 0xFFFF;
|
pascal@17225
|
12 @@ -327,7 +327,7 @@
|
pascal@17225
|
13 ctrl.mode = ECC_NONE;
|
pascal@17225
|
14
|
pascal@17225
|
15 /* First, locate the PCI bus where the MCH is located */
|
pascal@17225
|
16 - for(i = 0; i < sizeof(possible_nhm_bus); i++) {
|
pascal@17225
|
17 + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
|
pascal@17225
|
18 pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
|
pascal@17225
|
19 pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
|
pascal@17225
|
20 vid &= 0xFFFF;
|
pascal@24942
|
21 @@ -1424,7 +1424,7 @@
|
pascal@24942
|
22 unsigned long dramchr;
|
pascal@24942
|
23 float clockratio;
|
pascal@24942
|
24 double dramclock;
|
pascal@24942
|
25 - unsigned int dummy[3];
|
pascal@24942
|
26 + unsigned int dummy[4];
|
pascal@24942
|
27 int ram_type;
|
pascal@24942
|
28
|
pascal@24942
|
29 float coef = 10;
|
pascal@24942
|
30 @@ -3680,7 +3680,7 @@
|
pascal@24942
|
31 static void poll_timings_k16(void) {
|
pascal@24942
|
32
|
pascal@24942
|
33 ulong dramt0, dramt1;
|
pascal@24942
|
34 - int cas, rcd, rp, rc, ras;
|
pascal@24942
|
35 + int cas, rcd, rp, ras;
|
pascal@24942
|
36
|
pascal@24942
|
37 pci_conf_read(0, 24, 2, 0x200, 4, &dramt0);
|
pascal@24942
|
38 pci_conf_read(0, 24, 2, 0x204, 4, &dramt1);
|
pascal@24942
|
39 @@ -3690,7 +3690,7 @@
|
pascal@24942
|
40 rp = ((dramt0 >> 16) & 0x1F);
|
pascal@24942
|
41 ras = ((dramt0 >> 24) & 0x3F);
|
pascal@24942
|
42
|
pascal@24942
|
43 - rc = (dramt1 & 0x3F);
|
pascal@24942
|
44 + //int rc = (dramt1 & 0x3F);
|
pascal@24942
|
45
|
pascal@24942
|
46 print_ram_line(cas, rcd, rp, ras, 1);
|
pascal@24942
|
47 }
|