From 77fc34ee7d69c5042d899813a38854ff59133fab Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 21 Apr 2014 11:02:17 +0200 Subject: [PATCH] Added some CPU vendors Former-commit-id: 0eb96633fe6bdd3f6f8649f766620f4e89bc2224 --- include/Nazara/Core/Enums.hpp | 8 ++++++-- src/Nazara/Core/HardwareInfo.cpp | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/Nazara/Core/Enums.hpp b/include/Nazara/Core/Enums.hpp index b2eb2203e..82e384138 100644 --- a/include/Nazara/Core/Enums.hpp +++ b/include/Nazara/Core/Enums.hpp @@ -116,16 +116,20 @@ enum nzProcessorVendor nzProcessorVendor_Centaur, nzProcessorVendor_Cyrix, nzProcessorVendor_Intel, - nzProcessorVendor_Transmeta, + nzProcessorVendor_KVM, + nzProcessorVendor_HyperV, nzProcessorVendor_NSC, nzProcessorVendor_NexGen, nzProcessorVendor_Rise, nzProcessorVendor_SIS, + nzProcessorVendor_Transmeta, nzProcessorVendor_UMC, nzProcessorVendor_VIA, + nzProcessorVendor_VMware, nzProcessorVendor_Vortex, + nzProcessorVendor_XenHVM, - nzProcessorVendor_Max = nzProcessorVendor_Vortex + nzProcessorVendor_Max = nzProcessorVendor_XenHVM }; enum nzSphereType diff --git a/src/Nazara/Core/HardwareInfo.cpp b/src/Nazara/Core/HardwareInfo.cpp index ecc9dff77..09299e052 100644 --- a/src/Nazara/Core/HardwareInfo.cpp +++ b/src/Nazara/Core/HardwareInfo.cpp @@ -25,23 +25,30 @@ namespace nzProcessorVendor vendorEnum; }; - const char* vendorNames[nzProcessorVendor_Max+2] = // +1 pour gérer le cas Unknown + // Exceptionellement, la valeur "unknown" est intégrée + const char* vendorNames[] = { "Unknown", // nzProcessorVendor_Unknown "Advanced Micro Devices", // nzProcessorVendor_AMD "Centaur Technology", // nzProcessorVendor_Centaur "Cyrix Corporation", // nzProcessorVendor_Cyrix "Intel Corporation", // nzProcessorVendor_Intel - "Transmeta Corporation", // nzProcessorVendor_Transmeta + "Kernel-based Virtual Machine", // nzProcessorVendor_KVM + "Microsoft Hyper-V", // nzProcessorVendor_HyperV "National Semiconductor", // nzProcessorVendor_NSC "NexGen", // nzProcessorVendor_NexGen "Rise Technology", // nzProcessorVendor_Rise "Silicon Integrated Systems", // nzProcessorVendor_SIS + "Transmeta Corporation", // nzProcessorVendor_Transmeta "United Microelectronics Corporation", // nzProcessorVendor_UMC "VIA Technologies", // nzProcessorVendor_VIA + "VMware", // nzProcessorVendor_VMware "Vortex86", // nzProcessorVendor_Vortex + "Xen" // nzProcessorVendor_XenHVM }; + static_assert(sizeof(vendorNames)/sizeof(const char*) == nzProcessorVendor_Max+2, "Processor vendor name array is incomplete"); + VendorString vendorStrings[] = { // Triés par ordre alphabétique (Majuscules primant sur minuscules) @@ -52,12 +59,17 @@ namespace {"GenuineIntel", nzProcessorVendor_Intel}, {"GenuineTMx86", nzProcessorVendor_Transmeta}, {"Geode by NSC", nzProcessorVendor_NSC}, + {"KVMKVMKVMKVM", nzProcessorVendor_KVM}, + {"Microsoft Hv", nzProcessorVendor_HyperV}, {"NexGenDriven", nzProcessorVendor_NexGen}, + {"RiseRiseRise", nzProcessorVendor_Rise}, {"SiS SiS SiS ", nzProcessorVendor_SIS}, {"TransmetaCPU", nzProcessorVendor_Transmeta}, {"UMC UMC UMC ", nzProcessorVendor_UMC}, {"VIA VIA VIA ", nzProcessorVendor_VIA}, - {"Vortex86 SoC", nzProcessorVendor_VIA} + {"VMwareVMware", nzProcessorVendor_VMware}, + {"Vortex86 SoC", nzProcessorVendor_Vortex}, + {"XenVMMXenVMM", nzProcessorVendor_XenHVM} }; nzProcessorVendor s_vendorEnum = nzProcessorVendor_Unknown;