Changeset 3bacee1 in mainline for kernel/arch/ia32/src

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

kernel/arch/ia32/src

Files:

• cpu/cpu.c (modified) (4 diffs)
• ia32.c (modified) (1 diff)

kernel/arch/ia32/src/cpu/cpu.c

@@ -101 +101 @@
         if (CPU->arch.fi.bits.sse) {
                 asm volatile (
-                        "mov %%cr4, %[help]\n"
-                        "or %[mask], %[help]\n"
-                        "mov %[help], %%cr4\n"
-                        : [help] "+r" (help)
-                        : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
+                    "mov %%cr4, %[help]\n"
+                    "or %[mask], %[help]\n"
+                    "mov %[help], %%cr4\n"
+                    : [help] "+r" (help)
+                    : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
                 );
         }
@@ -128 +128 @@
                  * Check for AMD processor.
                  */
-                if ((info.cpuid_ebx == AMD_CPUID_EBX)
-                    && (info.cpuid_ecx == AMD_CPUID_ECX)
-                    && (info.cpuid_edx == AMD_CPUID_EDX))
+                if ((info.cpuid_ebx == AMD_CPUID_EBX) &&
+                    (info.cpuid_ecx == AMD_CPUID_ECX) &&
+                    (info.cpuid_edx == AMD_CPUID_EDX))
                         CPU->arch.vendor = VendorAMD;
 
@@ -136 +136 @@
                  * Check for Intel processor.
                  */
-                if ((info.cpuid_ebx == INTEL_CPUID_EBX)
-                    && (info.cpuid_ecx == INTEL_CPUID_ECX)
-                    && (info.cpuid_edx == INTEL_CPUID_EDX))
+                if ((info.cpuid_ebx == INTEL_CPUID_EBX) &&
+                    (info.cpuid_ecx == INTEL_CPUID_ECX) &&
+                    (info.cpuid_edx == INTEL_CPUID_EDX))
                         CPU->arch.vendor = VendorIntel;
 
@@ -148 +148 @@
 }
 
-void cpu_print_report(cpu_t* cpu)
+void cpu_print_report(cpu_t *cpu)
 {
         printf("cpu%u: (%s family=%u model=%u stepping=%u apicid=%u) %" PRIu16
-                " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
-                cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
+            " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+            cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
 }
 

kernel/arch/ia32/src/ia32.c

@@ -200 +200 @@
         outdev_t **ns16550_out_ptr = NULL;
 #endif
-        ns16550_instance_t *ns16550_instance
-            = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
+        ns16550_instance_t *ns16550_instance =
+            ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
             ns16550_out_ptr);
         if (ns16550_instance) {