DynamicTablesPkg: Use abstract tokens in token generator

sarah-walker-arm · mergify[bot] · commit aace3eebd25a · 2025-10-13T10:45:45.000Z
Using abstract tokens ensures no collisions with non-generated tokens.

Signed-off-by: Sarah Walker &lt;Sarah.Walker2@arm.com&gt;
diff --git a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
@@ -55,6 +55,7 @@ typedef enum AbstractTokenID {
   ETokenNameSpaceUnknown = 0,
   ETokenNameSpaceSmbios,
   ETokenNameSpaceFdtHwInfo,
+  ETokenNameSpaceGenerated,
 
   ETokenNameSpaceMax
 } EABSTRACT_TOKEN_ID;
diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenGenerator.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/TokenGenerator.c
@@ -23,7 +23,9 @@ GenerateToken (
   )
 {
   // Start Tokens at 1 to avoid collisions with CM_NULL_TOKEN.
-  STATIC UINTN  CurrentToken = 1;
+  STATIC UINTN  CurrentToken = 0;
 
-  return (CM_OBJECT_TOKEN)(CurrentToken++);
+  CurrentToken++;
+
+  return (CM_OBJECT_TOKEN)CM_ABSTRACT_TOKEN_MAKE (ETokenNameSpaceGenerated, 0, CurrentToken);
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ GenerateToken (`
`23`	`23`	`)`
`24`	`24`	`{`
`25`	`25`	`// Start Tokens at 1 to avoid collisions with CM_NULL_TOKEN.`
`26`		`- STATIC UINTN CurrentToken = 1;`
	`26`	`+ STATIC UINTN CurrentToken = 0;`
`27`	`27`
`28`		`- return (CM_OBJECT_TOKEN)(CurrentToken++);`
	`28`	`+ CurrentToken++;`
	`29`	`+`
	`30`	`+ return (CM_OBJECT_TOKEN)CM_ABSTRACT_TOKEN_MAKE (ETokenNameSpaceGenerated, 0, CurrentToken);`
`29`	`31`	`}`