From 5535f22998bf991eeb75a56c9e147f0fd4bd23b2 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Dec 2025 11:04:42 -0500 Subject: chore: DebuggerKit: Move constants and types into `Config.h`. Signed-off-by: Amlal El Mahrouss --- src/DebuggerKit/DebuggerContract.h | 10 ---------- src/DebuggerKit/Detail/Config.h | 24 +++++++++++++++++++++++- src/DebuggerKit/NeKernelContract.h | 10 ---------- src/DebuggerKit/src/NeKernelContract.cc | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/DebuggerKit/DebuggerContract.h b/src/DebuggerKit/DebuggerContract.h index 04b9b32..e205e26 100644 --- a/src/DebuggerKit/DebuggerContract.h +++ b/src/DebuggerKit/DebuggerContract.h @@ -14,16 +14,6 @@ namespace DebuggerKit { class IDebuggerContract; -/// =========================================================== /// -/// \brief Process ID -/// =========================================================== /// -typedef uint64_t ProcessID; - -/// =========================================================== /// -/// \brief Address type, a la BSD. -/// =========================================================== /// -typedef char* CAddress; - /// =========================================================== /// /// \brief Debugger contract class in C++, as per the design states. /// \author Amlal El Mahrouss diff --git a/src/DebuggerKit/Detail/Config.h b/src/DebuggerKit/Detail/Config.h index 7124543..0ea3ba1 100644 --- a/src/DebuggerKit/Detail/Config.h +++ b/src/DebuggerKit/Detail/Config.h @@ -41,4 +41,26 @@ #define kDistRelease ToString(kDistReleaseBranch) -#endif // !kDistRelease \ No newline at end of file +#endif // !kDistRelease + +namespace DebuggerKit { +/// =========================================================== /// +/// \brief Process ID +/// =========================================================== /// +typedef uint64_t ProcessID; + +/// =========================================================== /// +/// \brief Address type, a la BSD. +/// =========================================================== /// +typedef char* CAddress; + +namespace Detail { + constexpr auto kDebugCmdLen = 256U; + constexpr auto kDebugPort = 51820; + constexpr auto kDebugMagic = "NE1.0.0;"; + constexpr uint16_t kDebugVersion = 0x0100; + constexpr auto kDebugDelim = ';'; + constexpr auto kDebugEnd = '\r'; + using dk_socket_type = int64_t; +} // namespace Detail +} // namespace DebuggerKit \ No newline at end of file diff --git a/src/DebuggerKit/NeKernelContract.h b/src/DebuggerKit/NeKernelContract.h index 1448fa7..fe38a22 100644 --- a/src/DebuggerKit/NeKernelContract.h +++ b/src/DebuggerKit/NeKernelContract.h @@ -18,16 +18,6 @@ namespace DebuggerKit::NeKernel { class NeKernelContract; -namespace Detail { - inline constexpr auto kDebugCmdLen = 256U; - inline constexpr auto kDebugPort = 51820; - inline constexpr auto kDebugMagic = "NE1.0.0;"; - inline constexpr uint16_t kDebugVersion = 0x0100; - inline constexpr auto kDebugDelim = ';'; - inline constexpr auto kDebugEnd = '\r'; - typedef int64_t dk_socket_type; -} // namespace Detail - /// =========================================================== /// /// \brief NeKernel Debugger Contract /// \author Amlal El Mahrouss diff --git a/src/DebuggerKit/src/NeKernelContract.cc b/src/DebuggerKit/src/NeKernelContract.cc index b62ee6e..58d1295 100644 --- a/src/DebuggerKit/src/NeKernelContract.cc +++ b/src/DebuggerKit/src/NeKernelContract.cc @@ -14,8 +14,8 @@ #include #include +using namespace DebuggerKit::Detail; using namespace DebuggerKit::NeKernel; -using namespace DebuggerKit::NeKernel::Detail; NeKernelContract::NeKernelContract() = default; -- cgit v1.2.3