From 6112fb0b649a1cdebc127a6a264ab64c1135f7a8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 29 Jul 2016 11:55:48 +0200 Subject: libfdt: Add fdt_setprop_inplace_namelen_partial Add a function to modify inplace only a portion of a property.. This is especially useful when the property is an array of values, and you want to update one of them without changing the DT size. Acked-by: Simon Glass Reviewed-by: David Gibson Signed-off-by: Maxime Ripard [dwg: Remove unnecessary unsigned qualifier, correct a comment] Signed-off-by: David Gibson --- cpukit/dtc/libfdt/fdt_wip.c | 29 +++++++++++++++++++++++++---- cpukit/include/libfdt.h | 21 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) (limited to 'cpukit') diff --git a/cpukit/dtc/libfdt/fdt_wip.c b/cpukit/dtc/libfdt/fdt_wip.c index c5bbb68d32..6aaab39992 100644 --- a/cpukit/dtc/libfdt/fdt_wip.c +++ b/cpukit/dtc/libfdt/fdt_wip.c @@ -55,21 +55,42 @@ #include "libfdt_internal.h" +int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset, + const char *name, int namelen, + uint32_t idx, const void *val, + int len) +{ + void *propval; + int proplen; + + propval = fdt_getprop_namelen_w(fdt, nodeoffset, name, namelen, + &proplen); + if (!propval) + return proplen; + + if (proplen < (len + idx)) + return -FDT_ERR_NOSPACE; + + memcpy((char *)propval + idx, val, len); + return 0; +} + int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, const void *val, int len) { - void *propval; + const void *propval; int proplen; - propval = fdt_getprop_w(fdt, nodeoffset, name, &proplen); + propval = fdt_getprop(fdt, nodeoffset, name, &proplen); if (! propval) return proplen; if (proplen != len) return -FDT_ERR_NOSPACE; - memcpy(propval, val, len); - return 0; + return fdt_setprop_inplace_namelen_partial(fdt, nodeoffset, name, + strlen(name), 0, + val, len); } static void _fdt_nop_region(void *start, int len) diff --git a/cpukit/include/libfdt.h b/cpukit/include/libfdt.h index 0189350fb3..376e628150 100644 --- a/cpukit/include/libfdt.h +++ b/cpukit/include/libfdt.h @@ -1079,6 +1079,27 @@ int fdt_size_cells(const void *fdt, int nodeoffset); /* Write-in-place functions */ /**********************************************************************/ +/** + * fdt_setprop_inplace_namelen_partial - change a property's value, + * but not its size + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @namelen: number of characters of name to consider + * @idx: index of the property to change in the array + * @val: pointer to data to replace the property value with + * @len: length of the property value + * + * Identical to fdt_setprop_inplace(), but modifies the given property + * starting from the given index, and using only the first characters + * of the name. It is useful when you want to manipulate only one value of + * an array and you have a string that doesn't end with \0. + */ +int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset, + const char *name, int namelen, + uint32_t idx, const void *val, + int len); + /** * fdt_setprop_inplace - change a property's value, but not its size * @fdt: pointer to the device tree blob -- cgit v1.2.3