From e1cdd2eba522182a30f10594c0ca018c4681462e Mon Sep 17 00:00:00 2001 From: mdkinney Date: Sun, 7 Dec 2008 22:36:29 +0000 Subject: [PATCH] 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 --- DuetPkg/CpuIoDxe/CpuIo.h | 14 ++++++-------- .../PcatPciRootBridge.h | 13 ++++++------- 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 #include -#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 { -- 2.39.2