X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FHotkey.h;h=d73a1cbeeb1136f5d684fe67db8aab98bff52f52;hb=c0a00b14385347c3c5e8d490fa4b065e1675a06c;hp=f2c964e0c53318ccddcbe1fe40f6a373582617da;hpb=402e4a9d777677296945afa020194bf4123885e2;p=mirror_edk2.git

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
index f2c964e0c5..d73a1cbeeb 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
@@ -2,14 +2,8 @@
   Provides a way for 3rd party applications to register themselves for launch by the
   Boot Manager based on hot key
 
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -19,9 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Bds.h"
 #include "String.h"
 
-#define GET_BOOT_OPTION_SUPPORT_KEY_COUNT(a) (((a) & EFI_BOOT_OPTION_SUPPORT_COUNT) >> 8)
 #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) {  \
-      (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << 8) & EFI_BOOT_OPTION_SUPPORT_COUNT); \
+      (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) & EFI_BOOT_OPTION_SUPPORT_COUNT); \
       }
 
 #define BDS_HOTKEY_OPTION_SIGNATURE SIGNATURE_32 ('B', 'd', 'K', 'O')
@@ -40,43 +33,6 @@ typedef struct {
 
 #define BDS_HOTKEY_OPTION_FROM_LINK(a) CR (a, BDS_HOTKEY_OPTION, Link, BDS_HOTKEY_OPTION_SIGNATURE)
 
-#define VAR_KEY_ORDER       L"KeyOrder"
-
-/**
-
-  Create Key#### for the given hotkey.
-
-
-  @param KeyOption       - The Hot Key Option to be added.
-  @param KeyOptionNumber - The key option number for Key#### (optional).
-
-  @retval  EFI_SUCCESS            Register hotkey successfully.
-  @retval  EFI_INVALID_PARAMETER  The hotkey option is invalid.
-
-**/
-EFI_STATUS
-RegisterHotkey (
-  IN EFI_KEY_OPTION     *KeyOption,
-  OUT UINT16            *KeyOptionNumber
-  );
-
-/**
-
-  Delete Key#### for the given Key Option number.
-
-
-  @param KeyOptionNumber - Key option number for Key####
-
-  @retval  EFI_SUCCESS            Unregister hotkey successfully.
-  @retval  EFI_NOT_FOUND          No Key#### is found for the given Key Option number.
-
-**/
-EFI_STATUS
-UnregisterHotkey (
-  IN UINT16             KeyOptionNumber
-  );
-
-
 /**
 
   Process all the "Key####" variables, associate Hotkeys with corresponding Boot Options.