ACK: [PATCH 1/3] acpi: correct ASF! table definitions
ivanhu
ivan.hu at canonical.com
Mon Aug 3 03:35:43 UTC 2015
On 2015年07月31日 00:24, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> The original typedef for the ASF! contained some typos. This fix
> also updates the fields to make implementation of a ASF! test easier.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> src/acpi/acpidump/acpidump.c | 18 +++++++++---------
> src/lib/include/fwts_acpi.h | 14 +++++++-------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
> index 3dae3cd..86dab8e 100644
> --- a/src/acpi/acpidump/acpidump.c
> +++ b/src/acpi/acpidump/acpidump.c
> @@ -1278,14 +1278,14 @@ static void acpidump_asf(fwts_framework *fw, const fwts_acpi_table_info *table)
> FIELD_END
> };
>
> - static const fwts_acpidump_field asf_rcmp_fields[] = {
> - FIELD_UINT("Remote Control Capabilities", fwts_acpi_table_asf_rcmp, remote_control_capabilities),
> - FIELD_UINT("RMCP Boot Options Completion Code", fwts_acpi_table_asf_rcmp, rcmp_completion_code),
> - FIELD_UINT("RMCP IANA Enterprise ID", fwts_acpi_table_asf_rcmp, rcmp_iana),
> - FIELD_UINT("RMCP Special Command", fwts_acpi_table_asf_rcmp, rcmp_special_command),
> - FIELD_UINT("RMCP Special Command Parameter", fwts_acpi_table_asf_rcmp, rcmp_special_command_param),
> - FIELD_UINT("RMCP Boot Options", fwts_acpi_table_asf_rcmp, rcmp_boot_options),
> - FIELD_UINT("RMCP OEM Parameters", fwts_acpi_table_asf_rcmp, rcmp_oem_parameters),
> + static const fwts_acpidump_field asf_rmcp_fields[] = {
> + FIELD_UINT("Remote Control Capabilities", fwts_acpi_table_asf_rmcp, remote_control_capabilities),
> + FIELD_UINT("RMCP Boot Options Completion Code", fwts_acpi_table_asf_rmcp, completion_code),
> + FIELD_UINT("RMCP IANA Enterprise ID", fwts_acpi_table_asf_rmcp, iana),
> + FIELD_UINT("RMCP Special Command", fwts_acpi_table_asf_rmcp, special_command),
> + FIELD_UINT("RMCP Special Command Parameter", fwts_acpi_table_asf_rmcp, special_command_param),
> + FIELD_UINT("RMCP Boot Options", fwts_acpi_table_asf_rmcp, boot_options),
> + FIELD_UINT("RMCP OEM Parameters", fwts_acpi_table_asf_rmcp, oem_parameters),
> FIELD_END
> };
>
> @@ -1360,7 +1360,7 @@ static void acpidump_asf(fwts_framework *fw, const fwts_acpi_table_info *table)
> break;
> case 3:
> /* remote control capabilties */
> - __acpi_dump_table_fields(fw, asf_ptr, asf_rcmp_fields, asf_ptr - data);
> + __acpi_dump_table_fields(fw, asf_ptr, asf_rmcp_fields, asf_ptr - data);
> break;
> case 4:
> /* fixed SMBus addresses */
> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
> index 4ee8cb2..2c0f629 100644
> --- a/src/lib/include/fwts_acpi.h
> +++ b/src/lib/include/fwts_acpi.h
> @@ -614,13 +614,13 @@ typedef struct {
>
> typedef struct {
> uint8_t remote_control_capabilities[7];
> - uint8_t rcmp_completion_code;
> - uint8_t rcmp_iana[4];
> - uint8_t rcmp_special_command;
> - uint8_t rcmp_special_command_param[2];
> - uint8_t rcmp_boot_options[2];
> - uint8_t rcmp_oem_parameters[2];
> -} __attribute__ ((packed)) fwts_acpi_table_asf_rcmp;
> + uint8_t completion_code;
> + uint32_t iana;
> + uint8_t special_command;
> + uint16_t special_command_param;
> + uint8_t boot_options[2];
> + uint16_t oem_parameters;
> +} __attribute__ ((packed)) fwts_acpi_table_asf_rmcp;
>
> typedef struct {
> uint8_t fixed_smbus_addr;
Acked-by: Ivan Hu<ivan.hu at canonical.com>
More information about the fwts-devel
mailing list