Author: kib
Date: Mon Feb 24 12:35:58 2020
New Revision: 358288
URL: https://svnweb.freebsd.org/changeset/base/358288
Log:
MFC r358226:
x86/identcpu.c whitespace cleanup.
Modified:
stable/12/sys/x86/x86/identcpu.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/x86/x86/identcpu.c
==============================================================================
--- stable/12/sys/x86/x86/identcpu.c Mon Feb 24 12:34:42 2020
(r358287)
+++ stable/12/sys/x86/x86/identcpu.c Mon Feb 24 12:35:58 2020
(r358288)
@@ -276,7 +276,7 @@ printcpuinfo(void)
switch (cpu_id & 0xf00) {
case 0x400:
strcat(cpu_model, "i486 ");
- /* Check the particular flavor of 486 */
+ /* Check the particular flavor of 486 */
switch (cpu_id & 0xf0) {
case 0x00:
case 0x10:
@@ -304,32 +304,32 @@ printcpuinfo(void)
}
break;
case 0x500:
- /* Check the particular flavor of 586 */
- strcat(cpu_model, "Pentium");
- switch (cpu_id & 0xf0) {
+ /* Check the particular flavor of 586 */
+ strcat(cpu_model, "Pentium");
+ switch (cpu_id & 0xf0) {
case 0x00:
- strcat(cpu_model, " A-step");
+ strcat(cpu_model, " A-step");
break;
case 0x10:
- strcat(cpu_model, "/P5");
+ strcat(cpu_model, "/P5");
break;
case 0x20:
- strcat(cpu_model, "/P54C");
+ strcat(cpu_model, "/P54C");
break;
case 0x30:
- strcat(cpu_model, "/P24T");
+ strcat(cpu_model, "/P24T");
break;
case 0x40:
- strcat(cpu_model, "/P55C");
+ strcat(cpu_model, "/P55C");
break;
case 0x70:
- strcat(cpu_model, "/P54C");
+ strcat(cpu_model, "/P54C");
break;
case 0x80:
- strcat(cpu_model, "/P55C
(quarter-micron)");
+ strcat(cpu_model, "/P55C
(quarter-micron)");
break;
default:
- /* nothing */
+ /* nothing */
break;
}
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
@@ -342,18 +342,18 @@ printcpuinfo(void)
#endif
break;
case 0x600:
- /* Check the particular flavor of 686 */
- switch (cpu_id & 0xf0) {
+ /* Check the particular flavor of 686 */
+ switch (cpu_id & 0xf0) {
case 0x00:
- strcat(cpu_model, "Pentium Pro A-step");
+ strcat(cpu_model, "Pentium Pro A-step");
break;
case 0x10:
- strcat(cpu_model, "Pentium Pro");
+ strcat(cpu_model, "Pentium Pro");
break;
case 0x30:
case 0x50:
case 0x60:
- strcat(cpu_model,
+ strcat(cpu_model,
"Pentium II/Pentium II Xeon/Celeron");
cpu = CPU_PII;
break;
@@ -361,12 +361,12 @@ printcpuinfo(void)
case 0x80:
case 0xa0:
case 0xb0:
- strcat(cpu_model,
+ strcat(cpu_model,
"Pentium III/Pentium III Xeon/Celeron");
cpu = CPU_PIII;
break;
default:
- strcat(cpu_model, "Unknown 80686");
+ strcat(cpu_model, "Unknown 80686");
break;
}
break;
@@ -1347,7 +1347,7 @@ identify_hypervisor(void)
if (regs[0] == 0 && regs[1] == 0x4b4d564b &&
regs[2] == 0x564b4d56 && regs[3] == 0x0000004d)
regs[0] = 0x40000001;
-
+
if (regs[0] >= 0x40000000) {
hv_high = regs[0];
((u_int *)&hv_vendor)[0] = regs[1];
@@ -1374,7 +1374,7 @@ identify_hypervisor(void)
if (strncmp(p, "VMware-", 7) == 0 || strncmp(p, "VMW", 3) == 0)
{
vmware_hvcall(VMW_HVCMD_GETVERSION, regs);
if (regs[1] == VMW_HVMAGIC) {
- vm_guest = VM_GUEST_VMWARE;
+ vm_guest = VM_GUEST_VMWARE;
freeenv(p);
return;
}
@@ -2228,23 +2228,23 @@ print_svm_info(void)
comma = 0;
if (features & (1 << 0)) {
printf("%sNP", comma ? "," : "");
- comma = 1;
+ comma = 1;
}
if (features & (1 << 3)) {
printf("%sNRIP", comma ? "," : "");
- comma = 1;
+ comma = 1;
}
if (features & (1 << 5)) {
printf("%sVClean", comma ? "," : "");
- comma = 1;
+ comma = 1;
}
if (features & (1 << 6)) {
printf("%sAFlush", comma ? "," : "");
- comma = 1;
+ comma = 1;
}
if (features & (1 << 7)) {
printf("%sDAssist", comma ? "," : "");
- comma = 1;
+ comma = 1;
}
printf("%sNAsids=%d", comma ? "," : "", regs[1]);
return;
@@ -2262,7 +2262,7 @@ print_svm_info(void)
"\010DecodeAssist" /* Decode assist */
"\011<b8>"
"\012<b9>"
- "\013PauseFilter" /* PAUSE intercept filter */
+ "\013PauseFilter" /* PAUSE intercept filter */
"\014EncryptedMcodePatch"
"\015PauseFilterThreshold" /* PAUSE filter threshold */
"\016AVIC" /* virtual interrupt controller */
@@ -2284,7 +2284,7 @@ print_svm_info(void)
"\036<b29>"
"\037<b30>"
"\040<b31>"
- );
+ );
printf("\nRevision=%d, ASIDs=%d", regs[0] & 0xff, regs[1]);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
