Merge branch 'master' of github.com:ElMahroussLogic/zka-dev

2 files changed, 69 insertions, 66 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index c827fa66..51ccdb77 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,5 @@
 # ZBA and ZKA are owned by Amlal.

-/dev/ZKAKit/ @ZKA-Technologies

-/dev/ZBAKit/ @ZKA-Technologies

+/dev/ZKAKit/ @Amlal-ElMahrouss

+/dev/ZBAKit/ @Amlal-ElMahrouss

 

-# SCI is owned by <blank>

+# SCI is led by none.

diff --git a/dev/ZKAKit/HALKit/AMD64/CPUID.h b/dev/ZKAKit/HALKit/AMD64/CPUID.h
index 4828d0ef..59b9bdec 100644
--- a/dev/ZKAKit/HALKit/AMD64/CPUID.h
+++ b/dev/ZKAKit/HALKit/AMD64/CPUID.h
@@ -15,69 +15,72 @@
 
 #include <NewKit/Defines.h>
 
-enum
+enum CPUFeatureEnum
 {
-	eCPUFeatureSSE3		  = 1 << 0,
-	eCPUFeaturePCLMUL	  = 1 << 1,
-	eCPUFeatureDTES64	  = 1 << 2,
-	eCPUFeatureMONITOR	  = 1 << 3,
-	eCPUFeatureDS_CPL	  = 1 << 4,
-	eCPUFeatureVMX		  = 1 << 5,
-	eCPUFeatureSMX		  = 1 << 6,
-	eCPUFeatureEST		  = 1 << 7,
-	eCPUFeatureTM2		  = 1 << 8,
-	eCPUFeatureSSSE3	  = 1 << 9,
-	eCPUFeatureCID		  = 1 << 10,
-	eCPUFeatureSDBG		  = 1 << 11,
-	eCPUFeatureFMA		  = 1 << 12,
-	eCPUFeatureCX16		  = 1 << 13,
-	eCPUFeatureXTPR		  = 1 << 14,
-	eCPUFeaturePDCM		  = 1 << 15,
-	eCPUFeaturePCID		  = 1 << 17,
-	eCPUFeatureDCA		  = 1 << 18,
-	eCPUFeatureSSE4_1	  = 1 << 19,
-	eCPUFeatureSSE4_2	  = 1 << 20,
-	eCPUFeatureX2APIC	  = 1 << 21,
-	eCPUFeatureMOVBE	  = 1 << 22,
-	eCPUFeaturePOP3C	  = 1 << 23,
-	eCPUFeatureECXTSC	  = 1 << 24,
-	eCPUFeatureAES		  = 1 << 25,
-	eCPUFeatureXSAVE	  = 1 << 26,
-	eCPUFeatureOSXSAVE	  = 1 << 27,
-	eCPUFeatureAVX		  = 1 << 28,
-	eCPUFeatureF16C		  = 1 << 29,
-	eCPUFeatureRDRAND	  = 1 << 30,
-	eCPUFeatureHYPERVISOR = 1 << 31,
-	eCPUFeatureFPU		  = 1 << 0,
-	eCPUFeatureVME		  = 1 << 1,
-	eCPUFeatureDE		  = 1 << 2,
-	eCPUFeaturePSE		  = 1 << 3,
-	eCPUFeatureEDXTSC	  = 1 << 4,
-	eCPUFeatureMSR		  = 1 << 5,
-	eCPUFeaturePAE		  = 1 << 6,
-	eCPUFeatureMCE		  = 1 << 7,
-	eCPUFeatureCX8		  = 1 << 8,
-	eCPUFeatureAPIC		  = 1 << 9,
-	eCPUFeatureSEP		  = 1 << 11,
-	eCPUFeatureMTRR		  = 1 << 12,
-	eCPUFeaturePGE		  = 1 << 13,
-	eCPUFeatureMCA		  = 1 << 14,
-	eCPUFeatureCMOV		  = 1 << 15,
-	eCPUFeaturePAT		  = 1 << 16,
-	eCPUFeaturePSE36	  = 1 << 17,
-	eCPUFeaturePSN		  = 1 << 18,
-	eCPUFeatureCLFLUSH	  = 1 << 19,
-	eCPUFeatureDS		  = 1 << 21,
-	eCPUFeatureACPI		  = 1 << 22,
-	eCPUFeatureMMX		  = 1 << 23,
-	eCPUFeatureFXSR		  = 1 << 24,
-	eCPUFeatureSSE		  = 1 << 25,
-	eCPUFeatureSSE2		  = 1 << 26,
-	eCPUFeatureSS		  = 1 << 27,
-	eCPUFeatureHTT		  = 1 << 28,
-	eCPUFeatureTM		  = 1 << 29,
-	eCPUFeatureIA64		  = 1 << 30,
-	eCPUFeaturePBE		  = 1 << 31
+	kCPUFeatureSSE3		  = 1 << 0,
+	kCPUFeaturePCLMUL	  = 1 << 1,
+	kCPUFeatureDTES64	  = 1 << 2,
+	kCPUFeatureMONITOR	  = 1 << 3,
+	kCPUFeatureDS_CPL	  = 1 << 4,
+	kCPUFeatureVMX		  = 1 << 5,
+	kCPUFeatureSMX		  = 1 << 6,
+	kCPUFeatureEST		  = 1 << 7,
+	kCPUFeatureTM2		  = 1 << 8,
+	kCPUFeatureSSSE3	  = 1 << 9,
+	kCPUFeatureCID		  = 1 << 10,
+	kCPUFeatureSDBG		  = 1 << 11,
+	kCPUFeatureFMA		  = 1 << 12,
+	kCPUFeatureCX16		  = 1 << 13,
+	kCPUFeatureXTPR		  = 1 << 14,
+	kCPUFeaturePDCM		  = 1 << 15,
+	kCPUFeaturePCID		  = 1 << 17,
+	kCPUFeatureDCA		  = 1 << 18,
+	kCPUFeatureSSE4_1	  = 1 << 19,
+	kCPUFeatureSSE4_2	  = 1 << 20,
+	kCPUFeatureX2APIC	  = 1 << 21,
+	kCPUFeatureMOVBE	  = 1 << 22,
+	kCPUFeaturePOP3C	  = 1 << 23,
+	kCPUFeatureECXTSC	  = 1 << 24,
+	kCPUFeatureAES		  = 1 << 25,
+	kCPUFeatureXSAVE	  = 1 << 26,
+	kCPUFeatureOSXSAVE	  = 1 << 27,
+	kCPUFeatureAVX		  = 1 << 28,
+	kCPUFeatureF16C		  = 1 << 29,
+	kCPUFeatureRDRAND	  = 1 << 30,
+	kCPUFeatureHYPERVISOR     = 1 << 31,
+	kCPUFeatureFPU		  = 1 << 0,
+	kCPUFeatureVME		  = 1 << 1,
+	kCPUFeatureDE		  = 1 << 2,
+	kCPUFeaturePSE		  = 1 << 3,
+	kCPUFeatureEDXTSC	  = 1 << 4,
+	kCPUFeatureMSR		  = 1 << 5,
+	kCPUFeaturePAE		  = 1 << 6,
+	kCPUFeatureMCE		  = 1 << 7,
+	kCPUFeatureCX8		  = 1 << 8,
+	kCPUFeatureAPIC		  = 1 << 9,
+	kCPUFeatureSEP		  = 1 << 11,
+	kCPUFeatureMTRR		  = 1 << 12,
+	kCPUFeaturePGE		  = 1 << 13,
+	kCPUFeatureMCA		  = 1 << 14,
+	kCPUFeatureCMOV		  = 1 << 15,
+	kCPUFeaturePAT		  = 1 << 16,
+	kCPUFeaturePSE36	  = 1 << 17,
+	kCPUFeaturePSN		  = 1 << 18,
+	kCPUFeatureCLFLUSH	  = 1 << 19,
+	kCPUFeatureDS		  = 1 << 21,
+	kCPUFeatureACPI		  = 1 << 22,
+	kCPUFeatureMMX		  = 1 << 23,
+	kCPUFeatureFXSR		  = 1 << 24,
+	kCPUFeatureSSE		  = 1 << 25,
+	kCPUFeatureSSE2		  = 1 << 26,
+	kCPUFeatureSS		  = 1 << 27,
+	kCPUFeatureHTT		  = 1 << 28,
+	kCPUFeatureTM		  = 1 << 29,
+	kCPUFeatureIA64		  = 1 << 30,
+	kCPUFeaturePBE		  = 1 << 31
 };
 
-typedef Kernel::Int64 hal_cpu_feature_type;
+namespace Kernel
+{
+	typedef Int64 CPUID;
+} // namespace Kernel