sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkPkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the NetworkPkg 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: Maciej Rabeda <maciej.rabeda@linux.intel.com>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:07 -08:00
committed by mergify[bot]
parent 2f88bd3a12
commit d1050b9dff
294 changed files with 29888 additions and 30440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
NetworkPkg/MnpDxe/MnpIo.c
View File

@@ -20,15 +20,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
BOOLEAN
MnpIsValidTxToken (
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token
)
{
MNP_SERVICE_DATA *MnpServiceData;
EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;
UINT32 Index;
UINT32 TotalLength;
EFI_MANAGED_NETWORK_FRAGMENT_DATA *FragmentTable;
MNP_SERVICE_DATA *MnpServiceData;
EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;
UINT32 Index;
UINT32 TotalLength;
EFI_MANAGED_NETWORK_FRAGMENT_DATA *FragmentTable;
MnpServiceData = Instance->MnpServiceData;
NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);
@@ -56,7 +56,6 @@ MnpIsValidTxToken (
TotalLength = 0;
FragmentTable = TxData->FragmentTable;
for (Index = 0; Index < TxData->FragmentCount; Index++) {
if ((FragmentTable[Index].FragmentLength == 0) || (FragmentTable[Index].FragmentBuffer == NULL)) {
//
// The token is invalid if any FragmentLength is zero or any FragmentBuffer is NULL.
@@ -111,17 +110,17 @@ MnpIsValidTxToken (
**/
EFI_STATUS
MnpBuildTxPacket (
IN MNP_SERVICE_DATA *MnpServiceData,
IN EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData,
OUT UINT8 **PktBuf,
OUT UINT32 *PktLen
IN MNP_SERVICE_DATA *MnpServiceData,
IN EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData,
OUT UINT8 **PktBuf,
OUT UINT32 *PktLen
)
{
EFI_SIMPLE_NETWORK_MODE *SnpMode;
UINT8 *DstPos;
UINT16 Index;
MNP_DEVICE_DATA *MnpDeviceData;
UINT8 *TxBuf;
EFI_SIMPLE_NETWORK_MODE *SnpMode;
UINT8 *DstPos;
UINT16 Index;
MNP_DEVICE_DATA *MnpDeviceData;
UINT8 *TxBuf;
MnpDeviceData = MnpServiceData->MnpDeviceData;
@@ -141,10 +140,10 @@ MnpBuildTxPacket (
if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {
CopyMem (
*PktBuf,
TxData->FragmentTable[0].FragmentBuffer,
TxData->FragmentTable[0].FragmentLength
);
*PktBuf,
TxData->FragmentTable[0].FragmentBuffer,
TxData->FragmentTable[0].FragmentLength
);
*PktLen = TxData->FragmentTable[0].FragmentLength;
} else {
@@ -161,7 +160,7 @@ MnpBuildTxPacket (
// If dest address is not NULL, move DstPos to reserve space for the
// media header. Add the media header length to buflen.
//
DstPos += SnpMode->MediaHeaderSize;
DstPos += SnpMode->MediaHeaderSize;
*PktLen += SnpMode->MediaHeaderSize;
}
@@ -186,7 +185,6 @@ MnpBuildTxPacket (
return EFI_SUCCESS;
}
/**
Synchronously send out the packet.
@@ -206,18 +204,18 @@ MnpBuildTxPacket (
**/
EFI_STATUS
MnpSyncSendPacket (
IN MNP_SERVICE_DATA *MnpServiceData,
IN UINT8 *Packet,
IN UINT32 Length,
IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token
IN MNP_SERVICE_DATA *MnpServiceData,
IN UINT8 *Packet,
IN UINT32 Length,
IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token
)
{
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;
UINT32 HeaderSize;
MNP_DEVICE_DATA *MnpDeviceData;
UINT16 ProtocolType;
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;
UINT32 HeaderSize;
MNP_DEVICE_DATA *MnpDeviceData;
UINT16 ProtocolType;
MnpDeviceData = MnpServiceData->MnpDeviceData;
Snp = MnpDeviceData->Snp;
@@ -238,7 +236,6 @@ MnpSyncSendPacket (
goto SIGNAL_TOKEN;
}
if (MnpServiceData->VlanId != 0) {
//
// Insert VLAN tag
@@ -294,7 +291,6 @@ SIGNAL_TOKEN:
return EFI_SUCCESS;
}
/**
Try to deliver the received packet to the instance.
@@ -308,7 +304,7 @@ SIGNAL_TOKEN:
**/
EFI_STATUS
MnpInstanceDeliverPacket (
IN OUT MNP_INSTANCE_DATA *Instance
IN OUT MNP_INSTANCE_DATA *Instance
)
{
MNP_DEVICE_DATA *MnpDeviceData;
@@ -363,10 +359,10 @@ MnpInstanceDeliverPacket (
//
// Set all the buffer pointers.
//
RxData->MediaHeader = NetbufGetByte (RxDataWrap->Nbuf, 0, NULL);
RxData->DestinationAddress = RxData->MediaHeader;
RxData->SourceAddress = (UINT8 *) RxData->MediaHeader + SnpMode->HwAddressSize;
RxData->PacketData = (UINT8 *) RxData->MediaHeader + SnpMode->MediaHeaderSize;
RxData->MediaHeader = NetbufGetByte (RxDataWrap->Nbuf, 0, NULL);
RxData->DestinationAddress = RxData->MediaHeader;
RxData->SourceAddress = (UINT8 *)RxData->MediaHeader + SnpMode->HwAddressSize;
RxData->PacketData = (UINT8 *)RxData->MediaHeader + SnpMode->MediaHeaderSize;
//
// Insert this RxDataWrap into the delivered queue.
@@ -381,14 +377,13 @@ MnpInstanceDeliverPacket (
//
// Signal this token's event.
//
RxToken->Packet.RxData = &RxDataWrap->RxData;
RxToken->Status = EFI_SUCCESS;
RxToken->Packet.RxData = &RxDataWrap->RxData;
RxToken->Status = EFI_SUCCESS;
gBS->SignalEvent (RxToken->Event);
return EFI_SUCCESS;
}
/**
Deliver the received packet for the instances belonging to the MnpServiceData.
@@ -397,11 +392,11 @@ MnpInstanceDeliverPacket (
**/
VOID
MnpDeliverPacket (
IN MNP_SERVICE_DATA *MnpServiceData
IN MNP_SERVICE_DATA *MnpServiceData
)
{
LIST_ENTRY *Entry;
MNP_INSTANCE_DATA *Instance;
LIST_ENTRY *Entry;
MNP_INSTANCE_DATA *Instance;
NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);
@@ -416,7 +411,6 @@ MnpDeliverPacket (
}
}
/**
Recycle the RxData and other resources used to hold and deliver the received
packet.
@@ -428,16 +422,16 @@ MnpDeliverPacket (
VOID
EFIAPI
MnpRecycleRxData (
IN EFI_EVENT Event,
IN VOID *Context
IN EFI_EVENT Event,
IN VOID *Context
)
{
MNP_RXDATA_WRAP *RxDataWrap;
MNP_DEVICE_DATA *MnpDeviceData;
MNP_RXDATA_WRAP *RxDataWrap;
MNP_DEVICE_DATA *MnpDeviceData;
ASSERT (Context != NULL);
RxDataWrap = (MNP_RXDATA_WRAP *) Context;
RxDataWrap = (MNP_RXDATA_WRAP *)Context;
NET_CHECK_SIGNATURE (RxDataWrap->Instance, MNP_INSTANCE_DATA_SIGNATURE);
ASSERT (RxDataWrap->Nbuf != NULL);
@@ -464,7 +458,6 @@ MnpRecycleRxData (
FreePool (RxDataWrap);
}
/**
Queue the received packet into instance's receive queue.
@@ -474,11 +467,11 @@ MnpRecycleRxData (
**/
VOID
MnpQueueRcvdPacket (
IN OUT MNP_INSTANCE_DATA *Instance,
IN OUT MNP_RXDATA_WRAP *RxDataWrap
IN OUT MNP_INSTANCE_DATA *Instance,
IN OUT MNP_RXDATA_WRAP *RxDataWrap
)
{
MNP_RXDATA_WRAP *OldRxDataWrap;
MNP_RXDATA_WRAP *OldRxDataWrap;
NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);
@@ -487,7 +480,6 @@ MnpQueueRcvdPacket (
// from the head.
//
if (Instance->RcvdPacketQueueSize == MNP_MAX_RCVD_PACKET_QUE_SIZE) {
DEBUG ((DEBUG_WARN, "MnpQueueRcvdPacket: Drop one packet bcz queue size limit reached.\n"));
//
@@ -502,7 +494,7 @@ MnpQueueRcvdPacket (
//
// Recycle this OldRxDataWrap, this entry will be removed by the callee.
//
MnpRecycleRxData (NULL, (VOID *) OldRxDataWrap);
MnpRecycleRxData (NULL, (VOID *)OldRxDataWrap);
Instance->RcvdPacketQueueSize--;
}
@@ -518,7 +510,6 @@ MnpQueueRcvdPacket (
Instance->RcvdPacketQueueSize++;
}
/**
Match the received packet with the instance receive filters.
@@ -535,15 +526,15 @@ MnpQueueRcvdPacket (
**/
BOOLEAN
MnpMatchPacket (
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData,
IN MNP_GROUP_ADDRESS *GroupAddress OPTIONAL,
IN UINT8 PktAttr
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData,
IN MNP_GROUP_ADDRESS *GroupAddress OPTIONAL,
IN UINT8 PktAttr
)
{
EFI_MANAGED_NETWORK_CONFIG_DATA *ConfigData;
LIST_ENTRY *Entry;
MNP_GROUP_CONTROL_BLOCK *GroupCtrlBlk;
EFI_MANAGED_NETWORK_CONFIG_DATA *ConfigData;
LIST_ENTRY *Entry;
MNP_GROUP_CONTROL_BLOCK *GroupCtrlBlk;
NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);
@@ -574,11 +565,9 @@ MnpMatchPacket (
// Check multicast addresses.
//
if (ConfigData->EnableMulticastReceive && RxData->MulticastFlag) {
ASSERT (GroupAddress != NULL);
NET_LIST_FOR_EACH (Entry, &Instance->GroupCtrlBlkList) {
GroupCtrlBlk = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_CONTROL_BLOCK, CtrlBlkEntry);
if (GroupCtrlBlk->GroupAddress == GroupAddress) {
//
@@ -596,7 +585,6 @@ MnpMatchPacket (
return FALSE;
}
/**
Analyse the received packets.
@@ -614,17 +602,17 @@ MnpMatchPacket (
**/
VOID
MnpAnalysePacket (
IN MNP_SERVICE_DATA *MnpServiceData,
IN NET_BUF *Nbuf,
IN OUT EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData,
OUT MNP_GROUP_ADDRESS **GroupAddress,
OUT UINT8 *PktAttr
IN MNP_SERVICE_DATA *MnpServiceData,
IN NET_BUF *Nbuf,
IN OUT EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData,
OUT MNP_GROUP_ADDRESS **GroupAddress,
OUT UINT8 *PktAttr
)
{
EFI_SIMPLE_NETWORK_MODE *SnpMode;
MNP_DEVICE_DATA *MnpDeviceData;
UINT8 *BufPtr;
LIST_ENTRY *Entry;
EFI_SIMPLE_NETWORK_MODE *SnpMode;
MNP_DEVICE_DATA *MnpDeviceData;
UINT8 *BufPtr;
LIST_ENTRY *Entry;
MnpDeviceData = MnpServiceData->MnpDeviceData;
SnpMode = MnpDeviceData->Snp->Mode;
@@ -660,7 +648,6 @@ MnpAnalysePacket (
// It's multicast, try to match the multicast filters.
//
NET_LIST_FOR_EACH (Entry, &MnpDeviceData->GroupAddressList) {
*GroupAddress = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);
if (NET_MAC_EQUAL (BufPtr, &((*GroupAddress)->Address), SnpMode->HwAddressSize)) {
RxData->MulticastFlag = TRUE;
@@ -680,7 +667,7 @@ MnpAnalysePacket (
//
// Skip the below code, there is no receiver of this packet.
//
return ;
return;
}
}
} else {
@@ -697,10 +684,9 @@ MnpAnalysePacket (
RxData->HeaderLength = SnpMode->MediaHeaderSize;
RxData->AddressLength = SnpMode->HwAddressSize;
RxData->DataLength = RxData->PacketLength - RxData->HeaderLength;
RxData->ProtocolType = NTOHS (*(UINT16 *) (BufPtr + 2 * SnpMode->HwAddressSize));
RxData->ProtocolType = NTOHS (*(UINT16 *)(BufPtr + 2 * SnpMode->HwAddressSize));
}
/**
Wrap the RxData.
@@ -712,12 +698,12 @@ MnpAnalysePacket (
**/
MNP_RXDATA_WRAP *
MnpWrapRxData (
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData
IN MNP_INSTANCE_DATA *Instance,
IN EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData
)
{
EFI_STATUS Status;
MNP_RXDATA_WRAP *RxDataWrap;
EFI_STATUS Status;
MNP_RXDATA_WRAP *RxDataWrap;
//
// Allocate memory.
@@ -755,7 +741,6 @@ MnpWrapRxData (
return RxDataWrap;
}
/**
Enqueue the received the packets to the instances belonging to the
MnpServiceData.
@@ -767,8 +752,8 @@ MnpWrapRxData (
**/
VOID
MnpEnqueuePacket (
IN MNP_SERVICE_DATA *MnpServiceData,
IN NET_BUF *Nbuf
IN MNP_SERVICE_DATA *MnpServiceData,
IN NET_BUF *Nbuf
)
{
LIST_ENTRY *Entry;
@@ -778,7 +763,6 @@ MnpEnqueuePacket (
MNP_GROUP_ADDRESS *GroupAddress;
MNP_RXDATA_WRAP *RxDataWrap;
GroupAddress = NULL;
//
// First, analyse the packet header.
@@ -789,14 +773,13 @@ MnpEnqueuePacket (
//
// No receivers, no more action need.
//
return ;
return;
}
//
// Iterate the children to find match.
//
NET_LIST_FOR_EACH (Entry, &MnpServiceData->ChildrenList) {
Instance = NET_LIST_USER_STRUCT (Entry, MNP_INSTANCE_DATA, InstEntry);
NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);
@@ -830,7 +813,6 @@ MnpEnqueuePacket (
}
}
/**
Try to receive a packet and deliver it.
@@ -844,19 +826,19 @@ MnpEnqueuePacket (
**/
EFI_STATUS
MnpReceivePacket (
IN OUT MNP_DEVICE_DATA *MnpDeviceData
IN OUT MNP_DEVICE_DATA *MnpDeviceData
)
{
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
NET_BUF *Nbuf;
UINT8 *BufPtr;
UINTN BufLen;
UINTN HeaderSize;
UINT32 Trimmed;
MNP_SERVICE_DATA *MnpServiceData;
UINT16 VlanId;
BOOLEAN IsVlanPacket;
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
NET_BUF *Nbuf;
UINT8 *BufPtr;
UINTN BufLen;
UINTN HeaderSize;
UINT32 Trimmed;
MNP_SERVICE_DATA *MnpServiceData;
UINT16 VlanId;
BOOLEAN IsVlanPacket;
NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);
@@ -888,9 +870,9 @@ MnpReceivePacket (
);
}
Nbuf = MnpDeviceData->RxNbufCache;
BufLen = Nbuf->TotalSize;
BufPtr = NetbufGetByte (Nbuf, 0, NULL);
Nbuf = MnpDeviceData->RxNbufCache;
BufLen = Nbuf->TotalSize;
BufPtr = NetbufGetByte (Nbuf, 0, NULL);
ASSERT (BufPtr != NULL);
//
@@ -899,9 +881,10 @@ MnpReceivePacket (
Status = Snp->Receive (Snp, &HeaderSize, &BufLen, BufPtr, NULL, NULL, NULL);
if (EFI_ERROR (Status)) {
DEBUG_CODE_BEGIN ();
if (Status != EFI_NOT_READY) {
DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));
}
if (Status != EFI_NOT_READY) {
DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));
}
DEBUG_CODE_END ();
return Status;
@@ -913,9 +896,9 @@ MnpReceivePacket (
if ((HeaderSize != Snp->Mode->MediaHeaderSize) || (BufLen < HeaderSize)) {
DEBUG (
(DEBUG_WARN,
"MnpReceivePacket: Size error, HL:TL = %d:%d.\n",
HeaderSize,
BufLen)
"MnpReceivePacket: Size error, HL:TL = %d:%d.\n",
HeaderSize,
BufLen)
);
return EFI_DEVICE_ERROR;
}
@@ -925,7 +908,7 @@ MnpReceivePacket (
//
// Trim the packet from tail.
//
Trimmed = NetbufTrim (Nbuf, Nbuf->TotalSize - (UINT32) BufLen, NET_BUF_TAIL);
Trimmed = NetbufTrim (Nbuf, Nbuf->TotalSize - (UINT32)BufLen, NET_BUF_TAIL);
ASSERT (Nbuf->TotalSize == BufLen);
}
@@ -982,12 +965,14 @@ MnpReceivePacket (
if (Trimmed > 0) {
NetbufAllocSpace (Nbuf, Trimmed, NET_BUF_TAIL);
}
if (IsVlanPacket) {
NetbufAllocSpace (Nbuf, NET_VLAN_TAG_LEN, NET_BUF_HEAD);
}
goto EXIT;
}
//
// Deliver the queued packets.
//
@@ -1000,7 +985,6 @@ EXIT:
return Status;
}
/**
Remove the received packets if timeout occurs.
@@ -1011,28 +995,27 @@ EXIT:
VOID
EFIAPI
MnpCheckPacketTimeout (
IN EFI_EVENT Event,
IN VOID *Context
IN EFI_EVENT Event,
IN VOID *Context
)
{
MNP_DEVICE_DATA *MnpDeviceData;
MNP_SERVICE_DATA *MnpServiceData;
LIST_ENTRY *Entry;
LIST_ENTRY *ServiceEntry;
LIST_ENTRY *RxEntry;
LIST_ENTRY *NextEntry;
MNP_INSTANCE_DATA *Instance;
MNP_RXDATA_WRAP *RxDataWrap;
EFI_TPL OldTpl;
MNP_DEVICE_DATA *MnpDeviceData;
MNP_SERVICE_DATA *MnpServiceData;
LIST_ENTRY *Entry;
LIST_ENTRY *ServiceEntry;
LIST_ENTRY *RxEntry;
LIST_ENTRY *NextEntry;
MNP_INSTANCE_DATA *Instance;
MNP_RXDATA_WRAP *RxDataWrap;
EFI_TPL OldTpl;
MnpDeviceData = (MNP_DEVICE_DATA *) Context;
MnpDeviceData = (MNP_DEVICE_DATA *)Context;
NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);
NET_LIST_FOR_EACH (ServiceEntry, &MnpDeviceData->ServiceList) {
MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (ServiceEntry);
NET_LIST_FOR_EACH (Entry, &MnpServiceData->ChildrenList) {
Instance = NET_LIST_USER_STRUCT (Entry, MNP_INSTANCE_DATA, InstEntry);
NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);
@@ -1047,7 +1030,6 @@ MnpCheckPacketTimeout (
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
NET_LIST_FOR_EACH_SAFE (RxEntry, NextEntry, &Instance->RcvdPacketQueue) {
RxDataWrap = NET_LIST_USER_STRUCT (RxEntry, MNP_RXDATA_WRAP, WrapEntry);
//
@@ -1080,15 +1062,15 @@ MnpCheckPacketTimeout (
VOID
EFIAPI
MnpCheckMediaStatus (
IN EFI_EVENT Event,
IN VOID *Context
IN EFI_EVENT Event,
IN VOID *Context
)
{
MNP_DEVICE_DATA *MnpDeviceData;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
UINT32 InterruptStatus;
MNP_DEVICE_DATA *MnpDeviceData;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
UINT32 InterruptStatus;
MnpDeviceData = (MNP_DEVICE_DATA *) Context;
MnpDeviceData = (MNP_DEVICE_DATA *)Context;
NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);
Snp = MnpDeviceData->Snp;
@@ -1112,13 +1094,13 @@ MnpCheckMediaStatus (
VOID
EFIAPI
MnpSystemPoll (
IN EFI_EVENT Event,
IN VOID *Context
IN EFI_EVENT Event,
IN VOID *Context
)
{
MNP_DEVICE_DATA *MnpDeviceData;
MnpDeviceData = (MNP_DEVICE_DATA *) Context;
MnpDeviceData = (MNP_DEVICE_DATA *)Context;
NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);
//