From 8b150d1dc2adda1236d9f576f62947c612b317d5 Mon Sep 17 00:00:00 2001 From: Alon Livne <2005alonlivne@gmail.com> Date: Wed, 24 Sep 2025 11:52:51 +0300 Subject: [PATCH] feature: rename uefi/hooks to uefi/services --- uefi/Makefile | 18 +++++++++--------- uefi/app.c | 2 +- uefi/{hooks => services}/headers.h | 0 uefi/{hooks/raw => services/hooks}/Makefile | 0 .../hooks}/get_memory_map/Makefile | 0 .../hooks}/get_memory_map/get_memory_map.c | 0 uefi/{hooks/raw => services/hooks}/script.ld | 0 .../hooks}/set_variable/Makefile | 0 .../hooks}/set_variable/set_variable.c | 0 .../hooks}/virtual_address_map_event/Makefile | 0 .../virtual_address_map_event.c | 0 uefi/{hooks => services}/hooks_loader.c | 0 uefi/{hooks => services}/hooks_loader.h | 2 +- .../loaders/get_memory_map.c | 4 ++-- .../loaders/get_memory_map.h | 0 .../{hooks => services}/loaders/set_variable.c | 4 ++-- .../{hooks => services}/loaders/set_variable.h | 0 .../loaders/virtual_address_map_event.c | 4 ++-- .../loaders/virtual_address_map_event.h | 0 uefi/{hooks => services}/offsets.h | 0 20 files changed, 17 insertions(+), 17 deletions(-) rename uefi/{hooks => services}/headers.h (100%) rename uefi/{hooks/raw => services/hooks}/Makefile (100%) rename uefi/{hooks/raw => services/hooks}/get_memory_map/Makefile (100%) rename uefi/{hooks/raw => services/hooks}/get_memory_map/get_memory_map.c (100%) rename uefi/{hooks/raw => services/hooks}/script.ld (100%) rename uefi/{hooks/raw => services/hooks}/set_variable/Makefile (100%) rename uefi/{hooks/raw => services/hooks}/set_variable/set_variable.c (100%) rename uefi/{hooks/raw => services/hooks}/virtual_address_map_event/Makefile (100%) rename uefi/{hooks/raw => services/hooks}/virtual_address_map_event/virtual_address_map_event.c (100%) rename uefi/{hooks => services}/hooks_loader.c (100%) rename uefi/{hooks => services}/hooks_loader.h (96%) rename uefi/{hooks => services}/loaders/get_memory_map.c (94%) rename uefi/{hooks => services}/loaders/get_memory_map.h (100%) rename uefi/{hooks => services}/loaders/set_variable.c (93%) rename uefi/{hooks => services}/loaders/set_variable.h (100%) rename uefi/{hooks => services}/loaders/virtual_address_map_event.c (97%) rename uefi/{hooks => services}/loaders/virtual_address_map_event.h (100%) rename uefi/{hooks => services}/offsets.h (100%) diff --git a/uefi/Makefile b/uefi/Makefile index ae1d779..340b450 100644 --- a/uefi/Makefile +++ b/uefi/Makefile @@ -34,10 +34,10 @@ OBJS += core_loader.o include acpi/Makefile -OBJS += hooks/hooks_loader.o -OBJS += hooks/loaders/get_memory_map.o -OBJS += hooks/loaders/set_variable.o -OBJS += hooks/loaders/virtual_address_map_event.o +OBJS += services/hooks_loader.o +OBJS += services/loaders/get_memory_map.o +OBJS += services/loaders/set_variable.o +OBJS += services/loaders/virtual_address_map_event.o # Shipped core binary OBJS += core.o @@ -47,17 +47,17 @@ OBJS += $(addprefix shared/,$(SHARED_OBJS)) OBJS := $(addprefix obj/,$(OBJS)) -hooks/raw/build/hooks.o: +services/hooks/build/hooks.o: @mkdir -p $(@D) - $(MAKE) -C hooks/raw + $(MAKE) -C services/hooks -.PHONY: hooks/raw/build/hooks.o +.PHONY: services/hooks/build/hooks.o obj/%.o: %.c mkdir -p $(dir $@) $(CC) -c $< -o $@ $(CFLAGS) -obj/app.so: $(OBJS) $(GNU_EFI)/x86_64/gnuefi/crt0-efi-x86_64.o hooks/raw/build/hooks.o +obj/app.so: $(OBJS) $(GNU_EFI)/x86_64/gnuefi/crt0-efi-x86_64.o services/hooks/build/hooks.o mkdir -p $(dir $@) $(LD) $(LDFLAGS) $^ -o $@ -lgnuefi -lefi @@ -69,7 +69,7 @@ all: build/app.efi .DEFAULT_GOAL := all clean: - $(MAKE) -C hooks/raw clean + $(MAKE) -C services/hooks clean rm -rf obj/* rm -rf build/* diff --git a/uefi/app.c b/uefi/app.c index bd4bc30..ce23c21 100644 --- a/uefi/app.c +++ b/uefi/app.c @@ -7,7 +7,7 @@ #include "acpi/tables.h" #include "core_header_utils.h" #include "core_loader.h" -#include "hooks/hooks_loader.h" +#include "services/hooks_loader.h" EFI_STATUS efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE* SystemTable) { diff --git a/uefi/hooks/headers.h b/uefi/services/headers.h similarity index 100% rename from uefi/hooks/headers.h rename to uefi/services/headers.h diff --git a/uefi/hooks/raw/Makefile b/uefi/services/hooks/Makefile similarity index 100% rename from uefi/hooks/raw/Makefile rename to uefi/services/hooks/Makefile diff --git a/uefi/hooks/raw/get_memory_map/Makefile b/uefi/services/hooks/get_memory_map/Makefile similarity index 100% rename from uefi/hooks/raw/get_memory_map/Makefile rename to uefi/services/hooks/get_memory_map/Makefile diff --git a/uefi/hooks/raw/get_memory_map/get_memory_map.c b/uefi/services/hooks/get_memory_map/get_memory_map.c similarity index 100% rename from uefi/hooks/raw/get_memory_map/get_memory_map.c rename to uefi/services/hooks/get_memory_map/get_memory_map.c diff --git a/uefi/hooks/raw/script.ld b/uefi/services/hooks/script.ld similarity index 100% rename from uefi/hooks/raw/script.ld rename to uefi/services/hooks/script.ld diff --git a/uefi/hooks/raw/set_variable/Makefile b/uefi/services/hooks/set_variable/Makefile similarity index 100% rename from uefi/hooks/raw/set_variable/Makefile rename to uefi/services/hooks/set_variable/Makefile diff --git a/uefi/hooks/raw/set_variable/set_variable.c b/uefi/services/hooks/set_variable/set_variable.c similarity index 100% rename from uefi/hooks/raw/set_variable/set_variable.c rename to uefi/services/hooks/set_variable/set_variable.c diff --git a/uefi/hooks/raw/virtual_address_map_event/Makefile b/uefi/services/hooks/virtual_address_map_event/Makefile similarity index 100% rename from uefi/hooks/raw/virtual_address_map_event/Makefile rename to uefi/services/hooks/virtual_address_map_event/Makefile diff --git a/uefi/hooks/raw/virtual_address_map_event/virtual_address_map_event.c b/uefi/services/hooks/virtual_address_map_event/virtual_address_map_event.c similarity index 100% rename from uefi/hooks/raw/virtual_address_map_event/virtual_address_map_event.c rename to uefi/services/hooks/virtual_address_map_event/virtual_address_map_event.c diff --git a/uefi/hooks/hooks_loader.c b/uefi/services/hooks_loader.c similarity index 100% rename from uefi/hooks/hooks_loader.c rename to uefi/services/hooks_loader.c diff --git a/uefi/hooks/hooks_loader.h b/uefi/services/hooks_loader.h similarity index 96% rename from uefi/hooks/hooks_loader.h rename to uefi/services/hooks_loader.h index 4fcabe2..ad9ebd5 100644 --- a/uefi/hooks/hooks_loader.h +++ b/uefi/services/hooks_loader.h @@ -45,7 +45,7 @@ void free_hook(struct loaded_hook* loaded_hook, size_t hook_size); /** * Place hooks on the required UEFI runtime and boot services, and register any additional events that are required. - * See the `loaders` and `raw` directories for a list of all hooks. + * See the `loaders` and `hooks` directories for a list of all hooks. */ err_t hook_services(void); diff --git a/uefi/hooks/loaders/get_memory_map.c b/uefi/services/loaders/get_memory_map.c similarity index 94% rename from uefi/hooks/loaders/get_memory_map.c rename to uefi/services/loaders/get_memory_map.c index dbde738..901dd18 100644 --- a/uefi/hooks/loaders/get_memory_map.c +++ b/uefi/services/loaders/get_memory_map.c @@ -5,8 +5,8 @@ #include #include "acpi/tables.h" -#include "hooks/headers.h" -#include "hooks/hooks_loader.h" +#include "services/headers.h" +#include "services/hooks_loader.h" DECLARE_HOOK_BINARY(get_memory_map); diff --git a/uefi/hooks/loaders/get_memory_map.h b/uefi/services/loaders/get_memory_map.h similarity index 100% rename from uefi/hooks/loaders/get_memory_map.h rename to uefi/services/loaders/get_memory_map.h diff --git a/uefi/hooks/loaders/set_variable.c b/uefi/services/loaders/set_variable.c similarity index 93% rename from uefi/hooks/loaders/set_variable.c rename to uefi/services/loaders/set_variable.c index d06f27d..e211579 100644 --- a/uefi/hooks/loaders/set_variable.c +++ b/uefi/services/loaders/set_variable.c @@ -5,8 +5,8 @@ #include #include "acpi/tables.h" -#include "hooks/headers.h" -#include "hooks/hooks_loader.h" +#include "services/headers.h" +#include "services/hooks_loader.h" DECLARE_HOOK_BINARY(set_variable); diff --git a/uefi/hooks/loaders/set_variable.h b/uefi/services/loaders/set_variable.h similarity index 100% rename from uefi/hooks/loaders/set_variable.h rename to uefi/services/loaders/set_variable.h diff --git a/uefi/hooks/loaders/virtual_address_map_event.c b/uefi/services/loaders/virtual_address_map_event.c similarity index 97% rename from uefi/hooks/loaders/virtual_address_map_event.c rename to uefi/services/loaders/virtual_address_map_event.c index 00384e8..40ccb02 100644 --- a/uefi/hooks/loaders/virtual_address_map_event.c +++ b/uefi/services/loaders/virtual_address_map_event.c @@ -6,8 +6,8 @@ #include #include "get_memory_map.h" -#include "hooks/headers.h" -#include "hooks/hooks_loader.h" +#include "services/headers.h" +#include "services/hooks_loader.h" #include "set_variable.h" #define EFI_EVENT_VIRTUAL_ADDRESS_CHANGE_GUID \ diff --git a/uefi/hooks/loaders/virtual_address_map_event.h b/uefi/services/loaders/virtual_address_map_event.h similarity index 100% rename from uefi/hooks/loaders/virtual_address_map_event.h rename to uefi/services/loaders/virtual_address_map_event.h diff --git a/uefi/hooks/offsets.h b/uefi/services/offsets.h similarity index 100% rename from uefi/hooks/offsets.h rename to uefi/services/offsets.h