From f02bd3768c1aba2d4e023c7623dff4dab2dbb1df Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 16 Dec 2008 15:31:57 +0000
Subject: Clean up to update the reference of the these macros:  
 EFI_SIGNATURE_16 -> SIGNATURE_16   EFI_SIGNATURE_32 -> SIGNATURE_32  
 EFI_SIGNATURE_64 -> SIGNATURE_64   EFI_FIELD_OFFSET -> OFFSET_OF  
 EFI_MAX_BIT      -> MAX_BIT   EFI_MAX_ADDRESS  -> MAX_ADDRESS These macros
 are not defined in UEFI spec. It makes more sense to use the equivalent
 macros in Base.h to avoid alias.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7050 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h            | 2 +-
 IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h              | 4 ++--
 IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h                 | 2 +-
 IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h          | 4 ++--
 .../Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h      | 2 +-
 IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'IntelFrameworkModulePkg/Bus/Isa')

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index 14d124f9b1..66bd00ad86 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
@@ -134,7 +134,7 @@ typedef struct {
 //
 // ISA I/O Device Structure
 //
-#define ISA_IO_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('i', 's', 'a', 'i')
+#define ISA_IO_DEVICE_SIGNATURE SIGNATURE_32 ('i', 's', 'a', 'i')
 
 typedef struct {
   UINT32                                    Signature;
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
index 8983ab15c2..e518d4774d 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
@@ -53,8 +53,8 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gIsaFloppyComponentName2;
 //
 // Internal Data Structures
 //
-#define FDC_BLK_IO_DEV_SIGNATURE            EFI_SIGNATURE_32 ('F', 'B', 'I', 'O')
-#define FLOPPY_CONTROLLER_CONTEXT_SIGNATURE EFI_SIGNATURE_32 ('F', 'D', 'C', 'C')
+#define FDC_BLK_IO_DEV_SIGNATURE            SIGNATURE_32 ('F', 'B', 'I', 'O')
+#define FLOPPY_CONTROLLER_CONTEXT_SIGNATURE SIGNATURE_32 ('F', 'D', 'C', 'C')
 
 typedef enum {
   FDC_DISK0   = 0,
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index 980e0d17c2..2d3f71c136 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
@@ -43,7 +43,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gIsaSerialComponentName2;
 //
 // Internal Data Structures
 //
-#define SERIAL_DEV_SIGNATURE    EFI_SIGNATURE_32 ('s', 'e', 'r', 'd')
+#define SERIAL_DEV_SIGNATURE    SIGNATURE_32 ('s', 'e', 'r', 'd')
 #define SERIAL_MAX_BUFFER_SIZE  16
 #define TIMEOUT_STALL_INTERVAL  10
 
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index d7cf700efa..c69cc41ce6 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -38,8 +38,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Driver Private Data
 //
 #define KEYBOARD_BUFFER_MAX_COUNT         32
-#define KEYBOARD_CONSOLE_IN_DEV_SIGNATURE EFI_SIGNATURE_32 ('k', 'k', 'e', 'y')
-#define KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('k', 'c', 'e', 'n')
+#define KEYBOARD_CONSOLE_IN_DEV_SIGNATURE SIGNATURE_32 ('k', 'k', 'e', 'y')
+#define KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('k', 'c', 'e', 'n')
 
 typedef struct _KEYBOARD_CONSOLE_IN_EX_NOTIFY {
   UINTN                                 Signature;
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
index 46cdff9db7..d7041a40ae 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
@@ -66,7 +66,7 @@ typedef enum {
 //
 // Driver Private Data
 //
-#define PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE EFI_SIGNATURE_32 ('p', '2', 's', 't')
+#define PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE SIGNATURE_32 ('p', '2', 's', 't')
 
 typedef struct {
   UINTN                               Signature;
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index 9a1a3040aa..5102d34307 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
@@ -66,7 +66,7 @@ typedef enum {
 //
 // Driver Private Data
 //
-#define PS2_MOUSE_DEV_SIGNATURE EFI_SIGNATURE_32 ('p', 's', '2', 'm')
+#define PS2_MOUSE_DEV_SIGNATURE SIGNATURE_32 ('p', 's', '2', 'm')
 
 typedef struct {
   UINTN                               Signature;
-- 
cgit v1.2.3