xnu-4570.71.2.tar.gz

[apple/xnu.git] / osfmk / mach / machine.h

diff --git a/osfmk/mach/machine.h b/osfmk/mach/machine.h
index 9c459178a7fa390d244a68cb15a0b7eecf5f35e2..87c1ba64f8612edecca450cd72a9de1c94209a2e 100644 (file)
--- a/osfmk/mach/machine.h
+++ b/osfmk/mach/machine.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2007-2016 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -385,8 +386,6 @@ __END_DECLS
 #define CPUFAMILY_POWERPC_G4           0x77c184ae
 #define CPUFAMILY_POWERPC_G5           0xed76d8aa
 #define CPUFAMILY_INTEL_6_13           0xaa33392b
-#define CPUFAMILY_INTEL_YONAH          0x73d67300
-#define CPUFAMILY_INTEL_MEROM          0x426f69ef
 #define CPUFAMILY_INTEL_PENRYN         0x78ea4fbc
 #define CPUFAMILY_INTEL_NEHALEM                0x6b5a4cd2
 #define CPUFAMILY_INTEL_WESTMERE       0x573b5eec
@@ -395,25 +394,23 @@ __END_DECLS
 #define CPUFAMILY_INTEL_HASWELL                0x10b282dc
 #define CPUFAMILY_INTEL_BROADWELL      0x582ed09c
 #define CPUFAMILY_INTEL_SKYLAKE                0x37fc219f
+#define CPUFAMILY_INTEL_KABYLAKE       0x0f817246
 #define CPUFAMILY_ARM_9                        0xe73283ae
 #define CPUFAMILY_ARM_11               0x8ff620d8
 #define CPUFAMILY_ARM_XSCALE           0x53b005f5
-#define CPUFAMILY_ARM_12               0xbd1b0ae9
+#define CPUFAMILY_ARM_12                0xbd1b0ae9
 #define CPUFAMILY_ARM_13               0x0cc90e64
 #define CPUFAMILY_ARM_14               0x96077ef1
 #define CPUFAMILY_ARM_15               0xa8511bca
 #define CPUFAMILY_ARM_SWIFT            0x1e2d6381
 #define CPUFAMILY_ARM_CYCLONE          0x37a09642
 #define CPUFAMILY_ARM_TYPHOON          0x2c91a47e
+#define CPUFAMILY_ARM_TWISTER          0x92fb37c8
+#define CPUFAMILY_ARM_HURRICANE                0x67ceee93
 
 /* The following synonyms are deprecated: */
-#define CPUFAMILY_INTEL_6_14   CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_6_15   CPUFAMILY_INTEL_MEROM
 #define CPUFAMILY_INTEL_6_23   CPUFAMILY_INTEL_PENRYN
 #define CPUFAMILY_INTEL_6_26   CPUFAMILY_INTEL_NEHALEM
 
-#define CPUFAMILY_INTEL_CORE   CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_CORE2  CPUFAMILY_INTEL_MEROM
-
 
 #endif /* _MACH_MACHINE_H_ */