summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Stone <ahs3@ahs3.net>2021-01-03 17:52:44 -0700
committerAl Stone <ahs3@ahs3.net>2021-01-03 17:52:44 -0700
commit4534cc3700f73c88e2f6a0e0f0b9efe4fc644757 (patch)
treee5335cbb3963ad252c23443e8c5c84b6ad84cc73
parent2c39dcccda4dc250a44379ae086b8b1a3fdad115 (diff)
downloadacpica-4534cc3700f73c88e2f6a0e0f0b9efe4fc644757.tar.gz
Remove the VRTC table
The VRTC table is no longer in use and is not defined by the ACPI specification. Remove the table from the known, allowed tables. Signed-off-by: Al Stone <ahs3@ahs3.net>
-rw-r--r--source/common/ahtable.c1
-rw-r--r--source/common/dmtable.c1
-rw-r--r--source/common/dmtbdump3.c53
-rw-r--r--source/common/dmtbinfo3.c21
-rw-r--r--source/compiler/dtcompiler.h5
-rw-r--r--source/compiler/dttable2.c25
-rw-r--r--source/compiler/dttemplate.h13
-rw-r--r--source/include/acdisasm.h6
-rw-r--r--source/include/actbinfo.h1
-rw-r--r--source/include/actbl3.h28
-rw-r--r--source/tools/acpisrc/astable.c2
11 files changed, 0 insertions, 156 deletions
diff --git a/source/common/ahtable.c b/source/common/ahtable.c
index 94b24827a..8f3672bc0 100644
--- a/source/common/ahtable.c
+++ b/source/common/ahtable.c
@@ -251,7 +251,6 @@ const AH_TABLE AcpiGbl_SupportedTables[] =
{ACPI_SIG_TCPA, "Trusted Computing Platform Alliance table"},
{ACPI_SIG_TPM2, "Trusted Platform Module hardware interface table"},
{ACPI_SIG_UEFI, "UEFI Boot Optimization Table"},
- {ACPI_SIG_VRTC, "Virtual Real-Time Clock Table"},
{ACPI_SIG_WAET, "Windows ACPI Emulated Devices Table"},
{ACPI_SIG_WDAT, "Watchdog Action Table"},
{ACPI_SIG_WDDT, "Watchdog Description Table"},
diff --git a/source/common/dmtable.c b/source/common/dmtable.c
index c705fd8ef..4e6f3743f 100644
--- a/source/common/dmtable.c
+++ b/source/common/dmtable.c
@@ -529,7 +529,6 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] =
{ACPI_SIG_TCPA, NULL, AcpiDmDumpTcpa, DtCompileTcpa, TemplateTcpa},
{ACPI_SIG_TPM2, AcpiDmTableInfoTpm2, AcpiDmDumpTpm2, DtCompileTpm2, TemplateTpm2},
{ACPI_SIG_UEFI, AcpiDmTableInfoUefi, NULL, DtCompileUefi, TemplateUefi},
- {ACPI_SIG_VRTC, AcpiDmTableInfoVrtc, AcpiDmDumpVrtc, DtCompileVrtc, TemplateVrtc},
{ACPI_SIG_WAET, AcpiDmTableInfoWaet, NULL, NULL, TemplateWaet},
{ACPI_SIG_WDAT, NULL, AcpiDmDumpWdat, DtCompileWdat, TemplateWdat},
{ACPI_SIG_WDDT, AcpiDmTableInfoWddt, NULL, NULL, TemplateWddt},
diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c
index 7c6d2848e..c7921f289 100644
--- a/source/common/dmtbdump3.c
+++ b/source/common/dmtbdump3.c
@@ -603,59 +603,6 @@ AcpiDmDumpTpm2 (
/*******************************************************************************
*
- * FUNCTION: AcpiDmDumpVrtc
- *
- * PARAMETERS: Table - A VRTC table
- *
- * RETURN: None
- *
- * DESCRIPTION: Format the contents of a VRTC
- *
- ******************************************************************************/
-
-void
-AcpiDmDumpVrtc (
- ACPI_TABLE_HEADER *Table)
-{
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
- ACPI_VRTC_ENTRY *Subtable;
-
-
- /* Main table */
-
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
- /* Subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
- while (Offset < Table->Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
- sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
- /* Point to next subtable */
-
- Offset += sizeof (ACPI_VRTC_ENTRY);
- Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Subtable,
- sizeof (ACPI_VRTC_ENTRY));
- }
-}
-
-
-/*******************************************************************************
- *
* FUNCTION: AcpiDmDumpWdat
*
* PARAMETERS: Table - A WDAT table
diff --git a/source/common/dmtbinfo3.c b/source/common/dmtbinfo3.c
index f4092c240..a86206bff 100644
--- a/source/common/dmtbinfo3.c
+++ b/source/common/dmtbinfo3.c
@@ -528,27 +528,6 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoUefi[] =
/*******************************************************************************
*
- * VRTC - Virtual Real Time Clock Table
- *
- ******************************************************************************/
-
-ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc[] =
-{
- ACPI_DMT_TERMINATOR
-};
-
-/* VRTC Subtables - VRTC Entry */
-
-ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc0[] =
-{
- {ACPI_DMT_GAS, ACPI_VRTC0_OFFSET (PhysicalAddress), "PhysicalAddress", 0},
- {ACPI_DMT_UINT32, ACPI_VRTC0_OFFSET (Irq), "IRQ", 0},
- ACPI_DMT_TERMINATOR
-};
-
-
-/*******************************************************************************
- *
* WAET - Windows ACPI Emulated devices Table
*
******************************************************************************/
diff --git a/source/compiler/dtcompiler.h b/source/compiler/dtcompiler.h
index 88b926a9c..d203cf8e6 100644
--- a/source/compiler/dtcompiler.h
+++ b/source/compiler/dtcompiler.h
@@ -706,10 +706,6 @@ DtCompileUefi (
void **PFieldList);
ACPI_STATUS
-DtCompileVrtc (
- void **PFieldList);
-
-ACPI_STATUS
DtCompileWdat (
void **PFieldList);
@@ -781,7 +777,6 @@ extern const unsigned char TemplateStao[];
extern const unsigned char TemplateTcpa[];
extern const unsigned char TemplateTpm2[];
extern const unsigned char TemplateUefi[];
-extern const unsigned char TemplateVrtc[];
extern const unsigned char TemplateWaet[];
extern const unsigned char TemplateWdat[];
extern const unsigned char TemplateWddt[];
diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c
index 4d773c3c5..dd7c2a332 100644
--- a/source/compiler/dttable2.c
+++ b/source/compiler/dttable2.c
@@ -2139,31 +2139,6 @@ DtCompileUefi (
/******************************************************************************
*
- * FUNCTION: DtCompileVrtc
- *
- * PARAMETERS: List - Current field list pointer
- *
- * RETURN: Status
- *
- * DESCRIPTION: Compile VRTC.
- *
- *****************************************************************************/
-
-ACPI_STATUS
-DtCompileVrtc (
- void **List)
-{
- ACPI_STATUS Status;
-
-
- Status = DtCompileTwoSubtables (List,
- AcpiDmTableInfoVrtc, AcpiDmTableInfoVrtc0);
- return (Status);
-}
-
-
-/******************************************************************************
- *
* FUNCTION: DtCompileWdat
*
* PARAMETERS: List - Current field list pointer
diff --git a/source/compiler/dttemplate.h b/source/compiler/dttemplate.h
index 3f5471bfb..715a10c4c 100644
--- a/source/compiler/dttemplate.h
+++ b/source/compiler/dttemplate.h
@@ -1450,19 +1450,6 @@ const unsigned char TemplateUefi[] =
0x0C,0x0D,0x0E,0x0F,0x00,0x00 /* 00000030 "......" */
};
-const unsigned char TemplateVrtc[] =
-{
- 0x56,0x52,0x54,0x43,0x44,0x00,0x00,0x00, /* 00000000 "VRTCD..." */
- 0x01,0xEF,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */
- 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */
- 0x03,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
- 0x17,0x01,0x13,0x20,0x00,0x08,0x00,0x00, /* 00000020 "... ...." */
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */
- 0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00, /* 00000030 "........" */
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */
- 0x00,0x00,0x00,0x00 /* 00000040 "...." */
-};
-
const unsigned char TemplateWaet[] =
{
0x57,0x41,0x45,0x54,0x28,0x00,0x00,0x00, /* 00000000 "WAET(..." */
diff --git a/source/include/acdisasm.h b/source/include/acdisasm.h
index 99f79ee03..8b3c3ee92 100644
--- a/source/include/acdisasm.h
+++ b/source/include/acdisasm.h
@@ -565,8 +565,6 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm211[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23a[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoUefi[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoWaet[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoWdat[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoWdat0[];
@@ -779,10 +777,6 @@ AcpiDmDumpTpm2 (
ACPI_TABLE_HEADER *Table);
void
-AcpiDmDumpVrtc (
- ACPI_TABLE_HEADER *Table);
-
-void
AcpiDmDumpWdat (
ACPI_TABLE_HEADER *Table);
diff --git a/source/include/actbinfo.h b/source/include/actbinfo.h
index ec140665a..1cb6b2aa0 100644
--- a/source/include/actbinfo.h
+++ b/source/include/actbinfo.h
@@ -341,7 +341,6 @@
#define ACPI_TPM2A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_TRAILER,f)
#define ACPI_TPM211_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_ARM_SMC,f)
#define ACPI_TPM23A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM23_TRAILER,f)
-#define ACPI_VRTC0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_VRTC_ENTRY,f)
#define ACPI_WDAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WDAT_ENTRY,f)
/*
diff --git a/source/include/actbl3.h b/source/include/actbl3.h
index 74d4648a8..be69eb948 100644
--- a/source/include/actbl3.h
+++ b/source/include/actbl3.h
@@ -177,7 +177,6 @@
#define ACPI_SIG_TCPA "TCPA" /* Trusted Computing Platform Alliance table */
#define ACPI_SIG_TPM2 "TPM2" /* Trusted Platform Module 2.0 H/W interface table */
#define ACPI_SIG_UEFI "UEFI" /* Uefi Boot Optimization Table */
-#define ACPI_SIG_VRTC "VRTC" /* Virtual Real Time Clock Table */
#define ACPI_SIG_WAET "WAET" /* Windows ACPI Emulated devices Table */
#define ACPI_SIG_WDAT "WDAT" /* Watchdog Action Table */
#define ACPI_SIG_WDDT "WDDT" /* Watchdog Timer Description Table */
@@ -685,33 +684,6 @@ typedef struct acpi_table_uefi
/*******************************************************************************
*
- * VRTC - Virtual Real Time Clock Table
- * Version 1
- *
- * Conforms to "Simple Firmware Interface Specification",
- * Draft 0.8.2, Oct 19, 2010
- * NOTE: The ACPI VRTC is equivalent to The SFI MRTC table.
- *
- ******************************************************************************/
-
-typedef struct acpi_table_vrtc
-{
- ACPI_TABLE_HEADER Header; /* Common ACPI table header */
-
-} ACPI_TABLE_VRTC;
-
-/* VRTC entry */
-
-typedef struct acpi_vrtc_entry
-{
- ACPI_GENERIC_ADDRESS PhysicalAddress;
- UINT32 Irq;
-
-} ACPI_VRTC_ENTRY;
-
-
-/*******************************************************************************
- *
* WAET - Windows ACPI Emulated devices Table
* Version 1
*
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index a8d453168..e0feb225e 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -536,7 +536,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_TABLE_LPIT", SRC_TYPE_STRUCT},
{"ACPI_TABLE_SUPPORT", SRC_TYPE_STRUCT},
{"ACPI_TABLE_TYPE", SRC_TYPE_SIMPLE},
- {"ACPI_TABLE_VRTC", SRC_TYPE_STRUCT},
{"ACPI_TAG_INFO", SRC_TYPE_STRUCT},
{"ACPI_THREAD_ID", SRC_TYPE_SIMPLE},
{"ACPI_THREAD_STATE", SRC_TYPE_STRUCT},
@@ -547,7 +546,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_UUID", SRC_TYPE_STRUCT},
{"ACPI_VENDOR_UUID", SRC_TYPE_STRUCT},
{"ACPI_VENDOR_WALK_INFO", SRC_TYPE_STRUCT},
- {"ACPI_VRTC_ENTRY", SRC_TYPE_STRUCT},
{"ACPI_WALK_AML_CALLBACK", SRC_TYPE_SIMPLE},
{"ACPI_WALK_CALLBACK", SRC_TYPE_SIMPLE},
{"ACPI_WALK_RESOURCE_CALLBACK", SRC_TYPE_SIMPLE},