Remove use of 'VOLATILE'. Use 'volatile' instead.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6896 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/CpuIoDxe/CpuIo.h b/DuetPkg/CpuIoDxe/CpuIo.h
index 622cc1560f48566b6f555dd78298c0c8d0e994ea..2facb53ad80228eeb5f1369ad9c423fd60899096 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.h
+++ b/DuetPkg/CpuIoDxe/CpuIo.h
@@ -33,15 +33,13 @@ Abstract:
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
-#define VOLATILE  volatile\r
-\r
 typedef union {\r
-  UINT8  VOLATILE  *buf;\r
-  UINT8  VOLATILE  *ui8;\r
-  UINT16 VOLATILE  *ui16;\r
-  UINT32 VOLATILE  *ui32;\r
-  UINT64 VOLATILE  *ui64;\r
-  UINTN  VOLATILE  ui;\r
+  UINT8  volatile  *buf;\r
+  UINT8  volatile  *ui8;\r
+  UINT16 volatile  *ui16;\r
+  UINT32 volatile  *ui32;\r
+  UINT64 volatile  *ui64;\r
+  UINTN  volatile  ui;\r
 } PTR;\r
 \r
 EFI_STATUS\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
index f88932615e16184a408480551afea2d1691d723a..960ad9a27fb823c5fec22caae549f6e0e5c1d609 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
@@ -96,17 +96,16 @@ typedef struct {
 #define DRIVER_INSTANCE_FROM_PCI_ROOT_BRIDGE_IO_THIS(a) \\r
   CR(a, PCAT_PCI_ROOT_BRIDGE_INSTANCE, Io, PCAT_PCI_ROOT_BRIDGE_SIGNATURE)\r
 \r
-#define VOLATILE volatile\r
 //\r
 // Private data types\r
 //\r
 typedef union {\r
-  UINT8   VOLATILE  *buf;\r
-  UINT8   VOLATILE  *ui8;\r
-  UINT16  VOLATILE  *ui16;\r
-  UINT32  VOLATILE  *ui32;\r
-  UINT64  VOLATILE  *ui64;\r
-  UINTN   VOLATILE  ui;\r
+  UINT8   volatile  *buf;\r
+  UINT8   volatile  *ui8;\r
+  UINT16  volatile  *ui16;\r
+  UINT32  volatile  *ui32;\r
+  UINT64  volatile  *ui64;\r
+  UINTN   volatile  ui;\r
 } PTR;\r
 \r
 typedef struct {\r