Changeset 76fca31 in mainline for kernel/arch/ia32/src

Timestamp:

2008-12-16T19:02:07Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5ae4443

Parents:

8fe5980

Message:

kconsole is optional
kernel & uspace framebuffer rewrite with speedups (some things are slightly broken yet)

Location:

kernel/arch/ia32/src

Files:

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

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

@@ -66 +66 @@
 static char *vendor_str[] = {
         "Unknown Vendor",
-        "AuthenticAMD",
-        "GenuineIntel"
+        "AMD",
+        "Intel"
 };
 
@@ -78 +78 @@
                 :
                 :
-                :"%eax"
+                : "%eax"
         );
 }
@@ -90 +90 @@
                 :
                 :
-                :"%eax"
+                : "%eax"
         );      
 }
@@ -141 +141 @@
                  * 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;
-                }
-
+                
                 /*
                  * 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;
-                }
-                                
+                
                 cpuid(1, &info);
-                CPU->arch.family = (info.cpuid_eax>>8)&0xf;
-                CPU->arch.model = (info.cpuid_eax>>4)&0xf;
-                CPU->arch.stepping = (info.cpuid_eax>>0)&0xf;                                           
+                CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
+                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;
+                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f;                                              
         }
 }
 
-void cpu_print_report(cpu_t* m)
+void cpu_print_report(cpu_t* cpu)
 {
-        printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n",
-                m->id, vendor_str[m->arch.vendor], m->arch.family, m->arch.model, m->arch.stepping,
-                m->frequency_mhz);
+        printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n",
+                cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+                cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz);
 }
 

kernel/arch/ia32/src/drivers/vesa.c

@@ -98 +98 @@
 }
 
+void vesa_redraw(void)
+{
+        fb_redraw();
+}
+
 #endif
 

kernel/arch/ia32/src/ia32.c

@@ -94 +94 @@
                 else
 #endif
-                        ega_init();     /* video */
+                        ega_init(); /* video */
                 
                 /* Enable debugger */
@@ -160 +160 @@
 void arch_grab_console(void)
 {
+#ifdef CONFIG_FB
+        vesa_redraw();
+#else
+        ega_redraw();
+#endif
+        
         i8042_grab();
 }
+
 /** Return console to userspace
  *