MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Bus / Sd / EmmcDxe / EmmcDxe.h

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
index 0ae4eccac6ea0d991009b1c7affafaf7495c2af2..d286d97f42133c22409ebf2256e325c9d2f2c4d6 100644 (file)
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
@@ -4,14 +4,8 @@
   This file defines common data structures, macro definitions and some module\r
   internal function header files.\r
 \r
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -26,6 +20,7 @@
 #include <Protocol/BlockIo2.h>\r
 #include <Protocol/StorageSecurityCommand.h>\r
 #include <Protocol/EraseBlock.h>\r
+#include <Protocol/DiskInfo.h>\r
 \r
 #include <Protocol/DevicePath.h>\r
 \r
@@ -40,6 +35,8 @@
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
 #include "EmmcBlockIo.h"\r
+#include "EmmcDiskInfo.h"\r
+\r
 //\r
 // Global Variables\r
 //\r
@@ -61,6 +58,9 @@ extern EFI_COMPONENT_NAME2_PROTOCOL     gEmmcDxeComponentName2;
 #define EMMC_PARTITION_DATA_FROM_ERASEBLK(a) \\r
     CR(a, EMMC_PARTITION, EraseBlock, EMMC_PARTITION_SIGNATURE)\r
 \r
+#define EMMC_PARTITION_DATA_FROM_DISKINFO(a) \\r
+    CR(a, EMMC_PARTITION, DiskInfo, EMMC_PARTITION_SIGNATURE)\r
+\r
 //\r
 // Take 2.5 seconds as generic time out value, 1 microsecond as unit.\r
 //\r
@@ -102,6 +102,7 @@ typedef struct {
   EFI_BLOCK_IO_MEDIA                    BlockMedia;\r
   EFI_STORAGE_SECURITY_COMMAND_PROTOCOL StorageSecurity;\r
   EFI_ERASE_BLOCK_PROTOCOL              EraseBlock;\r
+  EFI_DISK_INFO_PROTOCOL                DiskInfo;\r
 \r
   LIST_ENTRY                            Queue;\r
 \r