summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2008-12-07 22:36:29 +0000
committermdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2008-12-07 22:36:29 +0000
commite1cdd2eba522182a30f10594c0ca018c4681462e (patch)
tree8902b37498465d8567029b6e4220f133ac89e78a
parent15a2944afc76da6f3ea37fa6295937ec7a785bc5 (diff)
downloadedk2-e1cdd2eba522182a30f10594c0ca018c4681462e.tar.gz
edk2-e1cdd2eba522182a30f10594c0ca018c4681462e.tar.bz2
edk2-e1cdd2eba522182a30f10594c0ca018c4681462e.zip
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
-rw-r--r--DuetPkg/CpuIoDxe/CpuIo.h14
-rw-r--r--DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h13
2 files changed, 12 insertions, 15 deletions
diff --git a/DuetPkg/CpuIoDxe/CpuIo.h b/DuetPkg/CpuIoDxe/CpuIo.h
index 622cc1560f..2facb53ad8 100644
--- a/DuetPkg/CpuIoDxe/CpuIo.h
+++ b/DuetPkg/CpuIoDxe/CpuIo.h
@@ -33,15 +33,13 @@ Abstract:
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
-#define VOLATILE volatile
-
typedef union {
- UINT8 VOLATILE *buf;
- UINT8 VOLATILE *ui8;
- UINT16 VOLATILE *ui16;
- UINT32 VOLATILE *ui32;
- UINT64 VOLATILE *ui64;
- UINTN VOLATILE ui;
+ UINT8 volatile *buf;
+ UINT8 volatile *ui8;
+ UINT16 volatile *ui16;
+ UINT32 volatile *ui32;
+ UINT64 volatile *ui64;
+ UINTN volatile ui;
} PTR;
EFI_STATUS
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
index f88932615e..960ad9a27f 100644
--- 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) \
CR(a, PCAT_PCI_ROOT_BRIDGE_INSTANCE, Io, PCAT_PCI_ROOT_BRIDGE_SIGNATURE)
-#define VOLATILE volatile
//
// Private data types
//
typedef union {
- UINT8 VOLATILE *buf;
- UINT8 VOLATILE *ui8;
- UINT16 VOLATILE *ui16;
- UINT32 VOLATILE *ui32;
- UINT64 VOLATILE *ui64;
- UINTN VOLATILE ui;
+ UINT8 volatile *buf;
+ UINT8 volatile *ui8;
+ UINT16 volatile *ui16;
+ UINT32 volatile *ui32;
+ UINT64 volatile *ui64;
+ UINTN volatile ui;
} PTR;
typedef struct {