Patchwork acpi: syntaxcheck: use ASL_MESSAGE_TYPES instead of #defining them (LP: #1200568)

login
register
mail settings
Submitter Colin King
Date July 12, 2013, 10:35 a.m.
Message ID <1373625337-23532-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/258736/
State Accepted
Headers show

Comments

Colin King - July 12, 2013, 10:35 a.m.
From: Colin Ian King <colin.king@canonical.com>

The IASL error codes are hard coded in fwts syntaxcheck and now differ
from the ones in ACPICA, so we are no longer picking up errors.
Instead we should use the ACPCIA error codes as defined in aslmessages.h
which we are already #including by are subsequently redefining. So just
remove the dodgy #defines and it all works correctly.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/acpi/syntaxcheck/syntaxcheck.c | 7 -------
 1 file changed, 7 deletions(-)
Alex Hung - July 15, 2013, 6:07 a.m.
On 07/12/2013 06:35 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The IASL error codes are hard coded in fwts syntaxcheck and now differ
> from the ones in ACPICA, so we are no longer picking up errors.
> Instead we should use the ACPCIA error codes as defined in aslmessages.h
> which we are already #including by are subsequently redefining. So just
> remove the dodgy #defines and it all works correctly.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/acpi/syntaxcheck/syntaxcheck.c | 7 -------
>   1 file changed, 7 deletions(-)
>
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index 5d0ae6c..61d46f8 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -45,13 +45,6 @@ static void syntaxcheck_free_advice(void);
>    */
>   #define SYNTAXCHECK_JSON_FILE		"syntaxcheck.json"
>
> -#define ASL_WARNING             0
> -#define ASL_WARNING2            1
> -#define ASL_WARNING3            2
> -#define ASL_ERROR               3
> -#define ASL_REMARK		4
> -#define ASL_OPTIMIZATION	5
> -
>   #define ASL_ID(error)	{ error, #error, NULL }
>
>   /*
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu - July 16, 2013, 8:48 a.m.
On 07/12/2013 06:35 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The IASL error codes are hard coded in fwts syntaxcheck and now differ
> from the ones in ACPICA, so we are no longer picking up errors.
> Instead we should use the ACPCIA error codes as defined in aslmessages.h
> which we are already #including by are subsequently redefining. So just
> remove the dodgy #defines and it all works correctly.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/acpi/syntaxcheck/syntaxcheck.c | 7 -------
>   1 file changed, 7 deletions(-)
>
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index 5d0ae6c..61d46f8 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -45,13 +45,6 @@ static void syntaxcheck_free_advice(void);
>    */
>   #define SYNTAXCHECK_JSON_FILE		"syntaxcheck.json"
>
> -#define ASL_WARNING             0
> -#define ASL_WARNING2            1
> -#define ASL_WARNING3            2
> -#define ASL_ERROR               3
> -#define ASL_REMARK		4
> -#define ASL_OPTIMIZATION	5
> -
>   #define ASL_ID(error)	{ error, #error, NULL }
>
>   /*
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
index 5d0ae6c..61d46f8 100644
--- a/src/acpi/syntaxcheck/syntaxcheck.c
+++ b/src/acpi/syntaxcheck/syntaxcheck.c
@@ -45,13 +45,6 @@  static void syntaxcheck_free_advice(void);
  */
 #define SYNTAXCHECK_JSON_FILE		"syntaxcheck.json"
 
-#define ASL_WARNING             0
-#define ASL_WARNING2            1
-#define ASL_WARNING3            2
-#define ASL_ERROR               3
-#define ASL_REMARK		4
-#define ASL_OPTIMIZATION	5
-
 #define ASL_ID(error)	{ error, #error, NULL }
 
 /*