Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45392 )
Change subject: dev-arm: Rename SCMI namespace as scmi
......................................................................
dev-arm: Rename SCMI namespace as scmi
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::SCMI became ::scmi.
Change-Id: I68f729124079ecce02120577d2b89b25f10bde4a
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45392
Tested-by: kokoro <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/dev/arm/css/Scmi.py
M src/dev/arm/css/scmi_platform.cc
M src/dev/arm/css/scmi_platform.hh
M src/dev/arm/css/scmi_protocols.cc
M src/dev/arm/css/scmi_protocols.hh
5 files changed, 15 insertions(+), 11 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/arm/css/Scmi.py b/src/dev/arm/css/Scmi.py
index 790806f..b5759cf 100644
--- a/src/dev/arm/css/Scmi.py
+++ b/src/dev/arm/css/Scmi.py
@@ -46,7 +46,7 @@
"""
type = 'ScmiChannel'
cxx_header = "dev/arm/css/scmi_platform.hh"
- cxx_class = "SCMI::VirtualChannel"
+ cxx_class = "scmi::VirtualChannel"
shmem_range = Param.AddrRange(
"Virtual channel's shared memory address range")
phys_id = Param.Unsigned(4,
@@ -78,7 +78,7 @@
"""
type = 'ScmiAgentChannel'
cxx_header = "dev/arm/css/scmi_platform.hh"
- cxx_class = "SCMI::AgentChannel"
+ cxx_class = "scmi::AgentChannel"
class ScmiPlatformChannel(ScmiChannel):
@@ -87,7 +87,7 @@
"""
type = 'ScmiPlatformChannel'
cxx_header = "dev/arm/css/scmi_platform.hh"
- cxx_class = "SCMI::PlatformChannel"
+ cxx_class = "scmi::PlatformChannel"
class ScmiCommunication(SimObject):
"""
@@ -98,7 +98,7 @@
"""
type = 'ScmiCommunication'
cxx_header = "dev/arm/css/scmi_platform.hh"
- cxx_class = "SCMI::Communication"
+ cxx_class = "scmi::Communication"
agent_channel = Param.ScmiAgentChannel(
"Agent to Platform channel")
@@ -108,7 +108,7 @@
class ScmiPlatform(Scp):
type = 'ScmiPlatform'
cxx_header = "dev/arm/css/scmi_platform.hh"
- cxx_class = "SCMI::Platform"
+ cxx_class = "scmi::Platform"
comms = VectorParam.ScmiCommunication([],
"SCMI Communications")
diff --git a/src/dev/arm/css/scmi_platform.cc
b/src/dev/arm/css/scmi_platform.cc
index 823d225..d9a42da 100644
--- a/src/dev/arm/css/scmi_platform.cc
+++ b/src/dev/arm/css/scmi_platform.cc
@@ -43,7 +43,7 @@
#include "dev/arm/doorbell.hh"
#include "mem/packet_access.hh"
-using namespace SCMI;
+using namespace scmi;
AgentChannel::AgentChannel(const ScmiChannelParams &p)
: VirtualChannel(p),
diff --git a/src/dev/arm/css/scmi_platform.hh
b/src/dev/arm/css/scmi_platform.hh
index 8b23a09..5cd52bc 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -46,7 +46,8 @@
class Doorbell;
-namespace SCMI
+GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
+namespace scmi
{
class Platform;
@@ -326,6 +327,6 @@
DmaPort dmaPort;
};
-} // namespace SCMI
+} // namespace scmi
#endif // __DEV_ARM_CSS_SCMI_PLATFORM_H__
diff --git a/src/dev/arm/css/scmi_protocols.cc
b/src/dev/arm/css/scmi_protocols.cc
index dcec68e..61b3174 100644
--- a/src/dev/arm/css/scmi_protocols.cc
+++ b/src/dev/arm/css/scmi_protocols.cc
@@ -40,7 +40,7 @@
#include "debug/SCMI.hh"
#include "dev/arm/css/scmi_platform.hh"
-using namespace SCMI;
+using namespace scmi;
const std::string
Protocol::name() const
diff --git a/src/dev/arm/css/scmi_protocols.hh
b/src/dev/arm/css/scmi_protocols.hh
index 041dba2..28d8d6c 100644
--- a/src/dev/arm/css/scmi_protocols.hh
+++ b/src/dev/arm/css/scmi_protocols.hh
@@ -41,7 +41,10 @@
#include <cstdint>
#include <string>
-namespace SCMI
+#include "base/compiler.hh"
+
+GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
+namespace scmi
{
class Platform;
@@ -148,6 +151,6 @@
};
-}; // namespace SCMI
+}; // namespace scmi
#endif
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45392
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I68f729124079ecce02120577d2b89b25f10bde4a
Gerrit-Change-Number: 45392
Gerrit-PatchSet: 5
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
