Changeset 101470 in vbox

Timestamp:

Oct 17, 2023 10:33:30 AM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159539

Message:

Runtime/RTFdt: Add convenience method to add a property consisting of an arbitrary number of u32 cells which are given as an array, bugref:10528

Location:

trunk

Files:

• include/iprt/fdt.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/fdt.cpp (modified) (1 diff)

trunk/include/iprt/fdt.h

@@ -286 +286 @@
 
 /**
+ * Adds a property with a variable number of u32 items passed as an array.
+ *
+ * @returns IPRT staus code.
+ * @param   hFdt            The flattened devicetree handle.
+ * @param   pszProperty     The property name.
+ * @param   cCells          The number of cells.
+ * @param   pau32Cells      Pointer to the array of u32 cell data items.
+ */
+RTDECL(int) RTFdtNodePropertyAddCellsU32AsArray(RTFDT hFdt, const char *pszProperty, uint32_t cCells, uint32_t *pau32Cells);
+
+
+/**
  * Adds a property with a variable number of u64 items (each as two 32-bit cells).
  *

trunk/include/iprt/mangling.h

@@ -961 +961 @@
 # define RTFdtNodeFinalize                              RT_MANGLER(RTFdtNodeFinalize)
 # define RTFdtNodePropertyAddCellsU32                   RT_MANGLER(RTFdtNodePropertyAddCellsU32)
+# define RTFdtNodePropertyAddCellsU32AsArray            RT_MANGLER(RTFdtNodePropertyAddCellsU32AsArray)
 # define RTFdtNodePropertyAddCellsU32V                  RT_MANGLER(RTFdtNodePropertyAddCellsU32V)
 # define RTFdtNodePropertyAddCellsU64                   RT_MANGLER(RTFdtNodePropertyAddCellsU64)

trunk/src/VBox/Runtime/common/misc/fdt.cpp

@@ -1595 +1595 @@
 
 
+RTDECL(int) RTFdtNodePropertyAddCellsU32AsArray(RTFDT hFdt, const char *pszProperty, uint32_t cCells, uint32_t *pau32Cells)
+{
+    PRTFDTINT pThis = hFdt;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+
+    /* Insert the property name into the strings block. */
+    uint32_t offStr;
+    int rc = rtFdtStringsInsertString(pThis, pszProperty, &offStr);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    uint32_t cbProp = cCells * sizeof(uint32_t) + 3 * sizeof(uint32_t);
+
+    rc = rtFdtStructEnsureSpace(pThis, cbProp);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    uint32_t *pu32 = (uint32_t *)(pThis->pbStruct + pThis->cbStruct);
+    *pu32++ = DTB_FDT_TOKEN_PROPERTY_BE;
+    *pu32++ = RT_H2BE_U32(cCells * sizeof(uint32_t));
+    *pu32++ = RT_H2BE_U32(offStr);
+    for (uint32_t i = 0; i < cCells; i++)
+        *pu32++ = RT_H2BE_U32(pau32Cells[i]);
+
+    pThis->cbStruct += cbProp;
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) RTFdtNodePropertyAddCellsU64(RTFDT hFdt, const char *pszProperty, uint32_t cCells, ...)
 {