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@7056 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -73,7 +73,7 @@ typedef enum {
|
||||
//
|
||||
#define EHC_TPL TPL_NOTIFY
|
||||
|
||||
#define USB2_HC_DEV_SIGNATURE EFI_SIGNATURE_32 ('e', 'h', 'c', 'i')
|
||||
#define USB2_HC_DEV_SIGNATURE SIGNATURE_32 ('e', 'h', 'c', 'i')
|
||||
|
||||
//
|
||||
//Iterate through the doule linked list. NOT delete safe
|
||||
|
@@ -31,9 +31,9 @@ typedef enum {
|
||||
EHC_INT_TRANSFER_SYNC = 0x04,
|
||||
EHC_INT_TRANSFER_ASYNC = 0x08,
|
||||
|
||||
EHC_QTD_SIG = EFI_SIGNATURE_32 ('U', 'S', 'B', 'T'),
|
||||
EHC_QH_SIG = EFI_SIGNATURE_32 ('U', 'S', 'B', 'H'),
|
||||
EHC_URB_SIG = EFI_SIGNATURE_32 ('U', 'S', 'B', 'R'),
|
||||
EHC_QTD_SIG = SIGNATURE_32 ('U', 'S', 'B', 'T'),
|
||||
EHC_QH_SIG = SIGNATURE_32 ('U', 'S', 'B', 'H'),
|
||||
EHC_URB_SIG = SIGNATURE_32 ('U', 'S', 'B', 'R'),
|
||||
|
||||
//
|
||||
// Hardware related bit definitions
|
||||
|
@@ -82,7 +82,7 @@ typedef enum {
|
||||
//
|
||||
#define UHCI_TPL TPL_NOTIFY
|
||||
|
||||
#define USB_HC_DEV_SIGNATURE EFI_SIGNATURE_32 ('u', 'h', 'c', 'i')
|
||||
#define USB_HC_DEV_SIGNATURE SIGNATURE_32 ('u', 'h', 'c', 'i')
|
||||
|
||||
#pragma pack(1)
|
||||
typedef struct {
|
||||
|
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
|
||||
typedef enum {
|
||||
UHCI_ASYNC_INT_SIGNATURE = EFI_SIGNATURE_32 ('u', 'h', 'c', 'a'),
|
||||
UHCI_ASYNC_INT_SIGNATURE = SIGNATURE_32 ('u', 'h', 'c', 'a'),
|
||||
|
||||
//
|
||||
// The failure mask for USB transfer return status. If any of
|
||||
|
@@ -49,7 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define MUST_BE_STARTED 1
|
||||
#define MUST_BE_INITIALIZED 2
|
||||
|
||||
#define UNDI_DEV_SIGNATURE EFI_SIGNATURE_32('u','n','d','i')
|
||||
#define UNDI_DEV_SIGNATURE SIGNATURE_32('u','n','d','i')
|
||||
#define UNDI_DEV_FROM_THIS(a) CR(a, UNDI32_DEV, NIIProtocol_31, UNDI_DEV_SIGNATURE)
|
||||
#define UNDI_DEV_FROM_NIC(a) CR(a, UNDI32_DEV, NicInfo, UNDI_DEV_SIGNATURE)
|
||||
|
||||
|
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
#include <IndustryStandard/Scsi.h>
|
||||
|
||||
#define SCSI_IO_DEV_SIGNATURE EFI_SIGNATURE_32 ('s', 'c', 'i', 'o')
|
||||
#define SCSI_IO_DEV_SIGNATURE SIGNATURE_32 ('s', 'c', 'i', 'o')
|
||||
|
||||
typedef struct _SCSI_TARGET_ID {
|
||||
union {
|
||||
@@ -82,7 +82,7 @@ typedef struct _EFI_SCSI_BUS_PROTOCOL {
|
||||
UINT64 Reserved;
|
||||
} EFI_SCSI_BUS_PROTOCOL;
|
||||
|
||||
#define SCSI_BUS_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('s', 'c', 's', 'i')
|
||||
#define SCSI_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('s', 'c', 's', 'i')
|
||||
|
||||
|
||||
typedef struct _SCSI_BUS_DEVICE {
|
||||
|
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
#define IS_DEVICE_FIXED(a) (a)->FixedDevice ? 1 : 0
|
||||
|
||||
#define SCSI_DISK_DEV_SIGNATURE EFI_SIGNATURE_32 ('s', 'c', 'd', 'k')
|
||||
#define SCSI_DISK_DEV_SIGNATURE SIGNATURE_32 ('s', 'c', 'd', 'k')
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
|
@@ -126,8 +126,8 @@ typedef enum {
|
||||
//
|
||||
#define USB_BUS_TPL TPL_NOTIFY
|
||||
|
||||
#define USB_INTERFACE_SIGNATURE EFI_SIGNATURE_32 ('U', 'S', 'B', 'I')
|
||||
#define USB_BUS_SIGNATURE EFI_SIGNATURE_32 ('U', 'S', 'B', 'B')
|
||||
#define USB_INTERFACE_SIGNATURE SIGNATURE_32 ('U', 'S', 'B', 'I')
|
||||
#define USB_BUS_SIGNATURE SIGNATURE_32 ('U', 'S', 'B', 'B')
|
||||
|
||||
#define USB_BIT(a) ((UINTN)(1 << (a)))
|
||||
#define USB_BIT_IS_SET(Data, Bit) ((BOOLEAN)(((Data) & (Bit)) == (Bit)))
|
||||
@@ -272,7 +272,7 @@ struct _USB_HUB_API{
|
||||
|
||||
#define USB_US_LAND_ID 0x0409
|
||||
|
||||
#define DEVICE_PATH_LIST_ITEM_SIGNATURE EFI_SIGNATURE_32('d','p','l','i')
|
||||
#define DEVICE_PATH_LIST_ITEM_SIGNATURE SIGNATURE_32('d','p','l','i')
|
||||
typedef struct _DEVICE_PATH_LIST_ITEM{
|
||||
UINTN Signature;
|
||||
LIST_ENTRY Link;
|
||||
|
@@ -64,8 +64,8 @@ typedef struct {
|
||||
UINT8 BufferTail;
|
||||
} USB_KB_BUFFER;
|
||||
|
||||
#define USB_KB_DEV_SIGNATURE EFI_SIGNATURE_32 ('u', 'k', 'b', 'd')
|
||||
#define USB_KB_CONSOLE_IN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('u', 'k', 'b', 'x')
|
||||
#define USB_KB_DEV_SIGNATURE SIGNATURE_32 ('u', 'k', 'b', 'd')
|
||||
#define USB_KB_CONSOLE_IN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('u', 'k', 'b', 'x')
|
||||
|
||||
typedef struct _KEYBOARD_CONSOLE_IN_EX_NOTIFY {
|
||||
UINTN Signature;
|
||||
@@ -75,7 +75,7 @@ typedef struct _KEYBOARD_CONSOLE_IN_EX_NOTIFY {
|
||||
LIST_ENTRY NotifyEntry;
|
||||
} KEYBOARD_CONSOLE_IN_EX_NOTIFY;
|
||||
|
||||
#define USB_NS_KEY_SIGNATURE EFI_SIGNATURE_32 ('u', 'n', 's', 'k')
|
||||
#define USB_NS_KEY_SIGNATURE SIGNATURE_32 ('u', 'n', 's', 'k')
|
||||
|
||||
typedef struct {
|
||||
UINTN Signature;
|
||||
|
@@ -30,7 +30,7 @@ typedef struct _USB_MASS_DEVICE USB_MASS_DEVICE;
|
||||
//
|
||||
#define USB_MASS_TPL TPL_NOTIFY
|
||||
|
||||
#define USB_MASS_SIGNATURE EFI_SIGNATURE_32 ('U', 's', 'b', 'M')
|
||||
#define USB_MASS_SIGNATURE SIGNATURE_32 ('U', 's', 'b', 'M')
|
||||
|
||||
|
||||
struct _USB_MASS_DEVICE {
|
||||
|
@@ -47,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define BOOT_PROTOCOL 0
|
||||
#define REPORT_PROTOCOL 1
|
||||
|
||||
#define USB_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE EFI_SIGNATURE_32 ('u', 'm', 's', 't')
|
||||
#define USB_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE SIGNATURE_32 ('u', 'm', 's', 't')
|
||||
|
||||
typedef struct {
|
||||
BOOLEAN ButtonDetected;
|
||||
|
@@ -41,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define BOOT_PROTOCOL 0
|
||||
#define REPORT_PROTOCOL 1
|
||||
|
||||
#define USB_MOUSE_DEV_SIGNATURE EFI_SIGNATURE_32 ('u', 'm', 'o', 'u')
|
||||
#define USB_MOUSE_DEV_SIGNATURE SIGNATURE_32 ('u', 'm', 'o', 'u')
|
||||
|
||||
typedef struct {
|
||||
BOOLEAN ButtonDetected;
|
||||
|
Reference in New Issue
Block a user