Changeset 99d6fd0 in mainline for kernel/arch/ia32/src

Timestamp:

2009-03-13T12:57:15Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

421c833

Parents:

0160b1c8

Message:

cleanup pm.h and related stuff (no change in functionality)

Location:

kernel/arch/ia32/src

Files:

• pm.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)
• smp/smp.c (modified) (3 diffs)

kernel/arch/ia32/src/pm.c

@@ -113 +113 @@
 void tss_initialize(tss_t *t)
 {
-        memsetb(t, sizeof(struct tss), 0);
+        memsetb(t, sizeof(tss_t), 0);
 }
 

kernel/arch/ia32/src/proc/scheduler.c

@@ -60 +60 @@
         uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
             SP_DELTA];
-
+        
         /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
         write_msr(IA32_MSR_SYSENTER_ESP, kstk);
-
+        
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
         CPU->arch.tss->esp0 = kstk;
         CPU->arch.tss->ss0 = gdtselector(KDATA_DES);
-
+        
         /* Set up TLS in GS register */
         set_tls_desc(THREAD->arch.tls);

kernel/arch/ia32/src/smp/smp.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -132 +132 @@
 
         for (i = 0; i < ops->cpu_count(); i++) {
-                struct descriptor *gdt_new;
-        
+                descriptor_t *gdt_new;
+                
                 /*
                  * Skip processors marked unusable.
@@ -160 +160 @@
                  * the memory subsystem
                  */
-                gdt_new = (struct descriptor *) malloc(GDT_ITEMS *
-                    sizeof(struct descriptor), FRAME_ATOMIC);
+                gdt_new = (descriptor_t *) malloc(GDT_ITEMS *
+                    sizeof(descriptor_t), FRAME_ATOMIC);
                 if (!gdt_new)
                         panic("Cannot allocate memory for GDT.");
 
-                memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-                memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
-                protected_ap_gdtr.limit = GDT_ITEMS * sizeof(struct descriptor);
+                memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(descriptor_t));
+                memsetb(&gdt_new[TSS_DES], sizeof(descriptor_t), 0);
+                protected_ap_gdtr.limit = GDT_ITEMS * sizeof(descriptor_t);
                 protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new);
                 gdtr.base = (uintptr_t) gdt_new;