MdeModulePkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the MdeModulePkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
committed by
mergify[bot]
parent
7c7184e201
commit
1436aea4d5
@@ -41,8 +41,8 @@
|
||||
#include <Library/UefiDriverEntryPoint.h>
|
||||
#include <Library/ReportStatusCodeLib.h>
|
||||
|
||||
typedef struct _NVME_CONTROLLER_PRIVATE_DATA NVME_CONTROLLER_PRIVATE_DATA;
|
||||
typedef struct _NVME_DEVICE_PRIVATE_DATA NVME_DEVICE_PRIVATE_DATA;
|
||||
typedef struct _NVME_CONTROLLER_PRIVATE_DATA NVME_CONTROLLER_PRIVATE_DATA;
|
||||
typedef struct _NVME_DEVICE_PRIVATE_DATA NVME_DEVICE_PRIVATE_DATA;
|
||||
|
||||
#include "NvmExpressBlockIo.h"
|
||||
#include "NvmExpressDiskInfo.h"
|
||||
@@ -53,67 +53,67 @@ extern EFI_COMPONENT_NAME_PROTOCOL gNvmExpressComponentName;
|
||||
extern EFI_COMPONENT_NAME2_PROTOCOL gNvmExpressComponentName2;
|
||||
extern EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gNvmExpressDriverSupportedEfiVersion;
|
||||
|
||||
#define PCI_CLASS_MASS_STORAGE_NVM 0x08 // mass storage sub-class non-volatile memory.
|
||||
#define PCI_IF_NVMHCI 0x02 // mass storage programming interface NVMHCI.
|
||||
#define PCI_CLASS_MASS_STORAGE_NVM 0x08 // mass storage sub-class non-volatile memory.
|
||||
#define PCI_IF_NVMHCI 0x02 // mass storage programming interface NVMHCI.
|
||||
|
||||
#define NVME_ASQ_SIZE 1 // Number of admin submission queue entries, which is 0-based
|
||||
#define NVME_ACQ_SIZE 1 // Number of admin completion queue entries, which is 0-based
|
||||
#define NVME_ASQ_SIZE 1 // Number of admin submission queue entries, which is 0-based
|
||||
#define NVME_ACQ_SIZE 1 // Number of admin completion queue entries, which is 0-based
|
||||
|
||||
#define NVME_CSQ_SIZE 1 // Number of I/O submission queue entries, which is 0-based
|
||||
#define NVME_CCQ_SIZE 1 // Number of I/O completion queue entries, which is 0-based
|
||||
#define NVME_CSQ_SIZE 1 // Number of I/O submission queue entries, which is 0-based
|
||||
#define NVME_CCQ_SIZE 1 // Number of I/O completion queue entries, which is 0-based
|
||||
|
||||
//
|
||||
// Number of asynchronous I/O submission queue entries, which is 0-based.
|
||||
// The asynchronous I/O submission queue size is 4kB in total.
|
||||
//
|
||||
#define NVME_ASYNC_CSQ_SIZE 63
|
||||
#define NVME_ASYNC_CSQ_SIZE 63
|
||||
//
|
||||
// Number of asynchronous I/O completion queue entries, which is 0-based.
|
||||
// The asynchronous I/O completion queue size is 4kB in total.
|
||||
//
|
||||
#define NVME_ASYNC_CCQ_SIZE 255
|
||||
#define NVME_ASYNC_CCQ_SIZE 255
|
||||
|
||||
#define NVME_MAX_QUEUES 3 // Number of queues supported by the driver
|
||||
#define NVME_MAX_QUEUES 3 // Number of queues supported by the driver
|
||||
|
||||
#define NVME_CONTROLLER_ID 0
|
||||
#define NVME_CONTROLLER_ID 0
|
||||
|
||||
//
|
||||
// Time out value for Nvme transaction execution
|
||||
//
|
||||
#define NVME_GENERIC_TIMEOUT EFI_TIMER_PERIOD_SECONDS (5)
|
||||
#define NVME_GENERIC_TIMEOUT EFI_TIMER_PERIOD_SECONDS (5)
|
||||
|
||||
//
|
||||
// Nvme async transfer timer interval, set by experience.
|
||||
//
|
||||
#define NVME_HC_ASYNC_TIMER EFI_TIMER_PERIOD_MILLISECONDS (1)
|
||||
#define NVME_HC_ASYNC_TIMER EFI_TIMER_PERIOD_MILLISECONDS (1)
|
||||
|
||||
//
|
||||
// Unique signature for private data structure.
|
||||
//
|
||||
#define NVME_CONTROLLER_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('N','V','M','E')
|
||||
#define NVME_CONTROLLER_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('N','V','M','E')
|
||||
|
||||
//
|
||||
// Nvme private data structure.
|
||||
//
|
||||
struct _NVME_CONTROLLER_PRIVATE_DATA {
|
||||
UINT32 Signature;
|
||||
UINT32 Signature;
|
||||
|
||||
EFI_HANDLE ControllerHandle;
|
||||
EFI_HANDLE ImageHandle;
|
||||
EFI_HANDLE DriverBindingHandle;
|
||||
EFI_HANDLE ControllerHandle;
|
||||
EFI_HANDLE ImageHandle;
|
||||
EFI_HANDLE DriverBindingHandle;
|
||||
|
||||
EFI_PCI_IO_PROTOCOL *PciIo;
|
||||
UINT64 PciAttributes;
|
||||
EFI_PCI_IO_PROTOCOL *PciIo;
|
||||
UINT64 PciAttributes;
|
||||
|
||||
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
|
||||
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
|
||||
|
||||
EFI_NVM_EXPRESS_PASS_THRU_MODE PassThruMode;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL Passthru;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_MODE PassThruMode;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL Passthru;
|
||||
|
||||
//
|
||||
// pointer to identify controller data
|
||||
//
|
||||
NVME_ADMIN_CONTROLLER_DATA *ControllerData;
|
||||
NVME_ADMIN_CONTROLLER_DATA *ControllerData;
|
||||
|
||||
//
|
||||
// 6 x 4kB aligned buffers will be carved out of this buffer.
|
||||
@@ -124,45 +124,45 @@ struct _NVME_CONTROLLER_PRIVATE_DATA {
|
||||
// 5th 4kB boundary is the start of I/O submission queue #2.
|
||||
// 6th 4kB boundary is the start of I/O completion queue #2.
|
||||
//
|
||||
UINT8 *Buffer;
|
||||
UINT8 *BufferPciAddr;
|
||||
UINT8 *Buffer;
|
||||
UINT8 *BufferPciAddr;
|
||||
|
||||
//
|
||||
// Pointers to 4kB aligned submission & completion queues.
|
||||
//
|
||||
NVME_SQ *SqBuffer[NVME_MAX_QUEUES];
|
||||
NVME_CQ *CqBuffer[NVME_MAX_QUEUES];
|
||||
NVME_SQ *SqBufferPciAddr[NVME_MAX_QUEUES];
|
||||
NVME_CQ *CqBufferPciAddr[NVME_MAX_QUEUES];
|
||||
NVME_SQ *SqBuffer[NVME_MAX_QUEUES];
|
||||
NVME_CQ *CqBuffer[NVME_MAX_QUEUES];
|
||||
NVME_SQ *SqBufferPciAddr[NVME_MAX_QUEUES];
|
||||
NVME_CQ *CqBufferPciAddr[NVME_MAX_QUEUES];
|
||||
|
||||
//
|
||||
// Submission and completion queue indices.
|
||||
//
|
||||
NVME_SQTDBL SqTdbl[NVME_MAX_QUEUES];
|
||||
NVME_CQHDBL CqHdbl[NVME_MAX_QUEUES];
|
||||
UINT16 AsyncSqHead;
|
||||
NVME_SQTDBL SqTdbl[NVME_MAX_QUEUES];
|
||||
NVME_CQHDBL CqHdbl[NVME_MAX_QUEUES];
|
||||
UINT16 AsyncSqHead;
|
||||
|
||||
//
|
||||
// Flag to indicate internal IO queue creation.
|
||||
//
|
||||
BOOLEAN CreateIoQueue;
|
||||
BOOLEAN CreateIoQueue;
|
||||
|
||||
UINT8 Pt[NVME_MAX_QUEUES];
|
||||
UINT16 Cid[NVME_MAX_QUEUES];
|
||||
UINT8 Pt[NVME_MAX_QUEUES];
|
||||
UINT16 Cid[NVME_MAX_QUEUES];
|
||||
|
||||
//
|
||||
// Nvme controller capabilities
|
||||
//
|
||||
NVME_CAP Cap;
|
||||
NVME_CAP Cap;
|
||||
|
||||
VOID *Mapping;
|
||||
VOID *Mapping;
|
||||
|
||||
//
|
||||
// For Non-blocking operations.
|
||||
//
|
||||
EFI_EVENT TimerEvent;
|
||||
LIST_ENTRY AsyncPassThruQueue;
|
||||
LIST_ENTRY UnsubmittedSubtasks;
|
||||
EFI_EVENT TimerEvent;
|
||||
LIST_ENTRY AsyncPassThruQueue;
|
||||
LIST_ENTRY UnsubmittedSubtasks;
|
||||
};
|
||||
|
||||
#define NVME_CONTROLLER_PRIVATE_DATA_FROM_PASS_THRU(a) \
|
||||
@@ -175,7 +175,7 @@ struct _NVME_CONTROLLER_PRIVATE_DATA {
|
||||
//
|
||||
// Unique signature for private data structure.
|
||||
//
|
||||
#define NVME_DEVICE_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('X','S','S','D')
|
||||
#define NVME_DEVICE_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('X','S','S','D')
|
||||
|
||||
//
|
||||
// Nvme device private data structure
|
||||
@@ -208,7 +208,6 @@ struct _NVME_DEVICE_PRIVATE_DATA {
|
||||
NVME_ADMIN_NAMESPACE_DATA NamespaceData;
|
||||
|
||||
NVME_CONTROLLER_PRIVATE_DATA *Controller;
|
||||
|
||||
};
|
||||
|
||||
//
|
||||
@@ -235,7 +234,7 @@ struct _NVME_DEVICE_PRIVATE_DATA {
|
||||
NVME_DEVICE_PRIVATE_DATA_SIGNATURE \
|
||||
)
|
||||
|
||||
#define NVME_DEVICE_PRIVATE_DATA_FROM_STORAGE_SECURITY(a)\
|
||||
#define NVME_DEVICE_PRIVATE_DATA_FROM_STORAGE_SECURITY(a) \
|
||||
CR (a, \
|
||||
NVME_DEVICE_PRIVATE_DATA, \
|
||||
StorageSecurity, \
|
||||
@@ -245,38 +244,38 @@ struct _NVME_DEVICE_PRIVATE_DATA {
|
||||
//
|
||||
// Nvme block I/O 2 request.
|
||||
//
|
||||
#define NVME_BLKIO2_REQUEST_SIGNATURE SIGNATURE_32 ('N', 'B', '2', 'R')
|
||||
#define NVME_BLKIO2_REQUEST_SIGNATURE SIGNATURE_32 ('N', 'B', '2', 'R')
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
|
||||
EFI_BLOCK_IO2_TOKEN *Token;
|
||||
UINTN UnsubmittedSubtaskNum;
|
||||
BOOLEAN LastSubtaskSubmitted;
|
||||
EFI_BLOCK_IO2_TOKEN *Token;
|
||||
UINTN UnsubmittedSubtaskNum;
|
||||
BOOLEAN LastSubtaskSubmitted;
|
||||
//
|
||||
// The queue for Nvme read/write sub-tasks of a BlockIo2 request.
|
||||
//
|
||||
LIST_ENTRY SubtasksQueue;
|
||||
LIST_ENTRY SubtasksQueue;
|
||||
} NVME_BLKIO2_REQUEST;
|
||||
|
||||
#define NVME_BLKIO2_REQUEST_FROM_LINK(a) \
|
||||
CR (a, NVME_BLKIO2_REQUEST, Link, NVME_BLKIO2_REQUEST_SIGNATURE)
|
||||
|
||||
#define NVME_BLKIO2_SUBTASK_SIGNATURE SIGNATURE_32 ('N', 'B', '2', 'S')
|
||||
#define NVME_BLKIO2_SUBTASK_SIGNATURE SIGNATURE_32 ('N', 'B', '2', 'S')
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
|
||||
BOOLEAN IsLast;
|
||||
UINT32 NamespaceId;
|
||||
EFI_EVENT Event;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *CommandPacket;
|
||||
BOOLEAN IsLast;
|
||||
UINT32 NamespaceId;
|
||||
EFI_EVENT Event;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *CommandPacket;
|
||||
//
|
||||
// The BlockIo2 request this subtask belongs to
|
||||
//
|
||||
NVME_BLKIO2_REQUEST *BlockIo2Request;
|
||||
NVME_BLKIO2_REQUEST *BlockIo2Request;
|
||||
} NVME_BLKIO2_SUBTASK;
|
||||
|
||||
#define NVME_BLKIO2_SUBTASK_FROM_LINK(a) \
|
||||
@@ -285,20 +284,20 @@ typedef struct {
|
||||
//
|
||||
// Nvme asynchronous passthru request.
|
||||
//
|
||||
#define NVME_PASS_THRU_ASYNC_REQ_SIG SIGNATURE_32 ('N', 'P', 'A', 'R')
|
||||
#define NVME_PASS_THRU_ASYNC_REQ_SIG SIGNATURE_32 ('N', 'P', 'A', 'R')
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
UINT32 Signature;
|
||||
LIST_ENTRY Link;
|
||||
|
||||
EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet;
|
||||
UINT16 CommandId;
|
||||
VOID *MapPrpList;
|
||||
UINTN PrpListNo;
|
||||
VOID *PrpListHost;
|
||||
VOID *MapData;
|
||||
VOID *MapMeta;
|
||||
EFI_EVENT CallerEvent;
|
||||
EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet;
|
||||
UINT16 CommandId;
|
||||
VOID *MapPrpList;
|
||||
UINTN PrpListNo;
|
||||
VOID *PrpListHost;
|
||||
VOID *MapData;
|
||||
VOID *MapMeta;
|
||||
EFI_EVENT CallerEvent;
|
||||
} NVME_PASS_THRU_ASYNC_REQ;
|
||||
|
||||
#define NVME_PASS_THRU_ASYNC_REQ_FROM_THIS(a) \
|
||||
@@ -426,11 +425,11 @@ NvmExpressComponentNameGetDriverName (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressComponentNameGetControllerName (
|
||||
IN EFI_COMPONENT_NAME_PROTOCOL *This,
|
||||
IN EFI_HANDLE ControllerHandle,
|
||||
IN EFI_HANDLE ChildHandle OPTIONAL,
|
||||
IN CHAR8 *Language,
|
||||
OUT CHAR16 **ControllerName
|
||||
IN EFI_COMPONENT_NAME_PROTOCOL *This,
|
||||
IN EFI_HANDLE ControllerHandle,
|
||||
IN EFI_HANDLE ChildHandle OPTIONAL,
|
||||
IN CHAR8 *Language,
|
||||
OUT CHAR16 **ControllerName
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -555,10 +554,10 @@ NvmExpressDriverBindingStart (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressDriverBindingStop (
|
||||
IN EFI_DRIVER_BINDING_PROTOCOL *This,
|
||||
IN EFI_HANDLE Controller,
|
||||
IN UINTN NumberOfChildren,
|
||||
IN EFI_HANDLE *ChildHandleBuffer
|
||||
IN EFI_DRIVER_BINDING_PROTOCOL *This,
|
||||
IN EFI_HANDLE Controller,
|
||||
IN UINTN NumberOfChildren,
|
||||
IN EFI_HANDLE *ChildHandleBuffer
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -594,10 +593,10 @@ NvmExpressDriverBindingStop (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressPassThru (
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN UINT32 NamespaceId,
|
||||
IN OUT EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet,
|
||||
IN EFI_EVENT Event OPTIONAL
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN UINT32 NamespaceId,
|
||||
IN OUT EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET *Packet,
|
||||
IN EFI_EVENT Event OPTIONAL
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -636,8 +635,8 @@ NvmExpressPassThru (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressGetNextNamespace (
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN OUT UINT32 *NamespaceId
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN OUT UINT32 *NamespaceId
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -667,9 +666,9 @@ NvmExpressGetNextNamespace (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressGetNamespace (
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
|
||||
OUT UINT32 *NamespaceId
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
|
||||
OUT UINT32 *NamespaceId
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -706,9 +705,9 @@ NvmExpressGetNamespace (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
NvmExpressBuildDevicePath (
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN UINT32 NamespaceId,
|
||||
IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath
|
||||
IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This,
|
||||
IN UINT32 NamespaceId,
|
||||
IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -719,7 +718,7 @@ NvmExpressBuildDevicePath (
|
||||
**/
|
||||
VOID
|
||||
NvmeDumpStatus (
|
||||
IN NVME_CQ *Cq
|
||||
IN NVME_CQ *Cq
|
||||
);
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user