/*
* Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the
- * License may not be used to create, or enable the creation or
- * redistribution of, unlawful or unlicensed copies of an Apple operating
- * system, or to circumvent, violate, or enable the circumvention or
- * violation of, any terms of an Apple operating system software license
- * agreement.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
*/
#include <string.h>
return SYSCTL_OUT(req, buf, strlen(buf) + 1);
}
-static int
-hw_cpu_extfeatures SYSCTL_HANDLER_ARGS
-{
- __unused struct sysctl_oid *unused_oidp = oidp;
- __unused void *unused_arg1 = arg1;
- __unused int unused_arg2 = arg2;
- char buf[256];
-
- buf[0] = '\0';
- cpuid_get_extfeature_names(cpuid_extfeatures(), buf, sizeof(buf));
-
- return SYSCTL_OUT(req, buf, strlen(buf) + 1);
-}
-
SYSCTL_NODE(_machdep, OID_AUTO, cpu, CTLFLAG_RW, 0,
"CPU info");
(void *)offsetof(i386_cpu_info_t, cpuid_model_string), -1,
hw_cpu_sysctl, "A", "CPU model string");
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, value, CTLTYPE_INT | CTLFLAG_RD,
+ (void *)offsetof(i386_cpu_info_t, cpuid_value), sizeof(uint32_t),
+ hw_cpu_sysctl, "I", "CPU value");
+
SYSCTL_PROC(_machdep_cpu, OID_AUTO, family, CTLTYPE_INT | CTLFLAG_RD,
(void *)offsetof(i386_cpu_info_t, cpuid_family), sizeof(uint8_t),
hw_cpu_sysctl, "I", "CPU family");
(void *)offsetof(i386_cpu_info_t, cpuid_stepping), sizeof(uint8_t),
hw_cpu_sysctl, "I", "CPU stepping");
-SYSCTL_PROC(_machdep_cpu, OID_AUTO, feature_bits, CTLTYPE_QUAD | CTLFLAG_RD,
- (void *)offsetof(i386_cpu_info_t, cpuid_features), sizeof(uint64_t),
+SYSCTL_PROC(_machdep_cpu, OID_AUTO, feature_bits, CTLTYPE_INT | CTLFLAG_RD,
+ (void *)offsetof(i386_cpu_info_t, cpuid_features), sizeof(uint32_t),
hw_cpu_sysctl, "I", "CPU features");
-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeature_bits, CTLTYPE_QUAD | CTLFLAG_RD,
- (void *)offsetof(i386_cpu_info_t, cpuid_extfeatures), sizeof(uint64_t),
- hw_cpu_sysctl, "I", "CPU extended features");
-
SYSCTL_PROC(_machdep_cpu, OID_AUTO, signature, CTLTYPE_INT | CTLFLAG_RD,
(void *)offsetof(i386_cpu_info_t, cpuid_signature), sizeof(uint32_t),
hw_cpu_sysctl, "I", "CPU signature");
0, 0,
hw_cpu_features, "A", "CPU feature names");
-SYSCTL_PROC(_machdep_cpu, OID_AUTO, extfeatures, CTLTYPE_STRING | CTLFLAG_RD,
- 0, 0,
- hw_cpu_extfeatures, "A", "CPU extended feature names");
-
-SYSCTL_PROC(_machdep_cpu, OID_AUTO, logical_per_package,
- CTLTYPE_INT | CTLFLAG_RD,
- (void *)offsetof(i386_cpu_info_t, cpuid_logical_per_package),
- sizeof(uint32_t),
- hw_cpu_sysctl, "I", "CPU logical cpus per package");
-
-SYSCTL_PROC(_machdep_cpu, OID_AUTO, cores_per_package,
- CTLTYPE_INT | CTLFLAG_RD,
- (void *)offsetof(i386_cpu_info_t, cpuid_cores_per_package),
- sizeof(uint32_t),
- hw_cpu_sysctl, "I", "CPU cores per package");
-
struct sysctl_oid *machdep_sysctl_list[] =
{
&sysctl__machdep_cpu_vendor,
&sysctl__machdep_cpu_brand_string,
&sysctl__machdep_cpu_model_string,
+ &sysctl__machdep_cpu_value,
&sysctl__machdep_cpu_family,
&sysctl__machdep_cpu_model,
&sysctl__machdep_cpu_extmodel,
&sysctl__machdep_cpu_extfamily,
&sysctl__machdep_cpu_feature_bits,
- &sysctl__machdep_cpu_extfeature_bits,
&sysctl__machdep_cpu_stepping,
&sysctl__machdep_cpu_signature,
&sysctl__machdep_cpu_brand,
&sysctl__machdep_cpu_features,
- &sysctl__machdep_cpu_extfeatures,
- &sysctl__machdep_cpu_logical_per_package,
- &sysctl__machdep_cpu_cores_per_package,
(struct sysctl_oid *) 0
};
projects / apple / xnu.git / blobdiff