diff options
Diffstat (limited to 'libfdt')
| -rw-r--r-- | libfdt/libfdt.h | 6 | ||||
| -rw-r--r-- | libfdt/libfdt_strerror.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h index 1e53e1d..a48e4bf 100644 --- a/libfdt/libfdt.h +++ b/libfdt/libfdt.h @@ -45,7 +45,7 @@ struct fdt_header { fdt32_t off_dt_strings; /* offset to strings */ fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ fdt32_t version; /* format version */ - fdt32_t last_cocb_version; /* last compatible version */ + fdt32_t last_conb_version; /* last compatible version */ /* version 2 fields below */ fdt32_t boot_cpuid_phys; /* Which physical CPU id we're @@ -154,7 +154,7 @@ int fdt_next_subnode(const void* fdt, int offset); #define fdt_off_dt_strings(fdt) (fdt_get_header(fdt, off_dt_strings)) #define fdt_off_mem_rsvmap(fdt) (fdt_get_header(fdt, off_mem_rsvmap)) #define fdt_version(fdt) (fdt_get_header(fdt, version)) -#define fdt_last_cocb_version(fdt) (fdt_get_header(fdt, last_cocb_version)) +#define fdt_last_conb_version(fdt) (fdt_get_header(fdt, last_conb_version)) #define fdt_boot_cpuid_phys(fdt) (fdt_get_header(fdt, boot_cpuid_phys)) #define fdt_size_dt_strings(fdt) (fdt_get_header(fdt, size_dt_strings)) #define fdt_size_dt_struct(fdt) (fdt_get_header(fdt, size_dt_struct)) @@ -171,7 +171,7 @@ fdt_set_hdr_(off_dt_struct); fdt_set_hdr_(off_dt_strings); fdt_set_hdr_(off_mem_rsvmap); fdt_set_hdr_(version); -fdt_set_hdr_(last_cocb_version); +fdt_set_hdr_(last_conb_version); fdt_set_hdr_(boot_cpuid_phys); fdt_set_hdr_(size_dt_strings); fdt_set_hdr_(size_dt_struct); diff --git a/libfdt/libfdt_strerror.c b/libfdt/libfdt_strerror.c index e9a56b3..5c067b5 100644 --- a/libfdt/libfdt_strerror.c +++ b/libfdt/libfdt_strerror.c @@ -20,7 +20,7 @@ struct fdt_err { .e_str = #VAL, \ } -static struct fdt_err cb_fdtErrTbl[] = { +static struct fdt_err nb_fdtErrTbl[] = { fdt_error(FDT_ERR_NOTFOUND), fdt_error(FDT_ERR_EXISTS), fdt_error(FDT_ERR_NOSPACE), fdt_error(FDT_ERR_BADOFFSET), fdt_error(FDT_ERR_BADPATH), fdt_error(FDT_ERR_BADPHANDLE), @@ -32,7 +32,7 @@ static struct fdt_err cb_fdtErrTbl[] = { fdt_error(FDT_ERR_NOPHANDLES), fdt_error(FDT_ERR_BADFLAGS), fdt_error(FDT_ERR_ALIGNMENT), }; -#define fdt_error_length() mpux_array_size(cb_fdtErrTbl) +#define fdt_error_length() mpux_array_size(nb_fdtErrTbl) /// @brief Returns the error value as a string. /// @param errval @@ -43,7 +43,7 @@ const char* fdt_strerror(int32_t errval) { } else if (errval == 0) { return ("<no error>"); } else if (-errval < fdt_error_length()) { - const char* serr = cb_fdtErrTbl[errval].e_str; + const char* serr = nb_fdtErrTbl[errval].e_str; if (serr != null) { return serr; |