Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 69553 | Differences between
and this patch

Collapse All | Expand All

(-)computer_info.linux_orig.h (-1 / +23 lines)
Lines 38-44 Link Here
38
    kill(0,SIGINT);
38
    kill(0,SIGINT);
39
  }
39
  }
40
  // FIXME: Linux has more architectures last time I checked.
40
  // FIXME: Linux has more architectures last time I checked.
41
  hwinfo->arch = ARCH_INTEL;
41
  //hwinfo->arch = ARCH_INTEL;
42
  hwinfo->os = OS_LINUX;
42
  hwinfo->os = OS_LINUX;
43
  hwinfo->proctype = get_proctype();
43
  hwinfo->proctype = get_proctype();
44
  hwinfo->procspeed = get_procspeed();
44
  hwinfo->procspeed = get_procspeed();
Lines 46-51 Link Here
46
  hwinfo->speedindex = get_speedindex (hwinfo);
46
  hwinfo->speedindex = get_speedindex (hwinfo);
47
  hwinfo->memory = get_memory ();
47
  hwinfo->memory = get_memory ();
48
  hwinfo->nnbits = computer_info_nnbits();
48
  hwinfo->nnbits = computer_info_nnbits();
49
  
50
  // support for linux/mips
51
  if (hwinfo->proctype == PROCTYPE_MIPSR10000) {
52
    hwinfo->arch = ARCH_MIPS;
53
  } else {
54
    hwinfo->arch = ARCH_INTEL;
55
  }
56
49
}
57
}
50
58
51
uint32_t
59
uint32_t
Lines 118-123 Link Here
118
      proctype = PROCTYPE_INTELIA64;
126
      proctype = PROCTYPE_INTELIA64;
119
      found = 1;
127
      found = 1;
120
    }
128
    }
129
130
    // support for linux/mips
131
    else if ((strstr(buf,"cpu model") != NULL) && (strstr(buf,"R10000") != NULL)) {
132
    proctype = PROCTYPE_MIPSR10000;
133
    found = 1;
134
   }
135
121
  }
136
  }
122
137
123
  if (!found) {
138
  if (!found) {
Lines 152-158 Link Here
152
      sscanf (&buf[index],"%f\n",&st);
167
      sscanf (&buf[index],"%f\n",&st);
153
      procspeed = (int) st;
168
      procspeed = (int) st;
154
      found = 1;
169
      found = 1;
170
171
    // support for linux/mips
172
    } else if ((strstr(buf,"system type") != NULL) && (strstr(buf,"SGI") != NULL)) {
173
      // no speed on mips ;)
174
      procspeed = 0;
175
      found = 1;
155
    }
176
    }
177
156
  }
178
  }
157
179
158
  if (!found) {
180
  if (!found) {

Return to bug 69553