MdePkg/Include/Protocol/Tls.h: pack structures from the TLS RFC

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

diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
index 252729fd5c976fe22bc08c24f9c1812d8911cbe7..078a91b4c083b84f69e95858832b2ead9f72e920 100644 (file)
--- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
@@ -4,8 +4,8 @@
 \r
   This protocol provides the parent dispatch service for the periodical timer SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2009 - 2017, 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,21 +22,9 @@
 #define _SMM_PERIODIC_TIMER_DISPATCH2_H_\r
 \r
 #include <Pi/PiSmmCis.h>\r
+#include <Protocol/MmPeriodicTimerDispatch.h>\r
 \r
-///\r
-/// Note:\r
-///   To avoid name conflict between PI and Framework SMM spec, the following names defined\r
-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.\r
-///\r
-///   EFI_SMM_PERIODIC_TIMER_REGISTER   -> EFI_SMM_PERIODIC_TIMER_REGISTER2\r
-///   EFI_SMM_PERIODIC_TIMER_UNREGISTER -> EFI_SMM_PERIODIC_TIMER_UNREGISTER2\r
-///   EFI_SMM_PERIODIC_TIMER_INTERVAL   -> EFI_SMM_PERIODIC_TIMER_INTERVAL2\r
-///\r
-\r
-#define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID \\r
-  { \\r
-    0x4cec368e, 0x8e8e, 0x4d71, {0x8b, 0xe1, 0x95, 0x8c, 0x45, 0xfc, 0x8a, 0x53 } \\r
-  }\r
+#define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL_GUID\r
 \r
 ///\r
 /// Example: A chipset supports periodic SMIs on every 64ms or 2 seconds.\r
@@ -76,13 +64,7 @@ typedef struct {
 /// Register() in RegisterContext and with CommBuffer pointing to an instance of \r
 /// EFI_SMM_PERIODIC_TIMER_CONTEXT and CommBufferSize pointing to its size.\r
 ///\r
-typedef struct {\r
-  ///\r
-  /// ElapsedTime is the actual time in 100 nanosecond units elapsed since last called, a\r
-  /// value of 0 indicates an unknown amount of time.\r
-  ///\r
-  UINT64  ElapsedTime;\r
-} EFI_SMM_PERIODIC_TIMER_CONTEXT;\r
+typedef EFI_MM_PERIODIC_TIMER_CONTEXT EFI_SMM_PERIODIC_TIMER_CONTEXT;\r
 \r
 typedef struct _EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL  EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL;\r
 \r