diff --git a/src/dev/net/Ethernet.py b/src/dev/net/Ethernet.py index 53cc035281..dc29ce6124 100644 --- a/src/dev/net/Ethernet.py +++ b/src/dev/net/Ethernet.py @@ -229,7 +229,7 @@ class NSGigE(EtherDevBase): 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 b893b4917c..e0fed58bf6 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 @@ Device::unserialize(CheckpointIn &cp) } -} // namespace Sinic +} // namespace sinic diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh index 2230a77425..750b6821f0 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 @@ class Interface : public EtherInt 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 97154db0be..55fca69691 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 @@ regValid(Addr daddr) return true; } -} // namespace Sinic +} // namespace sinic #endif // __DEV_NET_SINICREG_HH__