Use Mde library and definition instead of some native definitions in NetLib.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4695 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
index 89cc20deff914f61aa8c97e0dd25f69293740b37..965452660eefe94b3a400690384e1995ca350916 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
@@ -75,7 +75,7 @@ SnpNt32DriverBindingSupported (
 {\r
 \r
   SNPNT32_GLOBAL_DATA   *GlobalData;\r
-  NET_LIST_ENTRY        *Entry;\r
+  LIST_ENTRY            *Entry;\r
   SNPNT32_INSTANCE_DATA *Instance;\r
 \r
   GlobalData = &gSnpNt32GlobalData;\r
@@ -268,7 +268,7 @@ SnpNt32ReceiveFilters (
 \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
@@ -279,7 +279,7 @@ SnpNt32ReceiveFilters (
                                                 McastFilter\r
                                                 );\r
 \r
-  NET_UNLOCK (&GlobalData->Lock);\r
+  EfiReleaseLock (&GlobalData->Lock);\r
 \r
   if (ReturnValue <= 0) {\r
     return EFI_DEVICE_ERROR;\r
@@ -459,7 +459,7 @@ SnpNt32Transmit (
     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
@@ -473,7 +473,7 @@ SnpNt32Transmit (
                                                 Protocol\r
                                                 );\r
 \r
-  NET_UNLOCK (&GlobalData->Lock);\r
+  EfiReleaseLock (&GlobalData->Lock);\r
 \r
   if (ReturnValue < 0) {\r
     return EFI_DEVICE_ERROR;\r
@@ -526,7 +526,7 @@ SnpNt32Receive (
 \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
@@ -536,7 +536,7 @@ SnpNt32Receive (
                                                 Buffer\r
                                                 );\r
 \r
-  NET_UNLOCK (&GlobalData->Lock);\r
+  EfiReleaseLock (&GlobalData->Lock);\r
 \r
   if (ReturnValue < 0) {\r
     if (ReturnValue == -100) {\r
@@ -553,13 +553,13 @@ SnpNt32Receive (
   }\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
-    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
@@ -652,7 +652,7 @@ SnpNt32InitializeGlobalData (
   BOOLEAN               NetUtilityLibInitDone;\r
   NT_NET_INTERFACE_INFO NetInterfaceInfoBuffer[MAX_INTERFACE_INFO_NUMBER];\r
   SNPNT32_INSTANCE_DATA *Instance;\r
-  NET_LIST_ENTRY        *Entry;\r
+  LIST_ENTRY            *Entry;\r
   UINT32                InterfaceCount;\r
 \r
   ASSERT (This != NULL);\r
@@ -660,8 +660,8 @@ SnpNt32InitializeGlobalData (
   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
@@ -755,7 +755,7 @@ SnpNt32InitializeGlobalData (
   //\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
@@ -764,7 +764,7 @@ SnpNt32InitializeGlobalData (
     //\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
@@ -776,29 +776,29 @@ SnpNt32InitializeGlobalData (
     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
-    NetListInsertTail (&This->InstanceList, &Instance->Entry);\r
+    InsertTailList (&This->InstanceList, &Instance->Entry);\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
-    NetListRemoveEntry (Entry);\r
+    RemoveEntryList (Entry);\r
 \r
     This->CloseInstance (This, Instance);\r
-    NetFreePool (Instance);\r
+    gBS->FreePool (Instance);\r
   }\r
 \r
   if (NetUtilityLibInitDone) {\r
@@ -857,13 +857,13 @@ SnpNt32InitializeInstanceData (
   //\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
-  NetCopyMem (\r
+  CopyMem (\r
     &Node.MacAddr.MacAddress,\r
     &Instance->Mode.CurrentAddress,\r
     sizeof (EFI_MAC_ADDRESS)\r
@@ -952,7 +952,7 @@ SnpNt32Unload (
 {\r
   EFI_STATUS            Status;\r
   SNPNT32_GLOBAL_DATA   *This;\r
-  NET_LIST_ENTRY        *Entry;\r
+  LIST_ENTRY            *Entry;\r
   SNPNT32_INSTANCE_DATA *Instance;\r
 \r
   This    = &gSnpNt32GlobalData;\r
@@ -963,7 +963,7 @@ SnpNt32Unload (
     return Status;\r
   }\r
 \r
-  while (!NetListIsEmpty (&This->InstanceList)) {\r
+  while (!IsListEmpty (&This->InstanceList)) {\r
     //\r
     //  Walkthrough the interfaces and remove all the SNP instance\r
     //\r
@@ -971,10 +971,10 @@ SnpNt32Unload (
 \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
-    NetFreePool (Instance);\r
+    gBS->FreePool (Instance);\r
   }\r
 \r
   if (This->NtNetUtilityTable.Finalize != NULL) {\r

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index 1ca5a3471951bf0f531bc132cc9af2ff44e79e78..7769bbf295aaf76a9ea1730ece00009241811164 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -145,14 +145,14 @@ typedef struct _SNPNT32_GLOBAL_DATA {
   //\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
-  NET_LOCK                          Lock;\r
+  EFI_LOCK                          Lock;\r
 \r
   //\r
   //  Private functions\r
@@ -173,7 +173,7 @@ typedef struct _SNPNT32_INSTANCE_DATA {
   //\r
   //  List entry use for linking with other instance\r
   //\r
-  NET_LIST_ENTRY              Entry;\r
+  LIST_ENTRY                  Entry;\r
 \r
   SNPNT32_GLOBAL_DATA         *GlobalData;\r
 \r