From 18d33e155d2f56e59eb49dadbb30ab2f7ac3e852 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 31 Jul 2025 08:49:33 +0100 Subject: feat: fix magic number of BootNet module, and fix compile_flags.txt Signed-off-by: Amlal El Mahrouss --- lib/bootnet.h | 4 ++-- lib/cxx-abi.h | 21 --------------------- lib/cxx-abi.hpp | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 lib/cxx-abi.h create mode 100644 lib/cxx-abi.hpp (limited to 'lib') diff --git a/lib/bootnet.h b/lib/bootnet.h index cba847c..2176c04 100644 --- a/lib/bootnet.h +++ b/lib/bootnet.h @@ -8,7 +8,7 @@ #include -#define BOOTNET_INET_MAGIC "NETB" +#define BOOTNET_INET_MAGIC "ONET" #define BOOTNET_INET_MAGIC_LEN (4) #define BOOTNET_NAME_LEN (256) @@ -26,7 +26,7 @@ typedef struct bootnet_inet_header { ascii_char_t m_patch_name[BOOTNET_NAME_LEN]; /// example: ColdChoco int32_t m_length; /// The patch's length. ascii_char_t m_target[BOOTNET_NAME_LEN]; /// The target file. - uint8_t m_implies_program; /// does it imply reprogramming? + uint8_t m_implies_rom; /// does it imply reprogramming? uint8_t m_preflight; /// Do we just check if this endpoint exists/is valid? uint8_t m_blob[]; } bootnet_inet_header; diff --git a/lib/cxx-abi.h b/lib/cxx-abi.h deleted file mode 100644 index 61225fc..0000000 --- a/lib/cxx-abi.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#define DSO_MAX_OBJECTS (128) - -struct atexit_func_entry_t { - void (*destructor_func)(void*); - void* obj_ptr; - void* dso_handle; -}; - -typedef unsigned uarch_t; - -namespace cxxabiv1 { -typedef void* __guard; -} diff --git a/lib/cxx-abi.hpp b/lib/cxx-abi.hpp new file mode 100644 index 0000000..61225fc --- /dev/null +++ b/lib/cxx-abi.hpp @@ -0,0 +1,21 @@ +/* ------------------------------------------- + + Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#define DSO_MAX_OBJECTS (128) + +struct atexit_func_entry_t { + void (*destructor_func)(void*); + void* obj_ptr; + void* dso_handle; +}; + +typedef unsigned uarch_t; + +namespace cxxabiv1 { +typedef void* __guard; +} -- cgit v1.2.3