Update PciCfg2.c to follow strict ANSI C spec.

[mirror_edk2.git] / MdePkg / Include / Protocol / SimpleTextIn.h

diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index 053ed58b90bf15fd45b5315bcfb27349918c5940..0e1e82b50c32e1863196ce3c1326905b55733988 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -13,24 +13,27 @@
   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
 \r
-  Module Name:  SimpleTextIn.h\r
-\r
 **/\r
 \r
 #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__\r
 #define __SIMPLE_TEXT_IN_PROTOCOL_H__\r
 \r
-#define EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID \\r
+#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \\r
   { \\r
     0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
   }\r
 \r
-#define EFI_SIMPLE_INPUT_PROTOCOL_GUID      EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID\r
-#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID\r
+//\r
+// Protocol GUID defined in EFI1.1.\r
+// \r
+#define SIMPLE_INPUT_PROTOCOL   EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID\r
 \r
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_IN_PROTOCOL;\r
-typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;\r
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL  EFI_SIMPLE_TEXT_INPUT_PROTOCOL;\r
 \r
+//\r
+// Backward-compatible with EFI1.1.\r
+// \r
+typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL  SIMPLE_INPUT_INTERFACE;\r
 //\r
 // Data structures\r
 //\r
@@ -89,7 +92,7 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_RESET) (\r
-  IN EFI_SIMPLE_TEXT_IN_PROTOCOL          *This,\r
+  IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   IN BOOLEAN                              ExtendedVerification\r
   )\r
 ;\r
@@ -110,16 +113,16 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_READ_KEY) (\r
-  IN EFI_SIMPLE_TEXT_IN_PROTOCOL          *This,\r
+  IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   OUT EFI_INPUT_KEY                       *Key\r
   )\r
 ;\r
 \r
-struct _EFI_SIMPLE_TEXT_IN_PROTOCOL {\r
+struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL {\r
   EFI_INPUT_RESET     Reset;\r
   EFI_INPUT_READ_KEY  ReadKeyStroke;\r
   EFI_EVENT           WaitForKey;\r
-} EFI_SIMPLE_INPUT_PROTOCOL;\r
+};\r
 \r
 extern EFI_GUID gEfiSimpleTextInProtocolGuid;\r
 \r