Move LockKeyboards API from GenericBdsLib to PlatformBdsLib

And change PlatformBdsLockNonUpdatableFlash in PlatformBdsLib return type to VOID.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8855 6f19259b-4bc3-4df7-8a09-765794883524

DuetPkg/Library/DuetBdsLib/BdsPlatform.c

@@ -1736,3 +1736,37 @@ Returns:
   
   return EFI_SUCCESS;  
 } 
+  
+/**
+  Lock the ConsoleIn device in system table. All key
+  presses will be ignored until the Password is typed in. The only way to
+  disable the password is to type it in to a ConIn device.
+
+  @param  Password        Password used to lock ConIn device.
+
+  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
+  @retval EFI_UNSUPPORTED Password not found
+
+**/
+EFI_STATUS
+EFIAPI
+LockKeyboards (
+  IN  CHAR16    *Password
+  )
+{
+    return EFI_UNSUPPORTED;
+}
+
+/**
+  This function locks platform flash that is not allowed to be updated during normal boot path.
+  The flash layout is platform specific.
+
+  **/
+VOID
+EFIAPI
+PlatformBdsLockNonUpdatableFlash (
+  VOID
+  )
+{
+  return;
+}

IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h

@@ -255,11 +255,18 @@ BdsLibLoadDrivers (
 
 
 /**
-  This function processes BootOrder or DriverOrder variables, by calling
+  Process BootOrder, or DriverOrder variables, by calling
   BdsLibVariableToOption () for each UINT16 in the variables.
 
-  @param  BdsCommonOptionList   The header of the option list base on variable VariableName.  @param  VariableName          EFI Variable name indicate the BootOrder or DriverOrder.
+  @param  BdsCommonOptionList   The header of the option list base on variable
-  @retval EFI_SUCCESS           Successfully created the boot option or driver option                                list  @retval EFI_OUT_OF_RESOURCES  Failed to get the boot option or driver option list**/
+                                VariableName
+  @param  VariableName          EFI Variable name indicate the BootOrder or
+                                DriverOrder
+
+  @retval EFI_SUCCESS           Success create the boot option or driver option
+                                list
+  @retval EFI_OUT_OF_RESOURCES  Failed to get the boot option or driver option list
+**/
 EFI_STATUS
 EFIAPI
 BdsLibBuildOptionFromVar (
@@ -1050,8 +1057,8 @@ CatPrint (
   );
 
 /**
-  Use Console Control to stop UGA-based Simple Text Out consoles from going
+  Use SystemTable ConOut to stop video based Simple Text Out consoles from going
-  to the UGA device. Put up LogoFile on every UGA device that is a console.
+  to the video device. Put up LogoFile on every video device that is a console.
 
   @param[in]  LogoFile   File name of logo to display on the center of the screen.
 
@@ -1067,8 +1074,8 @@ EnableQuietBoot (
 
 
 /**
-  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA 
+  Use SystemTable ConOut to turn on video based Simple Text Out consoles. The 
-  Simple Text Out screens will now be synced up with all non UGA output devices
+  Simple Text Out screens will now be synced up with all non video output devices
 
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.
 
@@ -1079,23 +1086,5 @@ DisableQuietBoot (
   VOID
   );
 
-/**
-  Use Console Control Protocol to lock the Console In Spliter virtual handle. 
-  This is the ConInHandle and ConIn handle in the EFI system table. All key
-  presses will be ignored until the Password is typed in. The only way to
-  disable the password is to type it in to a ConIn device.
-
-  @param  Password        Password used to lock ConIn device.
-
-  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
-  @retval EFI_UNSUPPORTED Password not found
-
-**/
-EFI_STATUS
-EFIAPI
-LockKeyboards (
-  IN  CHAR16    *Password
-  );
-
 #endif
 

IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h

@@ -85,11 +85,28 @@ PlatformBdsBootSuccess (
   This function locks platform flash that is not allowed to be updated during normal boot path.
   The flash layout is platform specific.
 
-  @retval EFI_SUCCESS             The non-updatable flash areas.
+  **/
-**/
+VOID
-EFI_STATUS
 EFIAPI
 PlatformBdsLockNonUpdatableFlash (
   VOID
   );
+
+/**
+  Lock the ConsoleIn device in system table. All key
+  presses will be ignored until the Password is typed in. The only way to
+  disable the password is to type it in to a ConIn device.
+
+  @param  Password        Password used to lock ConIn device.
+
+  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
+  @retval EFI_UNSUPPORTED Password not found
+
+**/
+EFI_STATUS
+EFIAPI
+LockKeyboards (
+  IN  CHAR16    *Password
+  );
+
 #endif

IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c

@@ -747,32 +747,9 @@ ConvertBmpToGopBlt (
   return EFI_SUCCESS;
 }
 
-
 /**
-  Use Console Control Protocol to lock the Console In Spliter virtual handle.
+  Use SystemTable Conout to stop video based Simple Text Out consoles from going
-  This is the ConInHandle and ConIn handle in the EFI system table. All key
+  to the video device. Put up LogoFile on every video device that is a console.
-  presses will be ignored until the Password is typed in. The only way to
-  disable the password is to type it in to a ConIn device.
-
-  @param  Password        Password used to lock ConIn device.
-
-  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
-  @retval EFI_UNSUPPORTED Password not found
-
-**/
-EFI_STATUS
-EFIAPI
-LockKeyboards (
-  IN  CHAR16    *Password
-  )
-{
-    return EFI_UNSUPPORTED;
-}
-
-
-/**
-  Use Console Control to turn off UGA based Simple Text Out consoles from going
-  to the UGA device. Put up LogoFile on every UGA device that is a console
 
   @param[in]  LogoFile   File name of logo to display on the center of the screen.
 
@@ -1012,8 +989,8 @@ EnableQuietBoot (
 }
 
 /**
-  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA
+  Use SystemTable Conout to turn on video based Simple Text Out consoles. The 
-  Simple Text Out screens will now be synced up with all non UGA output devices
+  Simple Text Out screens will now be synced up with all non video output devices
 
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.
 

Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c

@@ -528,11 +528,36 @@ Returns:
   return EFI_SUCCESS;
 }
 
-EFI_STATUS
+/**
+  This function locks platform flash that is not allowed to be updated during normal boot path.
+  The flash layout is platform specific.
+
+  **/
+VOID
 EFIAPI
 PlatformBdsLockNonUpdatableFlash (
   VOID
   )
 {
-  return EFI_SUCCESS;
+  return;
+}
+
+/**
+  Lock the ConsoleIn device in system table. All key
+  presses will be ignored until the Password is typed in. The only way to
+  disable the password is to type it in to a ConIn device.
+
+  @param  Password        Password used to lock ConIn device.
+
+  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
+  @retval EFI_UNSUPPORTED Password not found
+
+**/
+EFI_STATUS
+EFIAPI
+LockKeyboards (
+  IN  CHAR16    *Password
+  )
+{
+    return EFI_UNSUPPORTED;
 }

OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c

@@ -1064,14 +1064,14 @@ Returns:
   return EFI_SUCCESS;
 }
 
-EFI_STATUS
+VOID
 EFIAPI
 PlatformBdsLockNonUpdatableFlash (
   VOID
   )
 {
   DEBUG ((EFI_D_INFO, "PlatformBdsLockNonUpdatableFlash\n"));
-  return EFI_SUCCESS;
+  return;
 }
 
 
@@ -1175,3 +1175,22 @@ InstallDevicePathCallback (
                           );
 }
 
+/**
+  Lock the ConsoleIn device in system table. All key
+  presses will be ignored until the Password is typed in. The only way to
+  disable the password is to type it in to a ConIn device.
+
+  @param  Password        Password used to lock ConIn device.
+
+  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
+  @retval EFI_UNSUPPORTED Password not found
+
+**/
+EFI_STATUS
+EFIAPI
+LockKeyboards (
+  IN  CHAR16    *Password
+  )
+{
+    return EFI_UNSUPPORTED;
+}

UnixPkg/Library/UnixBdsLib/BdsPlatform.c

@@ -526,11 +526,31 @@ Returns:
   return EFI_SUCCESS;
 }
 
-EFI_STATUS
+VOID
 EFIAPI
 PlatformBdsLockNonUpdatableFlash (
   VOID
   )
 {
-  return EFI_SUCCESS;
+  return;
+}
+
+/**
+  Lock the ConsoleIn device in system table. All key
+  presses will be ignored until the Password is typed in. The only way to
+  disable the password is to type it in to a ConIn device.
+
+  @param  Password        Password used to lock ConIn device.
+
+  @retval EFI_SUCCESS     lock the Console In Spliter virtual handle successfully.
+  @retval EFI_UNSUPPORTED Password not found
+
+**/
+EFI_STATUS
+EFIAPI
+LockKeyboards (
+  IN  CHAR16    *Password
+  )
+{
+    return EFI_UNSUPPORTED;
 }