Changeset 100023 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 31, 2023 8:50:11 AM (20 months ago)

Author:

vboxsync

Message:

Runtime/RTFdt: Implement parsing Devicetree blobs (DTB) and output a DTS, bugref:10401 [build fixes]

File:

• trunk/src/VBox/Runtime/common/misc/fdt.cpp (modified) (8 diffs)

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

@@ -442 +442 @@
     pDump->pbStructs += sizeof(uint32_t);
     pDump->cbLeft    -= sizeof(uint32_t);
-    return u32Token;
-}
-
-
+    return RT_H2BE_U32(u32Token);
+}
+
+
+#ifdef LOG_ENABLED
 /**
  * Gets the offset inside the structs block given from the current pointer.
@@ -453 +454 @@
  * @param   pDump           Pointer to the dump state.
  */
-DECLINLINE(uint32_t) rtFdtStructsGetOffset(PRTFDTINT pThis, PCRTFDTDTBDUMP pDump)
+DECLINLINE(size_t) rtFdtStructsGetOffset(PRTFDTINT pThis, PCRTFDTDTBDUMP pDump)
 {
     return pThis->DtbHdr.cbDtStruct - pDump->cbLeft - sizeof(uint32_t);
 }
+#endif
 
 
@@ -619 +621 @@
 
 /**
- * Dumps a <u32> cell property.
+ * Dumps a u32 cell property.
  *
  * @returns IPRT status code.
@@ -789 +791 @@
  *
  * @returns IPRT status code.
- * @param   pThis           Pointer to the FDT instance.
  * @param   hVfsIos         The VFS I/O stream handle to dump the DTS to.
  * @param   pDump           The dump state.
@@ -850 +851 @@
     /* Skip any NOP tokens. */
     uint32_t u32Token = rtFdtStructsGetToken(&Dump);
-    while (u32Token == DTB_FDT_TOKEN_NOP_BE)
+    while (u32Token == DTB_FDT_TOKEN_NOP)
         u32Token = rtFdtStructsGetToken(&Dump);
 
     /* The root node starts with a BEGIN_NODE token. */
-    if (u32Token != DTB_FDT_TOKEN_BEGIN_NODE_BE)
+    if (u32Token != DTB_FDT_TOKEN_BEGIN_NODE)
         return RTErrInfoSetF(pErrInfo, VERR_FDT_DTB_STRUCTS_BLOCK_TOKEN_INVALID, "The structs block doesn't start with the BEGIN_NODE token for the root node: %#RX32",
                              RT_BE2H_U32(u32Token));
@@ -874 +875 @@
     uint32_t uNdLvl = 1;
     u32Token = rtFdtStructsGetToken(&Dump);
-    while (u32Token != DTB_FDT_TOKEN_END_BE)
+    while (u32Token != DTB_FDT_TOKEN_END)
     {
-        Log4(("rtFdtDumpAsDtsRoot: Token %#RX32 at offset %#RX32\n", RT_BE2H_U32(u32Token), rtFdtStructsGetOffset(pThis, &Dump)));
+        Log4(("rtFdtDumpAsDtsRoot: Token %#RX32 at offset %#zx\n", RT_BE2H_U32(u32Token), rtFdtStructsGetOffset(pThis, &Dump)));
 
         switch (u32Token)
         {
-            case DTB_FDT_TOKEN_BEGIN_NODE_BE:
-                Log3(("rtFdtDumpAsDtsRoot: BEGIN_NODE token at offset %#RX32\n", rtFdtStructsGetOffset(pThis, &Dump)));
+            case DTB_FDT_TOKEN_BEGIN_NODE:
+                Log3(("rtFdtDumpAsDtsRoot: BEGIN_NODE token at offset %#zx\n", rtFdtStructsGetOffset(pThis, &Dump)));
                 rc = rtFdtStructsDumpNodeAsDts(hVfsIos, &Dump, uNdLvl, pErrInfo);
                 if (RT_FAILURE(rc))
@@ -888 +889 @@
                 uNdLvl++;
                 break;
-            case DTB_FDT_TOKEN_PROPERTY_BE:
-                Log3(("rtFdtDumpAsDtsRoot: PROP token at offset %#RX32\n", rtFdtStructsGetOffset(pThis, &Dump)));
+            case DTB_FDT_TOKEN_PROPERTY:
+                Log3(("rtFdtDumpAsDtsRoot: PROP token at offset %#zx\n", rtFdtStructsGetOffset(pThis, &Dump)));
                 rc = rtFdtStructsDumpPropertyAsDts(pThis, hVfsIos, &Dump, uNdLvl, pErrInfo);
                 if (RT_FAILURE(rc))
                     return rc;
                 break;
-            case DTB_FDT_TOKEN_NOP_BE:
-                Log3(("rtFdtDumpAsDtsRoot: NOP token at offset %#RX32\n", rtFdtStructsGetOffset(pThis, &Dump)));
+            case DTB_FDT_TOKEN_NOP:
+                Log3(("rtFdtDumpAsDtsRoot: NOP token at offset %#zx\n", rtFdtStructsGetOffset(pThis, &Dump)));
                 break;
-            case DTB_FDT_TOKEN_END_NODE_BE:
-                Log3(("rtFdtDumpAsDtsRoot: END_NODE token at offset %#RX32\n", rtFdtStructsGetOffset(pThis, &Dump)));
+            case DTB_FDT_TOKEN_END_NODE:
+                Log3(("rtFdtDumpAsDtsRoot: END_NODE token at offset %#zx\n", rtFdtStructsGetOffset(pThis, &Dump)));
                 if (!uNdLvl)
                     return RTErrInfoSetF(pErrInfo, VERR_FDT_DTB_STRUCTS_BLOCK_PREMATURE_END,
@@ -916 +917 @@
 
         u32Token = rtFdtStructsGetToken(&Dump);
-        if (u32Token == DTB_FDT_TOKEN_END_BE)
-            Log3(("rtFdtDumpAsDtsRoot: END token at offset %#RX32\n", rtFdtStructsGetOffset(pThis, &Dump)));
+        if (u32Token == DTB_FDT_TOKEN_END)
+            Log3(("rtFdtDumpAsDtsRoot: END token at offset %#zx\n", rtFdtStructsGetOffset(pThis, &Dump)));
     }
 
     /* Need to end on an END token. */
-    if (u32Token != DTB_FDT_TOKEN_END_BE)
+    if (u32Token != DTB_FDT_TOKEN_END)
         return RTErrInfoSetF(pErrInfo, VERR_FDT_DTB_STRUCTS_BLOCK_TOKEN_INVALID, "The structs block doesn't end with an END token (got %#RX32, expected %#RX32)",
                              RT_BE2H_U32(u32Token), DTB_FDT_TOKEN_END);