@@ -113,12 +113,32 @@
+ (NSString*) cputype
{
int error = 0;
-
-
+
+ int cputype = -1;
+ size_t length = sizeof(cputype);
+ error = sysctlbyname("hw.cputype", &cputype, &length, NULL, 0);
+
+ if (error != 0) {
+ NSLog(@"Failed to obtain CPU type");
+ return nil;
+ }
+
+ // Intel
+ if (cputype == CPU_TYPE_X86) {
+ char stringValue[255];
+ size_t stringLength = sizeof(stringValue);
+ error = sysctlbyname("machdep.cpu.brand_string", &stringValue, &stringLength, NULL, 0);
+ if ((error == 0) && (stringValue != NULL)) {
+ NSString *brandString = [NSString stringWithUTF8String:stringValue];
+ if (brandString)
+ return brandString;
+ }
+ }
+
int cpufamily = -1;
- size_t length = sizeof(cpufamily);
+ length = sizeof(cpufamily);
error = sysctlbyname("hw.cpufamily", &cpufamily, &length, NULL, 0);
-
+
if (error == 0) {
// 10.5+
switch (cpufamily) {
@@ -135,21 +155,14 @@
case CPUFAMILY_INTEL_PENRYN:
return @"Intel Core 2 Duo (Penryn)";
case CPUFAMILY_INTEL_NEHALEM:
- return @"Intel Xeon (Nehalem)";
+ return @"Intel Xeon (Nehalem)";
}
return nil;
}
- int cputype = -1;
- error = sysctlbyname("hw.cputype", &cputype, &length, NULL, 0);
-
- if (error != 0) {
- NSLog(@"Failed to obtain CPU type");
- return nil;
- }
-
int cpusubtype = -1;
+ length = sizeof(cpusubtype);
error = sysctlbyname("hw.cpusubtype", &cpusubtype, &length, NULL, 0);
if (error != 0) {
@@ -158,16 +171,16 @@
}
switch (cputype) {
- case 7:
+ case CPU_TYPE_X86:
return @"Intel";
- case 18:
+ case CPU_TYPE_POWERPC:
switch (cpusubtype) {
- case 9:
+ case CPU_SUBTYPE_POWERPC_750:
return @"PowerPC G3";
- case 10:
- case 11:
+ case CPU_SUBTYPE_POWERPC_7400:
+ case CPU_SUBTYPE_POWERPC_7450:
return @"PowerPC G4";
- case 100:
+ case CPU_SUBTYPE_POWERPC_970:
return @"PowerPC G5";
}
break;
Sources/Main/FRSystemProfile.m
ce011c70220ddefc7a9a1e227e11157cc85e8ae6
BrotherBard
nkinsinger@brotherbard.com
http://github.com/tcurdt/feedbackreporter/commit/54748c5d4b7c8bb697b0aa9f6762bb80e92cd9a9
54748c5d4b7c8bb697b0aa9f6762bb80e92cd9a9
2009-11-06T02:15:14-08:00
2009-11-04T17:54:56-08:00
1) Better CPU subtype string for Intel machines.
Xeon CPUs showed up as Core 2 Duos because they have the same hw.cputype.
Use machdep.cpu.brand_string instead. This also has the advantage of always being up to date when Apple releases new hardware.
2) Replaced numbers with defined constants.
ac25544c9303d5567752e23a1e171452ced1c636
Torsten Curdt
tcurdt@vafer.org