Changeset 650cd22 in mainline for kernel/arch/ia32/src/pm.c

Timestamp:

2016-05-04T22:03:34Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

master

Children:

4b0206c

Parents:

6d87dce

Message:

Use designated initializer for initializing GDT

File:

• kernel/arch/ia32/src/pm.c (modified) (1 diff)

kernel/arch/ia32/src/pm.c

@@ -61 +61 @@
  */
 descriptor_t gdt[GDT_ITEMS] = {
-        /* NULL descriptor */
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-        /* KTEXT descriptor */
-        { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 },
-        /* KDATA descriptor */
-        { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 },
-        /* UTEXT descriptor */
-        { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
-        /* UDATA descriptor */
-        { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
-        /* TSS descriptor - set up will be completed later */
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-        /* VREG descriptor - segment used for virtual registers, will be reinitialized later */
-        { 0xffff, 0 , 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
+        [NULL_DES] = {
+                0
+        },
+        [KTEXT_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .access = AR_PRESENT | AR_CODE | DPL_KERNEL,
+                .special = 1,
+                .granularity = 1
+        },
+        [KDATA_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .access = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL,
+                .special = 1,
+                .granularity = 1
+        },
+        [UTEXT_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .access = AR_PRESENT | AR_CODE | DPL_USER,
+                .special = 1,
+                .granularity = 1
+        },
+        [UDATA_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .access = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER,
+                .special = 1,
+                .granularity = 1
+        },
+        [TSS_DES] = {           /* set up will be completed later */
+                0,
+        },
+        [VREG_DES] = {          /* will be reinitialized later */
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .access = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER,
+                .special = 1,
+                .granularity = 1
+        },
         /* VESA Init descriptor */
 #ifdef CONFIG_FB
-        { 0xffff, 0, VESA_INIT_SEGMENT >> 12, AR_PRESENT | AR_CODE | AR_READABLE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 },
-        { 0xffff, 0, VESA_INIT_SEGMENT >> 12, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 }
+        [VESA_INIT_CODE_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .base_16_23 = VESA_INIT_SEGMENT >> 12,
+                .access = AR_PRESENT | AR_CODE | AR_READABLE | DPL_KERNEL
+        },
+        [VESA_INIT_DATA_DES] = {
+                .limit_0_15 = 0xffff,
+                .limit_16_19 = 0xf,
+                .base_16_23 = VESA_INIT_SEGMENT >> 12,
+                .access = AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL
+        }
 #endif
 };