X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FDxe%2FWinNtThunk%2FBus%2FSerialIo%2FComponentName.c;fp=EdkNt32Pkg%2FDxe%2FWinNtThunk%2FBus%2FSerialIo%2FComponentName.c;h=2b7cb92c6487719238cfd73dc83c2d6fe1a38ed4;hp=d22f030f4b6a5f913732fca3145750d0750a61a3;hb=d84d8834a37e36529f838b6e39c82ce66b84d7ae;hpb=89ec4b37463b8bbaa77152ea64dabd8b68f4c9bf

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/ComponentName.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/ComponentName.c
index d22f030f4b..2b7cb92c64 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/ComponentName.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/ComponentName.c
@@ -17,14 +17,14 @@ Abstract:
 
 --*/
 
-#include "WinNtSerialIo.h"
+#include "UnixSerialIo.h"
 
 //
 // EFI Component Name Functions
 //
 EFI_STATUS
 EFIAPI
-WinNtSerialIoComponentNameGetDriverName (
+UnixSerialIoComponentNameGetDriverName (
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
   IN  CHAR8                        *Language,
   OUT CHAR16                       **DriverName
@@ -32,7 +32,7 @@ WinNtSerialIoComponentNameGetDriverName (
 
 EFI_STATUS
 EFIAPI
-WinNtSerialIoComponentNameGetControllerName (
+UnixSerialIoComponentNameGetControllerName (
   IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
   IN  EFI_HANDLE                                      ControllerHandle,
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
@@ -43,20 +43,20 @@ WinNtSerialIoComponentNameGetControllerName (
 //
 // EFI Component Name Protocol
 //
-EFI_COMPONENT_NAME_PROTOCOL     gWinNtSerialIoComponentName = {
-  WinNtSerialIoComponentNameGetDriverName,
-  WinNtSerialIoComponentNameGetControllerName,
+EFI_COMPONENT_NAME_PROTOCOL     gUnixSerialIoComponentName = {
+  UnixSerialIoComponentNameGetDriverName,
+  UnixSerialIoComponentNameGetControllerName,
   "eng"
 };
 
-static EFI_UNICODE_STRING_TABLE mWinNtSerialIoDriverNameTable[] = {
-  { "eng", L"Windows Serial I/O Driver" },
+static EFI_UNICODE_STRING_TABLE mUnixSerialIoDriverNameTable[] = {
+  { "eng", L"Unix Serial I/O Driver" },
   { NULL , NULL }
 };
 
 EFI_STATUS
 EFIAPI
-WinNtSerialIoComponentNameGetDriverName (
+UnixSerialIoComponentNameGetDriverName (
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
   IN  CHAR8                        *Language,
   OUT CHAR16                       **DriverName
@@ -90,15 +90,15 @@ WinNtSerialIoComponentNameGetDriverName (
 {
   return LookupUnicodeString (
           Language,
-          gWinNtSerialIoComponentName.SupportedLanguages,
-          mWinNtSerialIoDriverNameTable,
+          gUnixSerialIoComponentName.SupportedLanguages,
+          mUnixSerialIoDriverNameTable,
           DriverName
           );
 }
 
 EFI_STATUS
 EFIAPI
-WinNtSerialIoComponentNameGetControllerName (
+UnixSerialIoComponentNameGetControllerName (
   IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
   IN  EFI_HANDLE                                      ControllerHandle,
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
@@ -152,15 +152,15 @@ WinNtSerialIoComponentNameGetControllerName (
 {
   EFI_STATUS                    Status;
   EFI_SERIAL_IO_PROTOCOL        *SerialIo;
-  WIN_NT_SERIAL_IO_PRIVATE_DATA *Private;
+  UNIX_SERIAL_IO_PRIVATE_DATA *Private;
 
   //
   // Make sure this driver is currently managing ControllHandle
   //
   Status = EfiTestManagedDevice (
              ControllerHandle,
-             gWinNtSerialIoDriverBinding.DriverBindingHandle,
-             &gEfiWinNtIoProtocolGuid
+             gUnixSerialIoDriverBinding.DriverBindingHandle,
+             &gEfiUnixIoProtocolGuid
              );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -176,7 +176,7 @@ WinNtSerialIoComponentNameGetControllerName (
   Status = EfiTestChildHandle (
              ControllerHandle,
              ChildHandle,
-             &gEfiWinNtIoProtocolGuid
+             &gEfiUnixIoProtocolGuid
              );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -188,8 +188,8 @@ WinNtSerialIoComponentNameGetControllerName (
   Status = gBS->OpenProtocol (
                   ChildHandle,
                   &gEfiSerialIoProtocolGuid,
-                  &SerialIo,
-                  gWinNtSerialIoDriverBinding.DriverBindingHandle,
+                  (VOID**)&SerialIo,
+                  gUnixSerialIoDriverBinding.DriverBindingHandle,
                   ChildHandle,
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
                   );
@@ -197,11 +197,11 @@ WinNtSerialIoComponentNameGetControllerName (
     return EFI_UNSUPPORTED;
   }
 
-  Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (SerialIo);
+  Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (SerialIo);
 
   return LookupUnicodeString (
           Language,
-          gWinNtSerialIoComponentName.SupportedLanguages,
+          gUnixSerialIoComponentName.SupportedLanguages,
           Private->ControllerNameTable,
           ControllerName
           );