MdeModulePkg: Add BmpSupportLib class and instance

[mirror_edk2.git] / Nt32Pkg / WinNtBlockIoDxe / WinNtBlockIo.h

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
index 313e25448c31aef964c6ac12ce2193106bf14324..7a7817c59f31265e32cbab164f6acb448e4b9762 100644 (file)
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
@@ -1,7 +1,7 @@
-/*++\r
+/**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006, 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
@@ -22,7 +22,7 @@ Abstract:
 \r
   * Other names and brands may be claimed as the property of others.\r
 \r
---*/\r
+**/\r
 \r
 #ifndef _WIN_NT_BLOCK_IO_H_\r
 #define _WIN_NT_BLOCK_IO_H_\r
@@ -58,7 +58,7 @@ typedef enum {
   EifWinNtMaxTypeDisks\r
 } WIN_NT_RAW_DISK_DEVICE_TYPE;\r
 \r
-#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'b', 'k')\r
+#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'b', 'k')\r
 typedef struct {\r
   UINTN                       Signature;\r
 \r
@@ -99,6 +99,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL         gWinNtBlockIoComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL        gWinNtBlockIoComponentName2;\r
 extern EFI_DRIVER_CONFIGURATION_PROTOCOL   gWinNtBlockIoDriverConfiguration;\r
 extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL     gWinNtBlockIoDriverDiagnostics;\r
+extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL    gWinNtBlockIoDriverDiagnostics2;\r
 \r
 //\r
 // EFI Driver Binding Functions\r
@@ -186,7 +187,6 @@ Returns:
 //\r
 // Block IO protocol member functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoReadBlocks (\r
@@ -217,7 +217,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoWriteBlocks (\r
@@ -248,7 +247,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoFlushBlocks (\r
@@ -271,7 +269,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoResetBlock (\r
@@ -299,7 +296,6 @@ Returns:
 //\r
 // Private Worker functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoCreateMapping (\r
   IN EFI_WIN_NT_IO_PROTOCOL             *WinNtIo,\r
@@ -335,7 +331,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoReadWriteCommon (\r
   IN  WIN_NT_BLOCK_IO_PRIVATE *Private,\r
@@ -367,7 +362,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoError (\r
   IN WIN_NT_BLOCK_IO_PRIVATE      *Private\r
@@ -389,7 +383,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoOpenDevice (\r
   WIN_NT_BLOCK_IO_PRIVATE         *Private\r
@@ -411,7 +404,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 CHAR16                                    *\r
 GetNextElementPastTerminator (\r
   IN  CHAR16  *EnvironmentVariable,\r