Blame SOURCES/CEDT-support_10.patch

ed51cc
commit 0914618b553d6f3366e568409cebf2656891ca69
ed51cc
Author: Robert Moore <Robert.Moore@intel.com>
ed51cc
Date:   Thu Feb 17 14:24:24 2022 -0800
ed51cc
ed51cc
    Automated cleanup; No functional changes
ed51cc
    Removed some tabs and // comments.
ed51cc
ed51cc
diff --git a/source/common/dmtbdump1.c b/source/common/dmtbdump1.c
ed51cc
index 597bb3b..76662a4 100644
ed51cc
--- a/source/common/dmtbdump1.c
ed51cc
+++ b/source/common/dmtbdump1.c
ed51cc
@@ -273,14 +273,16 @@ AcpiDmDumpCedt (
ed51cc
             ACPI_CEDT_CFMWS *ptr = (ACPI_CEDT_CFMWS *) Subtable;
ed51cc
             unsigned int i, max = 0x01 << (ptr->InterleaveWays);
ed51cc
 
ed51cc
-            // print out table with first "Interleave target"
ed51cc
+            /* print out table with first "Interleave target" */
ed51cc
+
ed51cc
             Status = AcpiDmDumpTable (Length, Offset, Subtable,
ed51cc
                 Subtable->Length, AcpiDmTableInfoCedt1);
ed51cc
             if (ACPI_FAILURE (Status)) {
ed51cc
                 return;
ed51cc
             }
ed51cc
 
ed51cc
-            // Now, print out any interleave targets beyond the first.
ed51cc
+            /* Now, print out any interleave targets beyond the first. */
ed51cc
+
ed51cc
             for (i = 1; i < max; i++) {
ed51cc
                 unsigned int loc_offset = Offset + (i * 4) + ACPI_OFFSET(ACPI_CEDT_CFMWS, InterleaveTargets);
ed51cc
                 unsigned int *trg = &(ptr->InterleaveTargets[i]);
ed51cc
diff --git a/source/compiler/dttable1.c b/source/compiler/dttable1.c
ed51cc
index 6eea2a4..e2e0379 100644
ed51cc
--- a/source/compiler/dttable1.c
ed51cc
+++ b/source/compiler/dttable1.c
ed51cc
@@ -262,7 +262,9 @@ DtCompileCedt (
ed51cc
 
ed51cc
     while (*PFieldList)
ed51cc
     {
ed51cc
-        int InsertFlag = 1;             // if CFMWS and has more than one target, then set to zero later
ed51cc
+        /* if CFMWS and has more than one target, then set to zero later */
ed51cc
+
ed51cc
+        int InsertFlag = 1;
ed51cc
         SubtableStart = *PFieldList;
ed51cc
 
ed51cc
         /* CEDT Header */
ed51cc
@@ -293,27 +295,30 @@ DtCompileCedt (
ed51cc
             unsigned char *dump;
ed51cc
             unsigned int idx, offset, max = 0;
ed51cc
 
ed51cc
-            // Compile table with first "Interleave target"
ed51cc
+            /* Compile table with first "Interleave target" */
ed51cc
+
ed51cc
             Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt1, &Subtable);
ed51cc
             if (ACPI_FAILURE (Status))
ed51cc
             {
ed51cc
                 return (Status);
ed51cc
             }
ed51cc
 
ed51cc
-            // Look in buffer for the number of targets
ed51cc
+            /* Look in buffer for the number of targets */
ed51cc
             offset = (unsigned int) ACPI_OFFSET (ACPI_CEDT_CFMWS, InterleaveWays);
ed51cc
-            dump = (unsigned char *) Subtable->Buffer - 4;     // place at beginning of cedt1
ed51cc
-            max = 0x01 << dump[offset]; // 2^max, so 0=1, 1=2, 2=4, 3=8.  8 is MAX
ed51cc
-            if (max > 8)    max=1;      // Error in encoding Interleaving Ways.
ed51cc
-            if (max == 1)               // if only one target, then break here.
ed51cc
-                break;                  // break if only one target.
ed51cc
+            dump = (unsigned char *) Subtable->Buffer - 4;     /* place at beginning of cedt1 */
ed51cc
+            max = 0x01 << dump[offset];     /* 2^max, so 0=1, 1=2, 2=4, 3=8.  8 is MAX */
ed51cc
+            if (max > 8)    max=1;          /* Error in encoding Interleaving Ways. */
ed51cc
+            if (max == 1)                   /* if only one target, then break here. */
ed51cc
+                break;                      /* break if only one target. */
ed51cc
+
ed51cc
+            /* We need to add more interleave targets, so write the current Subtable. */
ed51cc
 
ed51cc
-            // We need to add more interleave targets, so write the current Subtable.
ed51cc
             ParentTable = DtPeekSubtable ();
ed51cc
-            DtInsertSubtable (ParentTable, Subtable);   // Insert AcpiDmTableInfoCedt1 table so we can put in
ed51cc
-            DtPushSubtable (Subtable);                  // the targets > the first.
ed51cc
+            DtInsertSubtable (ParentTable, Subtable);   /* Insert AcpiDmTableInfoCedt1 table so we can put in */
ed51cc
+            DtPushSubtable (Subtable);                  /* the targets > the first. */
ed51cc
+
ed51cc
+            /* Now, find out all interleave targets beyond the first. */
ed51cc
 
ed51cc
-            // Now, find out all interleave targets beyond the first.
ed51cc
             for (idx = 1; idx < max; idx++) {
ed51cc
                 ParentTable = DtPeekSubtable ();
ed51cc
 
ed51cc
@@ -326,7 +331,7 @@ DtCompileCedt (
ed51cc
                     }
ed51cc
                     if (Subtable)
ed51cc
                     {
ed51cc
-                        DtInsertSubtable (ParentTable, Subtable);       // got a target, so insert table.
ed51cc
+                        DtInsertSubtable (ParentTable, Subtable);       /* got a target, so insert table. */
ed51cc
                         InsertFlag = 0;
ed51cc
                     }
ed51cc
                 }
ed51cc
diff --git a/source/include/actbl1.h b/source/include/actbl1.h
ed51cc
index 3c46b60..b291aa2 100644
ed51cc
--- a/source/include/actbl1.h
ed51cc
+++ b/source/include/actbl1.h
ed51cc
@@ -468,19 +468,20 @@ typedef struct acpi_cedt_cfmws
ed51cc
 typedef struct acpi_cedt_cfmws_target_element
ed51cc
 {
ed51cc
     UINT32                  InterleaveTarget;
ed51cc
+
ed51cc
 } ACPI_CEDT_CFMWS_TARGET_ELEMENT;
ed51cc
 
ed51cc
 /* Values for Interleave Arithmetic field above */
ed51cc
 
ed51cc
-#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO	(0)
ed51cc
+#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO   (0)
ed51cc
 
ed51cc
 /* Values for Restrictions field above */
ed51cc
 
ed51cc
-#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2		(1)
ed51cc
-#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3		(1<<1)
ed51cc
-#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE	(1<<2)
ed51cc
-#define ACPI_CEDT_CFMWS_RESTRICT_PMEM		(1<<3)
ed51cc
-#define ACPI_CEDT_CFMWS_RESTRICT_FIXED		(1<<4)
ed51cc
+#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2      (1)
ed51cc
+#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3      (1<<1)
ed51cc
+#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE   (1<<2)
ed51cc
+#define ACPI_CEDT_CFMWS_RESTRICT_PMEM       (1<<3)
ed51cc
+#define ACPI_CEDT_CFMWS_RESTRICT_FIXED      (1<<4)
ed51cc
 
ed51cc
 
ed51cc
 /*******************************************************************************