| Message ID | 1342484991-5662-1-git-send-email-colin.king@canonical.com |
|---|---|
| State | Rejected |
| Headers | show |
On 16/07/12 17:29, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Newer ACPI 5.0 FACP tables may now have the SLEEP_CONTROL_REG > and SLEEP_STATUS_REG fields > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpi/acpidump/acpidump.c | 4 +++- > src/lib/include/fwts_acpi.h | 2 ++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c > index 505418d..5474a88 100644 > --- a/src/acpi/acpidump/acpidump.c > +++ b/src/acpi/acpidump/acpidump.c > @@ -656,7 +656,9 @@ static void acpidump_fadt(fwts_framework *fw, fwts_acpi_table_info *table) > FIELD_GAS ("X_PM2_CNT_BLK", fwts_acpi_table_fadt, x_pm2_cnt_blk), > FIELD_GAS ("X_PM_TMR_BLK", fwts_acpi_table_fadt, x_pm_tmr_blk), > FIELD_GAS ("X_GPE0_BLK", fwts_acpi_table_fadt, x_gpe0_blk), > - FIELD_GAS ("X_GPE1_BLK", fwts_acpi_table_fadt, x_gpe1_blk), > + FIELD_GAS ("X_GPE0_BLK", fwts_acpi_table_fadt, x_gpe0_blk), > + FIELD_GAS ("SLEEP_CONTROL_REG", fwts_acpi_table_fadt, sleep_control_reg), > + FIELD_GAS ("SLEEP_STATUS_REG", fwts_acpi_table_fadt, sleep_status_reg), > FIELD_END > }; > > diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h > index 3ae77d4..26bbf13 100644 > --- a/src/lib/include/fwts_acpi.h > +++ b/src/lib/include/fwts_acpi.h > @@ -215,6 +215,8 @@ typedef struct { > fwts_acpi_gas x_pm_tmr_blk; > fwts_acpi_gas x_gpe0_blk; > fwts_acpi_gas x_gpe1_blk; > + fwts_acpi_gas sleep_control_reg; > + fwts_acpi_gas sleep_status_reg; > } __attribute__ ((packed)) fwts_acpi_table_fadt; > > typedef struct { > NACK, removed X_GPE1_BLK by mistake.
diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c index 505418d..5474a88 100644 --- a/src/acpi/acpidump/acpidump.c +++ b/src/acpi/acpidump/acpidump.c @@ -656,7 +656,9 @@ static void acpidump_fadt(fwts_framework *fw, fwts_acpi_table_info *table) FIELD_GAS ("X_PM2_CNT_BLK", fwts_acpi_table_fadt, x_pm2_cnt_blk), FIELD_GAS ("X_PM_TMR_BLK", fwts_acpi_table_fadt, x_pm_tmr_blk), FIELD_GAS ("X_GPE0_BLK", fwts_acpi_table_fadt, x_gpe0_blk), - FIELD_GAS ("X_GPE1_BLK", fwts_acpi_table_fadt, x_gpe1_blk), + FIELD_GAS ("X_GPE0_BLK", fwts_acpi_table_fadt, x_gpe0_blk), + FIELD_GAS ("SLEEP_CONTROL_REG", fwts_acpi_table_fadt, sleep_control_reg), + FIELD_GAS ("SLEEP_STATUS_REG", fwts_acpi_table_fadt, sleep_status_reg), FIELD_END }; diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h index 3ae77d4..26bbf13 100644 --- a/src/lib/include/fwts_acpi.h +++ b/src/lib/include/fwts_acpi.h @@ -215,6 +215,8 @@ typedef struct { fwts_acpi_gas x_pm_tmr_blk; fwts_acpi_gas x_gpe0_blk; fwts_acpi_gas x_gpe1_blk; + fwts_acpi_gas sleep_control_reg; + fwts_acpi_gas sleep_status_reg; } __attribute__ ((packed)) fwts_acpi_table_fadt; typedef struct {