Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/HttpBootDxe/HttpBootDhcp6.h

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/HttpBootDxe/HttpBootDhcp6.h (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/HttpBootDxe/HttpBootDhcp6.h

@@ -7 +7 @@
 **/
 
-
 #ifndef __EFI_HTTP_BOOT_DHCP6_H__
 #define __EFI_HTTP_BOOT_DHCP6_H__
 
-#define HTTP_BOOT_OFFER_MAX_NUM                16
-#define HTTP_BOOT_DHCP6_OPTION_MAX_NUM         16
-#define HTTP_BOOT_DHCP6_OPTION_MAX_SIZE        312
-#define HTTP_BOOT_DHCP6_PACKET_MAX_SIZE        1472
-#define HTTP_BOOT_IP6_ROUTE_TABLE_TIMEOUT      10
-#define HTTP_BOOT_DEFAULT_HOPLIMIT             64
-#define HTTP_BOOT_DEFAULT_LIFETIME             50000
+#define HTTP_BOOT_OFFER_MAX_NUM            16
+#define HTTP_BOOT_DHCP6_OPTION_MAX_NUM     16
+#define HTTP_BOOT_DHCP6_OPTION_MAX_SIZE    312
+#define HTTP_BOOT_DHCP6_PACKET_MAX_SIZE    1472
+#define HTTP_BOOT_IP6_ROUTE_TABLE_TIMEOUT  10
+#define HTTP_BOOT_DEFAULT_HOPLIMIT         64
+#define HTTP_BOOT_DEFAULT_LIFETIME         50000
 
-#define HTTP_BOOT_DHCP6_ENTERPRISE_NUM        343   // TODO: IANA TBD: temporarily using Intel's
-#define HTTP_BOOT_DHCP6_MAX_BOOT_FILE_SIZE    65535 //   It's a limitation of bit length, 65535*512 bytes.
+#define HTTP_BOOT_DHCP6_ENTERPRISE_NUM      343     // TODO: IANA TBD: temporarily using Intel's
+#define HTTP_BOOT_DHCP6_MAX_BOOT_FILE_SIZE  65535   //   It's a limitation of bit length, 65535*512 bytes.
 
-#define HTTP_BOOT_DHCP6_IDX_IA_NA             0
-#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL     1
-#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_PARAM   2
-#define HTTP_BOOT_DHCP6_IDX_VENDOR_CLASS      3
-#define HTTP_BOOT_DHCP6_IDX_DNS_SERVER        4
-#define HTTP_BOOT_DHCP6_IDX_MAX               5
+#define HTTP_BOOT_DHCP6_IDX_IA_NA            0
+#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL    1
+#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_PARAM  2
+#define HTTP_BOOT_DHCP6_IDX_VENDOR_CLASS     3
+#define HTTP_BOOT_DHCP6_IDX_DNS_SERVER       4
+#define HTTP_BOOT_DHCP6_IDX_MAX              5
 
 #pragma pack(1)
 typedef struct {
-  UINT16 OpCode[256];
+  UINT16    OpCode[256];
 } HTTP_BOOT_DHCP6_OPTION_ORO;
 
 typedef struct {
-  UINT8 Type;
-  UINT8 MajorVer;
-  UINT8 MinorVer;
+  UINT8    Type;
+  UINT8    MajorVer;
+  UINT8    MinorVer;
 } HTTP_BOOT_DHCP6_OPTION_UNDI;
 
 typedef struct {
-  UINT16 Type;
+  UINT16    Type;
 } HTTP_BOOT_DHCP6_OPTION_ARCH;
 
 typedef struct {
-  UINT8 ClassIdentifier[11];
-  UINT8 ArchitecturePrefix[5];
-  UINT8 ArchitectureType[5];
-  UINT8 Lit3[1];
-  UINT8 InterfaceName[4];
-  UINT8 Lit4[1];
-  UINT8 UndiMajor[3];
-  UINT8 UndiMinor[3];
+  UINT8    ClassIdentifier[11];
+  UINT8    ArchitecturePrefix[5];
+  UINT8    ArchitectureType[5];
+  UINT8    Lit3[1];
+  UINT8    InterfaceName[4];
+  UINT8    Lit4[1];
+  UINT8    UndiMajor[3];
+  UINT8    UndiMinor[3];
 } HTTP_BOOT_CLASS_ID;
 
 typedef struct {
-  UINT32             Vendor;
-  UINT16             ClassLen;
-  HTTP_BOOT_CLASS_ID ClassId;
+  UINT32                Vendor;
+  UINT16                ClassLen;
+  HTTP_BOOT_CLASS_ID    ClassId;
 } HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS;
 
@@ -64 +63 @@
 
 typedef union {
-  HTTP_BOOT_DHCP6_OPTION_ORO            *Oro;
-  HTTP_BOOT_DHCP6_OPTION_UNDI           *Undi;
-  HTTP_BOOT_DHCP6_OPTION_ARCH           *Arch;
-  HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS   *VendorClass;
+  HTTP_BOOT_DHCP6_OPTION_ORO             *Oro;
+  HTTP_BOOT_DHCP6_OPTION_UNDI            *Undi;
+  HTTP_BOOT_DHCP6_OPTION_ARCH            *Arch;
+  HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS    *VendorClass;
 } HTTP_BOOT_DHCP6_OPTION_ENTRY;
 
@@ -73 +72 @@
 
 typedef union {
-  EFI_DHCP6_PACKET        Offer;
-  EFI_DHCP6_PACKET        Ack;
-  UINT8                   Buffer[HTTP_CACHED_DHCP6_PACKET_MAX_SIZE];
+  EFI_DHCP6_PACKET    Offer;
+  EFI_DHCP6_PACKET    Ack;
+  UINT8               Buffer[HTTP_CACHED_DHCP6_PACKET_MAX_SIZE];
 } HTTP_BOOT_DHCP6_PACKET;
 
 typedef struct {
-  HTTP_BOOT_DHCP6_PACKET      Packet;
-  HTTP_BOOT_OFFER_TYPE        OfferType;
-  EFI_DHCP6_PACKET_OPTION     *OptList[HTTP_BOOT_DHCP6_IDX_MAX];
-  VOID                        *UriParser;
+  HTTP_BOOT_DHCP6_PACKET     Packet;
+  HTTP_BOOT_OFFER_TYPE       OfferType;
+  EFI_DHCP6_PACKET_OPTION    *OptList[HTTP_BOOT_DHCP6_IDX_MAX];
+  VOID                       *UriParser;
 } HTTP_BOOT_DHCP6_PACKET_CACHE;
 
@@ -103 +102 @@
 EFI_STATUS
 HttpBootDhcp6Sarr (
-  IN HTTP_BOOT_PRIVATE_DATA         *Private
+  IN HTTP_BOOT_PRIVATE_DATA  *Private
   );
 
@@ -117 +116 @@
 EFI_STATUS
 HttpBootSetIp6Policy (
-  IN HTTP_BOOT_PRIVATE_DATA        *Private
+  IN HTTP_BOOT_PRIVATE_DATA  *Private
   );
 
@@ -134 +133 @@
 EFI_STATUS
 HttpBootSetIp6Dns (
-  IN HTTP_BOOT_PRIVATE_DATA         *Private,
-  IN UINTN                          DataLength,
-  IN VOID                           *DnsServerData
+  IN HTTP_BOOT_PRIVATE_DATA  *Private,
+  IN UINTN                   DataLength,
+  IN VOID                    *DnsServerData
   );
 
@@ -150 +149 @@
 EFI_STATUS
 HttpBootSetIp6Gateway (
-  IN HTTP_BOOT_PRIVATE_DATA         *Private
+  IN HTTP_BOOT_PRIVATE_DATA  *Private
   );
 
@@ -164 +163 @@
 EFI_STATUS
 HttpBootSetIp6Address (
-  IN HTTP_BOOT_PRIVATE_DATA         *Private
+  IN HTTP_BOOT_PRIVATE_DATA  *Private
   );