Merge pull request #3 from mytbk/mybranch

Fix some errors in building with Linux GCC Thanks a lot. All look good to me. Only one comment on Add missing EFIAPI. It's fine to have it, but it's not necessary. There is a discuss on EFIAPI in http://feishare.com/efimail/messages/20140317-0730-Re__edk2__EFIAPI_Calling_Convention-_Kinney__Michael_D_.html just some words copied from there: "All public interfaces of a UEFI module must follow the UEFI calling convention. Public interfaces include the image entry point, UEFI event handlers, and protocol member functions. The type EFIAPI is used to indicate conformance to the calling conventions defined in this section. Non public interfaces, such as private functions and static library calls, are not required to follow the UEFI calling conventions and may be optimized by the compiler"
zhenghuadai · Apr 23, 2016 · cb70d44 · cb70d44
2 parents 3c45991 + af6d4b6
commit cb70d44
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 30 deletions.
diff --git a/book/Event/TestEvent.c b/book/Event/TestEvent.c
@@ -47,7 +47,13 @@ void WaitKey()
     EFI_INPUT_KEY  Key;
 
     Status = gBS->WaitForEvent(1, &gST->ConIn->WaitForKey, &Index);
-    Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key); 
+    if (EFI_ERROR(Status)) {
+        Print(L"WaitKey: WaitForEvent Error!\n");
+    }
+    Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+    if (EFI_ERROR(Status)) {
+        Print(L"WaitKey: ReadKeyStroke Error!\n");
+    }
 }
 
 /** example 2
@@ -110,6 +116,10 @@ EFI_STATUS TestNotify()
     Status = gBS->CreateEvent(EVT_NOTIFY_WAIT, TPL_NOTIFY, (EFI_EVENT_NOTIFY)myEventNoify , (VOID*)NULL, &myEvent);
     Status = gBS->WaitForEvent(1, &myEvent, &index);
     Status = gBS->CloseEvent(myEvent);
+
+    if (EFI_ERROR(Status)) {
+        return Status;
+    }
     return EFI_SUCCESS;
 }
 
@@ -134,10 +144,19 @@ EFI_STATUS TestEventSingal()
     Print(L"Test EVT_TIMER | EVT_NOTIFY_SIGNAL");
     // 生成Timer事件，并设置触发函数
     Status = gBS->CreateEvent(EVT_TIMER | EVT_NOTIFY_SIGNAL, TPL_CALLBACK, (EFI_EVENT_NOTIFY)myEventNoify30, (VOID*)L"Hello! Time Out!", &myEvent);
+    if (EFI_ERROR(Status)) {
+        Print(L"TestEventSignal: CreateEvent error %d!\n", Status);
+    }
     // 设置Timer等待时间为10秒，属性为循环等待
     Status = gBS->SetTimer(myEvent,TimerPeriodic , 10 * 1000 * 1000);
+    if (EFI_ERROR(Status)) {
+        Print(L"TestEventSignal: SetTimer error %d!\n", Status);
+    }
     WaitKey();
     Status = gBS->CloseEvent(myEvent);
+    if (EFI_ERROR(Status)) {
+        Print(L"TestEventSignal: CloseEvent error %d!\n", Status);
+    }
     return EFI_SUCCESS;
 }
 
@@ -159,6 +178,9 @@ testMouseSimple()
             NULL,
             (VOID**)&mouse
             );
+    if (EFI_ERROR(Status)) {
+        Print(L"testMouseSimple: LocateProtocol error %d!\n", Status);
+    }
     // 重置鼠标设备
     Status = mouse->Reset(mouse, TRUE);
     // 将鼠标事件放到等待事件数组
@@ -192,7 +214,8 @@ testMouseSimple()
 }
 
 
-EFI_STATUS UefiMain(
+EFI_STATUS EFIAPI
+UefiMain(
         IN EFI_HANDLE           ImageHandle,
         IN EFI_SYSTEM_TABLE     *SystemTable
 		)

diff --git a/book/FileIo/TestFileIo.c b/book/FileIo/TestFileIo.c
@@ -11,7 +11,7 @@
 #include <Protocol/SimpleTextInEx.h>
 #include <Protocol/SimpleFileSystem.h>
 #include <Protocol/EfiShell.h>
-#include <guid/FileInfo.h>
+#include <Guid/FileInfo.h>
 #include <Uutil.h>
 
 EFI_STATUS TestOpen()
@@ -348,7 +348,7 @@ EFI_STATUS TestAsyncWrite(EFI_FILE_PROTOCOL* File)
     return Status;
 }
 
-VOID ReadNotification(EFI_EVENT event, VOID* Context)
+VOID EFIAPI ReadNotification(EFI_EVENT event, VOID* Context)
 {
     EFI_FILE_IO_TOKEN *ReadToken = (EFI_FILE_IO_TOKEN *)Context;
     // 检查ReadToken.Status;
@@ -450,7 +450,8 @@ EFI_STATUS TestVar(CONST CHAR16* var)
 
 }
 
-EFI_STATUS UefiMain(
+EFI_STATUS EFIAPI
+UefiMain(
         IN EFI_HANDLE           ImageHandle,
         IN EFI_SYSTEM_TABLE     *SystemTable
         )

diff --git a/book/GUIbasics/String/example.c b/book/GUIbasics/String/example.c
@@ -10,7 +10,7 @@ EFI_STATUS InitShellLib()
 {
 	if(gEfiShellProtocol == NULL)
 	{
-		gBS -> LocateProtocol(&gEfiShellProtocolGuid, NULL, &gEfiShellProtocol);
+		gBS -> LocateProtocol(&gEfiShellProtocolGuid, NULL, (VOID**)&gEfiShellProtocol);
 	}
 	if(gEfiShellParametersProtocol == NULL)
 	{
@@ -90,7 +90,7 @@ ShellAppMain (
 		IN CHAR16 **Argv
 	     )
 {
-	EFI_GUID   mStrPackageGuid = { 0xedd31def, 0xf262, 0xc24e, 0xa2, 0xe4, 0xde, 0xf7, 0xde, 0xcd, 0xcd, 0xee };
+	EFI_GUID   mStrPackageGuid = { 0xedd31def, 0xf262, 0xc24e, {0xa2, 0xe4, 0xde, 0xf7, 0xde, 0xcd, 0xcd, 0xee} };
 	//首先注册字符串资源文件：将我们的字符串package加入到Hii数据库中
 	EFI_HANDLE HiiHandle = HiiAddPackages (&mStrPackageGuid ,  gImageHandle, exampleStrings, NULL); 
 	//通过字符串标识符访问字符串。 

diff --git a/book/Hob/Hob.c b/book/Hob/Hob.c
@@ -30,7 +30,9 @@ testHotKey()
 	return Status;
 }
 
-EFI_STATUS UefiMain(
+EFI_STATUS
+EFIAPI
+UefiMain(
 		IN EFI_HANDLE           ImageHandle,
 		IN EFI_SYSTEM_TABLE     *SystemTable
 		)

diff --git a/book/Shell/Execute/Execute.c b/book/Shell/Execute/Execute.c
@@ -14,7 +14,7 @@ ShellAppMain (
 	EFI_STATUS RStatus = 0;	
 	EFI_SHELL_PROTOCOL            *mEfiShellProtocol;
 	CHAR16* Environment[] = { L"Var1=1", L"Var2=2", 0};
-	Status = gBS -> LocateProtocol( &gEfiShellProtocolGuid, NULL, &mEfiShellProtocol);
+	Status = gBS -> LocateProtocol( &gEfiShellProtocolGuid, NULL, (VOID**)&mEfiShellProtocol);
 	Status = mEfiShellProtocol -> Execute(&gImageHandle, L"-nomap ls fs0:",  NULL, &RStatus);
 	Print(L"Execute return %r with Status %d\n", Status, RStatus);
 	Status = mEfiShellProtocol -> Execute(&gImageHandle, L"-nomap -noversion -nostartup exit 1",  NULL, &RStatus);

diff --git a/book/Shell/Execute2/Execute.c b/book/Shell/Execute2/Execute.c
@@ -14,7 +14,7 @@ ShellAppMain (
 	EFI_STATUS RStatus = 0;	
 	CHAR16* Environment[] = { L"Var1=1", L"Var2=2", 0};
 	if(gEfiShellProtocol == NULL){
-		Status = gBS -> LocateProtocol( &gEfiShellProtocolGuid, NULL, &gEfiShellProtocol);
+		Status = gBS -> LocateProtocol( &gEfiShellProtocolGuid, NULL, (VOID**)&gEfiShellProtocol);
 	}
 	Status = ShellExecute(&gImageHandle, L"-nomap ls fs0:",  FALSE, NULL, &RStatus);
 	Print(L"Execute return %r with Status %d\n", Status, RStatus);

diff --git a/book/infs/Debug/Main.c b/book/infs/Debug/Main.c
@@ -1,11 +1,16 @@
 #include <Uefi.h>
 EFI_STATUS
+EFIAPI
 UefiMain (
           IN EFI_HANDLE        ImageHandle,
           IN EFI_SYSTEM_TABLE  *SystemTable
           )
 {
-   _asm int 3
+#ifdef _MSC_VER
+	_asm int 3;
+#else
+	asm("int $0x03");
+#endif
    SystemTable -> ConOut-> OutputString(SystemTable->ConOut, L"HelloWorld\n"); 
    return EFI_SUCCESS;
 }

diff --git a/book/infs/UefiMain/UefiMain.c b/book/infs/UefiMain/UefiMain.c
@@ -1,5 +1,6 @@
 #include <Uefi.h>
 EFI_STATUS
+EFIAPI
 UefiMain (
           IN EFI_HANDLE        ImageHandle,
           IN EFI_SYSTEM_TABLE  *SystemTable

diff --git a/book/mouse/mouse.c b/book/mouse/mouse.c
@@ -25,6 +25,10 @@ testMouseSimple()
 			NULL,
 			(VOID**)&mouse
 			);
+	if (EFI_ERROR(Status)) {
+		Print(L"Error locating Simple Pointer Protocol.\n");
+		return Status;
+	}
 	// 重置鼠标设备
 	Status = mouse->Reset(mouse, TRUE);
 	// 将鼠标事件放到等待事件数组
@@ -56,7 +60,9 @@ testMouseSimple()
 	return EFI_SUCCESS;
 }
 
-EFI_STATUS UefiMain(
+EFI_STATUS
+EFIAPI
+UefiMain(
         IN EFI_HANDLE           ImageHandle,
         IN EFI_SYSTEM_TABLE     *SystemTable
 		)

diff --git a/book/sstdPkg/Include/sstd.h b/book/sstdPkg/Include/sstd.h
@@ -4,9 +4,9 @@
 extern "C"{
 #endif
 
-#include <Library\MemoryAllocationLib.h>
-#include <Library\BaseMemoryLib.h>
-#include <Library\BaseLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/BaseLib.h>
 
 #define malloc(size)               AllocatePool ((UINTN) size)
 #define free(ptr)                  FreePool(ptr)

diff --git a/book/sstdPkg/Library/sstdall.cpp b/book/sstdPkg/Library/sstdall.cpp
@@ -1,11 +1,11 @@
 extern "C" {
 #include <Uefi.h>
-#include <Library\BaseLib.h>
+#include <Library/BaseLib.h>
 #undef NULL
 #define NULL 0
-typedef void (__cdecl *_PVFV)(void);
-typedef int  (__cdecl *_PIFV)(void);
-typedef void (__cdecl *_PVFI)(int); 
+typedef void (EFIAPI *_PVFV)(void);
+typedef int  (EFIAPI *_PIFV)(void);
+typedef void (EFIAPI *_PVFI)(int); 
 _PVFV *atexits  = (_PVFV*)NULL;
 int num_atexit = 0;
 int max_atexit =-1;
@@ -16,7 +16,7 @@ int max_atexit =-1;
 	 nonzero if it fails.
 **/
 int
-atexit(void (*handler)(void))
+atexit(_PVFV handler)
 {	
 	if(handler == NULL)
 		return 0;
@@ -38,7 +38,7 @@ atexit(void (*handler)(void))
 
 }
 
-extern  "C"  int __cdecl _purecall ( void ) 
+extern  "C"  int EFIAPI _purecall ( void ) 
 { 
     return  0 ; 
 }

diff --git a/book/std/sstd/Testsstd.c b/book/std/sstd/Testsstd.c
@@ -10,7 +10,9 @@ VOID Test()
     free(pStr);
 }
 
-EFI_STATUS UefiMain(
+EFI_STATUS
+EFIAPI
+UefiMain(
         IN EFI_HANDLE           ImageHandle,
         IN EFI_SYSTEM_TABLE     *SystemTable
 		)

diff --git a/book/systemtable/BS/BS.c b/book/systemtable/BS/BS.c
@@ -1,7 +1,8 @@
 #include <Uefi.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
-    EFI_STATUS
+EFI_STATUS
+	EFIAPI
 UefiMain (
         IN EFI_HANDLE        ImageHandle,
         IN EFI_SYSTEM_TABLE  *SystemTable
@@ -17,12 +18,20 @@ UefiMain (
         CHAR16* vendor = SystemTable->FirmwareVendor;
         //输出固件供应商的名字
         SystemTable -> ConOut-> OutputString(SystemTable->ConOut, vendor);
-        _asm int 3;
+#ifdef _MSC_VER
+		_asm int 3;
+#else
+		asm("int $0x03");
+#endif
         // 取得当前的MapKey
         gBS->GetMemoryMap(&MemMapSize, MemMap, &MapKey, &DesSize, &DesVersion);
         // 结束Boot Services
         gBS->ExitBootServices(ImageHandle, MapKey);
-        _asm int 3;
+#ifdef _MSC_VER
+		_asm int 3;
+#else
+		asm("int $0x03");
+#endif
         ASSERT(SystemTable -> BootServices == NULL); 
 
         //SystemTable -> ConOut-> OutputString(SystemTable->ConOut, L"Crash!\n"); 

diff --git a/book/systemtable/ST/ST.c b/book/systemtable/ST/ST.c
@@ -1,5 +1,7 @@
 #include <Uefi.h>
-EFI_STATUS UefiMain (
+EFI_STATUS
+EFIAPI
+UefiMain (
         IN EFI_HANDLE        ImageHandle,
         IN EFI_SYSTEM_TABLE  *SystemTable
         )
@@ -11,6 +13,9 @@ EFI_STATUS UefiMain (
     //¶ÁÈ¡¼üÅÌ
     SystemTable->BootServices->WaitForEvent(1, &SystemTable ->ConIn->WaitForKey, &Index);
     Status = SystemTable ->ConIn->ReadKeyStroke (SystemTable->ConIn, &Key);
+	if (EFI_ERROR(Status)) {
+		SystemTable->ConOut->OutputString(SystemTable->ConOut, L"Error reading key stroke!\n");
+	}
     StrBuffer[0] = Key.UnicodeChar;
     StrBuffer[1] = '\n';
     SystemTable -> ConOut-> OutputString(SystemTable->ConOut, StrBuffer); 

diff --git a/book/systemtable/gRT/RT.c b/book/systemtable/gRT/RT.c
@@ -6,7 +6,9 @@
 #include <Library/UefiLib.h>
 #define INIT_NAME_BUFFER_SIZE  128
 #define INIT_DATA_BUFFER_SIZE  1024
-EFI_STATUS UefiMain (
+EFI_STATUS
+EFIAPI
+UefiMain (
         IN EFI_HANDLE        ImageHandle,
         IN EFI_SYSTEM_TABLE  *SystemTable
         )

diff --git a/book/systemtable/gST/ST.c b/book/systemtable/gST/ST.c
@@ -1,6 +1,8 @@
 #include <Uefi.h>
 #include <Library/UefiBootServicesTableLib.h>
-EFI_STATUS UefiMain (
+EFI_STATUS
+EFIAPI
+UefiMain (
         IN EFI_HANDLE        ImageHandle,
         IN EFI_SYSTEM_TABLE  *SystemTable
         )
@@ -13,6 +15,10 @@ EFI_STATUS UefiMain (
     //¶ÁÈ¡¼üÅÌ
     gBS->WaitForEvent(1, &gST->ConIn->WaitForKey, &Index);
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+	if (EFI_ERROR(Status)) {
+		gST->ConOut->OutputString(gST->ConOut, L"ReadKeyStroke error.\n");
+		return Status;
+	}
     StrBuffer[0] = Key.UnicodeChar;
     StrBuffer[1] = '\n';
     gST -> ConOut-> OutputString(gST ->ConOut, StrBuffer); 

diff --git a/book/systemtable/memory/BSmem.c b/book/systemtable/memory/BSmem.c
@@ -17,7 +17,7 @@ EFI_STATUS    TestMMap()
     if(Status != EFI_BUFFER_TOO_SMALL){
         return Status;
     }
-    Status = gBS->AllocatePool(EfiBootServicesData, MemoryMapSize, &MemoryMap);
+    Status = gBS->AllocatePool(EfiBootServicesData, MemoryMapSize, (void**)&MemoryMap);
     Status = gBS->GetMemoryMap(&MemoryMapSize, MemoryMap, &MapKey, &DescriptorSize, &DescriptorVersion);
     for( i = 0; i< MemoryMapSize / (DescriptorSize); i++)
     {
@@ -66,7 +66,9 @@ EFI_STATUS TestAllocateAnyPages()
     return Status;
 }
 
-EFI_STATUS UefiMain (
+EFI_STATUS
+EFIAPI
+UefiMain (
         IN EFI_HANDLE        ImageHandle,
         IN EFI_SYSTEM_TABLE  *SystemTable
         )

diff --git a/book/thread/setjmp/Main.c b/book/thread/setjmp/Main.c
@@ -2,6 +2,7 @@
 #include <Library/BaseLib.h>
 #include <Library/MemoryAllocationLib.h>
 EFI_STATUS
+EFIAPI
 UefiMain (
           IN EFI_HANDLE        ImageHandle,
           IN EFI_SYSTEM_TABLE  *SystemTable