ArmPkg: Fix Ecc error 8005 for SCMI_PROTOCOL_ID

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>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
index d89587f9edf362d5afc6c4e67ef90779545a5b97..c84ce97f15acf963d34bfe62edd5cc568ff9f07c 100644 (file)
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2017-2018, Arm Limited. All rights reserved.\r
+  Copyright (c) 2017-2021, Arm Limited. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -34,7 +34,7 @@ BaseGetVersion (
   OUT UINT32              *Version\r
   )\r
 {\r
-  return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_BASE, Version);\r
+  return ScmiGetProtocolVersion (ScmiProtocolIdBase, Version);\r
 }\r
 \r
 /** Return total number of SCMI protocols supported by the SCP firmware.\r
@@ -57,7 +57,7 @@ BaseGetTotalProtocols (
   EFI_STATUS  Status;\r
   UINT32      *ReturnValues;\r
 \r
-  Status = ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_BASE, &ReturnValues);\r
+  Status = ScmiGetProtocolAttributes (ScmiProtocolIdBase, &ReturnValues);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -91,7 +91,7 @@ BaseDiscoverVendorDetails (
   SCMI_COMMAND  Cmd;\r
   UINT32        PayloadLength;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE;\r
+  Cmd.ProtocolId = ScmiProtocolIdBase;\r
   Cmd.MessageId  = MessageId;\r
 \r
   PayloadLength = 0;\r
@@ -183,7 +183,7 @@ BaseDiscoverImplVersion (
   SCMI_COMMAND  Cmd;\r
   UINT32        PayloadLength;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE;\r
+  Cmd.ProtocolId = ScmiProtocolIdBase;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_BASE_DISCOVER_IMPLEMENTATION_VERSION;\r
 \r
   PayloadLength = 0;\r
@@ -250,7 +250,7 @@ BaseDiscoverListProtocols (
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE;\r
+  Cmd.ProtocolId = ScmiProtocolIdBase;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_BASE_DISCOVER_LIST_PROTOCOLS;\r
 \r
   Skip = 0;\r

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
index 5c06e31bda226643d1c09c0c268dfc4f0ed1f98f..b7892bfd777169a851ad5049424c134468cbec6c 100644 (file)
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
@@ -52,7 +52,7 @@ ClockGetVersion (
   OUT UINT32               *Version\r
   )\r
 {\r
-  return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_CLOCK, Version);\r
+  return ScmiGetProtocolVersion (ScmiProtocolIdClock, Version);\r
 }\r
 \r
 /** Return total number of clock devices supported by the clock management\r
@@ -76,7 +76,7 @@ ClockGetTotalClocks (
   EFI_STATUS  Status;\r
   UINT32     *ReturnValues;\r
 \r
-  Status = ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_CLOCK, &ReturnValues);\r
+  Status = ScmiGetProtocolAttributes (ScmiProtocolIdClock, &ReturnValues);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -122,7 +122,7 @@ ClockGetClockAttributes (
 \r
   *MessageParams = ClockId;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK;\r
+  Cmd.ProtocolId = ScmiProtocolIdClock;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_CLOCK_ATTRIBUTES;\r
 \r
   PayloadLength = sizeof (ClockId);\r
@@ -203,7 +203,7 @@ ClockDescribeRates (
     return Status;\r
   }\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK;\r
+  Cmd.ProtocolId = ScmiProtocolIdClock;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_CLOCK_DESCRIBE_RATES;\r
 \r
   *MessageParams++  = ClockId;\r
@@ -320,7 +320,7 @@ ClockRateGet (
   // Fill arguments for clock protocol command.\r
   *MessageParams  = ClockId;\r
 \r
-  Cmd.ProtocolId  = SCMI_PROTOCOL_ID_CLOCK;\r
+  Cmd.ProtocolId  = ScmiProtocolIdClock;\r
   Cmd.MessageId   = SCMI_MESSAGE_ID_CLOCK_RATE_GET;\r
 \r
   PayloadLength = sizeof (ClockId);\r
@@ -374,7 +374,7 @@ ClockRateSet (
   ClockRateSetAttributes->Rate.Low   = (UINT32)Rate;\r
   ClockRateSetAttributes->Rate.High  = (UINT32)(Rate >> 32);\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK;\r
+  Cmd.ProtocolId = ScmiProtocolIdClock;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_CLOCK_RATE_SET;\r
 \r
   PayloadLength = sizeof (CLOCK_RATE_SET_ATTRIBUTES);\r
@@ -421,7 +421,7 @@ ClockEnable (
   ClockConfigSetAttributes->ClockId    = ClockId;\r
   ClockConfigSetAttributes->Attributes = Enable ? BIT0 : 0;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK;\r
+  Cmd.ProtocolId = ScmiProtocolIdClock;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_CLOCK_CONFIG_SET;\r
 \r
   PayloadLength = sizeof (CLOCK_CONFIG_SET_ATTRIBUTES);\r

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c
index e95f56e670edb3d30d55f7e718ebee552efbf4a6..d5890a7633a2d23dabbb068ea417b38f1ae36b5c 100644 (file)
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2017-2018, Arm Limited. All rights reserved.\r
+  Copyright (c) 2017-2021, Arm Limited. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -24,9 +24,9 @@
 #include "ScmiPrivate.h"\r
 \r
 STATIC CONST SCMI_PROTOCOL_ENTRY Protocols[] = {\r
-  { SCMI_PROTOCOL_ID_BASE, ScmiBaseProtocolInit },\r
-  { SCMI_PROTOCOL_ID_PERFORMANCE, ScmiPerformanceProtocolInit },\r
-  { SCMI_PROTOCOL_ID_CLOCK, ScmiClockProtocolInit }\r
+  { ScmiProtocolIdBase, ScmiBaseProtocolInit },\r
+  { ScmiProtocolIdPerformance, ScmiPerformanceProtocolInit },\r
+  { ScmiProtocolIdClock, ScmiClockProtocolInit }\r
 };\r
 \r
 /** ARM SCMI driver entry point function.\r
@@ -61,7 +61,7 @@ ArmScmiDxeEntryPoint (
   UINT32              SupportedListSize;\r
 \r
   // Every SCMI implementation must implement the base protocol.\r
-  ASSERT (Protocols[0].Id == SCMI_PROTOCOL_ID_BASE);\r
+  ASSERT (Protocols[0].Id == ScmiProtocolIdBase);\r
 \r
   Status = ScmiBaseProtocolInit (&ImageHandle);\r
   if (EFI_ERROR (Status)) {\r

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c
index 712f95d6ea406cb78b1b5fdd00cb37593b6eb504..51cad4d2c6020774a615edca193a557da2fc7c7e 100644 (file)
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2017-2018, Arm Limited. All rights reserved.\r
+  Copyright (c) 2017-2021, Arm Limited. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -35,7 +35,7 @@ PerformanceGetVersion (
   OUT UINT32                     *Version\r
   )\r
 {\r
-  return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_PERFORMANCE, Version);\r
+  return ScmiGetProtocolVersion (ScmiProtocolIdPerformance, Version);\r
 }\r
 \r
 /** Return protocol attributes of the performance management protocol.\r
@@ -59,7 +59,7 @@ PerformanceGetAttributes (
   UINT32* ReturnValues;\r
 \r
   Status = ScmiGetProtocolAttributes (\r
-             SCMI_PROTOCOL_ID_PERFORMANCE,\r
+             ScmiProtocolIdPerformance,\r
              &ReturnValues\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -107,7 +107,7 @@ PerformanceDomainAttributes (
 \r
   *MessageParams = DomainId;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_DOMAIN_ATTRIBUTES;\r
 \r
   PayloadLength = sizeof (DomainId);\r
@@ -179,7 +179,7 @@ PerformanceDescribeLevels (
 \r
   *MessageParams++ = DomainId;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_DESCRIBE_LEVELS;\r
 \r
   do {\r
@@ -258,7 +258,7 @@ PerformanceLimitsSet (
   *MessageParams++ = Limits->RangeMax;\r
   *MessageParams   = Limits->RangeMin;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_SET;\r
 \r
   PayloadLength = sizeof (DomainId) + sizeof (SCMI_PERFORMANCE_LIMITS);\r
@@ -304,7 +304,7 @@ PerformanceLimitsGet (
 \r
   *MessageParams = DomainId;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_GET;\r
 \r
   PayloadLength = sizeof (DomainId);\r
@@ -354,7 +354,7 @@ PerformanceLevelSet (
   *MessageParams++ = DomainId;\r
   *MessageParams   = Level;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_SET;\r
 \r
   PayloadLength = sizeof (DomainId) + sizeof (Level);\r
@@ -399,7 +399,7 @@ PerformanceLevelGet (
 \r
   *MessageParams = DomainId;\r
 \r
-  Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE;\r
+  Cmd.ProtocolId = ScmiProtocolIdPerformance;\r
   Cmd.MessageId  = SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_GET;\r
 \r
   PayloadLength = sizeof (DomainId);\r

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h b/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h
index 7763c848aedc000ec86936936318c823094660d1..5f1225f54cd9760ae0b2b43610e5ee6bb0e8811c 100644 (file)
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2017-2018, Arm Limited. All rights reserved.\r
+  Copyright (c) 2017-2021, Arm Limited. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -13,12 +13,12 @@
 \r
 // SCMI protocol IDs.\r
 typedef enum {\r
-  SCMI_PROTOCOL_ID_BASE         = 0x10,\r
-  SCMI_PROTOCOL_ID_POWER_DOMAIN = 0x11,\r
-  SCMI_PROTOCOL_ID_SYSTEM_POWER = 0x12,\r
-  SCMI_PROTOCOL_ID_PERFORMANCE  = 0x13,\r
-  SCMI_PROTOCOL_ID_CLOCK        = 0x14,\r
-  SCMI_PROTOCOL_ID_SENSOR       = 0x15\r
+  ScmiProtocolIdBase        = 0x10,\r
+  ScmiProtocolIdPowerDomain = 0x11,\r
+  ScmiProtocolIdSystemPower = 0x12,\r
+  ScmiProtocolIdPerformance = 0x13,\r
+  ScmiProtocolIdClock       = 0x14,\r
+  ScmiProtocolIdSensor      = 0x15\r
 } SCMI_PROTOCOL_ID;\r
 \r
 // SCMI message types.\r