**/\r
BOOLEAN\r
AmlIsRootPath (\r
- IN UINT8 *Buffer\r
+ IN UINT8 *Buffer\r
)\r
{\r
if ((Buffer[0] == AML_ROOT_CHAR) && (Buffer[1] == 0)) {\r
**/\r
BOOLEAN\r
AmlIsLeadName (\r
- IN CHAR8 Ch\r
+ IN CHAR8 Ch\r
)\r
{\r
- if ((Ch == '_') || (Ch >= 'A' && Ch <= 'Z')) {\r
+ if ((Ch == '_') || ((Ch >= 'A') && (Ch <= 'Z'))) {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
BOOLEAN\r
AmlIsName (\r
- IN CHAR8 Ch\r
+ IN CHAR8 Ch\r
)\r
{\r
- if (AmlIsLeadName (Ch) || (Ch >= '0' && Ch <= '9')) {\r
+ if (AmlIsLeadName (Ch) || ((Ch >= '0') && (Ch <= '9'))) {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
BOOLEAN\r
AmlIsNameSeg (\r
- IN UINT8 *Buffer\r
+ IN UINT8 *Buffer\r
)\r
{\r
UINTN Index;\r
+\r
if (!AmlIsLeadName (Buffer[0])) {\r
return FALSE;\r
}\r
+\r
for (Index = 1; Index < AML_NAME_SEG_SIZE; Index++) {\r
if (!AmlIsName (Buffer[Index])) {\r
return FALSE;\r
}\r
}\r
+\r
return TRUE;\r
}\r
\r
**/\r
EFI_STATUS\r
AmlGetNameStringSize (\r
- IN UINT8 *Buffer,\r
- OUT UINTN *BufferSize\r
+ IN UINT8 *Buffer,\r
+ OUT UINTN *BufferSize\r
)\r
{\r
- UINTN SegCount;\r
- UINTN Length;\r
- UINTN Index;\r
+ UINTN SegCount;\r
+ UINTN Length;\r
+ UINTN Index;\r
\r
Length = 0;\r
\r
// Parse root or parent prefix\r
//\r
if (*Buffer == AML_ROOT_CHAR) {\r
- Buffer ++;\r
- Length ++;\r
+ Buffer++;\r
+ Length++;\r
} else if (*Buffer == AML_PARENT_PREFIX_CHAR) {\r
do {\r
- Buffer ++;\r
- Length ++;\r
+ Buffer++;\r
+ Length++;\r
} while (*Buffer == AML_PARENT_PREFIX_CHAR);\r
}\r
\r
// Parse name segment\r
//\r
if (*Buffer == AML_DUAL_NAME_PREFIX) {\r
- Buffer ++;\r
- Length ++;\r
+ Buffer++;\r
+ Length++;\r
SegCount = 2;\r
} else if (*Buffer == AML_MULTI_NAME_PREFIX) {\r
- Buffer ++;\r
- Length ++;\r
+ Buffer++;\r
+ Length++;\r
SegCount = *Buffer;\r
- Buffer ++;\r
- Length ++;\r
+ Buffer++;\r
+ Length++;\r
} else if (*Buffer == 0) {\r
//\r
// NULL Name, only for Root\r
//\r
SegCount = 0;\r
- Buffer --;\r
+ Buffer--;\r
if ((Length == 1) && (*Buffer == AML_ROOT_CHAR)) {\r
*BufferSize = 2;\r
return EFI_SUCCESS;\r
if (!AmlIsNameSeg (Buffer)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
Buffer += AML_NAME_SEG_SIZE;\r
Length += AML_NAME_SEG_SIZE;\r
- Index ++;\r
+ Index++;\r
} while (Index < SegCount);\r
\r
*BufferSize = Length;\r
**/\r
BOOLEAN\r
AmlIsAslLeadName (\r
- IN CHAR8 Ch\r
+ IN CHAR8 Ch\r
)\r
{\r
- if (AmlIsLeadName (Ch) || (Ch >= 'a' && Ch <= 'z')) {\r
+ if (AmlIsLeadName (Ch) || ((Ch >= 'a') && (Ch <= 'z'))) {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
BOOLEAN\r
AmlIsAslName (\r
- IN CHAR8 Ch\r
+ IN CHAR8 Ch\r
)\r
{\r
- if (AmlIsAslLeadName (Ch) || (Ch >= '0' && Ch <= '9')) {\r
+ if (AmlIsAslLeadName (Ch) || ((Ch >= '0') && (Ch <= '9'))) {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
UINTN\r
AmlGetAslNameSegLength (\r
- IN UINT8 *Buffer\r
+ IN UINT8 *Buffer\r
)\r
{\r
- UINTN Length;\r
- UINTN Index;\r
+ UINTN Length;\r
+ UINTN Index;\r
\r
if (*Buffer == 0) {\r
return 0;\r
// 1st\r
//\r
if (AmlIsAslLeadName (*Buffer)) {\r
- Length ++;\r
- Buffer ++;\r
+ Length++;\r
+ Buffer++;\r
}\r
+\r
if ((*Buffer == 0) || (*Buffer == '.')) {\r
return Length;\r
}\r
+\r
//\r
// 2, 3, 4 name char\r
//\r
for (Index = 0; Index < 3; Index++) {\r
if (AmlIsAslName (*Buffer)) {\r
- Length ++;\r
- Buffer ++;\r
+ Length++;\r
+ Buffer++;\r
}\r
+\r
if ((*Buffer == 0) || (*Buffer == '.')) {\r
return Length;\r
}\r
**/\r
UINTN\r
AmlGetAslNameStringSize (\r
- IN UINT8 *Buffer,\r
- OUT UINTN *Root,\r
- OUT UINTN *Parent,\r
- OUT UINTN *SegCount\r
+ IN UINT8 *Buffer,\r
+ OUT UINTN *Root,\r
+ OUT UINTN *Parent,\r
+ OUT UINTN *SegCount\r
)\r
{\r
- UINTN NameLength;\r
- UINTN TotalLength;\r
+ UINTN NameLength;\r
+ UINTN TotalLength;\r
\r
- *Root = 0;\r
- *Parent = 0;\r
- *SegCount = 0;\r
+ *Root = 0;\r
+ *Parent = 0;\r
+ *SegCount = 0;\r
TotalLength = 0;\r
- NameLength = 0;\r
+ NameLength = 0;\r
if (*Buffer == AML_ROOT_CHAR) {\r
*Root = 1;\r
- Buffer ++;\r
+ Buffer++;\r
} else if (*Buffer == AML_PARENT_PREFIX_CHAR) {\r
do {\r
- Buffer ++;\r
- (*Parent) ++;\r
+ Buffer++;\r
+ (*Parent)++;\r
} while (*Buffer == AML_PARENT_PREFIX_CHAR);\r
}\r
\r
if ((NameLength == 0) || (NameLength > AML_NAME_SEG_SIZE)) {\r
return 0;\r
}\r
- (*SegCount) ++;\r
+\r
+ (*SegCount)++;\r
Buffer += NameLength;\r
if (*Buffer == 0) {\r
break;\r
}\r
- Buffer ++;\r
+\r
+ Buffer++;\r
}\r
\r
//\r
//\r
// Add NULL char\r
//\r
- TotalLength ++;\r
+ TotalLength++;\r
\r
return TotalLength;\r
}\r
**/\r
VOID\r
AmlUpperCaseCopyMem (\r
- IN UINT8 *DstBuffer,\r
- IN UINT8 *SrcBuffer,\r
- IN UINTN Length\r
+ IN UINT8 *DstBuffer,\r
+ IN UINT8 *SrcBuffer,\r
+ IN UINTN Length\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
for (Index = 0; Index < Length; Index++) {\r
- if (SrcBuffer[Index] >= 'a' && SrcBuffer[Index] <= 'z') {\r
+ if ((SrcBuffer[Index] >= 'a') && (SrcBuffer[Index] <= 'z')) {\r
DstBuffer[Index] = (UINT8)(SrcBuffer[Index] - 'a' + 'A');\r
} else {\r
DstBuffer[Index] = SrcBuffer[Index];\r
**/\r
UINT8 *\r
AmlNameFromAslName (\r
- IN UINT8 *AslPath\r
+ IN UINT8 *AslPath\r
)\r
{\r
- UINTN Root;\r
- UINTN Parent;\r
- UINTN SegCount;\r
- UINTN TotalLength;\r
- UINTN NameLength;\r
- UINT8 *Buffer;\r
- UINT8 *AmlPath;\r
- UINT8 *AmlBuffer;\r
+ UINTN Root;\r
+ UINTN Parent;\r
+ UINTN SegCount;\r
+ UINTN TotalLength;\r
+ UINTN NameLength;\r
+ UINT8 *Buffer;\r
+ UINT8 *AmlPath;\r
+ UINT8 *AmlBuffer;\r
\r
TotalLength = AmlGetAslNameStringSize (AslPath, &Root, &Parent, &SegCount);\r
if (TotalLength == 0) {\r
ASSERT (AmlPath != NULL);\r
\r
AmlBuffer = AmlPath;\r
- Buffer = AslPath;\r
+ Buffer = AslPath;\r
\r
//\r
// Handle Root and Parent\r
//\r
if (Root == 1) {\r
*AmlBuffer = AML_ROOT_CHAR;\r
- AmlBuffer ++;\r
- Buffer ++;\r
+ AmlBuffer++;\r
+ Buffer++;\r
} else if (Parent > 0) {\r
SetMem (AmlBuffer, Parent, AML_PARENT_PREFIX_CHAR);\r
AmlBuffer += Parent;\r
- Buffer += Parent;\r
+ Buffer += Parent;\r
}\r
\r
//\r
//\r
if (SegCount > 2) {\r
*AmlBuffer = AML_MULTI_NAME_PREFIX;\r
- AmlBuffer ++;\r
+ AmlBuffer++;\r
*AmlBuffer = (UINT8)SegCount;\r
- AmlBuffer ++;\r
+ AmlBuffer++;\r
} else if (SegCount == 2) {\r
*AmlBuffer = AML_DUAL_NAME_PREFIX;\r
- AmlBuffer ++;\r
+ AmlBuffer++;\r
}\r
\r
//\r
ASSERT ((NameLength != 0) && (NameLength <= AML_NAME_SEG_SIZE));\r
AmlUpperCaseCopyMem (AmlBuffer, Buffer, NameLength);\r
SetMem (AmlBuffer + NameLength, AML_NAME_SEG_SIZE - NameLength, AML_NAME_CHAR__);\r
- Buffer += NameLength;\r
+ Buffer += NameLength;\r
AmlBuffer += AML_NAME_SEG_SIZE;\r
if (*Buffer == 0) {\r
break;\r
}\r
- Buffer ++;\r
+\r
+ Buffer++;\r
}\r
\r
//\r
**/\r
VOID\r
AmlPrintNameSeg (\r
- IN UINT8 *Buffer\r
+ IN UINT8 *Buffer\r
)\r
{\r
DEBUG ((DEBUG_ERROR, "%c", Buffer[0]));\r
if ((Buffer[1] == '_') && (Buffer[2] == '_') && (Buffer[3] == '_')) {\r
- return ;\r
+ return;\r
}\r
+\r
DEBUG ((DEBUG_ERROR, "%c", Buffer[1]));\r
if ((Buffer[2] == '_') && (Buffer[3] == '_')) {\r
- return ;\r
+ return;\r
}\r
+\r
DEBUG ((DEBUG_ERROR, "%c", Buffer[2]));\r
if (Buffer[3] == '_') {\r
- return ;\r
+ return;\r
}\r
+\r
DEBUG ((DEBUG_ERROR, "%c", Buffer[3]));\r
- return ;\r
+ return;\r
}\r
\r
/**\r
**/\r
VOID\r
AmlPrintNameString (\r
- IN UINT8 *Buffer\r
+ IN UINT8 *Buffer\r
)\r
{\r
- UINT8 SegCount;\r
- UINT8 Index;\r
+ UINT8 SegCount;\r
+ UINT8 Index;\r
\r
if (*Buffer == AML_ROOT_CHAR) {\r
//\r
// RootChar\r
//\r
- Buffer ++;\r
+ Buffer++;\r
DEBUG ((DEBUG_ERROR, "\\"));\r
} else if (*Buffer == AML_PARENT_PREFIX_CHAR) {\r
//\r
// ParentPrefixChar\r
//\r
do {\r
- Buffer ++;\r
+ Buffer++;\r
DEBUG ((DEBUG_ERROR, "^"));\r
} while (*Buffer == AML_PARENT_PREFIX_CHAR);\r
}\r
//\r
// DualName\r
//\r
- Buffer ++;\r
+ Buffer++;\r
SegCount = 2;\r
} else if (*Buffer == AML_MULTI_NAME_PREFIX) {\r
//\r
// MultiName\r
//\r
- Buffer ++;\r
+ Buffer++;\r
SegCount = *Buffer;\r
- Buffer ++;\r
+ Buffer++;\r
} else if (*Buffer == 0) {\r
//\r
// NULL Name\r
//\r
- return ;\r
+ return;\r
} else {\r
//\r
// NameSeg\r
Buffer += AML_NAME_SEG_SIZE;\r
}\r
\r
- return ;\r
+ return;\r
}\r