From 80c57daa907624b68bc1ddc408bdf5dc4a26a0ff Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Tue, 15 Jun 2021 19:00:53 +0300 Subject: Replace ImageInfo name with ImageHandle --- Lesson_6/README.md | 16 ++-- Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.c | 29 +++++++ .../UefiLessonsPkg/ImageHandle/ImageHandle.inf | 18 +++++ Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.c | 29 ------- Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.inf | 18 ----- Lesson_6/UefiLessonsPkg/UefiLessonsPkg.dsc | 2 +- Lesson_7/README.md | 2 +- Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.c | 88 ++++++++++++++++++++++ .../UefiLessonsPkg/ImageHandle/ImageHandle.inf | 18 +++++ Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.c | 88 ---------------------- Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.inf | 18 ----- Lesson_7/UefiLessonsPkg/UefiLessonsPkg.dsc | 2 +- 12 files changed, 164 insertions(+), 164 deletions(-) create mode 100644 Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.c create mode 100644 Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.inf delete mode 100644 Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.c delete mode 100644 Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.inf create mode 100644 Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.c create mode 100644 Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.inf delete mode 100644 Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.c delete mode 100644 Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.inf diff --git a/Lesson_6/README.md b/Lesson_6/README.md index b1d8b03..3bd7b83 100644 --- a/Lesson_6/README.md +++ b/Lesson_6/README.md @@ -1,4 +1,4 @@ -Let's create `ImageInfo` app in our `UefiLessonsPkg`. +Let's create `ImageHandle` app in our `UefiLessonsPkg`. First generate a random GUID. ``` @@ -8,17 +8,17 @@ b68d3472-70c7-4928-841b-6566032e0a23 And then create *.inf and *.c file based on the code in our `HelloWorld` app: ``` -$ cat UefiLessonsPkg/ImageInfo/ImageInfo.inf +$ cat UefiLessonsPkg/ImageHandle/ImageHandle.inf [Defines] INF_VERSION = 1.25 - BASE_NAME = ImageInfo + BASE_NAME = ImageHandle FILE_GUID = b68d3472-70c7-4928-841b-6566032e0a23 MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 ENTRY_POINT = UefiMain [Sources] - ImageInfo.c + ImageHandle.c [Packages] MdePkg/MdePkg.dec @@ -28,7 +28,7 @@ $ cat UefiLessonsPkg/ImageInfo/ImageInfo.inf UefiLib ``` ``` -$ cat UefiLessonsPkg/ImageInfo/ImageInfo.c +$ cat UefiLessonsPkg/ImageHandle/ImageHandle.c #include #include @@ -46,7 +46,7 @@ Add a newly created app to our `UefiLessonsPkg/UefiLessonsPkg.dsc` file: ``` [Components] ... -+ UefiLessonsPkg/ImageInfo/ImageInfo.inf ++ UefiLessonsPkg/ImageHandle/ImageHandle.inf ``` Now let's get to work. @@ -215,7 +215,7 @@ Don't blame me for redefinition of `IHANDLE` structure. These structures (IHANDL ``` $ . edksetup.sh $ build -$ cp Build/UefiLessonsPkg/RELEASE_GCC5/X64/ImageInfo.efi ~/UEFI_disk/ +$ cp Build/UefiLessonsPkg/RELEASE_GCC5/X64/ImageHandle.efi ~/UEFI_disk/ $ qemu-system-x86_64 -drive if=pflash,format=raw,file=Build/OvmfX64/RELEASE_GCC5/FV/OVMF.fd \ -drive format=raw,file=fat:rw:~/UEFI_disk \ -nographic \ @@ -235,7 +235,7 @@ Mapping table PciRoot(0x0)/Pci(0x1,0x1)/Ata(0x0) Press ESC in 4 seconds to skip startup.nsh or any other key to continue. Shell> fs0: -FS0:\> ImageInfo.efi +FS0:\> ImageHandle.efi Signature: h n d l ``` diff --git a/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.c b/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.c new file mode 100644 index 0000000..f88b36b --- /dev/null +++ b/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.c @@ -0,0 +1,29 @@ +#include +#include + + +typedef struct { + UINTN Signature; + /// All handles list of IHANDLE + LIST_ENTRY AllHandles; + /// List of PROTOCOL_INTERFACE's for this handle + LIST_ENTRY Protocols; + UINTN LocateRequest; + /// The Handle Database Key value when this handle was last created or modified + UINT64 Key; +} IHANDLE; + +EFIAPI +UefiMain ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + IHANDLE* MyHandle = ImageHandle; + Print(L"Signature: %c %c %c %c\n", (MyHandle->Signature >> 0) & 0xff, + (MyHandle->Signature >> 8) & 0xff, + (MyHandle->Signature >> 16) & 0xff, + (MyHandle->Signature >> 24) & 0xff); + + return EFI_SUCCESS; +} diff --git a/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.inf b/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.inf new file mode 100644 index 0000000..34256ee --- /dev/null +++ b/Lesson_6/UefiLessonsPkg/ImageHandle/ImageHandle.inf @@ -0,0 +1,18 @@ +[Defines] + INF_VERSION = 1.25 + BASE_NAME = ImageHandle + FILE_GUID = b68d3472-70c7-4928-841b-6566032e0a23 + MODULE_TYPE = UEFI_APPLICATION + VERSION_STRING = 1.0 + ENTRY_POINT = UefiMain + +[Sources] + ImageHandle.c + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiApplicationEntryPoint + UefiLib + diff --git a/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.c b/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.c deleted file mode 100644 index f88b36b..0000000 --- a/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include - - -typedef struct { - UINTN Signature; - /// All handles list of IHANDLE - LIST_ENTRY AllHandles; - /// List of PROTOCOL_INTERFACE's for this handle - LIST_ENTRY Protocols; - UINTN LocateRequest; - /// The Handle Database Key value when this handle was last created or modified - UINT64 Key; -} IHANDLE; - -EFIAPI -UefiMain ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - IHANDLE* MyHandle = ImageHandle; - Print(L"Signature: %c %c %c %c\n", (MyHandle->Signature >> 0) & 0xff, - (MyHandle->Signature >> 8) & 0xff, - (MyHandle->Signature >> 16) & 0xff, - (MyHandle->Signature >> 24) & 0xff); - - return EFI_SUCCESS; -} diff --git a/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.inf b/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.inf deleted file mode 100644 index 3abc61f..0000000 --- a/Lesson_6/UefiLessonsPkg/ImageInfo/ImageInfo.inf +++ /dev/null @@ -1,18 +0,0 @@ -[Defines] - INF_VERSION = 1.25 - BASE_NAME = ImageInfo - FILE_GUID = b68d3472-70c7-4928-841b-6566032e0a23 - MODULE_TYPE = UEFI_APPLICATION - VERSION_STRING = 1.0 - ENTRY_POINT = UefiMain - -[Sources] - ImageInfo.c - -[Packages] - MdePkg/MdePkg.dec - -[LibraryClasses] - UefiApplicationEntryPoint - UefiLib - diff --git a/Lesson_6/UefiLessonsPkg/UefiLessonsPkg.dsc b/Lesson_6/UefiLessonsPkg/UefiLessonsPkg.dsc index cdb5169..0d4fbb0 100644 --- a/Lesson_6/UefiLessonsPkg/UefiLessonsPkg.dsc +++ b/Lesson_6/UefiLessonsPkg/UefiLessonsPkg.dsc @@ -26,6 +26,6 @@ [Components] UefiLessonsPkg/SimplestApp/SimplestApp.inf UefiLessonsPkg/HelloWorld/HelloWorld.inf - UefiLessonsPkg/ImageInfo/ImageInfo.inf + UefiLessonsPkg/ImageHandle/ImageHandle.inf diff --git a/Lesson_7/README.md b/Lesson_7/README.md index 0431b42..66e8689 100644 --- a/Lesson_7/README.md +++ b/Lesson_7/README.md @@ -158,7 +158,7 @@ UefiMain ( If we compile and run our app in OVMF (I hope at this time I don't need to repeat how to do it): ``` -FS0:\> ImageInfo.efi +FS0:\> ImageHandle.efi h n d l Back Protocol Interface Link: 68D4320 Forward Protocol Interface Link: 6891520 diff --git a/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.c b/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.c new file mode 100644 index 0000000..bcf42e3 --- /dev/null +++ b/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.c @@ -0,0 +1,88 @@ +#include +#include + + +typedef struct { + UINTN Signature; + /// All handles list of IHANDLE + LIST_ENTRY AllHandles; + /// List of PROTOCOL_INTERFACE's for this handle + LIST_ENTRY Protocols; + UINTN LocateRequest; + /// The Handle Database Key value when this handle was last created or modified + UINT64 Key; +} IHANDLE; + +typedef struct { + UINTN Signature; + /// Link Entry inserted to mProtocolDatabase + LIST_ENTRY AllEntries; + /// ID of the protocol + EFI_GUID ProtocolID; + /// All protocol interfaces + LIST_ENTRY Protocols; + /// Registerd notification handlers + LIST_ENTRY Notify; +} PROTOCOL_ENTRY; + +typedef struct { + UINTN Signature; + /// Link on IHANDLE.Protocols + LIST_ENTRY Link; + /// Back pointer + IHANDLE *Handle; + /// Link on PROTOCOL_ENTRY.Protocols + LIST_ENTRY ByProtocol; + /// The protocol ID + PROTOCOL_ENTRY *Protocol; + /// The interface value + VOID *Interface; + /// OPEN_PROTOCOL_DATA list + LIST_ENTRY OpenList; + UINTN OpenListCount; + +} PROTOCOL_INTERFACE; + + +#define offsetof(a,b) ((INTN)(&(((a*)(0))->b))) + +#define container_of(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + +EFI_STATUS +EFIAPI +UefiMain ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + IHANDLE* MyHandle = ImageHandle; + Print(L"Signature: %c %c %c %c\n", (MyHandle->Signature >> 0) & 0xff, + (MyHandle->Signature >> 8) & 0xff, + (MyHandle->Signature >> 16) & 0xff, + (MyHandle->Signature >> 24) & 0xff); + + Print(L"Back Protocol Interface Link: %p\n", MyHandle->Protocols.BackLink); + Print(L"Forward Protocol Interface Link: %p\n", MyHandle->Protocols.ForwardLink); + + LIST_ENTRY *FirstLink = MyHandle->Protocols.ForwardLink; + LIST_ENTRY *CurrentLink = FirstLink; + do { + PROTOCOL_INTERFACE* MyProtocolInterface = container_of(CurrentLink, PROTOCOL_INTERFACE, Link); + + Print(L"\n"); + Print(L"Current Link: %p\n", CurrentLink); + Print(L"Signature: %x %x %x %x\n", (MyProtocolInterface->Signature >> 0) & 0xff, + (MyProtocolInterface->Signature >> 8) & 0xff, + (MyProtocolInterface->Signature >> 16) & 0xff, + (MyProtocolInterface->Signature >> 24) & 0xff); + + Print(L"Back Link: %p\n", MyProtocolInterface->Link.BackLink); + Print(L"Forward Link: %p\n", MyProtocolInterface->Link.ForwardLink); + Print(L"GUID=%g\n", MyProtocolInterface->Protocol->ProtocolID); + CurrentLink = MyProtocolInterface->Link.ForwardLink; + } while (CurrentLink != FirstLink); + + return EFI_SUCCESS; +} diff --git a/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.inf b/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.inf new file mode 100644 index 0000000..34256ee --- /dev/null +++ b/Lesson_7/UefiLessonsPkg/ImageHandle/ImageHandle.inf @@ -0,0 +1,18 @@ +[Defines] + INF_VERSION = 1.25 + BASE_NAME = ImageHandle + FILE_GUID = b68d3472-70c7-4928-841b-6566032e0a23 + MODULE_TYPE = UEFI_APPLICATION + VERSION_STRING = 1.0 + ENTRY_POINT = UefiMain + +[Sources] + ImageHandle.c + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + UefiApplicationEntryPoint + UefiLib + diff --git a/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.c b/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.c deleted file mode 100644 index bcf42e3..0000000 --- a/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.c +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include - - -typedef struct { - UINTN Signature; - /// All handles list of IHANDLE - LIST_ENTRY AllHandles; - /// List of PROTOCOL_INTERFACE's for this handle - LIST_ENTRY Protocols; - UINTN LocateRequest; - /// The Handle Database Key value when this handle was last created or modified - UINT64 Key; -} IHANDLE; - -typedef struct { - UINTN Signature; - /// Link Entry inserted to mProtocolDatabase - LIST_ENTRY AllEntries; - /// ID of the protocol - EFI_GUID ProtocolID; - /// All protocol interfaces - LIST_ENTRY Protocols; - /// Registerd notification handlers - LIST_ENTRY Notify; -} PROTOCOL_ENTRY; - -typedef struct { - UINTN Signature; - /// Link on IHANDLE.Protocols - LIST_ENTRY Link; - /// Back pointer - IHANDLE *Handle; - /// Link on PROTOCOL_ENTRY.Protocols - LIST_ENTRY ByProtocol; - /// The protocol ID - PROTOCOL_ENTRY *Protocol; - /// The interface value - VOID *Interface; - /// OPEN_PROTOCOL_DATA list - LIST_ENTRY OpenList; - UINTN OpenListCount; - -} PROTOCOL_INTERFACE; - - -#define offsetof(a,b) ((INTN)(&(((a*)(0))->b))) - -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) - -EFI_STATUS -EFIAPI -UefiMain ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - IHANDLE* MyHandle = ImageHandle; - Print(L"Signature: %c %c %c %c\n", (MyHandle->Signature >> 0) & 0xff, - (MyHandle->Signature >> 8) & 0xff, - (MyHandle->Signature >> 16) & 0xff, - (MyHandle->Signature >> 24) & 0xff); - - Print(L"Back Protocol Interface Link: %p\n", MyHandle->Protocols.BackLink); - Print(L"Forward Protocol Interface Link: %p\n", MyHandle->Protocols.ForwardLink); - - LIST_ENTRY *FirstLink = MyHandle->Protocols.ForwardLink; - LIST_ENTRY *CurrentLink = FirstLink; - do { - PROTOCOL_INTERFACE* MyProtocolInterface = container_of(CurrentLink, PROTOCOL_INTERFACE, Link); - - Print(L"\n"); - Print(L"Current Link: %p\n", CurrentLink); - Print(L"Signature: %x %x %x %x\n", (MyProtocolInterface->Signature >> 0) & 0xff, - (MyProtocolInterface->Signature >> 8) & 0xff, - (MyProtocolInterface->Signature >> 16) & 0xff, - (MyProtocolInterface->Signature >> 24) & 0xff); - - Print(L"Back Link: %p\n", MyProtocolInterface->Link.BackLink); - Print(L"Forward Link: %p\n", MyProtocolInterface->Link.ForwardLink); - Print(L"GUID=%g\n", MyProtocolInterface->Protocol->ProtocolID); - CurrentLink = MyProtocolInterface->Link.ForwardLink; - } while (CurrentLink != FirstLink); - - return EFI_SUCCESS; -} diff --git a/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.inf b/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.inf deleted file mode 100644 index 3abc61f..0000000 --- a/Lesson_7/UefiLessonsPkg/ImageInfo/ImageInfo.inf +++ /dev/null @@ -1,18 +0,0 @@ -[Defines] - INF_VERSION = 1.25 - BASE_NAME = ImageInfo - FILE_GUID = b68d3472-70c7-4928-841b-6566032e0a23 - MODULE_TYPE = UEFI_APPLICATION - VERSION_STRING = 1.0 - ENTRY_POINT = UefiMain - -[Sources] - ImageInfo.c - -[Packages] - MdePkg/MdePkg.dec - -[LibraryClasses] - UefiApplicationEntryPoint - UefiLib - diff --git a/Lesson_7/UefiLessonsPkg/UefiLessonsPkg.dsc b/Lesson_7/UefiLessonsPkg/UefiLessonsPkg.dsc index cdb5169..0d4fbb0 100644 --- a/Lesson_7/UefiLessonsPkg/UefiLessonsPkg.dsc +++ b/Lesson_7/UefiLessonsPkg/UefiLessonsPkg.dsc @@ -26,6 +26,6 @@ [Components] UefiLessonsPkg/SimplestApp/SimplestApp.inf UefiLessonsPkg/HelloWorld/HelloWorld.inf - UefiLessonsPkg/ImageInfo/ImageInfo.inf + UefiLessonsPkg/ImageHandle/ImageHandle.inf -- cgit v1.2.3-18-g5258