Skip to content

Commit 9e43f5d

Browse files
Erik Kanedarafaeljw
authored andcommitted
ACPICA: ASL-ASL+ converter: make root file a parameter for cv_init_file_tree
ACPICA commit 5d160cc86cca440eac7055f981e48bc14d4eb9f7 This decouples cv_init_file_tree from acpi_gbl_output_file and allows it to be called independently of acpi_os_redirect_output() Link: acpica/acpica@5d160cc8 Signed-off-by: Erik Kaneda <[email protected]> Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 1f57e6a commit 9e43f5d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/acpi/acpica/acconvert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void cg_write_aml_comment(union acpi_parse_object *op);
6565
/*
6666
* cvparser
6767
*/
68-
void cv_init_file_tree(struct acpi_table_header *table);
68+
void cv_init_file_tree(struct acpi_table_header *table, FILE * root_file);
6969

7070
void cv_clear_op_comments(union acpi_parse_object *op);
7171

drivers/acpi/acpica/acmacros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) cv_print_one_comment_type (a,b,c,d);
478478
#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) cv_print_one_comment_list (a,b);
479479
#define ASL_CV_FILE_HAS_SWITCHED(a) cv_file_has_switched(a)
480-
#define ASL_CV_INIT_FILETREE(a) cv_init_file_tree(a);
480+
#define ASL_CV_INIT_FILETREE(a,b) cv_init_file_tree(a,b);
481481

482482
#else
483483

@@ -492,7 +492,7 @@
492492
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d)
493493
#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b)
494494
#define ASL_CV_FILE_HAS_SWITCHED(a) 0
495-
#define ASL_CV_INIT_FILETREE(a)
495+
#define ASL_CV_INIT_FILETREE(a,b)
496496

497497
#endif
498498

0 commit comments

Comments
 (0)