From 89718213b89026ef0ad3a7ac135677579f70c82e Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 17 May 2023 15:13:10 +0200 Subject: [PATCH] Remove no longer needed dummy module --- xtldr/modules/CMakeLists.txt | 1 - xtldr/modules/dummy/CMakeLists.txt | 27 -------------- xtldr/modules/dummy/dummy.c | 55 ---------------------------- xtldr/modules/dummy/includes/dummy.h | 21 ----------- 4 files changed, 104 deletions(-) delete mode 100644 xtldr/modules/dummy/CMakeLists.txt delete mode 100644 xtldr/modules/dummy/dummy.c delete mode 100644 xtldr/modules/dummy/includes/dummy.h diff --git a/xtldr/modules/CMakeLists.txt b/xtldr/modules/CMakeLists.txt index 27e5cb8..c898f2e 100644 --- a/xtldr/modules/CMakeLists.txt +++ b/xtldr/modules/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(dummy) add_subdirectory(framebuf) add_subdirectory(pecoff) add_subdirectory(xtos) diff --git a/xtldr/modules/dummy/CMakeLists.txt b/xtldr/modules/dummy/CMakeLists.txt deleted file mode 100644 index 4544c74..0000000 --- a/xtldr/modules/dummy/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# XT Boot Loader -PROJECT(XTLDR_DUMMY) - -# Specify include directories -include_directories( - ${EXECTOS_SOURCE_DIR}/sdk/xtdk - ${XTLDR_SOURCE_DIR}/includes - ${XTLDR_DUMMY_SOURCE_DIR}/includes) - -# Specify list of source code files -list(APPEND XTLDR_DUMMY_SOURCE - ${XTLDR_SOURCE_DIR}/blproto.c - ${XTLDR_DUMMY_SOURCE_DIR}/dummy.c) - -# Link bootloader executable -add_executable(dummy ${XTLDR_DUMMY_SOURCE}) - -# Add linker libraries -target_link_libraries(dummy libxtos) - -# Set proper binary name and install target -set_target_properties(dummy PROPERTIES SUFFIX .efi) -set_install_target(dummy efi/boot/xtldr) - -# Set module entrypoint and subsystem -set_entrypoint(dummy "BlXtLdrModuleMain") -set_subsystem(dummy efi_boot_service_driver) diff --git a/xtldr/modules/dummy/dummy.c b/xtldr/modules/dummy/dummy.c deleted file mode 100644 index a3f70c1..0000000 --- a/xtldr/modules/dummy/dummy.c +++ /dev/null @@ -1,55 +0,0 @@ -/** - * PROJECT: ExectOS - * COPYRIGHT: See COPYING.md in the top level directory - * FILE: xtldr/modules/dummy/dummy.c - * DESCRIPTION: Boot loader dummy module - * DEVELOPERS: Rafal Kupiec - */ - -#include - - -/* EFI Image Handle */ -EFI_HANDLE EfiImageHandle; - -/* EFI System Table */ -PEFI_SYSTEM_TABLE EfiSystemTable; - -/* EFI XT Loader Protocol */ -PXT_BOOT_LOADER_PROTOCOL XtLdrProtocol; - -/** - * This routine is the entry point of the XT EFI boot loader module. - * - * @param ImageHandle - * Firmware-allocated handle that identifies the image. - * - * @param SystemTable - * Provides the EFI system table. - * - * @return This routine returns status code. - * - * @since XT 1.0 - */ -XTCDECL -EFI_STATUS -BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, - IN PEFI_SYSTEM_TABLE SystemTable) -{ - EFI_STATUS Status; - - /* Set the system table and image handle */ - EfiImageHandle = ImageHandle; - EfiSystemTable = SystemTable; - - /* Open the XTLDR protocol */ - Status = BlGetXtLoaderProtocol(&XtLdrProtocol); - if(Status != STATUS_EFI_SUCCESS) - { - /* Failed to open loader protocol */ - return STATUS_EFI_PROTOCOL_ERROR; - } - - /* Return success */ - return STATUS_EFI_SUCCESS; -} diff --git a/xtldr/modules/dummy/includes/dummy.h b/xtldr/modules/dummy/includes/dummy.h deleted file mode 100644 index fbdcee9..0000000 --- a/xtldr/modules/dummy/includes/dummy.h +++ /dev/null @@ -1,21 +0,0 @@ -/** - * PROJECT: ExectOS - * COPYRIGHT: See COPYING.md in the top level directory - * FILE: xtldr/modules/dummy/includes/dummy.h - * DESCRIPTION: Dummy module header file - * DEVELOPERS: Rafal Kupiec - */ - -#ifndef __XTLDR_MODULES_DUMMY_H -#define __XTLDR_MODULES_DUMMY_H - -#include - - -/* Dummy module related routines forward references */ -XTCDECL -EFI_STATUS -BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, - IN PEFI_SYSTEM_TABLE SystemTable); - -#endif /* __XTLDR_MODULES_DUMMY_H */