Use Mde library and definition instead of some native definitions in NetLib, to simply network library.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4693 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -151,7 +151,7 @@ Mtftp4CreateService (
|
||||
EFI_STATUS Status;
|
||||
|
||||
*Service = NULL;
|
||||
MtftpSb = NetAllocatePool (sizeof (MTFTP4_SERVICE));
|
||||
MtftpSb = AllocatePool (sizeof (MTFTP4_SERVICE));
|
||||
|
||||
if (MtftpSb == NULL) {
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
@@ -161,7 +161,7 @@ Mtftp4CreateService (
|
||||
MtftpSb->ServiceBinding = gMtftp4ServiceBindingTemplete;
|
||||
MtftpSb->InDestory = FALSE;
|
||||
MtftpSb->ChildrenNum = 0;
|
||||
NetListInit (&MtftpSb->Children);
|
||||
InitializeListHead (&MtftpSb->Children);
|
||||
|
||||
MtftpSb->Timer = NULL;
|
||||
MtftpSb->TimerToGetMap = NULL;
|
||||
@@ -174,14 +174,14 @@ Mtftp4CreateService (
|
||||
//
|
||||
Status = gBS->CreateEvent (
|
||||
EVT_NOTIFY_SIGNAL | EVT_TIMER,
|
||||
NET_TPL_TIMER,
|
||||
TPL_CALLBACK,
|
||||
Mtftp4OnTimerTick,
|
||||
MtftpSb,
|
||||
&MtftpSb->Timer
|
||||
);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
NetFreePool (MtftpSb);
|
||||
gBS->FreePool (MtftpSb);
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -191,14 +191,14 @@ Mtftp4CreateService (
|
||||
//
|
||||
Status = gBS->CreateEvent (
|
||||
EVT_TIMER,
|
||||
NET_TPL_TIMER,
|
||||
TPL_CALLBACK,
|
||||
NULL,
|
||||
NULL,
|
||||
&MtftpSb->TimerToGetMap
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
gBS->CloseEvent (MtftpSb->Timer);
|
||||
NetFreePool (MtftpSb);
|
||||
gBS->FreePool (MtftpSb);
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ Mtftp4CreateService (
|
||||
if (MtftpSb->ConnectUdp == NULL) {
|
||||
gBS->CloseEvent (MtftpSb->TimerToGetMap);
|
||||
gBS->CloseEvent (MtftpSb->Timer);
|
||||
NetFreePool (MtftpSb);
|
||||
gBS->FreePool (MtftpSb);
|
||||
return EFI_DEVICE_ERROR;
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ Mtftp4DriverBindingStart (
|
||||
|
||||
ON_ERROR:
|
||||
Mtftp4CleanService (MtftpSb);
|
||||
NetFreePool (MtftpSb);
|
||||
gBS->FreePool (MtftpSb);
|
||||
|
||||
return Status;
|
||||
}
|
||||
@@ -370,7 +370,7 @@ Mtftp4DriverBindingStop (
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
if (NumberOfChildren == 0) {
|
||||
|
||||
@@ -384,10 +384,10 @@ Mtftp4DriverBindingStop (
|
||||
|
||||
Mtftp4CleanService (MtftpSb);
|
||||
|
||||
NetFreePool (MtftpSb);
|
||||
gBS->FreePool (MtftpSb);
|
||||
} else {
|
||||
|
||||
while (!NetListIsEmpty (&MtftpSb->Children)) {
|
||||
while (!IsListEmpty (&MtftpSb->Children)) {
|
||||
Instance = NET_LIST_HEAD (&MtftpSb->Children, MTFTP4_PROTOCOL, Link);
|
||||
Mtftp4ServiceBindingDestroyChild (ServiceBinding, Instance->Handle);
|
||||
}
|
||||
@@ -397,7 +397,7 @@ Mtftp4DriverBindingStop (
|
||||
}
|
||||
}
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -417,16 +417,16 @@ Mtftp4InitProtocol (
|
||||
IN MTFTP4_PROTOCOL *Instance
|
||||
)
|
||||
{
|
||||
NetZeroMem (Instance, sizeof (MTFTP4_PROTOCOL));
|
||||
ZeroMem (Instance, sizeof (MTFTP4_PROTOCOL));
|
||||
|
||||
Instance->Signature = MTFTP4_PROTOCOL_SIGNATURE;
|
||||
NetListInit (&Instance->Link);
|
||||
InitializeListHead (&Instance->Link);
|
||||
CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (Instance->Mtftp4));
|
||||
Instance->State = MTFTP4_STATE_UNCONFIGED;
|
||||
Instance->Indestory = FALSE;
|
||||
Instance->Service = MtftpSb;
|
||||
|
||||
NetListInit (&Instance->Blocks);
|
||||
InitializeListHead (&Instance->Blocks);
|
||||
}
|
||||
|
||||
|
||||
@@ -458,7 +458,7 @@ Mtftp4ServiceBindingCreateChild (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
Instance = NetAllocatePool (sizeof (*Instance));
|
||||
Instance = AllocatePool (sizeof (*Instance));
|
||||
|
||||
if (Instance == NULL) {
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
@@ -476,7 +476,7 @@ Mtftp4ServiceBindingCreateChild (
|
||||
);
|
||||
|
||||
if (Instance->UnicastPort == NULL) {
|
||||
NetFreePool (Instance);
|
||||
gBS->FreePool (Instance);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
@@ -521,18 +521,18 @@ Mtftp4ServiceBindingCreateChild (
|
||||
//
|
||||
// Add it to the parent's child list.
|
||||
//
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
NetListInsertTail (&MtftpSb->Children, &Instance->Link);
|
||||
InsertTailList (&MtftpSb->Children, &Instance->Link);
|
||||
MtftpSb->ChildrenNum++;
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
ON_ERROR:
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
UdpIoFreePort (Instance->UnicastPort);
|
||||
NetFreePool (Instance);
|
||||
gBS->FreePool (Instance);
|
||||
}
|
||||
|
||||
return Status;
|
||||
@@ -620,16 +620,16 @@ Mtftp4ServiceBindingDestroyChild (
|
||||
return Status;
|
||||
}
|
||||
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
Mtftp4CleanOperation (Instance, EFI_DEVICE_ERROR);
|
||||
UdpIoFreePort (Instance->UnicastPort);
|
||||
|
||||
NetListRemoveEntry (&Instance->Link);
|
||||
RemoveEntryList (&Instance->Link);
|
||||
MtftpSb->ChildrenNum--;
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
NetFreePool (Instance);
|
||||
gBS->FreePool (Instance);
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ EfiMtftp4GetModeData (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
Instance = MTFTP4_PROTOCOL_FROM_THIS (This);
|
||||
CopyMem(&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));
|
||||
@@ -65,7 +65,7 @@ EfiMtftp4GetModeData (
|
||||
ModeData->UnsupportedOptionCount = 0;
|
||||
ModeData->UnsupportedOptoins = NULL;
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
@@ -87,8 +87,8 @@ Mtftp4CleanOperation (
|
||||
IN EFI_STATUS Result
|
||||
)
|
||||
{
|
||||
NET_LIST_ENTRY *Entry;
|
||||
NET_LIST_ENTRY *Next;
|
||||
LIST_ENTRY *Entry;
|
||||
LIST_ENTRY *Next;
|
||||
MTFTP4_BLOCK_RANGE *Block;
|
||||
EFI_MTFTP4_TOKEN *Token;
|
||||
|
||||
@@ -122,11 +122,11 @@ Mtftp4CleanOperation (
|
||||
|
||||
NET_LIST_FOR_EACH_SAFE (Entry, Next, &Instance->Blocks) {
|
||||
Block = NET_LIST_USER_STRUCT (Entry, MTFTP4_BLOCK_RANGE, Link);
|
||||
NetListRemoveEntry (Entry);
|
||||
NetFreePool (Block);
|
||||
RemoveEntryList (Entry);
|
||||
gBS->FreePool (Block);
|
||||
}
|
||||
|
||||
NetZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));
|
||||
ZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));
|
||||
|
||||
Instance->Operation = 0;
|
||||
|
||||
@@ -183,22 +183,22 @@ EfiMtftp4Configure (
|
||||
//
|
||||
// Reset the operation if ConfigData is NULL
|
||||
//
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
Mtftp4CleanOperation (Instance, EFI_ABORTED);
|
||||
NetZeroMem (&Instance->Config, sizeof (EFI_MTFTP4_CONFIG_DATA));
|
||||
ZeroMem (&Instance->Config, sizeof (EFI_MTFTP4_CONFIG_DATA));
|
||||
Instance->State = MTFTP4_STATE_UNCONFIGED;
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
} else {
|
||||
//
|
||||
// Configure the parameters for new operation.
|
||||
//
|
||||
NetCopyMem (&Ip, &ConfigData->StationIp, sizeof (IP4_ADDR));
|
||||
NetCopyMem (&Netmask, &ConfigData->SubnetMask, sizeof (IP4_ADDR));
|
||||
NetCopyMem (&Gateway, &ConfigData->GatewayIp, sizeof (IP4_ADDR));
|
||||
NetCopyMem (&ServerIp, &ConfigData->ServerIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Ip, &ConfigData->StationIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Netmask, &ConfigData->SubnetMask, sizeof (IP4_ADDR));
|
||||
CopyMem (&Gateway, &ConfigData->GatewayIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&ServerIp, &ConfigData->ServerIp, sizeof (IP4_ADDR));
|
||||
|
||||
Ip = NTOHL (Ip);
|
||||
Netmask = NTOHL (Netmask);
|
||||
@@ -221,17 +221,17 @@ EfiMtftp4Configure (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
if ((Instance->State == MTFTP4_STATE_CONFIGED) && (Instance->Operation != 0)) {
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
return EFI_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
CopyMem(&Instance->Config, ConfigData, sizeof (*ConfigData));;
|
||||
Instance->State = MTFTP4_STATE_CONFIGED;
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
}
|
||||
|
||||
return EFI_SUCCESS;
|
||||
@@ -287,7 +287,7 @@ Mtftp4GetInfoCheckPacket (
|
||||
|
||||
//
|
||||
// Allocate buffer then copy the packet over. Use gBS->AllocatePool
|
||||
// in case NetAllocatePool will implements something tricky.
|
||||
// in case AllocatePool will implements something tricky.
|
||||
//
|
||||
Status = gBS->AllocatePool (EfiBootServicesData, PacketLen, (VOID **) State->Packet);
|
||||
|
||||
@@ -297,7 +297,7 @@ Mtftp4GetInfoCheckPacket (
|
||||
}
|
||||
|
||||
*(State->PacketLen) = PacketLen;
|
||||
NetCopyMem (*(State->Packet), Packet, PacketLen);
|
||||
CopyMem (*(State->Packet), Packet, PacketLen);
|
||||
|
||||
return EFI_ABORTED;
|
||||
}
|
||||
@@ -456,19 +456,19 @@ Mtftp4OverrideValid (
|
||||
IP4_ADDR Netmask;
|
||||
IP4_ADDR Gateway;
|
||||
|
||||
NetCopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));
|
||||
if (!Ip4IsUnicast (NTOHL (Ip), 0)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
Config = &Instance->Config;
|
||||
|
||||
NetCopyMem (&Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));
|
||||
Gateway = NTOHL (Gateway);
|
||||
|
||||
if (!Config->UseDefaultSetting && (Gateway != 0)) {
|
||||
NetCopyMem (&Netmask, &Config->SubnetMask, sizeof (IP4_ADDR));
|
||||
NetCopyMem (&Ip, &Config->StationIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Netmask, &Config->SubnetMask, sizeof (IP4_ADDR));
|
||||
CopyMem (&Ip, &Config->StationIp, sizeof (IP4_ADDR));
|
||||
|
||||
Netmask = NTOHL (Netmask);
|
||||
Ip = NTOHL (Ip);
|
||||
@@ -577,7 +577,7 @@ Mtftp4ConfigUnicastPort (
|
||||
UdpConfig.RemotePort = 0;
|
||||
|
||||
Ip = HTONL (Instance->ServerIp);
|
||||
NetCopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
|
||||
Status = UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfig);
|
||||
|
||||
@@ -654,7 +654,7 @@ Mtftp4Start (
|
||||
Instance = MTFTP4_PROTOCOL_FROM_THIS (This);
|
||||
|
||||
Status = EFI_SUCCESS;
|
||||
OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
|
||||
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
|
||||
|
||||
if (Instance->State != MTFTP4_STATE_CONFIGED) {
|
||||
Status = EFI_NOT_STARTED;
|
||||
@@ -665,7 +665,7 @@ Mtftp4Start (
|
||||
}
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -701,13 +701,13 @@ Mtftp4Start (
|
||||
Instance->Token = Token;
|
||||
Instance->BlkSize = MTFTP4_DEFAULT_BLKSIZE;
|
||||
|
||||
NetCopyMem (&Instance->ServerIp, &Config->ServerIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Instance->ServerIp, &Config->ServerIp, sizeof (IP4_ADDR));
|
||||
Instance->ServerIp = NTOHL (Instance->ServerIp);
|
||||
|
||||
Instance->ListeningPort = Config->InitialServerPort;
|
||||
Instance->ConnectedPort = 0;
|
||||
|
||||
NetCopyMem (&Instance->Gateway, &Config->GatewayIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Instance->Gateway, &Config->GatewayIp, sizeof (IP4_ADDR));
|
||||
Instance->Gateway = NTOHL (Instance->Gateway);
|
||||
|
||||
Instance->MaxRetry = Config->TryCount;
|
||||
@@ -715,8 +715,8 @@ Mtftp4Start (
|
||||
Instance->Master = TRUE;
|
||||
|
||||
if (Override != NULL) {
|
||||
NetCopyMem (&Instance->ServerIp, &Override->ServerIp, sizeof (IP4_ADDR));
|
||||
NetCopyMem (&Instance->Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Instance->ServerIp, &Override->ServerIp, sizeof (IP4_ADDR));
|
||||
CopyMem (&Instance->Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));
|
||||
|
||||
Instance->ServerIp = NTOHL (Instance->ServerIp);
|
||||
Instance->Gateway = NTOHL (Instance->Gateway);
|
||||
@@ -756,7 +756,7 @@ Mtftp4Start (
|
||||
Status = Mtftp4RrqStart (Instance, Operation);
|
||||
}
|
||||
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ON_ERROR;
|
||||
@@ -779,7 +779,7 @@ Mtftp4Start (
|
||||
|
||||
ON_ERROR:
|
||||
Mtftp4CleanOperation (Instance, Status);
|
||||
NET_RESTORE_TPL (OldTpl);
|
||||
gBS->RestoreTPL (OldTpl);
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
@@ -71,7 +71,7 @@ struct _MTFTP4_SERVICE {
|
||||
BOOLEAN InDestory;
|
||||
|
||||
UINT16 ChildrenNum;
|
||||
NET_LIST_ENTRY Children;
|
||||
LIST_ENTRY Children;
|
||||
|
||||
EFI_EVENT Timer; // Ticking timer for all the MTFTP clients
|
||||
EFI_EVENT TimerToGetMap;
|
||||
@@ -94,7 +94,7 @@ typedef struct {
|
||||
|
||||
struct _MTFTP4_PROTOCOL {
|
||||
UINT32 Signature;
|
||||
NET_LIST_ENTRY Link;
|
||||
LIST_ENTRY Link;
|
||||
EFI_MTFTP4_PROTOCOL Mtftp4;
|
||||
|
||||
INTN State;
|
||||
@@ -118,7 +118,7 @@ struct _MTFTP4_PROTOCOL {
|
||||
//
|
||||
UINT16 BlkSize;
|
||||
UINT16 LastBlock;
|
||||
NET_LIST_ENTRY Blocks;
|
||||
LIST_ENTRY Blocks;
|
||||
|
||||
//
|
||||
// The server's communication end point: IP and two ports. one for
|
||||
|
@@ -167,7 +167,7 @@ Mtftp4ExtractOptions (
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
*OptionList = NetAllocatePool (*OptionCount * sizeof (EFI_MTFTP4_OPTION));
|
||||
*OptionList = AllocatePool (*OptionCount * sizeof (EFI_MTFTP4_OPTION));
|
||||
|
||||
if (*OptionList == NULL) {
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
@@ -537,6 +537,6 @@ Mtftp4ParseOptionOack (
|
||||
|
||||
Status = Mtftp4ParseOption (OptionList, Count, FALSE, MtftpOption);
|
||||
|
||||
NetFreePool (OptionList);
|
||||
gBS->FreePool (OptionList);
|
||||
return Status;
|
||||
}
|
||||
|
@@ -183,7 +183,7 @@ Mtftp4RrqSaveBlock (
|
||||
Start = MultU64x32 (Block - 1, Instance->BlkSize);
|
||||
|
||||
if (Start + DataLen <= Token->BufferSize) {
|
||||
NetCopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen);
|
||||
CopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen);
|
||||
|
||||
//
|
||||
// Update the file size when received the last block
|
||||
@@ -404,7 +404,7 @@ Mtftp4RrqConfigMcastPort (
|
||||
UdpConfig.RemotePort = 0;
|
||||
|
||||
Ip = HTONL (Instance->ServerIp);
|
||||
NetCopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
|
||||
Status = McastIo->Udp->Configure (McastIo->Udp, &UdpConfig);
|
||||
|
||||
@@ -428,7 +428,7 @@ Mtftp4RrqConfigMcastPort (
|
||||
// join the multicast group
|
||||
//
|
||||
Ip = HTONL (Instance->McastIp);
|
||||
NetCopyMem (&Group, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
CopyMem (&Group, &Ip, sizeof (EFI_IPv4_ADDRESS));
|
||||
|
||||
return McastIo->Udp->Groups (McastIo->Udp, TRUE, &Group);
|
||||
}
|
||||
@@ -479,7 +479,7 @@ Mtftp4RrqHandleOack (
|
||||
//
|
||||
// Parse and validate the options from server
|
||||
//
|
||||
NetZeroMem (&Reply, sizeof (MTFTP4_OPTION));
|
||||
ZeroMem (&Reply, sizeof (MTFTP4_OPTION));
|
||||
|
||||
Status = Mtftp4ParseOptionOack (Packet, Len, &Reply);
|
||||
|
||||
@@ -650,7 +650,7 @@ Mtftp4RrqInput (
|
||||
Len = UdpPacket->TotalSize;
|
||||
|
||||
if (UdpPacket->BlockOpNum > 1) {
|
||||
Packet = NetAllocatePool (Len);
|
||||
Packet = AllocatePool (Len);
|
||||
|
||||
if (Packet == NULL) {
|
||||
Status = EFI_OUT_OF_RESOURCES;
|
||||
@@ -726,7 +726,7 @@ ON_EXIT:
|
||||
// receive, otherwise end the session.
|
||||
//
|
||||
if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {
|
||||
NetFreePool (Packet);
|
||||
gBS->FreePool (Packet);
|
||||
}
|
||||
|
||||
if (UdpPacket != NULL) {
|
||||
|
@@ -42,13 +42,13 @@ Mtftp4AllocateRange (
|
||||
{
|
||||
MTFTP4_BLOCK_RANGE *Range;
|
||||
|
||||
Range = NetAllocatePool (sizeof (MTFTP4_BLOCK_RANGE));
|
||||
Range = AllocatePool (sizeof (MTFTP4_BLOCK_RANGE));
|
||||
|
||||
if (Range == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
NetListInit (&Range->Link);
|
||||
InitializeListHead (&Range->Link);
|
||||
Range->Start = Start;
|
||||
Range->End = End;
|
||||
|
||||
@@ -78,7 +78,7 @@ Mtftp4AllocateRange (
|
||||
**/
|
||||
EFI_STATUS
|
||||
Mtftp4InitBlockRange (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Start,
|
||||
IN UINT16 End
|
||||
)
|
||||
@@ -91,7 +91,7 @@ Mtftp4InitBlockRange (
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
NetListInsertTail (Head, &Range->Link);
|
||||
InsertTailList (Head, &Range->Link);
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -106,12 +106,12 @@ Mtftp4InitBlockRange (
|
||||
**/
|
||||
INTN
|
||||
Mtftp4GetNextBlockNum (
|
||||
IN NET_LIST_ENTRY *Head
|
||||
IN LIST_ENTRY *Head
|
||||
)
|
||||
{
|
||||
MTFTP4_BLOCK_RANGE *Range;
|
||||
|
||||
if (NetListIsEmpty (Head)) {
|
||||
if (IsListEmpty (Head)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ Mtftp4GetNextBlockNum (
|
||||
**/
|
||||
VOID
|
||||
Mtftp4SetLastBlockNum (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Last
|
||||
)
|
||||
{
|
||||
@@ -145,12 +145,12 @@ Mtftp4SetLastBlockNum (
|
||||
// Iterate from the tail to head to remove the block number
|
||||
// after the last.
|
||||
//
|
||||
while (!NetListIsEmpty (Head)) {
|
||||
while (!IsListEmpty (Head)) {
|
||||
Range = NET_LIST_TAIL (Head, MTFTP4_BLOCK_RANGE, Link);
|
||||
|
||||
if (Range->Start > Last) {
|
||||
NetListRemoveEntry (&Range->Link);
|
||||
NetFreePool (Range);
|
||||
RemoveEntryList (&Range->Link);
|
||||
gBS->FreePool (Range);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -176,13 +176,13 @@ Mtftp4SetLastBlockNum (
|
||||
**/
|
||||
EFI_STATUS
|
||||
Mtftp4RemoveBlockNum (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Num
|
||||
)
|
||||
{
|
||||
MTFTP4_BLOCK_RANGE *Range;
|
||||
MTFTP4_BLOCK_RANGE *NewRange;
|
||||
NET_LIST_ENTRY *Entry;
|
||||
LIST_ENTRY *Entry;
|
||||
|
||||
NET_LIST_FOR_EACH (Entry, Head) {
|
||||
|
||||
@@ -219,8 +219,8 @@ Mtftp4RemoveBlockNum (
|
||||
Range->Start++;
|
||||
|
||||
if (Range->Start > Range->End) {
|
||||
NetListRemoveEntry (&Range->Link);
|
||||
NetFreePool (Range);
|
||||
RemoveEntryList (&Range->Link);
|
||||
gBS->FreePool (Range);
|
||||
}
|
||||
|
||||
return EFI_SUCCESS;
|
||||
@@ -554,8 +554,8 @@ Mtftp4OnTimerTick (
|
||||
)
|
||||
{
|
||||
MTFTP4_SERVICE *MtftpSb;
|
||||
NET_LIST_ENTRY *Entry;
|
||||
NET_LIST_ENTRY *Next;
|
||||
LIST_ENTRY *Entry;
|
||||
LIST_ENTRY *Next;
|
||||
MTFTP4_PROTOCOL *Instance;
|
||||
EFI_MTFTP4_TOKEN *Token;
|
||||
|
||||
|
@@ -29,7 +29,7 @@ Abstract:
|
||||
// the holes are filled in, then the download or upload has completed.
|
||||
//
|
||||
typedef struct {
|
||||
NET_LIST_ENTRY Link;
|
||||
LIST_ENTRY Link;
|
||||
INTN Start;
|
||||
INTN End;
|
||||
} MTFTP4_BLOCK_RANGE;
|
||||
@@ -37,25 +37,25 @@ typedef struct {
|
||||
|
||||
EFI_STATUS
|
||||
Mtftp4InitBlockRange (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Start,
|
||||
IN UINT16 End
|
||||
);
|
||||
|
||||
INTN
|
||||
Mtftp4GetNextBlockNum (
|
||||
IN NET_LIST_ENTRY *Head
|
||||
IN LIST_ENTRY *Head
|
||||
);
|
||||
|
||||
VOID
|
||||
Mtftp4SetLastBlockNum (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Last
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
Mtftp4RemoveBlockNum (
|
||||
IN NET_LIST_ENTRY *Head,
|
||||
IN LIST_ENTRY *Head,
|
||||
IN UINT16 Num
|
||||
);
|
||||
|
||||
|
@@ -131,7 +131,7 @@ Mtftp4WrqSendBlock (
|
||||
|
||||
if (DataLen > 0) {
|
||||
NetbufAllocSpace (UdpPacket, DataLen, FALSE);
|
||||
NetCopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);
|
||||
CopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);
|
||||
}
|
||||
|
||||
} else {
|
||||
@@ -162,7 +162,7 @@ Mtftp4WrqSendBlock (
|
||||
|
||||
if (DataLen > 0) {
|
||||
NetbufAllocSpace (UdpPacket, DataLen, FALSE);
|
||||
NetCopyMem (Packet->Data.Data, DataBuf, DataLen);
|
||||
CopyMem (Packet->Data.Data, DataBuf, DataLen);
|
||||
gBS->FreePool (DataBuf);
|
||||
}
|
||||
}
|
||||
@@ -327,7 +327,7 @@ Mtftp4WrqHandleOack (
|
||||
//
|
||||
// Parse and validate the options from server
|
||||
//
|
||||
NetZeroMem (&Reply, sizeof (MTFTP4_OPTION));
|
||||
ZeroMem (&Reply, sizeof (MTFTP4_OPTION));
|
||||
Status = Mtftp4ParseOptionOack (Packet, Len, &Reply);
|
||||
|
||||
if (EFI_ERROR (Status) || !Mtftp4WrqOackValid (&Reply, &Instance->RequestOption)) {
|
||||
@@ -428,7 +428,7 @@ Mtftp4WrqInput (
|
||||
Len = UdpPacket->TotalSize;
|
||||
|
||||
if (UdpPacket->BlockOpNum > 1) {
|
||||
Packet = NetAllocatePool (Len);
|
||||
Packet = AllocatePool (Len);
|
||||
|
||||
if (Packet == NULL) {
|
||||
Status = EFI_OUT_OF_RESOURCES;
|
||||
@@ -502,7 +502,7 @@ ON_EXIT:
|
||||
// restart the receive, otherwise end the session.
|
||||
//
|
||||
if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {
|
||||
NetFreePool (Packet);
|
||||
gBS->FreePool (Packet);
|
||||
}
|
||||
|
||||
if (UdpPacket != NULL) {
|
||||
|
Reference in New Issue
Block a user