summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e733f54)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4695
6f19259b-4bc3-4df7-8a09-
765794883524
{\r
\r
SNPNT32_GLOBAL_DATA *GlobalData;\r
{\r
\r
SNPNT32_GLOBAL_DATA *GlobalData;\r
- NET_LIST_ENTRY *Entry;\r
SNPNT32_INSTANCE_DATA *Instance;\r
\r
GlobalData = &gSnpNt32GlobalData;\r
SNPNT32_INSTANCE_DATA *Instance;\r
\r
GlobalData = &gSnpNt32GlobalData;\r
\r
GlobalData = Instance->GlobalData;\r
\r
\r
GlobalData = Instance->GlobalData;\r
\r
- if (EFI_ERROR (NET_TRYLOCK (&GlobalData->Lock))) {\r
+ if (EFI_ERROR (EfiAcquireLockOrFail (&GlobalData->Lock))) {\r
return EFI_ACCESS_DENIED;\r
}\r
\r
return EFI_ACCESS_DENIED;\r
}\r
\r
- NET_UNLOCK (&GlobalData->Lock);\r
+ EfiReleaseLock (&GlobalData->Lock);\r
\r
if (ReturnValue <= 0) {\r
return EFI_DEVICE_ERROR;\r
\r
if (ReturnValue <= 0) {\r
return EFI_DEVICE_ERROR;\r
SrcAddr = &Instance->Mode.CurrentAddress;\r
}\r
\r
SrcAddr = &Instance->Mode.CurrentAddress;\r
}\r
\r
- if (EFI_ERROR (NET_TRYLOCK (&GlobalData->Lock))) {\r
+ if (EFI_ERROR (EfiAcquireLockOrFail (&GlobalData->Lock))) {\r
return EFI_ACCESS_DENIED;\r
}\r
\r
return EFI_ACCESS_DENIED;\r
}\r
\r
- NET_UNLOCK (&GlobalData->Lock);\r
+ EfiReleaseLock (&GlobalData->Lock);\r
\r
if (ReturnValue < 0) {\r
return EFI_DEVICE_ERROR;\r
\r
if (ReturnValue < 0) {\r
return EFI_DEVICE_ERROR;\r
\r
ASSERT (GlobalData->NtNetUtilityTable.Receive != NULL);\r
\r
\r
ASSERT (GlobalData->NtNetUtilityTable.Receive != NULL);\r
\r
- if (EFI_ERROR (NET_TRYLOCK (&GlobalData->Lock))) {\r
+ if (EFI_ERROR (EfiAcquireLockOrFail (&GlobalData->Lock))) {\r
return EFI_ACCESS_DENIED;\r
}\r
\r
return EFI_ACCESS_DENIED;\r
}\r
\r
- NET_UNLOCK (&GlobalData->Lock);\r
+ EfiReleaseLock (&GlobalData->Lock);\r
\r
if (ReturnValue < 0) {\r
if (ReturnValue == -100) {\r
\r
if (ReturnValue < 0) {\r
if (ReturnValue == -100) {\r
}\r
\r
if (SourceAddr != NULL) {\r
}\r
\r
if (SourceAddr != NULL) {\r
- NetZeroMem (SourceAddr, sizeof (EFI_MAC_ADDRESS));\r
- NetCopyMem (SourceAddr, ((UINT8 *) Buffer) + 6, 6);\r
+ ZeroMem (SourceAddr, sizeof (EFI_MAC_ADDRESS));\r
+ CopyMem (SourceAddr, ((UINT8 *) Buffer) + 6, 6);\r
}\r
\r
if (DestinationAddr != NULL) {\r
}\r
\r
if (DestinationAddr != NULL) {\r
- NetZeroMem (DestinationAddr, sizeof (EFI_MAC_ADDRESS));\r
- NetCopyMem (DestinationAddr, ((UINT8 *) Buffer), 6);\r
+ ZeroMem (DestinationAddr, sizeof (EFI_MAC_ADDRESS));\r
+ CopyMem (DestinationAddr, ((UINT8 *) Buffer), 6);\r
}\r
\r
if (Protocol != NULL) {\r
}\r
\r
if (Protocol != NULL) {\r
BOOLEAN NetUtilityLibInitDone;\r
NT_NET_INTERFACE_INFO NetInterfaceInfoBuffer[MAX_INTERFACE_INFO_NUMBER];\r
SNPNT32_INSTANCE_DATA *Instance;\r
BOOLEAN NetUtilityLibInitDone;\r
NT_NET_INTERFACE_INFO NetInterfaceInfoBuffer[MAX_INTERFACE_INFO_NUMBER];\r
SNPNT32_INSTANCE_DATA *Instance;\r
- NET_LIST_ENTRY *Entry;\r
UINT32 InterfaceCount;\r
\r
ASSERT (This != NULL);\r
UINT32 InterfaceCount;\r
\r
ASSERT (This != NULL);\r
NetUtilityLibInitDone = FALSE;\r
InterfaceCount = MAX_INTERFACE_INFO_NUMBER;\r
\r
NetUtilityLibInitDone = FALSE;\r
InterfaceCount = MAX_INTERFACE_INFO_NUMBER;\r
\r
- NetListInit (&This->InstanceList);\r
- NET_LOCK_INIT (&This->Lock);\r
+ InitializeListHead (&This->InstanceList);\r
+ EfiInitializeLock (&This->Lock, TPL_CALLBACK);\r
\r
//\r
// Get the WinNT thunk\r
\r
//\r
// Get the WinNT thunk\r
//\r
for (Index = 0; Index < InterfaceCount; Index++) {\r
\r
//\r
for (Index = 0; Index < InterfaceCount; Index++) {\r
\r
- Instance = NetAllocatePool (sizeof (SNPNT32_INSTANCE_DATA));\r
+ Instance = AllocatePool (sizeof (SNPNT32_INSTANCE_DATA));\r
\r
if (NULL == Instance) {\r
Status = EFI_OUT_OF_RESOURCES;\r
\r
if (NULL == Instance) {\r
Status = EFI_OUT_OF_RESOURCES;\r
//\r
// Copy the content from a template\r
//\r
//\r
// Copy the content from a template\r
//\r
- NetCopyMem (Instance, &gSnpNt32InstanceTemplate, sizeof (SNPNT32_INSTANCE_DATA));\r
+ CopyMem (Instance, &gSnpNt32InstanceTemplate, sizeof (SNPNT32_INSTANCE_DATA));\r
\r
//\r
// Set the interface information.\r
\r
//\r
// Set the interface information.\r
Status = This->InitializeInstanceData (This, Instance);\r
if (EFI_ERROR (Status)) {\r
\r
Status = This->InitializeInstanceData (This, Instance);\r
if (EFI_ERROR (Status)) {\r
\r
- NetFreePool (Instance);\r
+ gBS->FreePool (Instance);\r
goto ErrorReturn;\r
}\r
//\r
// Insert this instance into the instance list\r
//\r
goto ErrorReturn;\r
}\r
//\r
// Insert this instance into the instance list\r
//\r
- NetListInsertTail (&This->InstanceList, &Instance->Entry);\r
+ InsertTailList (&This->InstanceList, &Instance->Entry);\r
}\r
\r
return EFI_SUCCESS;\r
\r
ErrorReturn:\r
\r
}\r
\r
return EFI_SUCCESS;\r
\r
ErrorReturn:\r
\r
- while (!NetListIsEmpty (&This->InstanceList)) {\r
+ while (!IsListEmpty (&This->InstanceList)) {\r
\r
Entry = This->InstanceList.ForwardLink;\r
\r
Instance = NET_LIST_USER_STRUCT_S (Entry, SNPNT32_INSTANCE_DATA, Entry, SNP_NT32_INSTANCE_SIGNATURE);\r
\r
\r
Entry = This->InstanceList.ForwardLink;\r
\r
Instance = NET_LIST_USER_STRUCT_S (Entry, SNPNT32_INSTANCE_DATA, Entry, SNP_NT32_INSTANCE_SIGNATURE);\r
\r
- NetListRemoveEntry (Entry);\r
+ RemoveEntryList (Entry);\r
\r
This->CloseInstance (This, Instance);\r
\r
This->CloseInstance (This, Instance);\r
- NetFreePool (Instance);\r
+ gBS->FreePool (Instance);\r
}\r
\r
if (NetUtilityLibInitDone) {\r
}\r
\r
if (NetUtilityLibInitDone) {\r
//\r
// Create a fake device path for the instance\r
//\r
//\r
// Create a fake device path for the instance\r
//\r
- NetZeroMem (&Node, sizeof (Node));\r
+ ZeroMem (&Node, sizeof (Node));\r
\r
Node.DevPath.Type = MESSAGING_DEVICE_PATH;\r
Node.DevPath.SubType = MSG_MAC_ADDR_DP;\r
SetDevicePathNodeLength (&Node.DevPath, sizeof (MAC_ADDR_DEVICE_PATH));\r
\r
\r
Node.DevPath.Type = MESSAGING_DEVICE_PATH;\r
Node.DevPath.SubType = MSG_MAC_ADDR_DP;\r
SetDevicePathNodeLength (&Node.DevPath, sizeof (MAC_ADDR_DEVICE_PATH));\r
\r
&Node.MacAddr.MacAddress,\r
&Instance->Mode.CurrentAddress,\r
sizeof (EFI_MAC_ADDRESS)\r
&Node.MacAddr.MacAddress,\r
&Instance->Mode.CurrentAddress,\r
sizeof (EFI_MAC_ADDRESS)\r
{\r
EFI_STATUS Status;\r
SNPNT32_GLOBAL_DATA *This;\r
{\r
EFI_STATUS Status;\r
SNPNT32_GLOBAL_DATA *This;\r
- NET_LIST_ENTRY *Entry;\r
SNPNT32_INSTANCE_DATA *Instance;\r
\r
This = &gSnpNt32GlobalData;\r
SNPNT32_INSTANCE_DATA *Instance;\r
\r
This = &gSnpNt32GlobalData;\r
- while (!NetListIsEmpty (&This->InstanceList)) {\r
+ while (!IsListEmpty (&This->InstanceList)) {\r
//\r
// Walkthrough the interfaces and remove all the SNP instance\r
//\r
//\r
// Walkthrough the interfaces and remove all the SNP instance\r
//\r
\r
Instance = NET_LIST_USER_STRUCT_S (Entry, SNPNT32_INSTANCE_DATA, Entry, SNP_NT32_INSTANCE_SIGNATURE);\r
\r
\r
Instance = NET_LIST_USER_STRUCT_S (Entry, SNPNT32_INSTANCE_DATA, Entry, SNP_NT32_INSTANCE_SIGNATURE);\r
\r
- NetListRemoveEntry (Entry);\r
+ RemoveEntryList (Entry);\r
\r
This->CloseInstance (This, Instance);\r
\r
This->CloseInstance (This, Instance);\r
- NetFreePool (Instance);\r
+ gBS->FreePool (Instance);\r
}\r
\r
if (This->NtNetUtilityTable.Finalize != NULL) {\r
}\r
\r
if (This->NtNetUtilityTable.Finalize != NULL) {\r
//\r
// List for all the fake SNP instance\r
//\r
//\r
// List for all the fake SNP instance\r
//\r
- NET_LIST_ENTRY InstanceList;\r
+ LIST_ENTRY InstanceList;\r
\r
EFI_WIN_NT_THUNK_PROTOCOL *WinNtThunk;\r
HMODULE NetworkLibraryHandle;\r
\r
NT_NET_UTILITY_TABLE NtNetUtilityTable;\r
\r
\r
EFI_WIN_NT_THUNK_PROTOCOL *WinNtThunk;\r
HMODULE NetworkLibraryHandle;\r
\r
NT_NET_UTILITY_TABLE NtNetUtilityTable;\r
\r
\r
//\r
// Private functions\r
\r
//\r
// Private functions\r
//\r
// List entry use for linking with other instance\r
//\r
//\r
// List entry use for linking with other instance\r
//\r
- NET_LIST_ENTRY Entry;\r
\r
SNPNT32_GLOBAL_DATA *GlobalData;\r
\r
\r
SNPNT32_GLOBAL_DATA *GlobalData;\r
\r