44#include "term/klog.h"
55
66void acpi_init () {
7- ACPI_STATUS st ;
8- st = AcpiInitializeSubsystem ();
9- if (ACPI_FAILURE (st ))
7+ ACPI_STATUS st = AcpiInitializeSubsystem ();
8+ if (ACPI_FAILURE (st )) {
109 goto error ;
10+ }
1111 st = AcpiInitializeTables (NULL , 16 , TRUE);
12- if (ACPI_FAILURE (st ))
12+ if (ACPI_FAILURE (st )) {
1313 goto error ;
14+ }
1415 return ;
1516error :
1617 kerror ("acpica initialize failure" );
17- while (true)
18+ while (true) {
1819 arch_wait_for_interrupt ();
20+ }
1921}
2022
2123void acpi_namespace_setup () {
22- ACPI_STATUS st ;
23- st = AcpiLoadTables ();
24- if (ACPI_FAILURE (st ))
24+ ACPI_STATUS st = AcpiLoadTables ();
25+ if (ACPI_FAILURE (st )) {
2526 goto error ;
27+ }
2628 st = AcpiEnableSubsystem (ACPI_FULL_INITIALIZATION );
27- if (ACPI_FAILURE (st ))
29+ if (ACPI_FAILURE (st )) {
2830 goto error ;
31+ }
2932 st = AcpiInitializeObjects (ACPI_FULL_INITIALIZATION );
30- if (ACPI_FAILURE (st ))
33+ if (ACPI_FAILURE (st )) {
3134 goto error ;
35+ }
3236 return ;
3337error :
3438 kerror ("acpica namespace setup fault" );
3539}
3640
3741ACPI_STATUS acpi_table_find_by_signature (const char * signature , acpi_table_handle_t * out_table ) {
3842 size_t i ;
39- ACPI_STATUS st ;
4043
4144 if (!signature || !out_table ) {
4245 return AE_BAD_PARAMETER ;
@@ -52,15 +55,14 @@ ACPI_STATUS acpi_table_find_by_signature(const char *signature, acpi_table_handl
5255 out_table -> signature [4 ] = '\0' ;
5356 out_table -> instance = 1 ;
5457
55- st = AcpiGetTable (out_table -> signature , out_table -> instance , & out_table -> hdr );
58+ const ACPI_STATUS st = AcpiGetTable (out_table -> signature , out_table -> instance , & out_table -> hdr );
5659 if (ACPI_FAILURE (st )) {
5760 out_table -> hdr = NULL ;
5861 }
5962 return st ;
6063}
6164
6265ACPI_STATUS acpi_table_find_next_with_same_signature (acpi_table_handle_t * in_out_table ) {
63- ACPI_STATUS st ;
6466
6567 if (!in_out_table || !in_out_table -> signature [0 ]) {
6668 return AE_BAD_PARAMETER ;
@@ -72,7 +74,8 @@ ACPI_STATUS acpi_table_find_next_with_same_signature(acpi_table_handle_t *in_out
7274 }
7375
7476 in_out_table -> instance ++ ;
75- st = AcpiGetTable (in_out_table -> signature , in_out_table -> instance , & in_out_table -> hdr );
77+ const ACPI_STATUS st =
78+ AcpiGetTable (in_out_table -> signature , in_out_table -> instance , & in_out_table -> hdr );
7679 if (ACPI_FAILURE (st )) {
7780 in_out_table -> hdr = NULL ;
7881 }
0 commit comments