1. Sync Tcp4 protocol definitions to match UEFI 2.1

[mirror_edk2.git] / MdeModulePkg / Library / DxeNetLib / DxeNetLib.c

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 88dcf76a05fc1437615b70b353483b41bf05aa8f..0dff772b7ae73ec916f0a98baa901d0cb9f319de 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -77,6 +77,7 @@ IP4_ADDR  mIp4AllMasks[IP4_MASK_NUM] = {
   0xFFFFFFFF,
 };
 
+EFI_IPv4_ADDRESS  mZeroIp4Addr = {{0, 0, 0, 0}};
 
 /**\r
   Converts the low nibble of a byte  to hex unicode character.\r
@@ -881,7 +882,7 @@ NetLibDefaultUnload (
     Status = gBS->HandleProtocol (
                     DeviceHandleBuffer[Index],
                     &gEfiDriverBindingProtocolGuid,
-                    &DriverBinding
+                    (VOID **) &DriverBinding
                     );
 
     if (EFI_ERROR (Status)) {
@@ -897,24 +898,10 @@ NetLibDefaultUnload (
           &gEfiDriverBindingProtocolGuid,
           DriverBinding
           );
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
-    Status = gBS->HandleProtocol (
-                    DeviceHandleBuffer[Index],
-                    &gEfiComponentName2ProtocolGuid,
-                    &ComponentName
-                    );
-    if (!EFI_ERROR (Status)) {
-      gBS->UninstallProtocolInterface (
-            ImageHandle,
-            &gEfiComponentName2ProtocolGuid,
-            ComponentName
-            );
-    }
-#else
     Status = gBS->HandleProtocol (
                     DeviceHandleBuffer[Index],
                     &gEfiComponentNameProtocolGuid,
-                    &ComponentName
+                    (VOID **) &ComponentName
                     );
     if (!EFI_ERROR (Status)) {
       gBS->UninstallProtocolInterface (
@@ -923,12 +910,11 @@ NetLibDefaultUnload (
              ComponentName
              );
     }
-#endif
 
     Status = gBS->HandleProtocol (
                     DeviceHandleBuffer[Index],
                     &gEfiDriverConfigurationProtocolGuid,
-                    &DriverConfiguration
+                    (VOID **) &DriverConfiguration
                     );
 
     if (!EFI_ERROR (Status)) {
@@ -942,7 +928,7 @@ NetLibDefaultUnload (
     Status = gBS->HandleProtocol (
                     DeviceHandleBuffer[Index],
                     &gEfiDriverDiagnosticsProtocolGuid,
-                    &DriverDiagnostics
+                    (VOID **) &DriverDiagnostics
                     );
 
     if (!EFI_ERROR (Status)) {
@@ -1085,7 +1071,7 @@ EFI_STATUS
 NetLibGetMacString (
   IN           EFI_HANDLE  SnpHandle,
   IN           EFI_HANDLE  ImageHandle,
-  IN OUT CONST CHAR16      **MacString
+  IN OUT       CHAR16      **MacString
   )
 {
   EFI_STATUS                   Status;
@@ -1126,7 +1112,7 @@ NetLibGetMacString (
   // Convert the mac address into a unicode string.
   //
   for (Index = 0; Index < Mode->HwAddressSize; Index++) {
-    MacAddress[Index * 2]     = NibbleToHexChar (Mode->CurrentAddress.Addr[Index] >> 4);
+    MacAddress[Index * 2]     = NibbleToHexChar ((UINT8) (Mode->CurrentAddress.Addr[Index] >> 4));
     MacAddress[Index * 2 + 1] = NibbleToHexChar (Mode->CurrentAddress.Addr[Index]);
   }