rpms/acpica-tools
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix up patches to account for displacements due to SPDX info

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2020-10-25 11:36:21 -06:00
parent 6c29d68058
commit 38a008cb32
5 changed files with 360 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0039-Add-partial-big-endian-support-for-WPBT-tables.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 3 ++- source/compiler/dttable2.c | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-) 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c Index: acpica-unix2-20200925/source/common/dmtbdump3.c
index d2f2bf7b7..da9b81c92 100644 ===================================================================
--- a/source/common/dmtbdump3.c --- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
+++ b/source/common/dmtbdump3.c +++ acpica-unix2-20200925/source/common/dmtbdump3.c
@@ -736,13 +736,13 @@ AcpiDmDumpWpbt ( @@ -628,13 +628,13 @@ AcpiDmDumpWpbt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_TABLE_WPBT *Subtable; ACPI_TABLE_WPBT *Subtable;
@ -32,7 +32,7 @@ index d2f2bf7b7..da9b81c92 100644
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -751,10 +751,10 @@ AcpiDmDumpWpbt ( @@ -643,10 +643,10 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */ /* Extract the arguments buffer length from the main table */
Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@ -45,11 +45,11 @@ index d2f2bf7b7..da9b81c92 100644
+ (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c Index: acpica-unix2-20200925/source/compiler/dttable2.c
index 584c09ee8..48729b48f 100644 ===================================================================
--- a/source/compiler/dttable2.c --- acpica-unix2-20200925.orig/source/compiler/dttable2.c
+++ b/source/compiler/dttable2.c +++ acpica-unix2-20200925/source/compiler/dttable2.c
@@ -2298,7 +2298,8 @@ DtCompileWpbt ( @@ -2190,7 +2190,8 @@ DtCompileWpbt (
/* Extract the length of the Arguments buffer, insert into main table */ /* Extract the length of the Arguments buffer, insert into main table */
@ -59,6 +59,3 @@ index 584c09ee8..48729b48f 100644
Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer); Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
Table->ArgumentsLength = Length; Table->ArgumentsLength = Length;
--
2.26.2

647
0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
View File

File diff suppressed because it is too large Load Diff

15
0041-Support-MTMR-in-a-big-endian-world.patch
View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 7 ++++--- source/common/dmtbdump2.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c Index: acpica-unix2-20200925/source/common/dmtbdump2.c
index 285fd30d7..7450ca3f7 100644 ===================================================================
--- a/source/common/dmtbdump2.c --- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
+++ b/source/common/dmtbdump2.c +++ acpica-unix2-20200925/source/common/dmtbdump2.c
@@ -1156,11 +1156,12 @@ AcpiDmDumpMtmr ( @@ -1048,11 +1048,12 @@ AcpiDmDumpMtmr (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MTMR); UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
ACPI_MTMR_ENTRY *Subtable; ACPI_MTMR_ENTRY *Subtable;
@ -26,7 +26,7 @@ index 285fd30d7..7450ca3f7 100644
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1169,12 +1170,12 @@ AcpiDmDumpMtmr ( @@ -1061,12 +1062,12 @@ AcpiDmDumpMtmr (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@ -41,6 +41,3 @@ index 285fd30d7..7450ca3f7 100644
sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0); sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
--
2.26.2

15
0042-Support-VRTC-in-a-big-endian-world.patch
View File

@ -7,11 +7,11 @@ Subject: [PATCH 4/5] Support VRTC in a big-endian world
source/common/dmtbdump3.c | 7 ++++--- source/common/dmtbdump3.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c Index: acpica-unix2-20200925/source/common/dmtbdump3.c
index da9b81c92..db2f54ffb 100644 ===================================================================
--- a/source/common/dmtbdump3.c --- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
+++ b/source/common/dmtbdump3.c +++ acpica-unix2-20200925/source/common/dmtbdump3.c
@@ -629,11 +629,12 @@ AcpiDmDumpVrtc ( @@ -521,11 +521,12 @@ AcpiDmDumpVrtc (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC); UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
ACPI_VRTC_ENTRY *Subtable; ACPI_VRTC_ENTRY *Subtable;
@ -25,7 +25,7 @@ index da9b81c92..db2f54ffb 100644
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -642,12 +643,12 @@ AcpiDmDumpVrtc ( @@ -534,12 +535,12 @@ AcpiDmDumpVrtc (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@ -40,6 +40,3 @@ index da9b81c92..db2f54ffb 100644
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0); sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
--
2.26.2

33
0043-Support-S3PT-in-a-big-endian-world.patch
View File

@ -8,11 +8,11 @@ Subject: [PATCH 5/5] Support S3PT in a big-endian world
source/compiler/dttable2.c | 4 +++- source/compiler/dttable2.c | 4 +++-
2 files changed, 12 insertions(+), 7 deletions(-) 2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c Index: acpica-unix2-20200925/source/common/dmtbdump2.c
index 7450ca3f7..ada564cd5 100644 ===================================================================
--- a/source/common/dmtbdump2.c --- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
+++ b/source/common/dmtbdump2.c +++ acpica-unix2-20200925/source/common/dmtbdump2.c
@@ -1917,6 +1917,8 @@ AcpiDmDumpS3pt ( @@ -1809,6 +1809,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@ -21,7 +21,7 @@ index 7450ca3f7..ada564cd5 100644
/* Main table */ /* Main table */
@@ -1928,19 +1930,20 @@ AcpiDmDumpS3pt ( @@ -1820,19 +1822,20 @@ AcpiDmDumpS3pt (
} }
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset); Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
@ -45,7 +45,7 @@ index 7450ca3f7..ada564cd5 100644
{ {
case ACPI_S3PT_TYPE_RESUME: case ACPI_S3PT_TYPE_RESUME:
@@ -1955,7 +1958,7 @@ AcpiDmDumpS3pt ( @@ -1847,7 +1850,7 @@ AcpiDmDumpS3pt (
default: default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@ -54,7 +54,7 @@ index 7450ca3f7..ada564cd5 100644
/* Attempt to continue */ /* Attempt to continue */
@@ -1968,7 +1971,7 @@ AcpiDmDumpS3pt ( @@ -1860,7 +1863,7 @@ AcpiDmDumpS3pt (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -63,7 +63,7 @@ index 7450ca3f7..ada564cd5 100644
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1982,7 +1985,7 @@ NextSubtable: @@ -1874,7 +1877,7 @@ NextSubtable:
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length); Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
} }
@ -72,11 +72,11 @@ index 7450ca3f7..ada564cd5 100644
} }
diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c Index: acpica-unix2-20200925/source/compiler/dttable2.c
index 48729b48f..1ac063795 100644 ===================================================================
--- a/source/compiler/dttable2.c --- acpica-unix2-20200925.orig/source/compiler/dttable2.c
+++ b/source/compiler/dttable2.c +++ acpica-unix2-20200925/source/compiler/dttable2.c
@@ -1296,6 +1296,7 @@ DtCompileS3pt ( @@ -1188,6 +1188,7 @@ DtCompileS3pt (
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
@ -84,7 +84,7 @@ index 48729b48f..1ac063795 100644
Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
@@ -1323,7 +1324,8 @@ DtCompileS3pt ( @@ -1215,7 +1216,8 @@ DtCompileS3pt (
S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
@ -94,6 +94,3 @@ index 48729b48f..1ac063795 100644
{ {
case ACPI_S3PT_TYPE_RESUME: case ACPI_S3PT_TYPE_RESUME:
--
2.26.2