korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

ACPICA: Update for SLIC ACPI table.

Browse Source 
ACPICA commit c73195e13d6ad53dd7f03f86cea03c7dec72ffd3

Update to latest table definition, which contains major changes.

SLIC table is not used in the Linux kernel.

Link: https://github.com/acpica/acpica/commit/c73195e1
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Bob Moore 2015-04-13 11:51:02 +08:00 committed by Rafael J. Wysocki
parent d5a6f6b48f
commit 64645c3fb0
1 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/acpi/actbl2.h
View File

@ -959,10 +959,10 @@ struct acpi_mtmr_entry {
/******************************************************************************* /*******************************************************************************
* *
* SLIC - Software Licensing Description Table * SLIC - Software Licensing Description Table
* Version 1
* *
* Conforms to "OEM Activation 2.0 for Windows Vista Operating Systems", * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",
* Copyright 2006 * November 29, 2011
* Copyright 2011 Microsoft
* *
******************************************************************************/ ******************************************************************************/
@ -972,52 +972,6 @@ struct acpi_table_slic {
struct acpi_table_header header; /* Common ACPI table header */ struct acpi_table_header header; /* Common ACPI table header */
}; };
/* Common SLIC subtable header */
struct acpi_slic_header {
u32 type;
u32 length;
};
/* Values for Type field above */
enum acpi_slic_type {
ACPI_SLIC_TYPE_PUBLIC_KEY = 0,
ACPI_SLIC_TYPE_WINDOWS_MARKER = 1,
ACPI_SLIC_TYPE_RESERVED = 2 /* 2 and greater are reserved */
};
/*
* SLIC Subtables, correspond to Type in struct acpi_slic_header
*/
/* 0: Public Key Structure */
struct acpi_slic_key {
struct acpi_slic_header header;
u8 key_type;
u8 version;
u16 reserved;
u32 algorithm;
char magic[4];
u32 bit_length;
u32 exponent;
u8 modulus[128];
};
/* 1: Windows Marker Structure */
struct acpi_slic_marker {
struct acpi_slic_header header;
u32 version;
char oem_id[ACPI_OEM_ID_SIZE]; /* ASCII OEM identification */
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table identification */
char windows_flag[8];
u32 slic_version;
u8 reserved[16];
u8 signature[128];
};
/******************************************************************************* /*******************************************************************************
* *
* SPCR - Serial Port Console Redirection table * SPCR - Serial Port Console Redirection table