Nbuf = NetbufAlloc (MnpServiceData->BufferLength + MnpServiceData->PaddingSize);\r
if (Nbuf == NULL) {\r
\r
- MNP_DEBUG_ERROR (("MnpAddFreeNbuf: NetBufAlloc failed.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpAddFreeNbuf: NetBufAlloc failed.\n"));\r
Status = EFI_OUT_OF_RESOURCES;\r
break;\r
}\r
\r
FreeNbufQue = &MnpServiceData->FreeNbufQue;\r
\r
- OldTpl = NET_RAISE_TPL (NET_TPL_RECYCLE);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
//\r
// Check whether there are available buffers, or else try to add some.\r
\r
if ((MnpServiceData->NbufCnt + MNP_NET_BUFFER_INCREASEMENT) > MNP_MAX_NET_BUFFER_NUM) {\r
\r
- MNP_DEBUG_ERROR (\r
- ("MnpAllocNbuf: The maximum NET_BUF size is reached for MNP driver instance %p.\n",\r
+ DEBUG (\r
+ (EFI_D_ERROR,\r
+ "MnpAllocNbuf: The maximum NET_BUF size is reached for MNP driver instance %p.\n",\r
MnpServiceData)\r
);\r
\r
Status = MnpAddFreeNbuf (MnpServiceData, MNP_NET_BUFFER_INCREASEMENT);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (\r
- ("MnpAllocNbuf: Failed to add NET_BUFs into the FreeNbufQue, %r.\n",\r
+ DEBUG (\r
+ (EFI_D_ERROR,\r
+ "MnpAllocNbuf: Failed to add NET_BUFs into the FreeNbufQue, %r.\n",\r
Status)\r
);\r
//\r
}\r
\r
ON_EXIT:\r
- NET_RESTORE_TPL (OldTpl);\r
+ gBS->RestoreTPL (OldTpl);\r
\r
return Nbuf;\r
}\r
NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
ASSERT (Nbuf->RefCnt > 1);\r
\r
- OldTpl = NET_RAISE_TPL (NET_TPL_RECYCLE);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
NET_PUT_REF (Nbuf);\r
\r
NetbufQueAppend (&MnpServiceData->FreeNbufQue, Nbuf);\r
}\r
\r
- NET_RESTORE_TPL (OldTpl);\r
+ gBS->RestoreTPL (OldTpl);\r
}\r
\r
\r
//\r
// Initialize the lists.\r
//\r
- NetListInit (&MnpServiceData->GroupAddressList);\r
- NetListInit (&MnpServiceData->ChildrenList);\r
+ InitializeListHead (&MnpServiceData->GroupAddressList);\r
+ InitializeListHead (&MnpServiceData->ChildrenList);\r
\r
//\r
// Get the buffer length used to allocate NET_BUF to hold data received\r
MnpServiceData->BufferLength = MnpServiceData->Mtu + SnpMode->MediaHeaderSize + NET_ETHER_FCS_SIZE;\r
\r
//\r
- // Make sure the protocol headers immediately following the media header \r
+ // Make sure the protocol headers immediately following the media header\r
// 4-byte aligned\r
//\r
MnpServiceData->PaddingSize = (4 - SnpMode->MediaHeaderSize) & 0x3;\r
Status = MnpAddFreeNbuf (MnpServiceData, MNP_INIT_NET_BUFFER_NUM);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpInitializeServiceData: MnpAddFreeNbuf failed, %r.\n", Status));\r
+ DEBUG ((EFI_D_ERROR, "MnpInitializeServiceData: MnpAddFreeNbuf failed, %r.\n", Status));\r
goto ERROR;\r
}\r
//\r
//\r
// Allocate buffer pool for tx.\r
//\r
- MnpServiceData->TxBuf = NetAllocatePool (MnpServiceData->Mtu + SnpMode->MediaHeaderSize);\r
+ MnpServiceData->TxBuf = AllocatePool (MnpServiceData->Mtu + SnpMode->MediaHeaderSize);\r
if (MnpServiceData->TxBuf == NULL) {\r
\r
- MNP_DEBUG_ERROR (("MnpInitializeServiceData: NetAllocatePool failed.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpInitializeServiceData: AllocatePool failed.\n"));\r
Status = EFI_OUT_OF_RESOURCES;\r
\r
goto ERROR;\r
//\r
Status = gBS->CreateEvent (\r
EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
- NET_TPL_LOCK,\r
+ TPL_CALLBACK,\r
MnpSystemPoll,\r
MnpServiceData,\r
&MnpServiceData->PollTimer\r
);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpInitializeServiceData: CreateEvent for poll timer failed.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpInitializeServiceData: CreateEvent for poll timer failed.\n"));\r
goto ERROR;\r
}\r
\r
//\r
Status = gBS->CreateEvent (\r
EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
- NET_TPL_TIMER,\r
+ TPL_CALLBACK,\r
MnpCheckPacketTimeout,\r
MnpServiceData,\r
&MnpServiceData->TimeoutCheckTimer\r
);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpInitializeServiceData: CreateEvent for packet timeout check failed.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpInitializeServiceData: CreateEvent for packet timeout check failed.\n"));\r
goto ERROR;\r
}\r
\r
//\r
Status = gBS->CreateEvent (\r
EVT_TIMER,\r
- NET_TPL_TIMER,\r
+ TPL_CALLBACK,\r
NULL,\r
NULL,\r
&MnpServiceData->TxTimeoutEvent\r
);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpInitializeServiceData: CreateEvent for tx timeout event failed.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpInitializeServiceData: CreateEvent for tx timeout event failed.\n"));\r
}\r
\r
ERROR:\r
\r
if (MnpServiceData->TxBuf != NULL) {\r
\r
- NetFreePool (MnpServiceData->TxBuf);\r
+ gBS->FreePool (MnpServiceData->TxBuf);\r
}\r
\r
if (MnpServiceData->RxNbufCache != NULL) {\r
//\r
// The GroupAddressList must be empty.\r
//\r
- ASSERT (NetListIsEmpty (&MnpServiceData->GroupAddressList));\r
+ ASSERT (IsListEmpty (&MnpServiceData->GroupAddressList));\r
\r
//\r
// Close the event.\r
//\r
// Free the tx buffer.\r
//\r
- NetFreePool (MnpServiceData->TxBuf);\r
+ gBS->FreePool (MnpServiceData->TxBuf);\r
\r
//\r
// Free the RxNbufCache.\r
\r
DEBUG_CODE (\r
\r
- if (MnpServiceData->NbufCnt != 0) {\r
+ if (MnpServiceData->NbufCnt != 0) {\r
\r
- MNP_DEBUG_WARN (("MnpFlushServiceData: Memory leak, MnpServiceData->NbufCnt != 0.\n"));\r
+ DEBUG ((EFI_D_WARN, "MnpFlushServiceData: Memory leak, MnpServiceData->NbufCnt != 0.\n"));\r
}\r
);\r
}\r
//\r
// Initialize the lists.\r
//\r
- NetListInit (&Instance->GroupCtrlBlkList);\r
- NetListInit (&Instance->RcvdPacketQueue);\r
- NetListInit (&Instance->RxDeliveredPacketQueue);\r
+ InitializeListHead (&Instance->GroupCtrlBlkList);\r
+ InitializeListHead (&Instance->RcvdPacketQueue);\r
+ InitializeListHead (&Instance->RxDeliveredPacketQueue);\r
\r
//\r
// Initialize the RxToken Map.\r
Status = MnpStartSnp (MnpServiceData->Snp);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpStart: MnpStartSnp failed, %r.\n", Status));\r
+ DEBUG ((EFI_D_ERROR, "MnpStart: MnpStartSnp failed, %r.\n", Status));\r
goto ErrorExit;\r
}\r
\r
);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (\r
- ("MnpStart, gBS->SetTimer for TimeoutCheckTimer %r.\n",\r
+ DEBUG (\r
+ (EFI_D_ERROR,\r
+ "MnpStart, gBS->SetTimer for TimeoutCheckTimer %r.\n",\r
Status)\r
);\r
goto ErrorExit;\r
Status = gBS->SetTimer (MnpServiceData->PollTimer, TimerOpType, MNP_SYS_POLL_INTERVAL);\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (("MnpStart: gBS->SetTimer for PollTimer failed, %r.\n", Status));\r
+ DEBUG ((EFI_D_ERROR, "MnpStart: gBS->SetTimer for PollTimer failed, %r.\n", Status));\r
goto ErrorExit;\r
}\r
\r
\r
NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
\r
- OldTpl = NET_RAISE_TPL (NET_TPL_RECYCLE);\r
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
\r
- while (!NetListIsEmpty (&Instance->RcvdPacketQueue)) {\r
+ while (!IsListEmpty (&Instance->RcvdPacketQueue)) {\r
//\r
// Remove all the Wraps.\r
//\r
\r
ASSERT (Instance->RcvdPacketQueueSize == 0);\r
\r
- NET_RESTORE_TPL (OldTpl);\r
+ gBS->RestoreTPL (OldTpl);\r
}\r
\r
\r
UINT32 EnableFilterBits;\r
UINT32 DisableFilterBits;\r
BOOLEAN ResetMCastFilters;\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
UINT32 Index;\r
MNP_GROUP_ADDRESS *GroupAddress;\r
\r
// Allocate pool for the mulicast addresses.\r
//\r
MCastFilterCnt = MnpServiceData->GroupAddressCount;\r
- MCastFilter = NetAllocatePool (sizeof (EFI_MAC_ADDRESS) * MCastFilterCnt);\r
+ MCastFilter = AllocatePool (sizeof (EFI_MAC_ADDRESS) * MCastFilterCnt);\r
if (MCastFilter == NULL) {\r
\r
- MNP_DEBUG_ERROR (("MnpConfigReceiveFilters: Failed to allocate memory resource for MCastFilter.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpConfigReceiveFilters: Failed to allocate memory resource for MCastFilter.\n"));\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
DEBUG_CODE (\r
if (EFI_ERROR (Status)) {\r
\r
- MNP_DEBUG_ERROR (\r
- ("MnpConfigReceiveFilters: Snp->ReceiveFilters failed, %r.\n",\r
+ DEBUG (\r
+ (EFI_D_ERROR,\r
+ "MnpConfigReceiveFilters: Snp->ReceiveFilters failed, %r.\n",\r
Status)\r
);\r
}\r
//\r
// Free the buffer used to hold the group addresses.\r
//\r
- NetFreePool (MCastFilter);\r
+ gBS->FreePool (MCastFilter);\r
}\r
\r
return Status;\r
//\r
// Allocate a new GroupAddress to be added into MNP's GroupAddressList.\r
//\r
- GroupAddress = NetAllocatePool (sizeof (MNP_GROUP_ADDRESS));\r
+ GroupAddress = AllocatePool (sizeof (MNP_GROUP_ADDRESS));\r
if (GroupAddress == NULL) {\r
\r
- MNP_DEBUG_ERROR (("MnpGroupOpFormCtrlBlk: Failed to allocate memory resource.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpGroupOpFormCtrlBlk: Failed to allocate memory resource.\n"));\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
CopyMem (&GroupAddress->Address, MacAddress, sizeof (GroupAddress->Address));\r
GroupAddress->RefCnt = 0;\r
- NetListInsertTail (\r
+ InsertTailList (\r
&MnpServiceData->GroupAddressList,\r
&GroupAddress->AddrEntry\r
);\r
// Add the CtrlBlk into the instance's GroupCtrlBlkList.\r
//\r
CtrlBlk->GroupAddress = GroupAddress;\r
- NetListInsertTail (&Instance->GroupCtrlBlkList, &CtrlBlk->CtrlBlkEntry);\r
+ InsertTailList (&Instance->GroupCtrlBlkList, &CtrlBlk->CtrlBlkEntry);\r
\r
return EFI_SUCCESS;\r
}\r
// Remove and free the CtrlBlk.\r
//\r
GroupAddress = CtrlBlk->GroupAddress;\r
- NetListRemoveEntry (&CtrlBlk->CtrlBlkEntry);\r
- NetFreePool (CtrlBlk);\r
+ RemoveEntryList (&CtrlBlk->CtrlBlkEntry);\r
+ gBS->FreePool (CtrlBlk);\r
\r
ASSERT (GroupAddress->RefCnt > 0);\r
\r
// Free this GroupAddress entry if no instance uses it.\r
//\r
MnpServiceData->GroupAddressCount--;\r
- NetListRemoveEntry (&GroupAddress->AddrEntry);\r
- NetFreePool (GroupAddress);\r
+ RemoveEntryList (&GroupAddress->AddrEntry);\r
+ gBS->FreePool (GroupAddress);\r
\r
return TRUE;\r
}\r
)\r
{\r
MNP_SERVICE_DATA *MnpServiceData;\r
- NET_LIST_ENTRY *Entry;\r
- NET_LIST_ENTRY *NextEntry;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
MNP_GROUP_ADDRESS *GroupAddress;\r
EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
MNP_GROUP_CONTROL_BLOCK *NewCtrlBlk;\r
//\r
// Allocate memory for the control block.\r
//\r
- NewCtrlBlk = NetAllocatePool (sizeof (MNP_GROUP_CONTROL_BLOCK));\r
+ NewCtrlBlk = AllocatePool (sizeof (MNP_GROUP_CONTROL_BLOCK));\r
if (NewCtrlBlk == NULL) {\r
\r
- MNP_DEBUG_ERROR (("MnpGroupOp: Failed to allocate memory resource.\n"));\r
+ DEBUG ((EFI_D_ERROR, "MnpGroupOp: Failed to allocate memory resource.\n"));\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
// Check whether the MacAddress is already joined by other instances.\r
//\r
GroupAddress = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);\r
- if (0 == NetCompareMem (\r
+ if (0 == CompareMem (\r
MacAddress,\r
&GroupAddress->Address,\r
SnpMode->HwAddressSize\r
projects / mirror_edk2.git / blobdiff