Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103777

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• NetworkPkg/Dhcp6Dxe/ComponentName.c (modified) (6 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c (modified) (4 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf (modified) (1 diff)
• NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c (modified) (3 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h (modified) (1 diff)
• NetworkPkg/Dhcp6Dxe/Dhcp6Io.c (modified) (8 diffs)
• NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/ComponentName.c

@@ -248 +248 @@
   @param  Dhcp6[in]                   A pointer to the EFI_DHCP6_PROTOCOL.
 
-  
+
   @retval EFI_SUCCESS                 Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER       The input parameter is invalid.
-  
+
 **/
 EFI_STATUS
@@ -273 +273 @@
     return Status;
   }
-  
+
   if (gDhcp6ControllerNameTable != NULL) {
     FreeUnicodeStringTable (gDhcp6ControllerNameTable);
     gDhcp6ControllerNameTable = NULL;
   }
-  
+
   if (Dhcp6ModeData.Ia == NULL) {
     HandleName = L"DHCPv6 (No configured IA)";
@@ -287 +287 @@
     HandleName = mDhcp6ControllerName[Dhcp6ModeData.Ia->State];
   }
-  
+
   Status = AddUnicodeString2 (
              "eng",
@@ -298 +298 @@
     return Status;
   }
-  
+
   return AddUnicodeString2 (
            "en",
@@ -395 +395 @@
     return EFI_UNSUPPORTED;
   }
-  
-  // 
-  // Make sure this driver produced ChildHandle 
-  // 
+
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
-             ChildHandle, 
+             ChildHandle,
              &gEfiUdp6ProtocolGuid
              );
@@ -414 +414 @@
                   ChildHandle,
                   &gEfiDhcp6ProtocolGuid,
-                  (VOID **)&Dhcp6, 
+                  (VOID **)&Dhcp6,
                   NULL,
                   NULL,

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c

@@ -329 +329 @@
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
-  
+
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -353 +353 @@
   Instance = NET_LIST_USER_STRUCT_S (Entry, DHCP6_INSTANCE, Link, DHCP6_INSTANCE_SIGNATURE);
   ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;
-  
+
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
 }
@@ -559 +559 @@
     //
     // Destroy all the children instances before destory the service.
-    //  
+    //
     List = &Service->Child;
     Status = NetDestroyLinkList (
@@ -592 +592 @@
     Status = EFI_SUCCESS;
   }
-  
+
 ON_EXIT:
   return Status;

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

@@ -1 +1 @@
 ## @file
 #  Client-side DHCPv6 services.
-#  
+#
 #  This driver produces EFI DHCPv6 Protocol which is used to get IPv6 addresses
 #  and other configuration parameters from DHCPv6 servers.

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c

@@ -226 +226 @@
     Status = Instance->UdpSts;
   }
-  
+
 ON_EXIT:
   //
@@ -667 +667 @@
     }
 
-    do {  
+    do {
       TimerStatus = gBS->CheckEvent (Timer);
       if (!EFI_ERROR (TimerStatus)) {
@@ -683 +683 @@
       }
     } while (TimerStatus == EFI_NOT_READY);
-    
+
     gBS->CloseEvent (Timer);
   }

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h

@@ -252 +252 @@
   //
   // StartTime is used to calculate the 'elapsed-time' option. Refer to RFC3315,
-  // the elapsed-time is amount of time since the client began its current DHCP transaction. 
+  // the elapsed-time is amount of time since the client began its current DHCP transaction.
   //
   UINT64                        StartTime;

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c

@@ -372 +372 @@
   @retval   TRUE      The control block is in Instance's retry list.
   @retval   FALSE     The control block is NOT in Instance's retry list.
-  
+
 **/
 BOOLEAN
@@ -1769 +1769 @@
     goto ON_ERROR;
   }
-  
+
   gBS->RestoreTPL (OldTpl);
   return EFI_SUCCESS;
-  
+
 ON_ERROR:
-  gBS->RestoreTPL (OldTpl); 
+  gBS->RestoreTPL (OldTpl);
   RemoveEntryList (&InfCb->Link);
   FreePool (InfCb);
@@ -1898 +1898 @@
   Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);
   ASSERT (Packet->Size > Packet->Length + 8);
-  
+
   //
   // Clear initial time for current transaction.
@@ -2234 +2234 @@
     } else if (Status == EFI_NOT_FOUND) {
       //
-      // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, 
+      // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message,
       // the client sends a Renew or Rebind if the IA is not in the Reply message.
       // Return EFI_SUCCESS so we can continue to restart the Renew/Rebind process.
@@ -2240 +2240 @@
       return EFI_SUCCESS;
     }
-    
+
     goto ON_EXIT;
-    
+
   } else if (Option != NULL) {
     //
@@ -2291 +2291 @@
       if (Instance->IaCb.Ia->State == Dhcp6Renewing || Instance->IaCb.Ia->State == Dhcp6Rebinding) {
         //
-        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client 
+        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client
         // sends a Request message if the IA contained a Status Code option with the NoBinding status.
         //
@@ -2310 +2310 @@
 
   return EFI_SUCCESS;
-  
+
 ON_EXIT:
 
@@ -2320 +2320 @@
                );
   }
-  
+
   return Status;
 }

trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c

@@ -68 +68 @@
     //
     //  The format of DUID-UUID:
-    //   
+    //
     //    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -91 +91 @@
     //
     Duid->Length = (UINT16) (18);
-  
+
     //
     // Set the Duid-type and copy UUID.
     //
     WriteUnaligned16 ((UINT16 *) (Duid->Duid), HTONS (Dhcp6DuidTypeUuid));
-  
+
     CopyMem (Duid->Duid + 2, &Uuid, sizeof(EFI_GUID));
 
   } else {
-      
+
     //
     //
@@ -135 +135 @@
       return NULL;
     }
-  
+
     //
     // sizeof (Duid-type + hardware-type + time) = 8 bytes
     //
     Duid->Length = (UINT16) (Mode->HwAddressSize + 8);
-  
+
     //
     // Set the Duid-type, hardware-type, time and copy the hardware address.
@@ -687 +687 @@
   //      .                                                               .
   //      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  
+
   //
   // Fill the value of Ia Address option type
@@ -1000 +1000 @@
 
 /**
-  Check whether the incoming IPv6 address in IaAddr is one of the maintained 
+  Check whether the incoming IPv6 address in IaAddr is one of the maintained
   addresses in the IA control blcok.
 
@@ -1019 +1019 @@
 
   ASSERT (IaAddr != NULL && CurrentIa != NULL);
-  
+
   for (Index = 0; Index < CurrentIa->IaAddressCount; Index++) {
     if (EFI_IP6_EQUAL(&IaAddr->IpAddress, &CurrentIa->IaAddress[Index].IpAddress)) {
@@ -1303 +1303 @@
   IN  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg,
   OUT UINTN                         *TimeOut
-  ) 
+  )
 {
   EFI_STATUS            Status;
@@ -1323 +1323 @@
     return Status;
   }
-  
+
   *TimeOut = TICKS_PER_SECOND * DadXmits.DupAddrDetectTransmits + DHCP6_DAD_ADDITIONAL_DELAY;
-  
+
   return EFI_SUCCESS;
 }