CPUDetect: Make CPUVendor enum an enum class

Avoids dumping the enum contents into the global namespace.
This commit is contained in:
Lioncash
2018-04-01 17:43:40 -04:00
parent bf8ffe5bfb
commit fd9eab73fb
3 changed files with 11 additions and 11 deletions

View File

@ -84,11 +84,11 @@ void CPUInfo::Detect()
__cpuid(cpu_id, 0x80000000);
u32 max_ex_fn = cpu_id[0];
if (!strcmp(brand_string, "GenuineIntel"))
vendor = VENDOR_INTEL;
vendor = CPUVendor::Intel;
else if (!strcmp(brand_string, "AuthenticAMD"))
vendor = VENDOR_AMD;
vendor = CPUVendor::AMD;
else
vendor = VENDOR_OTHER;
vendor = CPUVendor::Other;
// Set reasonable default brand string even if brand string not available.
strcpy(cpu_string, brand_string);
@ -198,7 +198,7 @@ void CPUInfo::Detect()
if (ht)
{
// New mechanism for modern Intel CPUs.
if (vendor == VENDOR_INTEL)
if (vendor == CPUVendor::Intel)
{
__cpuidex(cpu_id, 0x00000004, 0x00000000);
int cores_x_package = ((cpu_id[0] >> 26) & 0x3F) + 1;