| Index: source/libvpx/vpx_ports/x86_cpuid.c
|
| ===================================================================
|
| --- source/libvpx/vpx_ports/x86_cpuid.c (revision 172621)
|
| +++ source/libvpx/vpx_ports/x86_cpuid.c (working copy)
|
| @@ -11,43 +11,39 @@
|
| #include <string.h>
|
| #include "x86.h"
|
|
|
| -struct cpuid_vendors
|
| -{
|
| - char vendor_string[12];
|
| - vpx_cpu_t vendor_id;
|
| +struct cpuid_vendors {
|
| + char vendor_string[12];
|
| + vpx_cpu_t vendor_id;
|
| };
|
|
|
| -static struct cpuid_vendors cpuid_vendor_list[VPX_CPU_LAST] =
|
| -{
|
| - { "AuthenticAMD", VPX_CPU_AMD },
|
| - { "AMDisbetter!", VPX_CPU_AMD_OLD },
|
| - { "CentaurHauls", VPX_CPU_CENTAUR },
|
| - { "CyrixInstead", VPX_CPU_CYRIX },
|
| - { "GenuineIntel", VPX_CPU_INTEL },
|
| - { "NexGenDriven", VPX_CPU_NEXGEN },
|
| - { "Geode by NSC", VPX_CPU_NSC },
|
| - { "RiseRiseRise", VPX_CPU_RISE },
|
| - { "SiS SiS SiS ", VPX_CPU_SIS },
|
| - { "GenuineTMx86", VPX_CPU_TRANSMETA },
|
| - { "TransmetaCPU", VPX_CPU_TRANSMETA_OLD },
|
| - { "UMC UMC UMC ", VPX_CPU_UMC },
|
| - { "VIA VIA VIA ", VPX_CPU_VIA },
|
| +static struct cpuid_vendors cpuid_vendor_list[VPX_CPU_LAST] = {
|
| + { "AuthenticAMD", VPX_CPU_AMD },
|
| + { "AMDisbetter!", VPX_CPU_AMD_OLD },
|
| + { "CentaurHauls", VPX_CPU_CENTAUR },
|
| + { "CyrixInstead", VPX_CPU_CYRIX },
|
| + { "GenuineIntel", VPX_CPU_INTEL },
|
| + { "NexGenDriven", VPX_CPU_NEXGEN },
|
| + { "Geode by NSC", VPX_CPU_NSC },
|
| + { "RiseRiseRise", VPX_CPU_RISE },
|
| + { "SiS SiS SiS ", VPX_CPU_SIS },
|
| + { "GenuineTMx86", VPX_CPU_TRANSMETA },
|
| + { "TransmetaCPU", VPX_CPU_TRANSMETA_OLD },
|
| + { "UMC UMC UMC ", VPX_CPU_UMC },
|
| + { "VIA VIA VIA ", VPX_CPU_VIA },
|
| };
|
|
|
| -vpx_cpu_t vpx_x86_vendor(void)
|
| -{
|
| - unsigned int reg_eax;
|
| - unsigned int vs[3];
|
| - int i;
|
| +vpx_cpu_t vpx_x86_vendor(void) {
|
| + unsigned int reg_eax;
|
| + unsigned int vs[3];
|
| + int i;
|
|
|
| - /* Get the Vendor String from the CPU */
|
| - cpuid(0, reg_eax, vs[0], vs[2], vs[1]);
|
| + /* Get the Vendor String from the CPU */
|
| + cpuid(0, reg_eax, vs[0], vs[2], vs[1]);
|
|
|
| - for (i = 0; i < VPX_CPU_LAST; i++)
|
| - {
|
| - if (strncmp ((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0)
|
| - return (cpuid_vendor_list[i].vendor_id);
|
| - }
|
| + for (i = 0; i < VPX_CPU_LAST; i++) {
|
| + if (strncmp((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0)
|
| + return (cpuid_vendor_list[i].vendor_id);
|
| + }
|
|
|
| - return VPX_CPU_UNKNOWN;
|
| + return VPX_CPU_UNKNOWN;
|
| }
|
|
|