\r
#include "libfdt_internal.h"\r
\r
-static int _fdt_blocks_misordered(const void *fdt,\r
- int mem_rsv_size, int struct_size)\r
+static int\r
+_fdt_blocks_misordered (\r
+ const void *fdt,\r
+ int mem_rsv_size,\r
+ int struct_size\r
+ )\r
{\r
- return (fdt_off_mem_rsvmap(fdt) < FDT_ALIGN(sizeof(struct fdt_header), 8))\r
- || (fdt_off_dt_struct(fdt) <\r
- (fdt_off_mem_rsvmap(fdt) + mem_rsv_size))\r
- || (fdt_off_dt_strings(fdt) <\r
- (fdt_off_dt_struct(fdt) + struct_size))\r
- || (fdt_totalsize(fdt) <\r
- (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));\r
+ return (fdt_off_mem_rsvmap (fdt) < FDT_ALIGN (sizeof (struct fdt_header), 8))\r
+ || (fdt_off_dt_struct (fdt) <\r
+ (fdt_off_mem_rsvmap (fdt) + mem_rsv_size))\r
+ || (fdt_off_dt_strings (fdt) <\r
+ (fdt_off_dt_struct (fdt) + struct_size))\r
+ || (fdt_totalsize (fdt) <\r
+ (fdt_off_dt_strings (fdt) + fdt_size_dt_strings (fdt)));\r
}\r
\r
-static int _fdt_rw_check_header(void *fdt)\r
+static int\r
+_fdt_rw_check_header (\r
+ void *fdt\r
+ )\r
{\r
- FDT_CHECK_HEADER(fdt);\r
-\r
- if (fdt_version(fdt) < 17)\r
- return -FDT_ERR_BADVERSION;\r
- if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),\r
- fdt_size_dt_struct(fdt)))\r
- return -FDT_ERR_BADLAYOUT;\r
- if (fdt_version(fdt) > 17)\r
- fdt_set_version(fdt, 17);\r
-\r
- return 0;\r
+ FDT_CHECK_HEADER (fdt);\r
+\r
+ if (fdt_version (fdt) < 17) {\r
+ return -FDT_ERR_BADVERSION;\r
+ }\r
+\r
+ if (_fdt_blocks_misordered (\r
+ fdt,\r
+ sizeof (struct fdt_reserve_entry),\r
+ fdt_size_dt_struct (fdt)\r
+ ))\r
+ {\r
+ return -FDT_ERR_BADLAYOUT;\r
+ }\r
+\r
+ if (fdt_version (fdt) > 17) {\r
+ fdt_set_version (fdt, 17);\r
+ }\r
+\r
+ return 0;\r
}\r
\r
#define FDT_RW_CHECK_HEADER(fdt) \\r
- { \\r
- int __err; \\r
- if ((__err = _fdt_rw_check_header(fdt)) != 0) \\r
- return __err; \\r
- }\r
-\r
-static inline int _fdt_data_size(void *fdt)\r
+ { \\r
+ int __err; \\r
+ if ((__err = _fdt_rw_check_header(fdt)) != 0) \\r
+ return __err; \\r
+ }\r
+\r
+static inline int\r
+_fdt_data_size (\r
+ void *fdt\r
+ )\r
{\r
- return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);\r
+ return fdt_off_dt_strings (fdt) + fdt_size_dt_strings (fdt);\r
}\r
\r
-static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)\r
+static int\r
+_fdt_splice (\r
+ void *fdt,\r
+ void *splicepoint,\r
+ int oldlen,\r
+ int newlen\r
+ )\r
{\r
- char *p = splicepoint;\r
- char *end = (char *)fdt + _fdt_data_size(fdt);\r
-\r
- if (((p + oldlen) < p) || ((p + oldlen) > end))\r
- return -FDT_ERR_BADOFFSET;\r
- if ((p < (char *)fdt) || ((end - oldlen + newlen) < (char *)fdt))\r
- return -FDT_ERR_BADOFFSET;\r
- if ((end - oldlen + newlen) > ((char *)fdt + fdt_totalsize(fdt)))\r
- return -FDT_ERR_NOSPACE;\r
- memmove(p + newlen, p + oldlen, end - p - oldlen);\r
- return 0;\r
-}\r
+ char *p = splicepoint;\r
+ char *end = (char *)fdt + _fdt_data_size (fdt);\r
\r
-static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,\r
- int oldn, int newn)\r
-{\r
- int delta = (newn - oldn) * sizeof(*p);\r
- int err;\r
- err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));\r
- if (err)\r
- return err;\r
- fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta);\r
- fdt_set_off_dt_strings(fdt, fdt_off_dt_strings(fdt) + delta);\r
- return 0;\r
-}\r
+ if (((p + oldlen) < p) || ((p + oldlen) > end)) {\r
+ return -FDT_ERR_BADOFFSET;\r
+ }\r
\r
-static int _fdt_splice_struct(void *fdt, void *p,\r
- int oldlen, int newlen)\r
-{\r
- int delta = newlen - oldlen;\r
- int err;\r
+ if ((p < (char *)fdt) || ((end - oldlen + newlen) < (char *)fdt)) {\r
+ return -FDT_ERR_BADOFFSET;\r
+ }\r
\r
- if ((err = _fdt_splice(fdt, p, oldlen, newlen)))\r
- return err;\r
+ if ((end - oldlen + newlen) > ((char *)fdt + fdt_totalsize (fdt))) {\r
+ return -FDT_ERR_NOSPACE;\r
+ }\r
\r
- fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);\r
- fdt_set_off_dt_strings(fdt, fdt_off_dt_strings(fdt) + delta);\r
- return 0;\r
+ memmove (p + newlen, p + oldlen, end - p - oldlen);\r
+ return 0;\r
}\r
\r
-static int _fdt_splice_string(void *fdt, int newlen)\r
+static int\r
+_fdt_splice_mem_rsv (\r
+ void *fdt,\r
+ struct fdt_reserve_entry *p,\r
+ int oldn,\r
+ int newn\r
+ )\r
{\r
- void *p = (char *)fdt\r
- + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);\r
- int err;\r
+ int delta = (newn - oldn) * sizeof (*p);\r
+ int err;\r
\r
- if ((err = _fdt_splice(fdt, p, 0, newlen)))\r
- return err;\r
+ err = _fdt_splice (fdt, p, oldn * sizeof (*p), newn * sizeof (*p));\r
+ if (err) {\r
+ return err;\r
+ }\r
\r
- fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);\r
- return 0;\r
+ fdt_set_off_dt_struct (fdt, fdt_off_dt_struct (fdt) + delta);\r
+ fdt_set_off_dt_strings (fdt, fdt_off_dt_strings (fdt) + delta);\r
+ return 0;\r
}\r
\r
-static int _fdt_find_add_string(void *fdt, const char *s)\r
+static int\r
+_fdt_splice_struct (\r
+ void *fdt,\r
+ void *p,\r
+ int oldlen,\r
+ int newlen\r
+ )\r
{\r
- char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);\r
- const char *p;\r
- char *new;\r
- int len = strlen(s) + 1;\r
- int err;\r
-\r
- p = _fdt_find_string(strtab, fdt_size_dt_strings(fdt), s);\r
- if (p)\r
- /* found it */\r
- return (p - strtab);\r
-\r
- new = strtab + fdt_size_dt_strings(fdt);\r
- err = _fdt_splice_string(fdt, len);\r
- if (err)\r
- return err;\r
-\r
- memcpy(new, s, len);\r
- return (new - strtab);\r
-}\r
-\r
-int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)\r
-{\r
- struct fdt_reserve_entry *re;\r
- int err;\r
-\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ int delta = newlen - oldlen;\r
+ int err;\r
\r
- re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));\r
- err = _fdt_splice_mem_rsv(fdt, re, 0, 1);\r
- if (err)\r
- return err;\r
+ if ((err = _fdt_splice (fdt, p, oldlen, newlen))) {\r
+ return err;\r
+ }\r
\r
- re->address = cpu_to_fdt64(address);\r
- re->size = cpu_to_fdt64(size);\r
- return 0;\r
+ fdt_set_size_dt_struct (fdt, fdt_size_dt_struct (fdt) + delta);\r
+ fdt_set_off_dt_strings (fdt, fdt_off_dt_strings (fdt) + delta);\r
+ return 0;\r
}\r
\r
-int fdt_del_mem_rsv(void *fdt, int n)\r
+static int\r
+_fdt_splice_string (\r
+ void *fdt,\r
+ int newlen\r
+ )\r
{\r
- struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);\r
+ void *p = (char *)fdt\r
+ + fdt_off_dt_strings (fdt) + fdt_size_dt_strings (fdt);\r
+ int err;\r
\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ if ((err = _fdt_splice (fdt, p, 0, newlen))) {\r
+ return err;\r
+ }\r
\r
- if (n >= fdt_num_mem_rsv(fdt))\r
- return -FDT_ERR_NOTFOUND;\r
+ fdt_set_size_dt_strings (fdt, fdt_size_dt_strings (fdt) + newlen);\r
+ return 0;\r
+}\r
\r
- return _fdt_splice_mem_rsv(fdt, re, 1, 0);\r
+static int\r
+_fdt_find_add_string (\r
+ void *fdt,\r
+ const char *s\r
+ )\r
+{\r
+ char *strtab = (char *)fdt + fdt_off_dt_strings (fdt);\r
+ const char *p;\r
+ char *new;\r
+ int len = strlen (s) + 1;\r
+ int err;\r
+\r
+ p = _fdt_find_string (strtab, fdt_size_dt_strings (fdt), s);\r
+ if (p) {\r
+ /* found it */\r
+ return (p - strtab);\r
+ }\r
+\r
+ new = strtab + fdt_size_dt_strings (fdt);\r
+ err = _fdt_splice_string (fdt, len);\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ memcpy (new, s, len);\r
+ return (new - strtab);\r
}\r
\r
-static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,\r
- int len, struct fdt_property **prop)\r
+int\r
+fdt_add_mem_rsv (\r
+ void *fdt,\r
+ uint64_t address,\r
+ uint64_t size\r
+ )\r
{\r
- int oldlen;\r
- int err;\r
+ struct fdt_reserve_entry *re;\r
+ int err;\r
\r
- *prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);\r
- if (!*prop)\r
- return oldlen;\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),\r
- FDT_TAGALIGN(len))))\r
- return err;\r
+ re = _fdt_mem_rsv_w (fdt, fdt_num_mem_rsv (fdt));\r
+ err = _fdt_splice_mem_rsv (fdt, re, 0, 1);\r
+ if (err) {\r
+ return err;\r
+ }\r
\r
- (*prop)->len = cpu_to_fdt32(len);\r
- return 0;\r
+ re->address = cpu_to_fdt64 (address);\r
+ re->size = cpu_to_fdt64 (size);\r
+ return 0;\r
}\r
\r
-static int _fdt_add_property(void *fdt, int nodeoffset, const char *name,\r
- int len, struct fdt_property **prop)\r
+int\r
+fdt_del_mem_rsv (\r
+ void *fdt,\r
+ int n\r
+ )\r
{\r
- int proplen;\r
- int nextoffset;\r
- int namestroff;\r
- int err;\r
-\r
- if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)\r
- return nextoffset;\r
+ struct fdt_reserve_entry *re = _fdt_mem_rsv_w (fdt, n);\r
\r
- namestroff = _fdt_find_add_string(fdt, name);\r
- if (namestroff < 0)\r
- return namestroff;\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- *prop = _fdt_offset_ptr_w(fdt, nextoffset);\r
- proplen = sizeof(**prop) + FDT_TAGALIGN(len);\r
+ if (n >= fdt_num_mem_rsv (fdt)) {\r
+ return -FDT_ERR_NOTFOUND;\r
+ }\r
\r
- err = _fdt_splice_struct(fdt, *prop, 0, proplen);\r
- if (err)\r
- return err;\r
-\r
- (*prop)->tag = cpu_to_fdt32(FDT_PROP);\r
- (*prop)->nameoff = cpu_to_fdt32(namestroff);\r
- (*prop)->len = cpu_to_fdt32(len);\r
- return 0;\r
+ return _fdt_splice_mem_rsv (fdt, re, 1, 0);\r
}\r
\r
-int fdt_set_name(void *fdt, int nodeoffset, const char *name)\r
+static int\r
+_fdt_resize_property (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name,\r
+ int len,\r
+ struct fdt_property **prop\r
+ )\r
{\r
- char *namep;\r
- int oldlen, newlen;\r
- int err;\r
-\r
- FDT_RW_CHECK_HEADER(fdt);\r
-\r
- namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);\r
- if (!namep)\r
- return oldlen;\r
-\r
- newlen = strlen(name);\r
+ int oldlen;\r
+ int err;\r
+\r
+ *prop = fdt_get_property_w (fdt, nodeoffset, name, &oldlen);\r
+ if (!*prop) {\r
+ return oldlen;\r
+ }\r
+\r
+ if ((err = _fdt_splice_struct (\r
+ fdt,\r
+ (*prop)->data,\r
+ FDT_TAGALIGN (oldlen),\r
+ FDT_TAGALIGN (len)\r
+ )))\r
+ {\r
+ return err;\r
+ }\r
+\r
+ (*prop)->len = cpu_to_fdt32 (len);\r
+ return 0;\r
+}\r
\r
- err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1),\r
- FDT_TAGALIGN(newlen+1));\r
- if (err)\r
- return err;\r
+static int\r
+_fdt_add_property (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name,\r
+ int len,\r
+ struct fdt_property **prop\r
+ )\r
+{\r
+ int proplen;\r
+ int nextoffset;\r
+ int namestroff;\r
+ int err;\r
+\r
+ if ((nextoffset = _fdt_check_node_offset (fdt, nodeoffset)) < 0) {\r
+ return nextoffset;\r
+ }\r
+\r
+ namestroff = _fdt_find_add_string (fdt, name);\r
+ if (namestroff < 0) {\r
+ return namestroff;\r
+ }\r
+\r
+ *prop = _fdt_offset_ptr_w (fdt, nextoffset);\r
+ proplen = sizeof (**prop) + FDT_TAGALIGN (len);\r
+\r
+ err = _fdt_splice_struct (fdt, *prop, 0, proplen);\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ (*prop)->tag = cpu_to_fdt32 (FDT_PROP);\r
+ (*prop)->nameoff = cpu_to_fdt32 (namestroff);\r
+ (*prop)->len = cpu_to_fdt32 (len);\r
+ return 0;\r
+}\r
\r
- memcpy(namep, name, newlen+1);\r
- return 0;\r
+int\r
+fdt_set_name (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name\r
+ )\r
+{\r
+ char *namep;\r
+ int oldlen, newlen;\r
+ int err;\r
+\r
+ FDT_RW_CHECK_HEADER (fdt);\r
+\r
+ namep = (char *)(uintptr_t)fdt_get_name (fdt, nodeoffset, &oldlen);\r
+ if (!namep) {\r
+ return oldlen;\r
+ }\r
+\r
+ newlen = strlen (name);\r
+\r
+ err = _fdt_splice_struct (\r
+ fdt,\r
+ namep,\r
+ FDT_TAGALIGN (oldlen+1),\r
+ FDT_TAGALIGN (newlen+1)\r
+ );\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ memcpy (namep, name, newlen+1);\r
+ return 0;\r
}\r
\r
-int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,\r
- int len, void **prop_data)\r
+int\r
+fdt_setprop_placeholder (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name,\r
+ int len,\r
+ void **prop_data\r
+ )\r
{\r
- struct fdt_property *prop;\r
- int err;\r
+ struct fdt_property *prop;\r
+ int err;\r
+\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ err = _fdt_resize_property (fdt, nodeoffset, name, len, &prop);\r
+ if (err == -FDT_ERR_NOTFOUND) {\r
+ err = _fdt_add_property (fdt, nodeoffset, name, len, &prop);\r
+ }\r
\r
- err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop);\r
- if (err == -FDT_ERR_NOTFOUND)\r
- err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);\r
- if (err)\r
- return err;\r
+ if (err) {\r
+ return err;\r
+ }\r
\r
- *prop_data = prop->data;\r
- return 0;\r
+ *prop_data = prop->data;\r
+ return 0;\r
}\r
\r
-int fdt_setprop(void *fdt, int nodeoffset, const char *name,\r
- const void *val, int len)\r
+int\r
+fdt_setprop (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name,\r
+ const void *val,\r
+ int len\r
+ )\r
{\r
- void *prop_data;\r
- int err;\r
+ void *prop_data;\r
+ int err;\r
\r
- err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data);\r
- if (err)\r
- return err;\r
+ err = fdt_setprop_placeholder (fdt, nodeoffset, name, len, &prop_data);\r
+ if (err) {\r
+ return err;\r
+ }\r
\r
- if (len)\r
- memcpy(prop_data, val, len);\r
- return 0;\r
+ if (len) {\r
+ memcpy (prop_data, val, len);\r
+ }\r
+\r
+ return 0;\r
}\r
\r
-int fdt_appendprop(void *fdt, int nodeoffset, const char *name,\r
- const void *val, int len)\r
+int\r
+fdt_appendprop (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name,\r
+ const void *val,\r
+ int len\r
+ )\r
{\r
- struct fdt_property *prop;\r
- int err, oldlen, newlen;\r
-\r
- FDT_RW_CHECK_HEADER(fdt);\r
-\r
- prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);\r
- if (prop) {\r
- newlen = len + oldlen;\r
- err = _fdt_splice_struct(fdt, prop->data,\r
- FDT_TAGALIGN(oldlen),\r
- FDT_TAGALIGN(newlen));\r
- if (err)\r
- return err;\r
- prop->len = cpu_to_fdt32(newlen);\r
- memcpy(prop->data + oldlen, val, len);\r
- } else {\r
- err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);\r
- if (err)\r
- return err;\r
- memcpy(prop->data, val, len);\r
- }\r
- return 0;\r
+ struct fdt_property *prop;\r
+ int err, oldlen, newlen;\r
+\r
+ FDT_RW_CHECK_HEADER (fdt);\r
+\r
+ prop = fdt_get_property_w (fdt, nodeoffset, name, &oldlen);\r
+ if (prop) {\r
+ newlen = len + oldlen;\r
+ err = _fdt_splice_struct (\r
+ fdt,\r
+ prop->data,\r
+ FDT_TAGALIGN (oldlen),\r
+ FDT_TAGALIGN (newlen)\r
+ );\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ prop->len = cpu_to_fdt32 (newlen);\r
+ memcpy (prop->data + oldlen, val, len);\r
+ } else {\r
+ err = _fdt_add_property (fdt, nodeoffset, name, len, &prop);\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ memcpy (prop->data, val, len);\r
+ }\r
+\r
+ return 0;\r
}\r
\r
-int fdt_delprop(void *fdt, int nodeoffset, const char *name)\r
+int\r
+fdt_delprop (\r
+ void *fdt,\r
+ int nodeoffset,\r
+ const char *name\r
+ )\r
{\r
- struct fdt_property *prop;\r
- int len, proplen;\r
+ struct fdt_property *prop;\r
+ int len, proplen;\r
\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- prop = fdt_get_property_w(fdt, nodeoffset, name, &len);\r
- if (!prop)\r
- return len;\r
+ prop = fdt_get_property_w (fdt, nodeoffset, name, &len);\r
+ if (!prop) {\r
+ return len;\r
+ }\r
\r
- proplen = sizeof(*prop) + FDT_TAGALIGN(len);\r
- return _fdt_splice_struct(fdt, prop, proplen, 0);\r
+ proplen = sizeof (*prop) + FDT_TAGALIGN (len);\r
+ return _fdt_splice_struct (fdt, prop, proplen, 0);\r
}\r
\r
-int fdt_add_subnode_namelen(void *fdt, int parentoffset,\r
- const char *name, int namelen)\r
+int\r
+fdt_add_subnode_namelen (\r
+ void *fdt,\r
+ int parentoffset,\r
+ const char *name,\r
+ int namelen\r
+ )\r
{\r
- struct fdt_node_header *nh;\r
- int offset, nextoffset;\r
- int nodelen;\r
- int err;\r
- uint32_t tag;\r
- fdt32_t *endtag;\r
-\r
- FDT_RW_CHECK_HEADER(fdt);\r
-\r
- offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);\r
- if (offset >= 0)\r
- return -FDT_ERR_EXISTS;\r
- else if (offset != -FDT_ERR_NOTFOUND)\r
- return offset;\r
-\r
- /* Try to place the new node after the parent's properties */\r
- fdt_next_tag(fdt, parentoffset, &nextoffset); /* skip the BEGIN_NODE */\r
- do {\r
- offset = nextoffset;\r
- tag = fdt_next_tag(fdt, offset, &nextoffset);\r
- } while ((tag == FDT_PROP) || (tag == FDT_NOP));\r
-\r
- nh = _fdt_offset_ptr_w(fdt, offset);\r
- nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE;\r
-\r
- err = _fdt_splice_struct(fdt, nh, 0, nodelen);\r
- if (err)\r
- return err;\r
-\r
- nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);\r
- memset(nh->name, 0, FDT_TAGALIGN(namelen+1));\r
- memcpy(nh->name, name, namelen);\r
- endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE);\r
- *endtag = cpu_to_fdt32(FDT_END_NODE);\r
-\r
- return offset;\r
+ struct fdt_node_header *nh;\r
+ int offset, nextoffset;\r
+ int nodelen;\r
+ int err;\r
+ uint32_t tag;\r
+ fdt32_t *endtag;\r
+\r
+ FDT_RW_CHECK_HEADER (fdt);\r
+\r
+ offset = fdt_subnode_offset_namelen (fdt, parentoffset, name, namelen);\r
+ if (offset >= 0) {\r
+ return -FDT_ERR_EXISTS;\r
+ } else if (offset != -FDT_ERR_NOTFOUND) {\r
+ return offset;\r
+ }\r
+\r
+ /* Try to place the new node after the parent's properties */\r
+ fdt_next_tag (fdt, parentoffset, &nextoffset); /* skip the BEGIN_NODE */\r
+ do {\r
+ offset = nextoffset;\r
+ tag = fdt_next_tag (fdt, offset, &nextoffset);\r
+ } while ((tag == FDT_PROP) || (tag == FDT_NOP));\r
+\r
+ nh = _fdt_offset_ptr_w (fdt, offset);\r
+ nodelen = sizeof (*nh) + FDT_TAGALIGN (namelen+1) + FDT_TAGSIZE;\r
+\r
+ err = _fdt_splice_struct (fdt, nh, 0, nodelen);\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ nh->tag = cpu_to_fdt32 (FDT_BEGIN_NODE);\r
+ memset (nh->name, 0, FDT_TAGALIGN (namelen+1));\r
+ memcpy (nh->name, name, namelen);\r
+ endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE);\r
+ *endtag = cpu_to_fdt32 (FDT_END_NODE);\r
+\r
+ return offset;\r
}\r
\r
-int fdt_add_subnode(void *fdt, int parentoffset, const char *name)\r
+int\r
+fdt_add_subnode (\r
+ void *fdt,\r
+ int parentoffset,\r
+ const char *name\r
+ )\r
{\r
- return fdt_add_subnode_namelen(fdt, parentoffset, name, strlen(name));\r
+ return fdt_add_subnode_namelen (fdt, parentoffset, name, strlen (name));\r
}\r
\r
-int fdt_del_node(void *fdt, int nodeoffset)\r
+int\r
+fdt_del_node (\r
+ void *fdt,\r
+ int nodeoffset\r
+ )\r
{\r
- int endoffset;\r
+ int endoffset;\r
\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- endoffset = _fdt_node_end_offset(fdt, nodeoffset);\r
- if (endoffset < 0)\r
- return endoffset;\r
+ endoffset = _fdt_node_end_offset (fdt, nodeoffset);\r
+ if (endoffset < 0) {\r
+ return endoffset;\r
+ }\r
\r
- return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),\r
- endoffset - nodeoffset, 0);\r
+ return _fdt_splice_struct (\r
+ fdt,\r
+ _fdt_offset_ptr_w (fdt, nodeoffset),\r
+ endoffset - nodeoffset,\r
+ 0\r
+ );\r
}\r
\r
-static void _fdt_packblocks(const char *old, char *new,\r
- int mem_rsv_size, int struct_size)\r
+static void\r
+_fdt_packblocks (\r
+ const char *old,\r
+ char *new,\r
+ int mem_rsv_size,\r
+ int struct_size\r
+ )\r
{\r
- int mem_rsv_off, struct_off, strings_off;\r
-\r
- mem_rsv_off = FDT_ALIGN(sizeof(struct fdt_header), 8);\r
- struct_off = mem_rsv_off + mem_rsv_size;\r
- strings_off = struct_off + struct_size;\r
-\r
- memmove(new + mem_rsv_off, old + fdt_off_mem_rsvmap(old), mem_rsv_size);\r
- fdt_set_off_mem_rsvmap(new, mem_rsv_off);\r
-\r
- memmove(new + struct_off, old + fdt_off_dt_struct(old), struct_size);\r
- fdt_set_off_dt_struct(new, struct_off);\r
- fdt_set_size_dt_struct(new, struct_size);\r
-\r
- memmove(new + strings_off, old + fdt_off_dt_strings(old),\r
- fdt_size_dt_strings(old));\r
- fdt_set_off_dt_strings(new, strings_off);\r
- fdt_set_size_dt_strings(new, fdt_size_dt_strings(old));\r
+ int mem_rsv_off, struct_off, strings_off;\r
+\r
+ mem_rsv_off = FDT_ALIGN (sizeof (struct fdt_header), 8);\r
+ struct_off = mem_rsv_off + mem_rsv_size;\r
+ strings_off = struct_off + struct_size;\r
+\r
+ memmove (new + mem_rsv_off, old + fdt_off_mem_rsvmap (old), mem_rsv_size);\r
+ fdt_set_off_mem_rsvmap (new, mem_rsv_off);\r
+\r
+ memmove (new + struct_off, old + fdt_off_dt_struct (old), struct_size);\r
+ fdt_set_off_dt_struct (new, struct_off);\r
+ fdt_set_size_dt_struct (new, struct_size);\r
+\r
+ memmove (\r
+ new + strings_off,\r
+ old + fdt_off_dt_strings (old),\r
+ fdt_size_dt_strings (old)\r
+ );\r
+ fdt_set_off_dt_strings (new, strings_off);\r
+ fdt_set_size_dt_strings (new, fdt_size_dt_strings (old));\r
}\r
\r
-int fdt_open_into(const void *fdt, void *buf, int bufsize)\r
+int\r
+fdt_open_into (\r
+ const void *fdt,\r
+ void *buf,\r
+ int bufsize\r
+ )\r
{\r
- int err;\r
- int mem_rsv_size, struct_size;\r
- int newsize;\r
- const char *fdtstart = fdt;\r
- const char *fdtend = fdtstart + fdt_totalsize(fdt);\r
- char *tmp;\r
-\r
- FDT_CHECK_HEADER(fdt);\r
-\r
- mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)\r
- * sizeof(struct fdt_reserve_entry);\r
-\r
- if (fdt_version(fdt) >= 17) {\r
- struct_size = fdt_size_dt_struct(fdt);\r
- } else {\r
- struct_size = 0;\r
- while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END)\r
- ;\r
- if (struct_size < 0)\r
- return struct_size;\r
- }\r
-\r
- if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {\r
- /* no further work necessary */\r
- err = fdt_move(fdt, buf, bufsize);\r
- if (err)\r
- return err;\r
- fdt_set_version(buf, 17);\r
- fdt_set_size_dt_struct(buf, struct_size);\r
- fdt_set_totalsize(buf, bufsize);\r
- return 0;\r
- }\r
-\r
- /* Need to reorder */\r
- newsize = FDT_ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size\r
- + struct_size + fdt_size_dt_strings(fdt);\r
-\r
- if (bufsize < newsize)\r
- return -FDT_ERR_NOSPACE;\r
-\r
- /* First attempt to build converted tree at beginning of buffer */\r
- tmp = buf;\r
- /* But if that overlaps with the old tree... */\r
- if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {\r
- /* Try right after the old tree instead */\r
- tmp = (char *)(uintptr_t)fdtend;\r
- if ((tmp + newsize) > ((char *)buf + bufsize))\r
- return -FDT_ERR_NOSPACE;\r
- }\r
-\r
- _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size);\r
- memmove(buf, tmp, newsize);\r
-\r
- fdt_set_magic(buf, FDT_MAGIC);\r
- fdt_set_totalsize(buf, bufsize);\r
- fdt_set_version(buf, 17);\r
- fdt_set_last_comp_version(buf, 16);\r
- fdt_set_boot_cpuid_phys(buf, fdt_boot_cpuid_phys(fdt));\r
-\r
- return 0;\r
+ int err;\r
+ int mem_rsv_size, struct_size;\r
+ int newsize;\r
+ const char *fdtstart = fdt;\r
+ const char *fdtend = fdtstart + fdt_totalsize (fdt);\r
+ char *tmp;\r
+\r
+ FDT_CHECK_HEADER (fdt);\r
+\r
+ mem_rsv_size = (fdt_num_mem_rsv (fdt)+1)\r
+ * sizeof (struct fdt_reserve_entry);\r
+\r
+ if (fdt_version (fdt) >= 17) {\r
+ struct_size = fdt_size_dt_struct (fdt);\r
+ } else {\r
+ struct_size = 0;\r
+ while (fdt_next_tag (fdt, struct_size, &struct_size) != FDT_END) {\r
+ }\r
+\r
+ if (struct_size < 0) {\r
+ return struct_size;\r
+ }\r
+ }\r
+\r
+ if (!_fdt_blocks_misordered (fdt, mem_rsv_size, struct_size)) {\r
+ /* no further work necessary */\r
+ err = fdt_move (fdt, buf, bufsize);\r
+ if (err) {\r
+ return err;\r
+ }\r
+\r
+ fdt_set_version (buf, 17);\r
+ fdt_set_size_dt_struct (buf, struct_size);\r
+ fdt_set_totalsize (buf, bufsize);\r
+ return 0;\r
+ }\r
+\r
+ /* Need to reorder */\r
+ newsize = FDT_ALIGN (sizeof (struct fdt_header), 8) + mem_rsv_size\r
+ + struct_size + fdt_size_dt_strings (fdt);\r
+\r
+ if (bufsize < newsize) {\r
+ return -FDT_ERR_NOSPACE;\r
+ }\r
+\r
+ /* First attempt to build converted tree at beginning of buffer */\r
+ tmp = buf;\r
+ /* But if that overlaps with the old tree... */\r
+ if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {\r
+ /* Try right after the old tree instead */\r
+ tmp = (char *)(uintptr_t)fdtend;\r
+ if ((tmp + newsize) > ((char *)buf + bufsize)) {\r
+ return -FDT_ERR_NOSPACE;\r
+ }\r
+ }\r
+\r
+ _fdt_packblocks (fdt, tmp, mem_rsv_size, struct_size);\r
+ memmove (buf, tmp, newsize);\r
+\r
+ fdt_set_magic (buf, FDT_MAGIC);\r
+ fdt_set_totalsize (buf, bufsize);\r
+ fdt_set_version (buf, 17);\r
+ fdt_set_last_comp_version (buf, 16);\r
+ fdt_set_boot_cpuid_phys (buf, fdt_boot_cpuid_phys (fdt));\r
+\r
+ return 0;\r
}\r
\r
-int fdt_pack(void *fdt)\r
+int\r
+fdt_pack (\r
+ void *fdt\r
+ )\r
{\r
- int mem_rsv_size;\r
+ int mem_rsv_size;\r
\r
- FDT_RW_CHECK_HEADER(fdt);\r
+ FDT_RW_CHECK_HEADER (fdt);\r
\r
- mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)\r
- * sizeof(struct fdt_reserve_entry);\r
- _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));\r
- fdt_set_totalsize(fdt, _fdt_data_size(fdt));\r
+ mem_rsv_size = (fdt_num_mem_rsv (fdt)+1)\r
+ * sizeof (struct fdt_reserve_entry);\r
+ _fdt_packblocks (fdt, fdt, mem_rsv_size, fdt_size_dt_struct (fdt));\r
+ fdt_set_totalsize (fdt, _fdt_data_size (fdt));\r
\r
- return 0;\r
+ return 0;\r
}\r
projects / mirror_edk2.git / blobdiff