\r
#include <Protocol/BlockIo.h>\r
#include <Protocol/DevicePathToText.h>\r
+#include <Protocol/FirmwareVolumeBlock.h>\r
#include <Protocol/PxeBaseCode.h>\r
#include <Protocol/SimpleFileSystem.h>\r
#include <Protocol/SimpleNetwork.h>\r
+#include <Protocol/Dhcp4.h>\r
+#include <Protocol/Mtftp4.h>\r
\r
#include <Guid/FileSystemInfo.h>\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
-EFI_STATUS\r
-BootDeviceGetType (\r
- IN EFI_DEVICE_PATH* DevicePath,\r
- OUT ARM_BDS_LOADER_TYPE *BootType,\r
- OUT UINT32 *Attributes\r
- )\r
-{\r
- EFI_STATUS Status;\r
- BOOLEAN IsEfiApp;\r
- BOOLEAN IsBootLoader;\r
- BOOLEAN HasFDTSupport;\r
- CHAR16* FileName;\r
- EFI_DEVICE_PATH* PrevDevicePathNode;\r
- EFI_DEVICE_PATH* DevicePathNode;\r
- EFI_PHYSICAL_ADDRESS Image;\r
- UINTN FileSize;\r
- EFI_IMAGE_DOS_HEADER* DosHeader;\r
- UINTN PeCoffHeaderOffset;\r
- EFI_IMAGE_NT_HEADERS32* NtHeader;\r
-\r
- //\r
- // Check if the last node of the device path is a FilePath node\r
- //\r
- PrevDevicePathNode = NULL;\r
- DevicePathNode = DevicePath;\r
- while ((DevicePathNode != NULL) && !IsDevicePathEnd (DevicePathNode)) {\r
- PrevDevicePathNode = DevicePathNode;\r
- DevicePathNode = NextDevicePathNode (DevicePathNode);\r
- }\r
-\r
- if ((PrevDevicePathNode != NULL) &&\r
- (PrevDevicePathNode->Type == MEDIA_DEVICE_PATH) &&\r
- (PrevDevicePathNode->SubType == MEDIA_FILEPATH_DP))\r
- {\r
- FileName = ((FILEPATH_DEVICE_PATH*)PrevDevicePathNode)->PathName;\r
- } else {\r
- FileName = NULL;\r
- }\r
-\r
- if (FileName == NULL) {\r
- Print(L"Is an EFI Application? ");\r
- Status = GetHIInputBoolean (&IsEfiApp);\r
- if (EFI_ERROR(Status)) {\r
- return EFI_ABORTED;\r
- }\r
- } else if (HasFilePathEfiExtension(FileName)) {\r
- IsEfiApp = TRUE;\r
- } else {\r
- // Check if the file exist\r
- Status = BdsLoadImage (DevicePath, AllocateAnyPages, &Image, &FileSize);\r
- if (!EFI_ERROR (Status)) {\r
-\r
- DosHeader = (EFI_IMAGE_DOS_HEADER *)(UINTN) Image;\r
- if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {\r
- //\r
- // DOS image header is present,\r
- // so read the PE header after the DOS image header.\r
- //\r
- PeCoffHeaderOffset = DosHeader->e_lfanew;\r
- } else {\r
- PeCoffHeaderOffset = 0;\r
- }\r
-\r
- //\r
- // Check PE/COFF image.\r
- //\r
- NtHeader = (EFI_IMAGE_NT_HEADERS32 *)(UINTN) (Image + PeCoffHeaderOffset);\r
- if (NtHeader->Signature != EFI_IMAGE_NT_SIGNATURE) {\r
- IsEfiApp = FALSE;\r
- } else {\r
- IsEfiApp = TRUE;\r
- }\r
-\r
- // Free memory\r
- gBS->FreePages (Image, EFI_SIZE_TO_PAGES(FileSize));\r
- } else {\r
- // If we did not manage to open it then ask for the type\r
- Print(L"Is an EFI Application? ");\r
- Status = GetHIInputBoolean (&IsEfiApp);\r
- if (EFI_ERROR(Status)) {\r
- return EFI_ABORTED;\r
- }\r
- }\r
- }\r
-\r
- if (IsEfiApp) {\r
- Print(L"Is your application is an OS loader? ");\r
- Status = GetHIInputBoolean (&IsBootLoader);\r
- if (EFI_ERROR(Status)) {\r
- return EFI_ABORTED;\r
- }\r
- if (!IsBootLoader) {\r
- *Attributes |= LOAD_OPTION_CATEGORY_APP;\r
- }\r
- *BootType = BDS_LOADER_EFI_APPLICATION;\r
- } else {\r
- Print(L"Has FDT support? ");\r
- Status = GetHIInputBoolean (&HasFDTSupport);\r
- if (EFI_ERROR(Status)) {\r
- return EFI_ABORTED;\r
- }\r
- if (HasFDTSupport) {\r
- *BootType = BDS_LOADER_KERNEL_LINUX_FDT;\r
- } else {\r
- *BootType = BDS_LOADER_KERNEL_LINUX_ATAG;\r
- }\r
- }\r
-\r
- return EFI_SUCCESS;\r
-}\r
-\r
EFI_STATUS\r
BdsLoadOptionFileSystemList (\r
IN OUT LIST_ENTRY* BdsLoadOptionList\r
DevicePath = DuplicateDevicePath (OldDevicePath);\r
\r
EndingDevicePath = (FILEPATH_DEVICE_PATH*)GetLastDevicePathNode (DevicePath);\r
- \r
+\r
Print(L"File path of the %s: ", FileName);\r
StrnCpy (BootFilePath, EndingDevicePath->PathName, BOOT_DEVICE_FILEPATH_MAX);\r
Status = EditHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
return EFI_SUCCESS;\r
}\r
\r
+/**\r
+ Check if a boot option path is a file system boot option path or not.\r
+\r
+ The device specified by the beginning of the path has to support the Simple File\r
+ System protocol. Furthermore, the remaining part of the path has to be composed of\r
+ a single node of type MEDIA_DEVICE_PATH and sub-type MEDIA_FILEPATH_DP.\r
+\r
+ @param[in] DevicePath Complete device path of a boot option.\r
+\r
+ @retval FALSE The boot option path has not been identified as that of a\r
+ file system boot option.\r
+ @retval TRUE The boot option path is a file system boot option.\r
+**/\r
BOOLEAN\r
BdsLoadOptionFileSystemIsSupported (\r
- IN EFI_DEVICE_PATH *DevicePath\r
+ IN EFI_DEVICE_PATH *DevicePath\r
)\r
{\r
- EFI_DEVICE_PATH* DevicePathNode;\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE Handle;\r
+ EFI_DEVICE_PATH *RemainingDevicePath;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FileProtocol;\r
+\r
+ Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
+ if (EFI_ERROR (Status)) {\r
+ return FALSE;\r
+ }\r
+\r
+ Status = gBS->HandleProtocol (\r
+ Handle,\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ (VOID **)(&FileProtocol)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return FALSE;\r
+ }\r
\r
- DevicePathNode = GetLastDevicePathNode (DevicePath);\r
+ if (!IS_DEVICE_PATH_NODE (RemainingDevicePath, MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP))\r
+ return FALSE;\r
\r
- return IS_DEVICE_PATH_NODE(DevicePathNode,MEDIA_DEVICE_PATH,MEDIA_FILEPATH_DP);\r
+ return TRUE;\r
}\r
\r
STATIC\r
IN OUT LIST_ENTRY* BdsLoadOptionList\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN HandleCount;\r
- EFI_HANDLE *HandleBuffer;\r
- UINTN DevicePathHandleCount;\r
- EFI_HANDLE *DevicePathHandleBuffer;\r
- BOOLEAN IsParent;\r
- UINTN Index;\r
- UINTN Index2;\r
- BDS_SUPPORTED_DEVICE *SupportedDevice;\r
- EFI_DEVICE_PATH_PROTOCOL* DevicePathProtocol;\r
- EFI_DEVICE_PATH* DevicePath;\r
+ EFI_STATUS Status;\r
+ UINTN HandleCount;\r
+ EFI_HANDLE *HandleBuffer;\r
+ UINTN DevicePathHandleCount;\r
+ EFI_HANDLE *DevicePathHandleBuffer;\r
+ BOOLEAN IsParent;\r
+ UINTN Index;\r
+ UINTN Index2;\r
+ BDS_SUPPORTED_DEVICE *SupportedDevice;\r
+ EFI_DEVICE_PATH_PROTOCOL* DevicePathProtocol;\r
+ EFI_DEVICE_PATH* DevicePath;\r
+ EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FileProtocol;\r
+ EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *FvbProtocol;\r
\r
// List all the BlockIo Protocols\r
Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiBlockIoProtocolGuid, NULL, &HandleCount, &HandleBuffer);\r
}\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
- // We only select the handle WITH a Device Path AND not part of Media (to avoid duplication with HardDisk, CDROM, etc)\r
+ // We only select handles WITH a Device Path AND not part of Media (to\r
+ // avoid duplication with HardDisk, CDROM, etc). Skip handles used by\r
+ // Simple Filesystem or used for Variable Storage.\r
+\r
+\r
+ Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ (VOID *)&FileProtocol);\r
+ if (!EFI_ERROR(Status)) {\r
+ // SimpleFilesystem supported on this handle, skip\r
+ continue;\r
+ }\r
+\r
+ Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+ &gEfiFirmwareVolumeBlockProtocolGuid,\r
+ (VOID *)&FvbProtocol);\r
+ if (!EFI_ERROR(Status)) {\r
+ // Firmware Volme Block / Variable storage supported on this handle, skip\r
+ continue;\r
+ }\r
+\r
+ Status = gBS->HandleProtocol (HandleBuffer[Index],\r
+ &gEfiFirmwareVolumeBlock2ProtocolGuid,\r
+ (VOID *)&FvbProtocol);\r
+ if (!EFI_ERROR(Status)) {\r
+ // Firmware Volme Block / Variable storage supported on this handle, skip\r
+ continue;\r
+ }\r
+\r
Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
if (!EFI_ERROR(Status)) {\r
// BlockIo is not part of Media Device Path\r
return Status;\r
}\r
\r
+/**\r
+ Check if a boot option path is a memory map boot option path or not.\r
+\r
+ The device specified by the beginning of the path has to support the BlockIo\r
+ protocol. Furthermore, the remaining part of the path has to be composed of\r
+ a single node of type HARDWARE_DEVICE_PATH and sub-type HW_MEMMAP_DP.\r
+\r
+ @param[in] DevicePath Complete device path of a boot option.\r
+\r
+ @retval FALSE The boot option path has not been identified as that of a\r
+ memory map boot option.\r
+ @retval TRUE The boot option path is a a memory map boot option.\r
+**/\r
BOOLEAN\r
BdsLoadOptionMemMapIsSupported (\r
- IN EFI_DEVICE_PATH *DevicePath\r
+ IN EFI_DEVICE_PATH *DevicePath\r
)\r
{\r
- EFI_DEVICE_PATH* DevicePathNode;\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE Handle;\r
+ EFI_DEVICE_PATH *RemainingDevicePath;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIoProtocol;\r
\r
- DevicePathNode = GetLastDevicePathNode (DevicePath);\r
+ Status = BdsConnectDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
+ if (EFI_ERROR (Status)) {\r
+ return FALSE;\r
+ }\r
\r
- return IS_DEVICE_PATH_NODE(DevicePathNode,HARDWARE_DEVICE_PATH,HW_MEMMAP_DP);\r
+ Status = gBS->HandleProtocol (\r
+ Handle,\r
+ &gEfiBlockIoProtocolGuid,\r
+ (VOID **)(&BlockIoProtocol)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return FALSE;\r
+ }\r
+\r
+ if (!IS_DEVICE_PATH_NODE (RemainingDevicePath, HARDWARE_DEVICE_PATH, HW_MEMMAP_DP))\r
+ return FALSE;\r
+\r
+ return TRUE;\r
}\r
\r
EFI_STATUS\r
// Allocate BDS Supported Device structure\r
SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool(sizeof(BDS_SUPPORTED_DEVICE));\r
\r
- Status = gBS->LocateProtocol (&gEfiSimpleNetworkProtocolGuid, NULL, (VOID **)&SimpleNet);\r
+ Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSimpleNetworkProtocolGuid, (VOID **)&SimpleNet);\r
if (!EFI_ERROR(Status)) {\r
Mac = &SimpleNet->Mode->CurrentAddress;\r
UnicodeSPrint (DeviceDescription,BOOT_DEVICE_DESCRIPTION_MAX,L"MAC Address: %02x:%02x:%02x:%02x:%02x:%02x", Mac->Addr[0], Mac->Addr[1], Mac->Addr[2], Mac->Addr[3], Mac->Addr[4], Mac->Addr[5]);\r
\r
BOOLEAN\r
BdsLoadOptionPxeIsSupported (\r
- IN EFI_DEVICE_PATH *DevicePath\r
+ IN EFI_DEVICE_PATH *DevicePath\r
)\r
{\r
EFI_STATUS Status;\r
}\r
}\r
\r
+/**\r
+ Add to the list of boot devices the devices allowing a TFTP boot\r
+\r
+ @param[in] BdsLoadOptionList List of devices to boot from\r
+\r
+ @retval EFI_SUCCESS Update completed\r
+ @retval EFI_OUT_OF_RESOURCES Fail to perform the update due to lack of resource\r
+**/\r
EFI_STATUS\r
BdsLoadOptionTftpList (\r
IN OUT LIST_ENTRY* BdsLoadOptionList\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN HandleCount;\r
- EFI_HANDLE *HandleBuffer;\r
- UINTN Index;\r
- BDS_SUPPORTED_DEVICE *SupportedDevice;\r
- EFI_DEVICE_PATH_PROTOCOL* DevicePathProtocol;\r
- EFI_SIMPLE_NETWORK_PROTOCOL* SimpleNet;\r
- CHAR16 DeviceDescription[BOOT_DEVICE_DESCRIPTION_MAX];\r
- EFI_MAC_ADDRESS *Mac;\r
+ EFI_STATUS Status;\r
+ UINTN HandleCount;\r
+ EFI_HANDLE *HandleBuffer;\r
+ EFI_HANDLE Handle;\r
+ UINTN Index;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePathProtocol;\r
+ VOID *Interface;\r
+ EFI_SIMPLE_NETWORK_PROTOCOL *SimpleNetworkProtocol;\r
+ BDS_SUPPORTED_DEVICE *SupportedDevice;\r
+ EFI_MAC_ADDRESS *Mac;\r
\r
- // List all the PXE Protocols\r
- Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiPxeBaseCodeProtocolGuid, NULL, &HandleCount, &HandleBuffer);\r
+ //\r
+ // List all the handles on which the Simple Network Protocol is installed.\r
+ //\r
+ Status = gBS->LocateHandleBuffer (\r
+ ByProtocol,\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ NULL,\r
+ &HandleCount,\r
+ &HandleBuffer\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
- // We only select the handle WITH a Device Path AND the PXE Protocol AND the TFTP Protocol (the TFTP protocol is required to start PXE)\r
- Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
- if (!EFI_ERROR(Status)) {\r
- // Allocate BDS Supported Device structure\r
- SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool(sizeof(BDS_SUPPORTED_DEVICE));\r
+ Handle = HandleBuffer[Index];\r
+ //\r
+ // We select the handles that support :\r
+ // . the Device Path Protocol\r
+ // . the MTFTP4 Protocol\r
+ //\r
+ Status = gBS->HandleProtocol (\r
+ Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ (VOID **)&DevicePathProtocol\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ continue;\r
+ }\r
\r
- Status = gBS->LocateProtocol (&gEfiSimpleNetworkProtocolGuid, NULL, (VOID **)&SimpleNet);\r
- if (!EFI_ERROR(Status)) {\r
- Mac = &SimpleNet->Mode->CurrentAddress;\r
- UnicodeSPrint (DeviceDescription,BOOT_DEVICE_DESCRIPTION_MAX,L"MAC Address: %02x:%02x:%02x:%02x:%02x:%02x", Mac->Addr[0], Mac->Addr[1], Mac->Addr[2], Mac->Addr[3], Mac->Addr[4], Mac->Addr[5]);\r
- } else {\r
- Status = GenerateDeviceDescriptionName (HandleBuffer[Index], DeviceDescription);\r
- ASSERT_EFI_ERROR (Status);\r
- }\r
- UnicodeSPrint (SupportedDevice->Description,BOOT_DEVICE_DESCRIPTION_MAX,L"TFTP on %s",DeviceDescription);\r
+ Status = gBS->HandleProtocol (\r
+ Handle,\r
+ &gEfiMtftp4ServiceBindingProtocolGuid,\r
+ &Interface\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ continue;\r
+ }\r
\r
- SupportedDevice->DevicePathProtocol = DevicePathProtocol;\r
- SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];\r
+ Status = gBS->HandleProtocol (\r
+ Handle,\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ (VOID **)&SimpleNetworkProtocol\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ continue;\r
+ }\r
\r
- InsertTailList (BdsLoadOptionList,&SupportedDevice->Link);\r
+ // Allocate BDS Supported Device structure\r
+ SupportedDevice = (BDS_SUPPORTED_DEVICE*)AllocatePool (sizeof (BDS_SUPPORTED_DEVICE));\r
+ if (SupportedDevice == NULL) {\r
+ continue;\r
}\r
+\r
+ Mac = &SimpleNetworkProtocol->Mode->CurrentAddress;\r
+ UnicodeSPrint (\r
+ SupportedDevice->Description,\r
+ BOOT_DEVICE_DESCRIPTION_MAX,\r
+ L"TFTP on MAC Address: %02x:%02x:%02x:%02x:%02x:%02x",\r
+ Mac->Addr[0], Mac->Addr[1], Mac->Addr[2], Mac->Addr[3], Mac->Addr[4], Mac->Addr[5]\r
+ );\r
+\r
+ SupportedDevice->DevicePathProtocol = DevicePathProtocol;\r
+ SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];\r
+\r
+ InsertTailList (BdsLoadOptionList, &SupportedDevice->Link);\r
}\r
\r
return EFI_SUCCESS;\r
OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes\r
)\r
{\r
- EFI_STATUS Status;\r
- BOOLEAN IsDHCP;\r
- EFI_IP_ADDRESS LocalIp;\r
- EFI_IP_ADDRESS RemoteIp;\r
- IPv4_DEVICE_PATH* IPv4DevicePathNode;\r
- FILEPATH_DEVICE_PATH* FilePathDevicePath;\r
- CHAR16 BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
- UINTN BootFilePathSize;\r
+ EFI_STATUS Status;\r
+ BOOLEAN IsDHCP;\r
+ EFI_IP_ADDRESS LocalIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS GatewayIp;\r
+ EFI_IP_ADDRESS RemoteIp;\r
+ IPv4_DEVICE_PATH *IPv4DevicePathNode;\r
+ FILEPATH_DEVICE_PATH *FilePathDevicePath;\r
+ CHAR16 BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
+ UINTN BootFilePathSize;\r
\r
- Print(L"Get the IP address from DHCP: ");\r
+ Print (L"Get the IP address from DHCP: ");\r
Status = GetHIInputBoolean (&IsDHCP);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return EFI_ABORTED;\r
}\r
\r
if (!IsDHCP) {\r
- Print(L"Get the static IP address: ");\r
+ Print (L"Local static IP address: ");\r
Status = GetHIInputIP (&LocalIp);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
+ return EFI_ABORTED;\r
+ }\r
+ Print (L"Get the network mask: ");\r
+ Status = GetHIInputIP (&SubnetMask);\r
+ if (EFI_ERROR (Status)) {\r
+ return EFI_ABORTED;\r
+ }\r
+ Print (L"Get the gateway IP address: ");\r
+ Status = GetHIInputIP (&GatewayIp);\r
+ if (EFI_ERROR (Status)) {\r
return EFI_ABORTED;\r
}\r
}\r
\r
- Print(L"Get the TFTP server IP address: ");\r
+ Print (L"Get the TFTP server IP address: ");\r
Status = GetHIInputIP (&RemoteIp);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return EFI_ABORTED;\r
}\r
\r
- Print(L"File path of the %s : ", FileName);\r
+ Print (L"File path of the %s : ", FileName);\r
Status = GetHIInputStr (BootFilePath, BOOT_DEVICE_FILEPATH_MAX);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return EFI_ABORTED;\r
}\r
\r
IPv4DevicePathNode->Header.Type = MESSAGING_DEVICE_PATH;\r
IPv4DevicePathNode->Header.SubType = MSG_IPv4_DP;\r
SetDevicePathNodeLength (&IPv4DevicePathNode->Header, sizeof(IPv4_DEVICE_PATH));\r
- CopyMem (&IPv4DevicePathNode->LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+\r
+ if (!IsDHCP) {\r
+ CopyMem (&IPv4DevicePathNode->LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&IPv4DevicePathNode->SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&IPv4DevicePathNode->GatewayIpAddress, &GatewayIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+ }\r
+\r
CopyMem (&IPv4DevicePathNode->RemoteIpAddress, &RemoteIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
IPv4DevicePathNode->LocalPort = 0;\r
IPv4DevicePathNode->RemotePort = 0;\r
IPv4_DEVICE_PATH Ipv4Node;\r
BOOLEAN IsDHCP;\r
EFI_IP_ADDRESS OldIp;\r
+ EFI_IP_ADDRESS OldSubnetMask;\r
+ EFI_IP_ADDRESS OldGatewayIp;\r
EFI_IP_ADDRESS LocalIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS GatewayIp;\r
EFI_IP_ADDRESS RemoteIp;\r
UINT8 *FileNodePtr;\r
CHAR16 BootFilePath[BOOT_DEVICE_FILEPATH_MAX];\r
if (!IsDHCP) {\r
Print (L"Local static IP address: ");\r
if (Ipv4Node.StaticIpAddress) {\r
- // Copy local IPv4 address into IPv4 or IPv6 union\r
CopyMem (&OldIp.v4, &Ipv4Node.LocalIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
-\r
Status = EditHIInputIP (&OldIp, &LocalIp);\r
} else {\r
Status = GetHIInputIP (&LocalIp);\r
if (EFI_ERROR (Status)) {\r
goto ErrorExit;\r
}\r
+\r
+ Print (L"Get the network mask: ");\r
+ if (Ipv4Node.StaticIpAddress) {\r
+ CopyMem (&OldSubnetMask.v4, &Ipv4Node.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ Status = EditHIInputIP (&OldSubnetMask, &SubnetMask);\r
+ } else {\r
+ Status = GetHIInputIP (&SubnetMask);\r
+ }\r
+ if (EFI_ERROR (Status)) {\r
+ goto ErrorExit;\r
+ }\r
+\r
+ Print (L"Get the gateway IP address: ");\r
+ if (Ipv4Node.StaticIpAddress) {\r
+ CopyMem (&OldGatewayIp.v4, &Ipv4Node.GatewayIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+ Status = EditHIInputIP (&OldGatewayIp, &GatewayIp);\r
+ } else {\r
+ Status = GetHIInputIP (&GatewayIp);\r
+ }\r
+ if (EFI_ERROR (Status)) {\r
+ goto ErrorExit;\r
+ }\r
}\r
\r
Print (L"TFTP server IP address: ");\r
//\r
// Update the IPv4 node. IPv6 case not handled yet.\r
//\r
- if (IsDHCP == TRUE) {\r
+ if (IsDHCP) {\r
Ipv4Node.StaticIpAddress = FALSE;\r
+ ZeroMem (&Ipv4Node.LocalIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
+ ZeroMem (&Ipv4Node.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ ZeroMem (&Ipv4Node.GatewayIpAddress, sizeof (EFI_IPv4_ADDRESS));\r
} else {\r
Ipv4Node.StaticIpAddress = TRUE;\r
+ CopyMem (&Ipv4Node.LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Ipv4Node.SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Ipv4Node.GatewayIpAddress, &GatewayIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
}\r
- CopyMem (&Ipv4Node.LocalIpAddress, &LocalIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
+\r
CopyMem (&Ipv4Node.RemoteIpAddress, &RemoteIp.v4, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (Ipv4NodePtr, &Ipv4Node, sizeof (IPv4_DEVICE_PATH));\r
\r