Changeset 973ef9fc in mainline for kernel/arch/amd64/src/pm.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/amd64/src/pm.c (modified) (7 diffs)

kernel/arch/amd64/src/pm.c

@@ -28 +28 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */
@@ -52 +52 @@
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
         /* KTEXT descriptor */
-        { .limit_0_15  = 0xffff, 
-          .base_0_15   = 0, 
-          .base_16_23  = 0, 
-          .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE, 
-          .limit_16_19 = 0xf, 
-          .available   = 0, 
-          .longmode    = 1, 
+        { .limit_0_15  = 0xffffU,
+          .base_0_15   = 0,
+          .base_16_23  = 0,
+          .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE,
+          .limit_16_19 = 0x0fU,
+          .available   = 0,
+          .longmode    = 1,
           .special     = 0,
-          .granularity = 1, 
+          .granularity = 1,
           .base_24_31  = 0 },
         /* KDATA descriptor */
-        { .limit_0_15  = 0xffff, 
-          .base_0_15   = 0, 
-          .base_16_23  = 0, 
-          .access      = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL, 
-          .limit_16_19 = 0xf, 
-          .available   = 0, 
-          .longmode    = 0, 
-          .special     = 0, 
-          .granularity = 1, 
+        { .limit_0_15  = 0xffffU,
+          .base_0_15   = 0,
+          .base_16_23  = 0,
+          .access      = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL,
+          .limit_16_19 = 0x0fU,
+          .available   = 0,
+          .longmode    = 0,
+          .special     = 0,
+          .granularity = 1,
           .base_24_31  = 0 },
         /* UDATA descriptor */
-        { .limit_0_15  = 0xffff, 
-          .base_0_15   = 0, 
-          .base_16_23  = 0, 
-          .access      = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 
-          .limit_16_19 = 0xf, 
-          .available   = 0, 
-          .longmode    = 0, 
-          .special     = 1, 
-          .granularity = 1, 
+        { .limit_0_15  = 0xffffU,
+          .base_0_15   = 0,
+          .base_16_23  = 0,
+          .access      = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER,
+          .limit_16_19 = 0x0fU,
+          .available   = 0,
+          .longmode    = 0,
+          .special     = 1,
+          .granularity = 1,
           .base_24_31  = 0 },
         /* UTEXT descriptor */
-        { .limit_0_15  = 0xffff, 
-          .base_0_15   = 0, 
-          .base_16_23  = 0, 
-          .access      = AR_PRESENT | AR_CODE | DPL_USER, 
-          .limit_16_19 = 0xf, 
-          .available   = 0, 
-          .longmode    = 1, 
-          .special     = 0, 
-          .granularity = 1, 
+        { .limit_0_15  = 0xffffU,
+          .base_0_15   = 0,
+          .base_16_23  = 0,
+          .access      = AR_PRESENT | AR_CODE | DPL_USER,
+          .limit_16_19 = 0x0fU,
+          .available   = 0,
+          .longmode    = 1,
+          .special     = 0,
+          .granularity = 1,
           .base_24_31  = 0 },
         /* KTEXT 32-bit protected, for protected mode before long mode */
-        { .limit_0_15  = 0xffff, 
-          .base_0_15   = 0, 
-          .base_16_23  = 0, 
-          .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE, 
-          .limit_16_19 = 0xf, 
-          .available   = 0, 
-          .longmode    = 0, 
+        { .limit_0_15  = 0xffffU,
+          .base_0_15   = 0,
+          .base_16_23  = 0,
+          .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE,
+          .limit_16_19 = 0x0fU,
+          .available   = 0,
+          .longmode    = 0,
           .special     = 1,
-          .granularity = 1, 
+          .granularity = 1,
           .base_24_31  = 0 },
         /* TSS descriptor - set up will be completed later,
@@ -111 +111 @@
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
         /* VESA Init descriptor */
-#ifdef CONFIG_FB        
-        { 0xffff, 0, VESA_INIT_SEGMENT >> 12, AR_PRESENT | AR_CODE | DPL_KERNEL,
-          0xf, 0, 0, 0, 0, 0
+#ifdef CONFIG_FB
+        {
+                0xffff, 0, VESA_INIT_SEGMENT >> 12, AR_PRESENT | AR_CODE | DPL_KERNEL,
+                    0xf, 0, 0, 0, 0, 0
         }
 #endif
@@ -129 +130 @@
 {
         tss_descriptor_t *td = (tss_descriptor_t *) d;
-
-        td->base_0_15 = base & 0xffff;
-        td->base_16_23 = ((base) >> 16) & 0xff;
-        td->base_24_31 = ((base) >> 24) & 0xff;
+        
+        td->base_0_15 = base & 0xffffU;
+        td->base_16_23 = ((base) >> 16) & 0xffU;
+        td->base_24_31 = ((base) >> 24) & 0xffU;
         td->base_32_63 = ((base) >> 32);
 }
@@ -140 +141 @@
         tss_descriptor_t *td = (tss_descriptor_t *) d;
         
-        td->limit_0_15 = limit & 0xffff;
-        td->limit_16_19 = (limit >> 16) & 0xf;
+        td->limit_0_15 = limit & 0xffffU;
+        td->limit_16_19 = (limit >> 16) & 0x0fU;
 }
 
@@ -149 +150 @@
          * Offset is a linear address.
          */
-        d->offset_0_15 = offset & 0xffff;
-        d->offset_16_31 = offset >> 16 & 0xffff;
+        d->offset_0_15 = offset & 0xffffU;
+        d->offset_16_31 = (offset >> 16) & 0xffffU;
         d->offset_32_63 = offset >> 32;
 }
@@ -165 +166 @@
 {
         idescriptor_t *d;
-        int i;
-
+        unsigned int i;
+        
         for (i = 0; i < IDT_ITEMS; i++) {
                 d = &idt[i];
-
+                
                 d->unused = 0;
                 d->selector = GDT_SELECTOR(KTEXT_DES);
-
+                
                 d->present = 1;
-                d->type = AR_INTERRUPT; /* masking interrupt */
+                d->type = AR_INTERRUPT;  /* masking interrupt */
         }
-
+        
         d = &idt[0];
         idt_setoffset(d++, (uintptr_t) &int_0);