From: Pierre Gondois <Pierre.Gondois@arm.com>

This patch fixes the following Ecc reported error:
Variable name does not follow the rules:
1. First character should be upper case
2. Must contain lower case characters
3. No white space characters
4. Global variable name must start with a 'g'

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1552_Ecc_ArmPkg_BIS_v3


Notes:
v3:
- Import ScmiMessageIdBasexxx related changes from the patch
'ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_CLOCK'. [Sami]

ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c | 12 ++++++------
ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
index c84ce97f15ac..2c6206be9368 100644
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
@@ -69,9 +69,9 @@ BaseGetTotalProtocols (

/** Common function which returns vendor details.

- @param[in] MessageId SCMI_MESSAGE_ID_BASE_DISCOVER_VENDOR
+ @param[in] MessageId ScmiMessageIdBaseDiscoverVendor
OR
- SCMI_MESSAGE_ID_BASE_DISCOVER_SUB_VENDOR
+ ScmiMessageIdBaseDiscoverSubVendor

@param[out] VendorIdentifier ASCII name of the vendor/subvendor.

@@ -133,7 +133,7 @@ BaseDiscoverVendor (
)
{
return BaseDiscoverVendorDetails (
- SCMI_MESSAGE_ID_BASE_DISCOVER_VENDOR,
+ ScmiMessageIdBaseDiscoverVendor,
VendorIdentifier
);
}
@@ -156,7 +156,7 @@ BaseDiscoverSubVendor (
)
{
return BaseDiscoverVendorDetails (
- SCMI_MESSAGE_ID_BASE_DISCOVER_SUB_VENDOR,
+ ScmiMessageIdBaseDiscoverSubVendor,
VendorIdentifier
);
}
@@ -184,7 +184,7 @@ BaseDiscoverImplVersion (
UINT32 PayloadLength;

Cmd.ProtocolId = ScmiProtocolIdBase;
- Cmd.MessageId = SCMI_MESSAGE_ID_BASE_DISCOVER_IMPLEMENTATION_VERSION;
+ Cmd.MessageId = ScmiMessageIdBaseDiscoverImplementationVersion;

PayloadLength = 0;

@@ -251,7 +251,7 @@ BaseDiscoverListProtocols (
}

Cmd.ProtocolId = ScmiProtocolIdBase;
- Cmd.MessageId = SCMI_MESSAGE_ID_BASE_DISCOVER_LIST_PROTOCOLS;
+ Cmd.MessageId = ScmiMessageIdBaseDiscoverListProtocols;

Skip = 0;

diff --git a/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h b/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h
index 2f93ec92325e..73ad3e32a2f5 100644
--- a/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h
+++ b/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h
@@ -1,6 +1,6 @@
/** @file

- Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ Copyright (c) 2017-2021, Arm Limited. All rights reserved.<BR>

SPDX-License-Identifier: BSD-2-Clause-Patent

@@ -158,10 +158,10 @@ typedef struct _SCMI_BASE_PROTOCOL {

// SCMI Message IDs for Base protocol.
typedef enum {
- SCMI_MESSAGE_ID_BASE_DISCOVER_VENDOR = 0x3,
- SCMI_MESSAGE_ID_BASE_DISCOVER_SUB_VENDOR = 0x4,
- SCMI_MESSAGE_ID_BASE_DISCOVER_IMPLEMENTATION_VERSION = 0x5,
- SCMI_MESSAGE_ID_BASE_DISCOVER_LIST_PROTOCOLS = 0x6
+ ScmiMessageIdBaseDiscoverVendor = 0x3,
+ ScmiMessageIdBaseDiscoverSubVendor = 0x4,
+ ScmiMessageIdBaseDiscoverImplementationVersion = 0x5,
+ ScmiMessageIdBaseDiscoverListProtocols = 0x6
} SCMI_MESSAGE_ID_BASE;

#endif /* ARM_SCMI_BASE_PROTOCOL_H_ */
--
2.17.1

Reviewed-by: Sami Mujawar <sami.mujawar@...>

Regards,

Sami Mujawar