//\r
// PCAT ISA ACPI device private data structure\r
//\r
-#define PCAT_ISA_ACPI_DEV_SIGNATURE EFI_SIGNATURE_32('L','P','C','D')\r
+#define PCAT_ISA_ACPI_DEV_SIGNATURE SIGNATURE_32('L','P','C','D')\r
\r
typedef struct {\r
UINTN Signature;\r
EFI_PCI_IO_PROTOCOL *PciIo;\r
} PCAT_ISA_ACPI_DEV;\r
\r
-#define PCAT_ISA_ACPI_DEV_FROM_THIS(a) _CR(a, PCAT_ISA_ACPI_DEV, IsaAcpi)\r
+#define PCAT_ISA_ACPI_DEV_FROM_THIS(a) BASE_CR(a, PCAT_ISA_ACPI_DEV, IsaAcpi)\r
\r
//\r
// Global Variables\r