Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45385 )
Change subject: dev: Rename Sinic namespace as sinic
......................................................................
dev: Rename Sinic namespace as sinic
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::Sinic became ::sinic.
Change-Id: I0a28089cc9f8f65b33101b4791d67c2f82b85059
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45385
Tested-by: kokoro <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/dev/net/Ethernet.py
M src/dev/net/sinic.cc
M src/dev/net/sinic.hh
M src/dev/net/sinicreg.hh
4 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/net/Ethernet.py b/src/dev/net/Ethernet.py
index 53cc035..dc29ce6 100644
--- a/src/dev/net/Ethernet.py
+++ b/src/dev/net/Ethernet.py
@@ -229,7 +229,7 @@
class Sinic(EtherDevBase):
type = 'Sinic'
- cxx_class = 'Sinic::Device'
+ cxx_class = 'sinic::Device'
cxx_header = "dev/net/sinic.hh"
rx_max_copy = Param.MemorySize('1514B', "rx max copy")
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index b893b49..e0fed58 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -45,7 +45,9 @@
using namespace Net;
-namespace Sinic {
+GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
+namespace sinic
+{
const char *RxStateStrings[] =
{
@@ -1486,4 +1488,4 @@
}
-} // namespace Sinic
+} // namespace sinic
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh
index 2230a77..750b682 100644
--- a/src/dev/net/sinic.hh
+++ b/src/dev/net/sinic.hh
@@ -29,6 +29,7 @@
#ifndef __DEV_NET_SINIC_HH__
#define __DEV_NET_SINIC_HH__
+#include "base/compiler.hh"
#include "base/inet.hh"
#include "base/statistics.hh"
#include "dev/io_device.hh"
@@ -41,7 +42,9 @@
#include "params/Sinic.hh"
#include "sim/eventq.hh"
-namespace Sinic {
+GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
+namespace sinic
+{
class Interface;
class Base : public EtherDevBase
@@ -319,6 +322,6 @@
virtual void sendDone() { dev->transferDone(); }
};
-} // namespace Sinic
+} // namespace sinic
#endif // __DEV_NET_SINIC_HH__
diff --git a/src/dev/net/sinicreg.hh b/src/dev/net/sinicreg.hh
index 97154db..55fca69 100644
--- a/src/dev/net/sinicreg.hh
+++ b/src/dev/net/sinicreg.hh
@@ -52,7 +52,9 @@
static inline uint64_t set_##NAME(uint64_t reg, uint64_t val) \
{ return (reg & ~NAME) | ((val << OFFSET) & NAME); }
-namespace Sinic {
+GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
+namespace sinic
+{
namespace Regs {
static const int VirtualShift = 8;
@@ -232,6 +234,6 @@
return true;
}
-} // namespace Sinic
+} // namespace sinic
#endif // __DEV_NET_SINICREG_HH__
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/+/45385
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: I0a28089cc9f8f65b33101b4791d67c2f82b85059
Gerrit-Change-Number: 45385
Gerrit-PatchSet: 5
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[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
