Changeset 99d6fd0 in mainline for kernel/arch/amd64/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/amd64/src

Files:

• ddi/ddi.c (modified) (7 diffs)
• pm.c (modified) (4 diffs)

kernel/arch/amd64/src/ddi/ddi.c

@@ -58 +58 @@
 {
         count_t bits;
-
+        
         bits = ioaddr + size;
         if (bits > IO_PORTS)
                 return ENOENT;
-
+        
         if (task->arch.iomap.bits < bits) {
                 bitmap_t oldiomap;
                 uint8_t *newmap;
-        
+                
                 /*
                  * The I/O permission bitmap is too small and needs to be grown.
@@ -78 +78 @@
                     task->arch.iomap.bits);
                 bitmap_initialize(&task->arch.iomap, newmap, bits);
-
+                
                 /*
                  * Mark the new range inaccessible.
@@ -84 +84 @@
                 bitmap_set_range(&task->arch.iomap, oldiomap.bits,
                     bits - oldiomap.bits);
-
+                
                 /*
                  * In case there really existed smaller iomap,
                  * copy its contents and deallocate it.
-                 */             
+                 */
                 if (oldiomap.bits) {
                         bitmap_copy(&task->arch.iomap, &oldiomap,
@@ -95 +95 @@
                 }
         }
-
+        
         /*
          * Enable the range and we are done.
          */
         bitmap_clear_range(&task->arch.iomap, (index_t) ioaddr, (count_t) size);
-
+        
         /*
          * Increment I/O Permission bitmap generation counter.
          */
         task->arch.iomapver++;
-
+        
         return 0;
 }
@@ -123 +123 @@
         tss_descriptor_t *tss_desc;
         count_t ver;
-
+        
         /* First, copy the I/O Permission Bitmap. */
         spinlock_lock(&TASK->lock);
@@ -141 +141 @@
         }
         spinlock_unlock(&TASK->lock);
-
+        
         /*
          * Second, adjust TSS segment limit.
@@ -152 +152 @@
         
         /*
-         * Before we load new TSS limit, the current TSS descriptor
-         * type must be changed to describe inactive TSS.
-         */
-        tss_desc = (tss_descriptor_t *) &gdt_p[TSS_DES];
+         * Before we load new TSS limit, the current TSS descriptor
+         * type must be changed to describe inactive TSS.
+         */
+        tss_desc = (tss_descriptor_t *) &gdt_p[TSS_DES];
         tss_desc->type = AR_TSS;
         tr_load(gdtselector(TSS_DES));

kernel/arch/amd64/src/pm.c

@@ -138 +138 @@
 void gdt_tss_setlimit(descriptor_t *d, uint32_t limit)
 {
-        struct tss_descriptor *td = (tss_descriptor_t *) d;
-
+        tss_descriptor_t *td = (tss_descriptor_t *) d;
+        
         td->limit_0_15 = limit & 0xffff;
         td->limit_16_19 = (limit >> 16) & 0xf;
@@ -186 +186 @@
 void pm_init(void)
 {
-        descriptor_t *gdt_p = (struct descriptor *) gdtr.base;
+        descriptor_t *gdt_p = (descriptor_t *) gdtr.base;
         tss_descriptor_t *tss_desc;
-
+        
         /*
          * Each CPU has its private GDT and TSS.
          * All CPUs share one IDT.
          */
-
+        
         if (config.cpu_active == 1) {
                 idt_init();
@@ -201 +201 @@
                  */
                 tss_p = &tss;
-        }
-        else {
+        } else {
                 /* We are going to use malloc, which may return
                  * non boot-mapped pointer, initialize the CR3 register
                  * ahead of page_init */
                 write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
-
-                tss_p = (struct tss *) malloc(sizeof(tss_t), FRAME_ATOMIC);
+                
+                tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC);
                 if (!tss_p)
                         panic("Cannot allocate TSS.");
         }
-
+        
         tss_initialize(tss_p);
-
+        
         tss_desc = (tss_descriptor_t *) (&gdt_p[TSS_DES]);
         tss_desc->present = 1;
@@ -222 +221 @@
         gdt_tss_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
         gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);
-
+        
         gdtr_load(&gdtr);
         idtr_load(&idtr);