|
5 | 5 | #include "../../hal_internal.h" |
6 | 6 | #include "../../include/memory_regions.h" |
7 | 7 |
|
8 | | -static fdt_t hal_riscv_fdt; |
9 | | -static bool hal_riscv_fdt_initialized = false; |
| 8 | +static fdt_t g_hal_riscv_fdt; |
| 9 | +static bool g_hal_riscv_fdt_initialized = false; |
10 | 10 |
|
11 | 11 | static error_t hal_riscv_read_u32_cells_be(buffer_t buf, size_t offset, u32 cell_count, u64* out); |
12 | 12 |
|
@@ -84,10 +84,11 @@ static error_t hal_riscv_find_next_memory_node(const fdt_t* fdt, dt_node_t node, |
84 | 84 | return ERR_BAD_ARG; |
85 | 85 |
|
86 | 86 | error_t err; |
87 | | - if (node != 0) |
| 87 | + if (node != 0) { |
88 | 88 | err = dt_get_node_sibling(fdt, node, &node); |
89 | | - else |
| 89 | + } else { |
90 | 90 | err = dt_get_node_child(fdt, fdt->root_node, &node); |
| 91 | + } |
91 | 92 | if (err) |
92 | 93 | return err; |
93 | 94 |
|
@@ -254,7 +255,8 @@ error_t hal_get_next_reserved_region(hal_reserved_memory_iterator_t* iter, memor |
254 | 255 | next_iter.resmem_address_cells, next_iter.resmem_size_cells, &addr, &size); |
255 | 256 | if (err != ERR_NONE && err != ERR_NOT_FOUND) { |
256 | 257 | return err; |
257 | | - } else if (err == ERR_NONE) { |
| 258 | + } |
| 259 | + if (err == ERR_NONE) { |
258 | 260 | memory_area_t area = { |
259 | 261 | .addr = (uintptr_t)addr, |
260 | 262 | .size = size, |
@@ -337,7 +339,8 @@ error_t hal_get_next_memory_region(hal_memory_iterator_t* iter, physical_memory_ |
337 | 339 | err = hal_riscv_read_reg_entry(fdt, next_iter.node, next_iter.reg_idx, address_cells, size_cells, &addr, &size); |
338 | 340 | if (err != ERR_NONE && err != ERR_NOT_FOUND) { |
339 | 341 | return err; |
340 | | - } else if (err == ERR_NONE) { |
| 342 | + } |
| 343 | + if (err == ERR_NONE) { |
341 | 344 | const physical_memory_region_t area = { |
342 | 345 | .addr = (__phys void*)(uintptr_t)addr, |
343 | 346 | .size = size, |
|
0 commit comments