[tcp] Update maximum window size to 2MB

The current maximum window size of 256kB was calculated based on rough
link bandwidth and RTT measurements taken in 2012, and is too small to
avoid filling the TCP window on some modern links.

Update the list of typical link bandwidth and RTT figures to reflect
the modern world, and increase the maximum window size accordingly.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

.github/workflows/build.yml

@@ -4,45 +4,14 @@ on: push
 
 jobs:
 
-  cache:
-    name: Cache
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
-          restore-keys: |
-            apt-cache-
-      - name: Download packages
-        run: |
-          sudo apt update
-          sudo apt install -y -d -o Acquire::Retries=50 \
-                           mtools syslinux isolinux \
-                           libc6-dev-i386 valgrind \
-                           gcc-arm-none-eabi gcc-aarch64-linux-gnu
-
   x86:
     name: x86
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo dpkg --add-architecture i386
@@ -63,21 +32,12 @@ jobs:
 
   arm32:
     name: ARM32
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo apt update
@@ -92,21 +52,12 @@ jobs:
 
   arm64:
     name: ARM64
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo apt update

.github/workflows/coverity.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   submit:
     name: Submit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Download Coverity Scan
         run: |
           curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \

src/arch/arm/include/bits/io.h

@@ -9,9 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-/** Page shift */
-#define PAGE_SHIFT 12
-
 #include <ipxe/arm_io.h>
 
 #endif /* _BITS_IO_H */

src/arch/arm/include/ipxe/arm_io.h

@@ -20,6 +20,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 
+/** Page shift */
+#define PAGE_SHIFT 12
+
 /*
  * Physical<->Bus address mappings
  *

src/arch/arm32/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 #define __asmcall
 #define __libgcc
 

src/arch/arm64/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 #define __asmcall
 #define __libgcc
 

src/arch/i386/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 /** Declare a function with standard calling conventions */
 #define __asmcall __attribute__ (( cdecl, regparm(0) ))
 

src/arch/loong64/Makefile

@@ -1,26 +0,0 @@
-# Assembler section type character
-#
-ASM_TCHAR	:= @
-ASM_TCHAR_OPS	:= @
-
-# LoongArch64-specific flags
-#
-CFLAGS		+= -fstrength-reduce -fomit-frame-pointer
-CFLAGS		+= -falign-jumps=1 -falign-loops=1 -falign-functions=1
-
-# Check if -mno-explicit-relocs is valid
-ifeq ($(CCTYPE),gcc)
-MNER_TEST = $(CC) -mno-explicit-relocs -x c -c /dev/null -o /dev/null >/dev/null 2>&1
-MNER_FLAGS := $(shell $(MNER_TEST) && $(ECHO) '-mno-explicit-relocs')
-WORKAROUND_CFLAGS += $(MNER_FLAGS)
-endif
-
-# EFI requires -fshort-wchar, and nothing else currently uses wchar_t
-CFLAGS		+= -fshort-wchar
-
-# LoongArch64-specific directories containing source files
-SRCDIRS		+= arch/loong64/core
-
-# Include platform-specific Makefile
-MAKEDEPS	+= arch/loong64/Makefile.$(PLATFORM)
-include arch/loong64/Makefile.$(PLATFORM)

src/arch/loong64/Makefile.linux

@@ -1,10 +0,0 @@
-# -*- makefile -*- : Force emacs to use Makefile mode
-
-# Starting virtual address
-#
-LDFLAGS += -Ttext=0x120000000
-
-# Include generic Linux Makefile
-#
-MAKEDEPS += Makefile.linux
-include Makefile.linux

src/arch/loong64/core/loong64_bigint.c

@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2012 Michael Brown <mbrown@fensystems.co.uk>.
- * Copyright (c) 2023, Xiaotian Wu <wuxiaotian@loongson.cn>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <string.h>
-#include <ipxe/bigint.h>
-
-/** @file
- *
- * Big integer support
- */
-
-/**
- * Multiply big integers
- *
- * @v multiplicand0	Element 0 of big integer to be multiplied
- * @v multiplier0	Element 0 of big integer to be multiplied
- * @v result0		Element 0 of big integer to hold result
- * @v size		Number of elements
- */
-void bigint_multiply_raw ( const uint64_t *multiplicand0,
-			   const uint64_t *multiplier0,
-			   uint64_t *result0, unsigned int size ) {
-	const bigint_t ( size ) __attribute__ (( may_alias )) *multiplicand =
-		( ( const void * ) multiplicand0 );
-	const bigint_t ( size ) __attribute__ (( may_alias )) *multiplier =
-		( ( const void * ) multiplier0 );
-	bigint_t ( size * 2 ) __attribute__ (( may_alias )) *result =
-		( ( void * ) result0 );
-	unsigned int i;
-	unsigned int j;
-	uint64_t multiplicand_element;
-	uint64_t multiplier_element;
-	uint64_t *result_elements;
-	uint64_t discard_low;
-	uint64_t discard_high;
-	uint64_t discard_temp_low;
-	uint64_t discard_temp_high;
-
-	/* Zero result */
-	memset ( result, 0, sizeof ( *result ) );
-
-	/* Multiply integers one element at a time */
-	for ( i = 0 ; i < size ; i++ ) {
-		multiplicand_element = multiplicand->element[i];
-		for ( j = 0 ; j < size ; j++ ) {
-			multiplier_element = multiplier->element[j];
-			result_elements = &result->element[ i + j ];
-			/* Perform a single multiply, and add the
-			 * resulting double-element into the result,
-			 * carrying as necessary.  The carry can
-			 * never overflow beyond the end of the
-			 * result, since:
-			 *
-			 *     a < 2^{n}, b < 2^{n} => ab < 2^{2n}
-			 */
-			__asm__ __volatile__ ( "mul.d   %1, %6, %7\n\t"
-					       "mulh.du %2, %6, %7\n\t"
-
-					       "ld.d    %3, %0, 0\n\t"
-					       "ld.d    %4, %0, 8\n\t"
-
-					       "add.d   %3, %3, %1\n\t"
-					       "sltu    $t0, %3, %1\n\t"
-
-					       "add.d   %4, %4, %2\n\t"
-					       "sltu    $t1, %4, %2\n\t"
-
-					       "add.d   %4, %4, $t0\n\t"
-					       "sltu    $t0, %4, $t0\n\t"
-					       "or      $t0, $t0, $t1\n\t"
-
-					       "st.d    %3,  %0, 0\n\t"
-					       "st.d    %4,  %0, 8\n\t"
-
-					       "addi.d  %0,  %0, 16\n\t"
-					       "beqz    $t0, 2f\n"
-					       "1:\n\t"
-					       "ld.d    %3,  %0, 0\n\t"
-					       "add.d   %3,  %3, $t0\n\t"
-					       "sltu    $t0, %3, $t0\n\t"
-					       "st.d    %3,  %0, 0\n\t"
-					       "addi.d  %0, %0, 8\n\t"
-					       "bnez    $t0, 1b\n"
-					       "2:"
-					       : "+r" ( result_elements ),
-						 "=&r" ( discard_low ),
-						 "=&r" ( discard_high ),
-						 "=r" ( discard_temp_low ),
-						 "=r" ( discard_temp_high ),
-						 "+m" ( *result )
-					       : "r" ( multiplicand_element ),
-						 "r" ( multiplier_element )
-					       : "t0", "t1" );
-		}
-	}
-}

src/arch/loong64/core/loong64_string.c

@@ -1,266 +0,0 @@
-/*
- * Copyright (C) 2016 Michael Brown <mbrown@fensystems.co.uk>.
- * Copyright (c) 2023, Xiaotian Wu <wuxiaotian@loongson.cn>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-/** @file
- *
- * Optimised string operations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <string.h>
-
-/**
- * Copy memory area
- *
- * @v dest		Destination address
- * @v src		Source address
- * @v len		Length
- * @ret dest		Destination address
- */
-void loong64_memcpy ( void *dest, const void *src, size_t len ) {
-	void *discard_dest;
-	void *discard_end;
-	const void *discard_src;
-	size_t discard_offset;
-	unsigned long discard_data;
-	unsigned long discard_low;
-	unsigned long discard_high;
-
-	/* If length is too short, then just copy individual bytes.
-	 */
-	if ( len < 16 ) {
-		__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-				       "\n1:\n\t"
-				       "addi.d %0, %0, -1\n\t"
-				       "ldx.b %1, %3, %0\n\t"
-				       "stx.b %1, %2, %0\n\t"
-				       "bnez %0, 1b\n\t"
-				       "\n2:\n\t"
-				       : "=&r" ( discard_offset ),
-					 "=&r" ( discard_data )
-				       : "r" ( dest ), "r" ( src ), "0" ( len )
-				       : "memory", "t0" );
-		return;
-	}
-
-	/* Copy 16 bytes at a time: one initial
-	 * potentially unaligned access, multiple destination-aligned
-	 * accesses, one final potentially unaligned access.
-	 */
-	__asm__ __volatile__ ( "ld.d %3, %1, 0\n\t"
-			       "ld.d %4, %1, 8\n\t"
-			       "addi.d %1, %1, 16\n\t"
-			       "st.d %3, %0, 0\n\t"
-			       "st.d %4, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "andi %3, %0, 15\n\t"
-			       "sub.d %0, %0, %3\n\t"
-			       "sub.d %1, %1, %3\n\t"
-			       "addi.d $t0, $zero, 0xf\n\t"
-			       "andn %2, %5, $t0\n\t"
-			       "b 2f\n\t"
-			       "\n1:\n\t"
-			       "ld.d %3, %1, 0\n\t"
-			       "ld.d %4, %1, 8\n\t"
-			       "addi.d %1, %1, 16\n\t"
-			       "st.d %3, %0, 0\n\t"
-			       "st.d %4, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %2, 1b\n\t"
-			       "ld.d %3, %6, -16\n\t"
-			       "ld.d %4, %6, -8\n\t"
-			       "st.d %3, %5, -16\n\t"
-			       "st.d %4, %5, -8\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_src ),
-				 "=&r" ( discard_end ),
-				 "=&r" ( discard_low ),
-				 "=&r" ( discard_high )
-			       : "r" ( dest + len ), "r" ( src + len ),
-				 "0" ( dest ), "1" ( src )
-			       : "memory", "t0" );
-}
-
-/**
- * Zero memory region
- *
- * @v dest		Destination region
- * @v len		Length
- */
-void loong64_bzero ( void *dest, size_t len ) {
-	size_t discard_offset;
-	void *discard_dest;
-	void *discard_end;
-
-	/* If length is too short, then just zero individual bytes.
-	 */
-	if ( len < 16 ) {
-		__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-				       "\n1:\n\t"
-				       "addi.d %0, %0, -1\n\t"
-				       "stx.b $zero, %1, %0\n\t"
-				       "bnez %0, 1b\n\t"
-				       "\n2:\n\t"
-				       : "=&r" ( discard_offset )
-				       : "r" ( dest ), "0" ( len )
-				       : "memory" );
-		return;
-	}
-
-	/* To zero 16 bytes at a time: one initial
-	 * potentially unaligned access, multiple aligned accesses,
-	 * one final potentially unaligned access.
-	 */
-
-	__asm__ __volatile__ ( "st.d $zero, %0, 0\n\t"
-			       "st.d $zero, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "addi.w $t0, $zero, 15\n\t"
-			       "andn %0, %0, $t0\n\t"
-			       "addi.w $t0, $zero, 15\n\t"
-			       "andn %1, %2, $t0\n\t"
-			       "b 2f\n\t"
-			       "\n1:\n\t"
-			       "st.d $zero, %0, 0\n\t"
-			       "st.d $zero, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %1, 1b\n\t"
-			       "st.d $zero, %2, -16\n\t"
-			       "st.d $zero, %2, -8\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_end )
-			       : "r" ( dest + len ), "0" ( dest )
-			       : "memory", "t0" );
-}
-
-/**
- * Fill memory region
- *
- * @v dest		Destination region
- * @v len		Length
- * @v character		Fill character
- *
- * The unusual parameter order is to allow for more efficient
- * tail-calling to loong64_memset() when zeroing a region.
- */
-void loong64_memset ( void *dest, size_t len, int character ) {
-	size_t discard_offset;
-
-	/* Use optimised zeroing code if applicable */
-	if ( character == 0 ) {
-		loong64_bzero ( dest, len );
-		return;
-	}
-
-	/* Fill one byte at a time.  Calling memset() with a non-zero
-	 * value is relatively rare and unlikely to be
-	 * performance-critical.
-	 */
-	__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-			       "\n1:\n\t"
-			       "addi.d %0, %0, -1\n\t"
-			       "stx.b %2, %1, %0\n\t"
-			       "bnez %0, 1b\n\t"
-			       "\n2:\n\t"
-			       : "=&r" ( discard_offset )
-			       : "r" ( dest ), "r" ( character ), "0" ( len )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region forwards
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove_forwards ( void *dest, const void *src, size_t len ) {
-	void *discard_dest;
-	const void *discard_src;
-	unsigned long discard_data;
-
-	/* Assume memmove() is not performance-critical, and perform a
-	 * bytewise copy for simplicity.
-	 */
-	__asm__ __volatile__ ( "b 2f\n\t"
-			       "\n1:\n\t"
-			       "ld.b %2, %1, 0\n\t"
-			       "addi.d %1, %1, 1\n\t"
-			       "st.b %2, %0, 0\n\t"
-			       "addi.d %0, %0, 1\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %3, 1b\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_src ),
-				 "=&r" ( discard_data )
-			       : "r" ( dest + len ), "0" ( dest ), "1" ( src )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region backwards
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove_backwards ( void *dest, const void *src, size_t len ) {
-	size_t discard_offset;
-	unsigned long discard_data;
-
-	/* Assume memmove() is not performance-critical, and perform a
-	 * bytewise copy for simplicity.
-	 */
-	__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-			       "\n1:\n\t"
-			       "addi.d %0, %0, -1\n\t"
-			       "ldx.b %1, %3, %0\n\t"
-			       "stx.b %1, %2, %0\n\t"
-			       "bnez %0, 1b\n\t"
-			       "\n2:\n\t"
-			       : "=&r" ( discard_offset ),
-				 "=&r" ( discard_data )
-			       : "r" ( dest ), "r" ( src ), "0" ( len )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove ( void *dest, const void *src, size_t len ) {
-
-	if ( dest <= src ) {
-		loong64_memmove_forwards ( dest, src, len );
-	} else {
-		loong64_memmove_backwards ( dest, src, len );
-	}
-}

src/arch/loong64/core/setjmp.S

@@ -1,53 +0,0 @@
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
-
-	.section ".note.GNU-stack", "", %progbits
-	.text
-/*
-   int setjmp(jmp_buf env);
-*/
-	.globl	setjmp
-	.type	setjmp, %function
-setjmp:
-	/* Store registers */
-	st.d	$s0, $a0, 0x0
-	st.d	$s1, $a0, 0x8
-	st.d	$s2, $a0, 0x10
-	st.d	$s3, $a0, 0x18
-	st.d	$s4, $a0, 0x20
-	st.d	$s5, $a0, 0x28
-	st.d	$s6, $a0, 0x30
-	st.d	$s7, $a0, 0x38
-	st.d	$s8, $a0, 0x40
-	st.d	$fp, $a0, 0x48
-	st.d	$sp, $a0, 0x50
-	st.d	$ra, $a0, 0x58
-
-	move	$a0, $zero
-	jirl	$zero, $ra, 0
-	.size	setjmp, . - setjmp
-
-/*
-   void longjmp(jmp_buf env, int val);
-*/
-	.globl	longjmp
-	.type	longjmp, %function
-longjmp:
-	/* Restore registers */
-	ld.d	$s0, $a0, 0x0
-	ld.d	$s1, $a0, 0x8
-	ld.d	$s2, $a0, 0x10
-	ld.d	$s3, $a0, 0x18
-	ld.d	$s4, $a0, 0x20
-	ld.d	$s5, $a0, 0x28
-	ld.d	$s6, $a0, 0x30
-	ld.d	$s7, $a0, 0x38
-	ld.d	$s8, $a0, 0x40
-	ld.d	$fp, $a0, 0x48
-	ld.d	$sp, $a0, 0x50
-	ld.d	$ra, $a0, 0x58
-	addi.d	$a0, $zero, 1    # a0 = 1
-	beqz	$a1, .exit       # if (a1 == 0); goto L0
-	move	$a0, $a1         # a0 = a1
-.exit:
-	jirl	$zero, $ra, 0
-	.size	longjmp, . - longjmp

src/arch/loong64/include/bits/acpi.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_ACPI_H
-#define _BITS_ACPI_H
-
-/** @file
- *
- * LoongArch64-specific ACPI API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_ACPI_H */

src/arch/loong64/include/bits/bigint.h

@@ -1,336 +0,0 @@
-#ifndef _BITS_BIGINT_H
-#define _BITS_BIGINT_H
-
-/** @file
- *
- * Big integer support
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-
-/** Element of a big integer */
-typedef uint64_t bigint_element_t;
-
-/**
- * Initialise big integer
- *
- * @v value0	Element 0 of big integer to initialise
- * @v size		Number of elements
- * @v data		Raw data
- * @v len		Length of raw data
- */
-static inline __attribute__ (( always_inline )) void
-bigint_init_raw ( uint64_t *value0, unsigned int size,
-		  const void *data, size_t len ) {
-	size_t pad_len = ( sizeof ( bigint_t ( size ) ) - len );
-	uint8_t *value_byte = ( ( void * ) value0 );
-	const uint8_t *data_byte = ( data + len );
-
-	/* Copy raw data in reverse order, padding with zeros */
-	while ( len-- )
-		*(value_byte++) = *(--data_byte);
-	while ( pad_len-- )
-		*(value_byte++) = 0;
-}
-
-/**
- * Add big integers
- *
- * @v addend0		Element 0 of big integer to add
- * @v value0		Element 0 of big integer to be added to
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_add_raw ( const uint64_t *addend0, uint64_t *value0,
-		 unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint64_t *discard_addend;
-	uint64_t *discard_value;
-	uint64_t discard_addend_i;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	__asm__ __volatile__ ( "move   $t0, $zero\n"
-			       "1:\n\t"
-			       "ld.d   %3, %0, 0\n\t"
-			       "addi.d %0, %0, 8\n\t"
-			       "ld.d   %4, %1, 0\n\t"
-
-			       "add.d  %4, %4, $t0\n\t"
-			       "sltu   $t0, %4, $t0\n\t"
-
-			       "add.d  %4, %4, %3\n\t"
-			       "sltu   $t1, %4, %3\n\t"
-
-			       "or     $t0, $t0, $t1\n\t"
-			       "st.d   %4,  %1, 0\n\t"
-			       "addi.d %1, %1, 8\n\t"
-			       "addi.w %2, %2, -1\n\t"
-			       "bnez   %2, 1b"
-			       : "=r" ( discard_addend ),
-				 "=r" ( discard_value ),
-				 "=r" ( discard_size ),
-				 "=r" ( discard_addend_i ),
-				 "=r" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( addend0 ),
-				 "1" ( value0 ),
-				 "2" ( size )
-			       : "t0", "t1" );
-}
-
-/**
- * Subtract big integers
- *
- * @v subtrahend0	Element 0 of big integer to subtract
- * @v value0		Element 0 of big integer to be subtracted from
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_subtract_raw ( const uint64_t *subtrahend0, uint64_t *value0,
-		      unsigned int size ) {
-	uint64_t *discard_subtrahend;
-	uint64_t *discard_value;
-	uint64_t discard_subtrahend_i;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	unsigned int flag = 0;
-
-	discard_subtrahend = (uint64_t*) subtrahend0;
-	discard_value = value0;
-	discard_size = size;
-
-	do {
-		discard_subtrahend_i = *discard_subtrahend;
-		discard_subtrahend++;
-		discard_value_i = *discard_value;
-
-		discard_value_i = discard_value_i - discard_subtrahend_i - flag;
-
-		if ( *discard_value < (discard_subtrahend_i + flag)) {
-			flag = 1;
-		} else {
-			flag = 0;
-		}
-
-		*discard_value = discard_value_i;
-
-		discard_value++;
-		discard_size -= 1;
-	} while (discard_size != 0);
-}
-
-/**
- * Rotate big integer left
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_rol_raw ( uint64_t *value0, unsigned int size ) {
-	uint64_t *discard_value;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	uint64_t current_value_i;
-	unsigned int flag = 0;
-
-	discard_value = value0;
-	discard_size = size;
-	do {
-		discard_value_i = *discard_value;
-		current_value_i = discard_value_i;
-
-		discard_value_i += discard_value_i + flag;
-
-		if (discard_value_i < current_value_i) {
-			flag = 1;
-		} else {
-			flag = 0;
-		}
-
-		*discard_value = discard_value_i;
-		discard_value++;
-		discard_size -= 1;
-	} while ( discard_size != 0 );
-}
-
-/**
- * Rotate big integer right
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_ror_raw ( uint64_t *value0, unsigned int size ) {
-	uint64_t *discard_value;
-	uint64_t discard_value_i;
-	uint64_t discard_value_j;
-	unsigned int discard_size;
-
-	discard_value = value0;
-	discard_size = size;
-
-	discard_value_j = 0;
-
-	do {
-		discard_size -= 1;
-
-		discard_value_i = *(discard_value + discard_size);
-
-		discard_value_j = (discard_value_j << 63) | (discard_value_i >> 1);
-
-		*(discard_value + discard_size) = discard_value_j;
-
-		discard_value_j = discard_value_i;
-	} while ( discard_size > 0 );
-}
-
-/**
- * Test if big integer is equal to zero
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret is_zero		Big integer is equal to zero
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_zero_raw ( const uint64_t *value0, unsigned int size ) {
-	const uint64_t *value = value0;
-	uint64_t value_i;
-
-	do {
-		value_i = *(value++);
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return ( value_i == 0 );
-}
-
-/**
- * Compare big integers
- *
- * @v value0		Element 0 of big integer
- * @v reference0	Element 0 of reference big integer
- * @v size		Number of elements
- * @ret geq		Big integer is greater than or equal to the reference
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_geq_raw ( const uint64_t *value0, const uint64_t *reference0,
-		    unsigned int size ) {
-	const uint64_t *value = ( value0 + size );
-	const uint64_t *reference = ( reference0 + size );
-	uint64_t value_i;
-	uint64_t reference_i;
-
-	do {
-		value_i = *(--value);
-		reference_i = *(--reference);
-		if ( value_i != reference_i )
-			break;
-	} while ( --size );
-
-	return ( value_i >= reference_i );
-}
-
-/**
- * Test if bit is set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @v bit		Bit to test
- * @ret is_set		Bit is set
- */
-static inline __attribute__ (( always_inline )) int
-bigint_bit_is_set_raw ( const uint64_t *value0, unsigned int size,
-			unsigned int bit ) {
-	const bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( const void * ) value0 );
-	unsigned int index = ( bit / ( 8 * sizeof ( value->element[0] ) ) );
-	unsigned int subindex = ( bit % ( 8 * sizeof ( value->element[0] ) ) );
-
-	return ( !! ( value->element[index] & ( 1UL << subindex ) ) );
-}
-
-/**
- * Find highest bit set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret max_bit		Highest bit set + 1 (or 0 if no bits set)
- */
-static inline __attribute__ (( always_inline )) int
-bigint_max_set_bit_raw ( const uint64_t *value0, unsigned int size ) {
-	const uint64_t *value = ( value0 + size );
-	int max_bit = ( 8 * sizeof ( bigint_t ( size ) ) );
-	uint64_t value_i;
-
-	do {
-		value_i = *(--value);
-		max_bit -= ( 64 - fls ( value_i ) );
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return max_bit;
-}
-
-/**
- * Grow big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_grow_raw ( const uint64_t *source0, unsigned int source_size,
-		  uint64_t *dest0, unsigned int dest_size ) {
-	unsigned int pad_size = ( dest_size - source_size );
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( source_size ) ) );
-	memset ( ( dest0 + source_size ), 0, sizeof ( bigint_t ( pad_size ) ) );
-}
-
-/**
- * Shrink big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_shrink_raw ( const uint64_t *source0, unsigned int source_size __unused,
-		    uint64_t *dest0, unsigned int dest_size ) {
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( dest_size ) ) );
-}
-
-/**
- * Finalise big integer
- *
- * @v value0		Element 0 of big integer to finalise
- * @v size		Number of elements
- * @v out		Output buffer
- * @v len		Length of output buffer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_done_raw ( const uint64_t *value0, unsigned int size __unused,
-		  void *out, size_t len ) {
-	const uint8_t *value_byte = ( ( const void * ) value0 );
-	uint8_t *out_byte = ( out + len );
-
-	/* Copy raw data in reverse order */
-	while ( len-- )
-		*(--out_byte) = *(value_byte++);
-}
-
-extern void bigint_multiply_raw ( const uint64_t *multiplicand0,
-				  const uint64_t *multiplier0,
-				  uint64_t *value0, unsigned int size );
-
-#endif /* _BITS_BIGINT_H */

src/arch/loong64/include/bits/bitops.h

@@ -1,102 +0,0 @@
-#ifndef _BITS_BITOPS_H
-#define _BITS_BITOPS_H
-
-/** @file
- *
- * loongArch bit operations
- *
- * We perform atomic bit set and bit clear operations using "ll"
- * and "sc".  We use the output constraint to inform the
- * compiler that any memory from the start of the bit field up to and
- * including the byte containing the bit may be modified.  (This is
- * overkill but shouldn't matter in practice since we're unlikely to
- * subsequently read other bits from the same bit field.)
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Test and set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_set_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 64 );
-	unsigned int offset = ( bit % 64 );
-	volatile uint64_t *qword = ( ( ( volatile uint64_t * ) bits ) + index );
-	uint64_t mask = ( 1UL << offset );
-	uint64_t old;
-	uint64_t new;
-
-	__asm__ __volatile__ ( "1:				\n\t"
-			       "ll.d %[old], %[qword]		\n\t"
-			       "or   %[new], %[old], %[mask]	\n\t"
-			       "sc.d %[new], %[qword]		\n\t"
-			       "beqz %[new], 1b			\n\t"
-			       : [old] "=&r" ( old ),
-				 [new] "=&r" ( new ),
-				 [qword] "+m" ( *qword )
-			       : [mask] "r" ( mask )
-			       : "cc", "memory");
-	return ( !! ( old & mask ) );
-}
-
-/**
- * Test and clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_clear_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 64 );
-	unsigned int offset = ( bit % 64 );
-	volatile uint64_t *qword = ( ( ( volatile uint64_t * ) bits ) + index );
-	uint64_t mask = ( 1UL << offset );
-	uint64_t old;
-	uint64_t new;
-
-	__asm__ __volatile__ ( "1:				\n\t"
-			       "ll.d %[old], %[qword]		\n\t"
-			       "andn %[new], %[old], %[mask]	\n\t"
-			       "sc.d %[new], %[qword]		\n\t"
-			       "beqz %[new], 1b			\n\t"
-			       : [old] "=&r" ( old ),
-				 [new] "=&r" ( new ),
-				 [qword] "+m" ( *qword )
-			       : [mask] "r" ( mask )
-			       : "cc", "memory");
-	return ( !! ( old & mask ) );
-}
-
-/**
- * Set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-set_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_set_bit ( bit, bits );
-}
-
-/**
- * Clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-clear_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_clear_bit ( bit, bits );
-}
-
-#endif /* _BITS_BITOPS_H */

src/arch/loong64/include/bits/byteswap.h

@@ -1,47 +0,0 @@
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H
-
-/** @file
- *
- * Byte-order swapping functions
- *
- */
-
-#include <stdint.h>
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-static inline __attribute__ (( always_inline, const )) uint16_t
-__bswap_variable_16 ( uint16_t x ) {
-	__asm__ ( "revb.2h %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_16s ( uint16_t *x ) {
-	*x = __bswap_variable_16 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint32_t
-__bswap_variable_32 ( uint32_t x ) {
-	__asm__ ( "revb.2w %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_32s ( uint32_t *x ) {
-	*x = __bswap_variable_32 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint64_t
-__bswap_variable_64 ( uint64_t x ) {
-	__asm__ ( "revb.d %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_64s ( uint64_t *x ) {
-	*x = __bswap_variable_64 ( *x );
-}
-
-#endif

src/arch/loong64/include/bits/compiler.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_COMPILER_H
-#define _BITS_COMPILER_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** Dummy relocation type */
-#define RELOC_TYPE_NONE R_LARCH_NONE
-
-#ifndef ASSEMBLY
-
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "a"
-
-#define __asmcall
-#define __libgcc
-
-#endif /* ASSEMBLY */
-
-#endif /*_BITS_COMPILER_H */

src/arch/loong64/include/bits/endian.h

@@ -1,8 +0,0 @@
-#ifndef _BITS_ENDIAN_H
-#define _BITS_ENDIAN_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#define __BYTE_ORDER __LITTLE_ENDIAN
-
-#endif /* _BITS_ENDIAN_H */

src/arch/loong64/include/bits/entropy.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_ENTROPY_H
-#define _BITS_ENTROPY_H
-
-/** @file
- *
- * LoongArch64-specific entropy API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_ENTROPY_H */

src/arch/loong64/include/bits/errfile.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_ERRFILE_H
-#define _BITS_ERRFILE_H
-
-/** @file
- *
- * LoongArch64-specific error file identifiers
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/**
- * @addtogroup errfile Error file identifiers
- * @{
- */
-
-/** @} */
-
-#endif /* _BITS_ERRFILE_H */

src/arch/loong64/include/bits/hyperv.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_HYPERV_H
-#define _BITS_HYPERV_H
-
-/** @file
- *
- * Hyper-V interface
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_HYPERV_H */

src/arch/loong64/include/bits/io.h

@@ -1,15 +0,0 @@
-#ifndef _BITS_IO_H
-#define _BITS_IO_H
-
-/** @file
- *
- * LoongArch64-specific I/O API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** Page shift */
-#define PAGE_SHIFT 12
-
-#endif /* _BITS_IO_H */

src/arch/loong64/include/bits/iomap.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_IOMAP_H
-#define _BITS_IOMAP_H
-
-/** @file
- *
- * LoongArch64-specific I/O mapping API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_IOMAP_H */

src/arch/loong64/include/bits/nap.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_NAP_H
-#define _BITS_NAP_H
-
-/** @file
- *
- * LoongArch64-specific CPU sleeping API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_MAP_H */

src/arch/loong64/include/bits/pci_io.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_PCI_IO_H
-#define _BITS_PCI_IO_H
-
-/** @file
- *
- * LoongArch64-specific PCI I/O API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_PCI_IO_H */

src/arch/loong64/include/bits/profile.h

@@ -1,28 +0,0 @@
-#ifndef _BITS_PROFILE_H
-#define _BITS_PROFILE_H
-
-/** @file
- *
- * Profiling
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Get profiling timestamp
- *
- * @ret timestamp	Timestamp
- */
-static inline __attribute__ (( always_inline )) uint64_t
-profile_timestamp ( void ) {
-	uint64_t cycles;
-
-	/* Read cycle counter */
-	__asm__ __volatile__ ( "rdtime.d %0, $zero\n\t" : "=r" ( cycles ) );
-	return cycles;
-}
-
-#endif /* _BITS_PROFILE_H */

src/arch/loong64/include/bits/reboot.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_REBOOT_H
-#define _BITS_REBOOT_H
-
-/** @file
- *
- * LoongArch64-specific reboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_REBOOT_H */

src/arch/loong64/include/bits/sanboot.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_SANBOOT_H
-#define _BITS_SANBOOT_H
-
-/** @file
- *
- * LoongArch64-specific sanboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_SANBOOT_H */

src/arch/loong64/include/bits/smbios.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_SMBIOS_H
-#define _BITS_SMBIOS_H
-
-/** @file
- *
- * LoongArch64-specific SMBIOS API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_SMBIOS_H */

src/arch/loong64/include/bits/stdint.h

@@ -1,23 +0,0 @@
-#ifndef _BITS_STDINT_H
-#define _BITS_STDINT_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-typedef __SIZE_TYPE__		size_t;
-typedef signed long		ssize_t;
-typedef signed long		off_t;
-
-typedef unsigned char		uint8_t;
-typedef unsigned short		uint16_t;
-typedef unsigned int		uint32_t;
-typedef unsigned long long	uint64_t;
-
-typedef signed char		int8_t;
-typedef signed short		int16_t;
-typedef signed int		int32_t;
-typedef signed long long	int64_t;
-
-typedef unsigned long		physaddr_t;
-typedef unsigned long		intptr_t;
-
-#endif /* _BITS_STDINT_H */

src/arch/loong64/include/bits/string.h

@@ -1,61 +0,0 @@
-#ifndef _BITS_STRING_H
-#define _BITS_STRING_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** @file
- *
- * String functions
- *
- */
-
-extern void loong64_bzero ( void *dest, size_t len );
-extern void loong64_memset ( void *dest, size_t len, int character );
-extern void loong64_memcpy ( void *dest, const void *src, size_t len );
-extern void loong64_memmove_forwards ( void *dest, const void *src, size_t len );
-extern void loong64_memmove_backwards ( void *dest, const void *src, size_t len );
-extern void loong64_memmove ( void *dest, const void *src, size_t len );
-
-/**
- * Fill memory region
- *
- * @v dest		Destination region
- * @v character		Fill character
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memset ( void *dest, int character, size_t len ) {
-	loong64_memset ( dest, len, character );
-	return dest;
-}
-
-/**
- * Copy memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memcpy ( void *dest, const void *src, size_t len ) {
-	loong64_memcpy ( dest, src, len );
-	return dest;
-}
-
-/**
- * Copy (possibly overlapping) memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memmove ( void *dest, const void *src, size_t len ) {
-	loong64_memmove ( dest, src, len );
-	return dest;
-}
-
-#endif /* _BITS_STRING_H */

src/arch/loong64/include/bits/strings.h

@@ -1,69 +0,0 @@
-#ifndef _BITS_STRINGS_H
-#define _BITS_STRINGS_H
-
-/** @file
- *
- * String functions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsll ( long long value ){
-	unsigned long long bits = value;
-	unsigned long long lsb;
-	unsigned int lz;
-
-	/* Extract least significant set bit */
-	lsb = ( bits & -bits );
-
-	/* Count number of leading zeroes before LSB */
-	__asm__ ( "clz.d %0, %1" : "=r" ( lz ) : "r" ( lsb ) );
-
-	return ( 64 - lz );
-}
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsl ( long value ) {
-
-	return __ffsll ( value );
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsll ( long long value ){
-	unsigned int lz;
-
-	/* Count number of leading zeroes */
-	__asm__ ( "clz.d %0, %1" : "=r" ( lz ) : "r" ( value ) );
-
-	return ( 64 - lz );
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsl ( long value ) {
-
-	return __flsll ( value );
-}
-
-#endif /* _BITS_STRINGS_H */

src/arch/loong64/include/bits/tcpip.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_TCPIP_H
-#define _BITS_TCPIP_H
-
-/** @file
- *
- * Transport-network layer interface
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-static inline __attribute__ (( always_inline )) uint16_t
-tcpip_continue_chksum ( uint16_t partial, const void *data, size_t len ) {
-
-	/* Not yet optimised */
-	return generic_tcpip_continue_chksum ( partial, data, len );
-}
-
-#endif /* _BITS_TCPIP_H */

src/arch/loong64/include/bits/time.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_TIME_H
-#define _BITS_TIME_H
-
-/** @file
- *
- * LoongArch64-specific time API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_TIME_H */

src/arch/loong64/include/bits/uaccess.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UACCESS_H
-#define _BITS_UACCESS_H
-
-/** @file
- *
- * LoongArch64-specific user access API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UACCESS_H */

src/arch/loong64/include/bits/uart.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UART_H
-#define _BITS_UART_H
-
-/** @file
- *
- * 16550-compatible UART
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UART_H */

src/arch/loong64/include/bits/umalloc.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UMALLOC_H
-#define _BITS_UMALLOC_H
-
-/** @file
- *
- * LoongArch64-specific user memory allocation API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UMALLOC_H */

src/arch/loong64/include/bits/xen.h

@@ -1,13 +0,0 @@
-#ifndef _BITS_XEN_H
-#define _BITS_XEN_H
-
-/** @file
- *
- * Xen interface
- *
- */
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/nonxen.h>
-
-#endif /* _BITS_XEN_H */

src/arch/loong64/include/gdbmach.h

@@ -1,45 +0,0 @@
-#ifndef GDBMACH_H
-#define GDBMACH_H
-
-/** @file
- *
- * GDB architecture specifics
- *
- * This file declares functions for manipulating the machine state and
- * debugging context.
- *
- */
-
-#include <stdint.h>
-
-typedef unsigned long gdbreg_t;
-
-/* Register snapshot */
-enum {
-	/* Not yet implemented */
-	GDBMACH_NREGS,
-};
-
-#define GDBMACH_SIZEOF_REGS ( GDBMACH_NREGS * sizeof ( gdbreg_t ) )
-
-static inline void gdbmach_set_pc ( gdbreg_t *regs, gdbreg_t pc ) {
-	/* Not yet implemented */
-	( void ) regs;
-	( void ) pc;
-}
-
-static inline void gdbmach_set_single_step ( gdbreg_t *regs, int step ) {
-	/* Not yet implemented */
-	( void ) regs;
-	( void ) step;
-}
-
-static inline void gdbmach_breakpoint ( void ) {
-	/* Not yet implemented */
-}
-
-extern int gdbmach_set_breakpoint ( int type, unsigned long addr, size_t len,
-				    int enable );
-extern void gdbmach_init ( void );
-
-#endif /* GDBMACH_H */

src/arch/loong64/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_LOONG64
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/loong64/include/limits.h

@@ -1,53 +0,0 @@
-#ifndef LIMITS_H
-#define LIMITS_H	1
-
-/* Number of bits in a `char' */
-#define CHAR_BIT	8
-
-/* Minimum and maximum values a `signed char' can hold */
-#define SCHAR_MIN	(-128)
-#define SCHAR_MAX	127
-
-/* Maximum value an `unsigned char' can hold. (Minimum is 0.) */
-#define UCHAR_MAX	255
-
-/* Minimum and maximum values a `char' can hold */
-#define CHAR_MIN	SCHAR_MIN
-#define CHAR_MAX	SCHAR_MAX
-
-/* Minimum and maximum values a `signed short int' can hold */
-#define SHRT_MIN	(-32768)
-#define SHRT_MAX	32767
-
-/* Maximum value an `unsigned short' can hold. (Minimum is 0.) */
-#define USHRT_MAX	65535
-
-/* Minimum and maximum values a `signed int' can hold */
-#define INT_MIN		(-INT_MAX - 1)
-#define INT_MAX		2147483647
-
-/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-#define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed int' can hold */
-#define INT_MAX		2147483647
-#define INT_MIN		(-INT_MAX - 1)
-
-/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-#define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed long' can hold */
-#define LONG_MAX	9223372036854775807L
-#define LONG_MIN	(-LONG_MAX - 1L)
-
-/* Maximum value an `unsigned long' can hold. (Minimum is 0.) */
-#define ULONG_MAX	18446744073709551615UL
-
-/* Minimum and maximum values a `signed long long' can hold */
-#define LLONG_MAX	9223372036854775807LL
-#define LLONG_MIN	(-LONG_MAX - 1LL)
-
-/* Maximum value an `unsigned long long' can hold. (Minimum is 0.) */
-#define ULLONG_MAX	18446744073709551615ULL
-
-#endif /* LIMITS_H */

src/arch/loong64/include/setjmp.h

@@ -1,31 +0,0 @@
-#ifndef _SETJMP_H
-#define _SETJMP_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/** jump buffer env*/
-typedef struct {
-	uint64_t s0;
-	uint64_t s1;
-	uint64_t s2;
-	uint64_t s3;
-	uint64_t s4;
-	uint64_t s5;
-	uint64_t s6;
-	uint64_t s7;
-	uint64_t s8;
-
-	uint64_t fp;
-	uint64_t sp;
-	uint64_t ra;
-} jmp_buf[1];
-
-extern int __asmcall __attribute__ (( returns_twice ))
-setjmp ( jmp_buf env );
-
-extern void __asmcall __attribute__ (( noreturn ))
-longjmp ( jmp_buf env, int val );
-
-#endif /* _SETJMP_H */

src/arch/x86/core/rdrand.c

@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2023 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** @file
- *
- * Hardware random number generator
- *
- */
-
-#include <errno.h>
-#include <ipxe/cpuid.h>
-#include <ipxe/entropy.h>
-
-/** Number of times to retry RDRAND instruction */
-#define RDRAND_RETRY_COUNT 16
-
-/** Colour for debug messages */
-#define colour CPUID_FEATURES_INTEL_ECX_RDRAND
-
-/**
- * Enable entropy gathering
- *
- * @ret rc		Return status code
- */
-static int rdrand_entropy_enable ( void ) {
-	struct x86_features features;
-
-	/* Check that RDRAND is supported */
-	x86_features ( &features );
-	if ( ! ( features.intel.ecx & CPUID_FEATURES_INTEL_ECX_RDRAND ) ) {
-		DBGC ( colour, "RDRAND not supported\n" );
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-/**
- * Disable entropy gathering
- *
- */
-static void rdrand_entropy_disable ( void ) {
-
-	/* Nothing to do */
-}
-
-/**
- * Get noise sample
- *
- * @ret noise		Noise sample
- * @ret rc		Return status code
- */
-static int rdrand_get_noise ( noise_sample_t *noise ) {
-	unsigned int result;
-	unsigned int discard_c;
-	unsigned int ok;
-
-	/* Issue RDRAND, retrying until CF is set */
-	__asm__ ( "\n1:\n\t"
-		  "rdrand %0\n\t"
-		  "sbb %1, %1\n\t"
-		  "loopz 1b\n\t"
-		  : "=r" ( result ), "=r" ( ok ), "=c" ( discard_c )
-		  : "2" ( RDRAND_RETRY_COUNT ) );
-	if ( ! ok ) {
-		DBGC ( colour, "RDRAND failed to become ready\n" );
-		return -EBUSY;
-	}
-
-	*noise = result;
-	return 0;
-}
-
-PROVIDE_ENTROPY_INLINE ( rdrand, min_entropy_per_sample );
-PROVIDE_ENTROPY ( rdrand, entropy_enable, rdrand_entropy_enable );
-PROVIDE_ENTROPY ( rdrand, entropy_disable, rdrand_entropy_disable );
-PROVIDE_ENTROPY ( rdrand, get_noise, rdrand_get_noise );

src/arch/x86/image/bzimage.c

@@ -247,17 +247,19 @@ static void bzimage_update_header ( struct image *image,
  *
  * @v image		bzImage file
  * @v bzimg		bzImage context
+ * @v cmdline		Kernel command line
  * @ret rc		Return status code
  */
 static int bzimage_parse_cmdline ( struct image *image,
-				   struct bzimage_context *bzimg ) {
-	const char *vga;
-	const char *mem;
+				   struct bzimage_context *bzimg,
+				   char *cmdline ) {
 	char *sep;
-	char *end;
+	char *vga;
+	char *mem;
 
 	/* Look for "vga=" */
-	if ( ( vga = image_argument ( image, "vga=" ) ) ) {
+	if ( ( vga = strstr ( cmdline, "vga=" ) ) ) {
+		vga += 4;
 		sep = strchr ( vga, ' ' );
 		if ( sep )
 			*sep = '\0';
@@ -268,10 +270,10 @@ static int bzimage_parse_cmdline ( struct image *image,
 		} else if ( strcmp ( vga, "ask" ) == 0 ) {
 			bzimg->vid_mode = BZI_VID_MODE_ASK;
 		} else {
-			bzimg->vid_mode = strtoul ( vga, &end, 0 );
-			if ( *end ) {
+			bzimg->vid_mode = strtoul ( vga, &vga, 0 );
+			if ( *vga ) {
 				DBGC ( image, "bzImage %p strange \"vga=\" "
-				       "terminator '%c'\n", image, *end );
+				       "terminator '%c'\n", image, *vga );
 			}
 		}
 		if ( sep )
@@ -279,9 +281,10 @@ static int bzimage_parse_cmdline ( struct image *image,
 	}
 
 	/* Look for "mem=" */
-	if ( ( mem = image_argument ( image, "mem=" ) ) ) {
-		bzimg->mem_limit = strtoul ( mem, &end, 0 );
-		switch ( *end ) {
+	if ( ( mem = strstr ( cmdline, "mem=" ) ) ) {
+		mem += 4;
+		bzimg->mem_limit = strtoul ( mem, &mem, 0 );
+		switch ( *mem ) {
 		case 'G':
 		case 'g':
 			bzimg->mem_limit <<= 10;
@@ -299,7 +302,7 @@ static int bzimage_parse_cmdline ( struct image *image,
 			break;
 		default:
 			DBGC ( image, "bzImage %p strange \"mem=\" "
-			       "terminator '%c'\n", image, *end );
+			       "terminator '%c'\n", image, *mem );
 			break;
 		}
 		bzimg->mem_limit -= 1;
@@ -313,10 +316,11 @@ static int bzimage_parse_cmdline ( struct image *image,
  *
  * @v image		bzImage image
  * @v bzimg		bzImage context
+ * @v cmdline		Kernel command line
  */
 static void bzimage_set_cmdline ( struct image *image,
-				  struct bzimage_context *bzimg ) {
-	const char *cmdline = ( image->cmdline ? image->cmdline : "" );
+				  struct bzimage_context *bzimg,
+				  const char *cmdline ) {
 	size_t cmdline_len;
 
 	/* Copy command line down to real-mode portion */
@@ -524,6 +528,7 @@ static void bzimage_load_initrds ( struct image *image,
  */
 static int bzimage_exec ( struct image *image ) {
 	struct bzimage_context bzimg;
+	char *cmdline = ( image->cmdline ? image->cmdline : "" );
 	int rc;
 
 	/* Read and parse header from image */
@@ -546,7 +551,7 @@ static int bzimage_exec ( struct image *image ) {
 	}
 
 	/* Parse command line for bootloader parameters */
-	if ( ( rc = bzimage_parse_cmdline ( image, &bzimg ) ) != 0)
+	if ( ( rc = bzimage_parse_cmdline ( image, &bzimg, cmdline ) ) != 0)
 		return rc;
 
 	/* Check that initrds can be loaded */
@@ -563,7 +568,7 @@ static int bzimage_exec ( struct image *image ) {
 		      bzimg.rm_filesz, bzimg.pm_sz );
 
 	/* Store command line */
-	bzimage_set_cmdline ( image, &bzimg );
+	bzimage_set_cmdline ( image, &bzimg, cmdline );
 
 	/* Prepare for exiting.  Must do this before loading initrds,
 	 * since loading the initrds will corrupt the external heap.

src/arch/x86/include/bits/entropy.h

@@ -10,6 +10,5 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/rtc_entropy.h>
-#include <ipxe/rdrand.h>
 
 #endif /* _BITS_ENTROPY_H */

src/arch/x86/include/bits/errfile.h

@@ -28,7 +28,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define ERRFILE_cpuid		( ERRFILE_ARCH | ERRFILE_CORE | 0x00110000 )
 #define ERRFILE_rdtsc_timer	( ERRFILE_ARCH | ERRFILE_CORE | 0x00120000 )
 #define ERRFILE_acpi_timer	( ERRFILE_ARCH | ERRFILE_CORE | 0x00130000 )
-#define ERRFILE_rdrand		( ERRFILE_ARCH | ERRFILE_CORE | 0x00140000 )
 
 #define ERRFILE_bootsector     ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00000000 )
 #define ERRFILE_bzimage	       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00010000 )

src/arch/x86/include/bits/io.h

@@ -9,9 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-/** Page shift */
-#define PAGE_SHIFT 12
-
 #include <ipxe/x86_io.h>
 
 #endif /* _BITS_IO_H */

src/arch/x86/include/ipxe/cpuid.h

@@ -39,9 +39,6 @@ struct x86_features {
 /** Get standard features */
 #define CPUID_FEATURES 0x00000001UL
 
-/** RDRAND instruction is supported */
-#define CPUID_FEATURES_INTEL_ECX_RDRAND 0x40000000UL
-
 /** Hypervisor is present */
 #define CPUID_FEATURES_INTEL_ECX_HYPERVISOR 0x80000000UL
 

src/arch/x86/include/ipxe/rdrand.h

@@ -1,37 +0,0 @@
-#ifndef _IPXE_RDRAND_H
-#define _IPXE_RDRAND_H
-
-/** @file
- *
- * Hardware random number generator
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <ipxe/drbg.h>
-
-#ifdef ENTROPY_RDRAND
-#define ENTROPY_PREFIX_rdrand
-#else
-#define ENTROPY_PREFIX_rdrand __rdrand_
-#endif
-
-/**
- * min-entropy per sample
- *
- * @ret min_entropy	min-entropy of each sample
- */
-static inline __always_inline min_entropy_t
-ENTROPY_INLINE ( rdrand, min_entropy_per_sample ) ( void ) {
-
-	/* Data returned by RDRAND is theoretically full entropy, up
-	 * to a security strength of 128 bits.
-	 */
-	if ( DRBG_SECURITY_STRENGTH > 128 )
-		return 0;
-	return MIN_ENTROPY ( 8 * sizeof ( noise_sample_t ) );
-}
-
-#endif /* _IPXE_RDRAND_H */

src/arch/x86/include/ipxe/x86_io.h

@@ -28,6 +28,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 
+/** Page shift */
+#define PAGE_SHIFT 12
+
 /*
  * Physical<->Bus address mappings
  *

src/arch/x86/interface/pcbios/rtc_entropy.c

@@ -42,9 +42,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 /** Maximum time to wait for an RTC interrupt, in milliseconds */
 #define RTC_MAX_WAIT_MS 100
 
-/** Number of RTC interrupts to check for */
-#define RTC_CHECK_COUNT 3
-
 /** RTC interrupt handler */
 extern void rtc_isr ( void );
 
@@ -148,7 +145,6 @@ static void rtc_disable_int ( void ) {
  * @ret rc		Return status code
  */
 static int rtc_entropy_check ( void ) {
-	unsigned int count = 0;
 	unsigned int i;
 
 	/* Check that RTC interrupts are working */
@@ -162,18 +158,14 @@ static int rtc_entropy_check ( void ) {
 				       "cli\n\t" );
 
 		/* Check for RTC interrupt flag */
-		if ( rtc_flag ) {
-			rtc_flag = 0;
-			if ( ++count >= RTC_CHECK_COUNT )
-				return 0;
-		}
+		if ( rtc_flag )
+			return 0;
 
 		/* Delay */
 		mdelay ( 1 );
 	}
 
-	DBGC ( &rtc_flag, "RTC timed out waiting for interrupt %d/%d\n",
-	       ( count + 1 ), RTC_CHECK_COUNT );
+	DBGC ( &rtc_flag, "RTC timed out waiting for interrupt\n" );
 	return -ETIMEDOUT;
 }
 

src/arch/x86/interface/pxe/pxe_udp.c

@@ -12,7 +12,6 @@
 #include <ipxe/uaccess.h>
 #include <ipxe/process.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/malloc.h>
 #include <realmode.h>
 #include <pxe.h>
 
@@ -483,28 +482,3 @@ struct pxe_api_call pxe_udp_api[] __pxe_api_call = {
 	PXE_API_CALL ( PXENV_UDP_READ, pxenv_udp_read,
 		       struct s_PXENV_UDP_READ ),
 };
-
-/**
- * Discard some cached PXE UDP data
- *
- * @ret discarded	Number of cached items discarded
- */
-static unsigned int pxe_udp_discard ( void ) {
-	struct io_buffer *iobuf;
-	unsigned int discarded = 0;
-
-	/* Try to discard the oldest received UDP packet */
-	iobuf = list_first_entry ( &pxe_udp.list, struct io_buffer, list );
-	if ( iobuf ) {
-		list_del ( &iobuf->list );
-		free_iob ( iobuf );
-		discarded++;
-	}
-
-	return discarded;
-}
-
-/** PXE UDP cache discarder */
-struct cache_discarder pxe_udp_discarder __cache_discarder ( CACHE_NORMAL ) = {
-	.discard = pxe_udp_discard,
-};

src/arch/x86_64/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 /** Declare a function with standard calling conventions */
 #define __asmcall __attribute__ (( regparm(0) ))
 

src/config/config_ethernet.c

@@ -49,6 +49,3 @@ REQUIRE_OBJECT ( eth_slow );
 #ifdef NET_PROTO_EAPOL
 REQUIRE_OBJECT ( eapol );
 #endif
-#ifdef NET_PROTO_LLDP
-REQUIRE_OBJECT ( lldp );
-#endif

src/config/defaults/efi.h

@@ -26,7 +26,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define FDT_EFI
 
 #define	NET_PROTO_IPV6		/* IPv6 protocol */
-#define	NET_PROTO_LLDP		/* Link Layer Discovery protocol */
 
 #define DOWNLOAD_PROTO_FILE	/* Local filesystem access */
 

src/config/general.h

@@ -40,7 +40,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define	NET_PROTO_STP		/* Spanning Tree protocol */
 #define	NET_PROTO_LACP		/* Link Aggregation control protocol */
 #define	NET_PROTO_EAPOL		/* EAP over LAN protocol */
-//#define NET_PROTO_LLDP	/* Link Layer Discovery protocol */
 
 /*
  * PXE support

src/core/cpio.c

@@ -77,12 +77,17 @@ size_t cpio_name_len ( struct image *image ) {
  */
 static void cpio_parse_cmdline ( struct image *image,
 				 struct cpio_header *cpio ) {
-	const char *arg;
+	const char *cmdline;
+	char *arg;
 	char *end;
 	unsigned int mode;
 
+	/* Skip image filename */
+	cmdline = ( cpio_name ( image ) + cpio_name_len ( image ) );
+
 	/* Look for "mode=" */
-	if ( ( arg = image_argument ( image, "mode=" ) ) ) {
+	if ( ( arg = strstr ( cmdline, "mode=" ) ) ) {
+		arg += 5;
 		mode = strtoul ( arg, &end, 8 /* Octal for file mode */ );
 		if ( *end && ( *end != ' ' ) ) {
 			DBGC ( image, "CPIO %p strange \"mode=\" "

src/core/image.c

@@ -27,7 +27,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <errno.h>
 #include <assert.h>
 #include <libgen.h>
@@ -570,33 +569,3 @@ struct image * image_memory ( const char *name, userptr_t data, size_t len ) {
  err_alloc_image:
 	return NULL;
 }
-
-/**
- * Find argument within image command line
- *
- * @v image		Image
- * @v key		Argument search key (including trailing delimiter)
- * @ret value		Argument value, or NULL if not found
- */
-const char * image_argument ( struct image *image, const char *key ) {
-	const char *cmdline = image->cmdline;
-	const char *search;
-	const char *match;
-	const char *next;
-
-	/* Find argument */
-	for ( search = cmdline ; search ; search = next ) {
-
-		/* Find next occurrence, if any */
-		match = strstr ( search, key );
-		if ( ! match )
-			break;
-		next = ( match + strlen ( key ) );
-
-		/* Check preceding delimiter, if any */
-		if ( ( match == cmdline ) || isspace ( match[-1] ) )
-			return next;
-	}
-
-	return NULL;
-}

src/drivers/bus/eisa.c

@@ -98,16 +98,8 @@ static void eisa_remove ( struct eisa_device *eisa ) {
 static int eisabus_probe ( struct root_device *rootdev ) {
 	struct eisa_device *eisa = NULL;
 	unsigned int slot;
-	uint8_t system;
 	int rc;
 
-	/* Check for EISA system board */
-	system = inb ( EISA_VENDOR_ID );
-	if ( system & 0x80 ) {
-		DBG ( "No EISA system board (read %02x)\n", system );
-		return -ENODEV;
-	}
-
 	for ( slot = EISA_MIN_SLOT ; slot <= EISA_MAX_SLOT ; slot++ ) {
 		/* Allocate struct eisa_device */
 		if ( ! eisa )

src/drivers/bus/pci.c

@@ -205,7 +205,6 @@ int pci_read_config ( struct pci_device *pci ) {
 	pci_read_config_dword ( pci, PCI_REVISION, &tmp );
 	pci->class = ( tmp >> 8 );
 	pci_read_config_byte ( pci, PCI_INTERRUPT_LINE, &pci->irq );
-	pci_read_config_byte ( pci, PCI_HEADER_TYPE, &pci->hdrtype );
 	pci_read_bases ( pci );
 
 	/* Initialise generic device component */

src/drivers/net/realtek.c

@@ -1067,15 +1067,11 @@ static void realtek_detect ( struct realtek_nic *rtl ) {
 	 * Note that enabling DAC seems to cause bizarre behaviour
 	 * (lockups, garbage data on the wire) on some systems, even
 	 * if only 32-bit addresses are used.
-	 *
-	 * Disable VLAN offload, since some cards seem to have it
-	 * enabled by default.
 	 */
 	cpcr = readw ( rtl->regs + RTL_CPCR );
 	cpcr |= ( RTL_CPCR_MULRW | RTL_CPCR_CPRX | RTL_CPCR_CPTX );
 	if ( sizeof ( physaddr_t ) > sizeof ( uint32_t ) )
 		cpcr |= RTL_CPCR_DAC;
-	cpcr &= ~RTL_CPCR_VLAN;
 	writew ( cpcr, rtl->regs + RTL_CPCR );
 	check_cpcr = readw ( rtl->regs + RTL_CPCR );
 

src/drivers/net/realtek.h

@@ -228,9 +228,8 @@ enum realtek_legacy_status {
 
 /** C+ Command Register (word) */
 #define RTL_CPCR 0xe0
-#define RTL_CPCR_VLAN		0x0040	/**< VLAN tag stripping enable */
-#define RTL_CPCR_DAC		0x0010	/**< PCI Dual Address Cycle enable */
-#define RTL_CPCR_MULRW		0x0008	/**< PCI Multiple Read/Write enable */
+#define RTL_CPCR_DAC		0x0010	/**< PCI Dual Address Cycle Enable */
+#define RTL_CPCR_MULRW		0x0008	/**< PCI Multiple Read/Write Enable */
 #define RTL_CPCR_CPRX		0x0002	/**< C+ receive enable */
 #define RTL_CPCR_CPTX		0x0001	/**< C+ transmit enable */
 

src/include/compiler.h

@@ -755,53 +755,6 @@ char __debug_disable(OBJECT) = ( DBGLVL_MAX & ~DBGLVL_DFLT );
 #define FILE_LICENCE_BSD2 \
 	PROVIDE_SYMBOL ( PREFIX_OBJECT ( __licence__bsd2__ ) )
 
-/** Declare a file as being under the two-clause BSD plus patent licence
- *
- * This licence declaration is applicable when a file states itself to
- * be licensed under terms allowing redistribution in source and
- * binary forms (with or without modification) provided that:
- *
- *     redistributions of source code retain the copyright notice,
- *     list of conditions and any attached disclaimers
- *
- *     redistributions in binary form reproduce the copyright notice,
- *     list of conditions and any attached disclaimers in the
- *     documentation and/or other materials provided with the
- *     distribution
- *
- * and in addition states that
- *
- *     Subject to the terms and conditions of this license, each
- *     copyright holder and contributor hereby grants to those
- *     receiving rights under this license a perpetual, worldwide,
- *     non-exclusive, no-charge, royalty-free, irrevocable (except for
- *     failure to satisfy the conditions of this license) patent
- *     license to make, have made, use, offer to sell, sell, import,
- *     and otherwise transfer this software, where such license
- *     applies only to those patent claims, already acquired or
- *     hereafter acquired, licensable by such copyright holder or
- *     contributor that are necessarily infringed by:
- *
- *       their Contribution(s) (the licensed copyrights of copyright
- *       holders and non-copyrightable additions of contributors, in
- *       source or binary form) alone; or
- *
- *       combination of their Contribution(s) with the work of
- *       authorship to which such Contribution(s) was added by such
- *       copyright holder or contributor, if, at the time the
- *       Contribution is added, such addition causes such combination
- *       to be necessarily infringed. The patent license shall not
- *       apply to any other combinations which include the
- *       Contribution.
- *
- * It is not necessary for the file to explicitly state that it is
- * under a "BSD" licence; only that the licensing terms be
- * functionally equivalent to the standard two-clause BSD licence with
- * patent grant.
- */
-#define FILE_LICENCE_BSD2_PATENT \
-	PROVIDE_SYMBOL ( PREFIX_OBJECT ( __licence__bsd2_patent__ ) )
-
 /** Declare a file as being under the one-clause MIT-style licence
  *
  * This licence declaration is applicable when a file states itself to

src/include/errno.h

@@ -262,10 +262,10 @@ static inline void eplatform_discard ( int dummy __unused, ... ) {}
 		  ".balign 8\n\t"					\
 		  "\n1:\n\t"						\
 		  ".long ( 4f - 1b )\n\t"				\
-		  ".long %" ASM_NO_PREFIX "0\n\t"			\
+		  ".long %c0\n\t"					\
 		  ".long ( 2f - 1b )\n\t"				\
 		  ".long ( 3f - 1b )\n\t"				\
-		  ".long %" ASM_NO_PREFIX "1\n\t"			\
+		  ".long %c1\n\t"					\
 		  "\n2:\t.asciz \"" __einfo_desc ( einfo ) "\"\n\t"	\
 		  "\n3:\t.asciz \"" __FILE__ "\"\n\t"			\
 		  ".balign 8\n\t"					\

src/include/ipxe/dhcp.h

@@ -274,9 +274,8 @@ struct dhcp_client_architecture {
 
 /** DHCP client architecture values
  *
- * These are originally defined by the PXE specification, redefined by
- * RFC4578, redefined again by RFC5970, and now maintained in the IANA
- * DHCPv6 parameters registry.
+ * These are defined by the PXE specification and redefined by
+ * RFC4578.
  */
 enum dhcp_client_architecture_values {
 	/** Intel x86 PC */
@@ -303,24 +302,6 @@ enum dhcp_client_architecture_values {
 	DHCP_CLIENT_ARCHITECTURE_ARM32 = 0x000a,
 	/** EFI 64-bit ARM */
 	DHCP_CLIENT_ARCHITECTURE_ARM64 = 0x000b,
-	/** EFI 32-bit RISC-V */
-	DHCP_CLIENT_ARCHITECTURE_RISCV32 = 0x0019,
-	/** EFI 64-bit RISC-V */
-	DHCP_CLIENT_ARCHITECTURE_RISCV64 = 0x001b,
-	/** EFI 128-bit RISC-V */
-	DHCP_CLIENT_ARCHITECTURE_RISCV128 = 0x001d,
-	/** EFI 32-bit MIPS */
-	DHCP_CLIENT_ARCHITECTURE_MIPS32 = 0x0021,
-	/** EFI 64-bit MIPS */
-	DHCP_CLIENT_ARCHITECTURE_MIPS64 = 0x0022,
-	/** EFI 32-bit Sunway */
-	DHCP_CLIENT_ARCHITECTURE_SUNWAY32 = 0x0023,
-	/** EFI 64-bit Sunway */
-	DHCP_CLIENT_ARCHITECTURE_SUNWAY64 = 0x0024,
-	/** EFI 32-bit LoongArch */
-	DHCP_CLIENT_ARCHITECTURE_LOONG32 = 0x0025,
-	/** EFI 64-bit LoongArch */
-	DHCP_CLIENT_ARCHITECTURE_LOONG64 = 0x0027,
 };
 
 /** Client network device interface */

src/include/ipxe/efi/AArch64/ProcessorBind.h

@@ -1,18 +1,24 @@
 /** @file
   Processor or Compiler specific defines and types for AArch64.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
   Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __PROCESSOR_BIND_H__
 #define __PROCESSOR_BIND_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// Define the processor type so other code can make processor based choices
@@ -22,102 +28,53 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Make sure we are using the correct packing rules per EFI specification
 //
-#if !defined (__GNUC__) && !defined (__ASSEMBLER__)
-  #pragma pack()
+#ifndef __GNUC__
+#pragma pack()
 #endif
 
-#if defined (_MSC_EXTENSIONS)
-
-//
-// Disable some level 4 compilation warnings (same as IA32 and X64)
-//
-
-//
-// Disabling bitfield type checking warnings.
-//
-  #pragma warning ( disable : 4214 )
-
-//
-// Disabling the unreferenced formal parameter warnings.
-//
-  #pragma warning ( disable : 4100 )
-
-//
-// Disable slightly different base types warning as CHAR8 * can not be set
-// to a constant string.
-//
-  #pragma warning ( disable : 4057 )
-
-//
-// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
-//
-  #pragma warning ( disable : 4127 )
-
-//
-// This warning is caused by functions defined but not used. For precompiled header only.
-//
-  #pragma warning ( disable : 4505 )
-
-//
-// This warning is caused by empty (after preprocessing) source file. For precompiled header only.
-//
-  #pragma warning ( disable : 4206 )
-
-//
-// Disable 'potentially uninitialized local variable X used' warnings
-//
-  #pragma warning ( disable : 4701 )
-
-//
-// Disable 'potentially uninitialized local pointer variable X used' warnings
-//
-  #pragma warning ( disable : 4703 )
-
-//
-// use Microsoft* C compiler dependent integer width types
-//
-typedef unsigned __int64  UINT64;
-typedef __int64           INT64;
-typedef unsigned __int32  UINT32;
-typedef __int32           INT32;
-typedef unsigned short    UINT16;
-typedef unsigned short    CHAR16;
-typedef short             INT16;
-typedef unsigned char     BOOLEAN;
-typedef unsigned char     UINT8;
-typedef char              CHAR8;
-typedef signed char       INT8;
-
+#if _MSC_EXTENSIONS
+  //
+  // use Microsoft* C compiler dependent integer width types
+  //
+  typedef unsigned __int64    UINT64;
+  typedef __int64             INT64;
+  typedef unsigned __int32    UINT32;
+  typedef __int32             INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
 #else
-
-//
-// Assume standard AARCH64 alignment.
-//
-typedef unsigned long long  UINT64;
-typedef long long           INT64;
-typedef unsigned int        UINT32;
-typedef int                 INT32;
-typedef unsigned short      UINT16;
-typedef unsigned short      CHAR16;
-typedef short               INT16;
-typedef unsigned char       BOOLEAN;
-typedef unsigned char       UINT8;
-typedef char                CHAR8;
-typedef signed char         INT8;
-
+  //
+  // Assume standard AARCH64 alignment.
+  //
+  typedef unsigned long long  UINT64;
+  typedef long long           INT64;
+  typedef unsigned int        UINT32;
+  typedef int                 INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
 #endif
 
 ///
 /// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,
 /// 8 bytes on supported 64-bit processor instructions)
 ///
-typedef UINT64 UINTN;
+typedef UINT64  UINTN;
 
 ///
 /// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
 /// 8 bytes on supported 64-bit processor instructions)
 ///
-typedef INT64 INTN;
+typedef INT64   INTN;
 
 //
 // Processor specific defines
@@ -126,7 +83,7 @@ typedef INT64 INTN;
 ///
 /// A value of native width with the highest bit set.
 ///
-#define MAX_BIT  0x8000000000000000ULL
+#define MAX_BIT     0x8000000000000000ULL
 
 ///
 /// A value of native width with the two highest bits set.
@@ -136,12 +93,7 @@ typedef INT64 INTN;
 ///
 /// Maximum legal AARCH64  address
 ///
-#define MAX_ADDRESS  0xFFFFFFFFFFFFFFFFULL
-
-///
-/// Maximum usable address at boot time (48 bits using 4 KB pages)
-///
-#define MAX_ALLOC_ADDRESS  0xFFFFFFFFFFFFULL
+#define MAX_ADDRESS   0xFFFFFFFFFFFFFFFFULL
 
 ///
 /// Maximum legal AArch64 INTN and UINTN values.
@@ -149,11 +101,6 @@ typedef INT64 INTN;
 #define MAX_INTN   ((INTN)0x7FFFFFFFFFFFFFFFULL)
 #define MAX_UINTN  ((UINTN)0xFFFFFFFFFFFFFFFFULL)
 
-///
-/// Minimum legal AArch64 INTN value.
-///
-#define MIN_INTN  (((INTN)-9223372036854775807LL) - 1)
-
 ///
 /// The stack alignment required for AARCH64
 ///
@@ -162,8 +109,8 @@ typedef INT64 INTN;
 ///
 /// Page allocation granularity for AARCH64
 ///
-#define DEFAULT_PAGE_ALLOCATION_GRANULARITY  (0x1000)
-#define RUNTIME_PAGE_ALLOCATION_GRANULARITY  (0x10000)
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x10000)
 
 //
 // Modifier to ensure that all protocol member functions and EFI intrinsics
@@ -174,18 +121,18 @@ typedef INT64 INTN;
 
 // When compiling with Clang, we still use GNU as for the assembler, so we still
 // need to define the GCC_ASM* macros.
-#if defined (__GNUC__) || defined (__clang__)
-///
-/// For GNU assembly code, .global or .globl can declare global symbols.
-/// Define this macro to unify the usage.
-///
-#define ASM_GLOBAL  .globl
+#if defined(__GNUC__) || defined(__clang__)
+  ///
+  /// For GNU assembly code, .global or .globl can declare global symbols.
+  /// Define this macro to unify the usage.
+  ///
+  #define ASM_GLOBAL .globl
 
-#define GCC_ASM_EXPORT(func__)  \
+  #define GCC_ASM_EXPORT(func__)  \
          .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\
          .type ASM_PFX(func__), %function
 
-#define GCC_ASM_IMPORT(func__)  \
+  #define GCC_ASM_IMPORT(func__)  \
          .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)
 
 #endif
@@ -200,7 +147,7 @@ typedef INT64 INTN;
   @return The pointer to the first instruction of a function given a function pointer.
 
 **/
-#define FUNCTION_ENTRY_POINT(FunctionPointer)  (VOID *)(UINTN)(FunctionPointer)
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)
 
 #ifndef __USER_LABEL_PREFIX__
 #define __USER_LABEL_PREFIX__

src/include/ipxe/efi/Arm/ProcessorBind.h

@@ -1,16 +1,22 @@
 /** @file
   Processor or Compiler specific defines and types for ARM.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __PROCESSOR_BIND_H__
 #define __PROCESSOR_BIND_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// Define the processor type so other code can make processor based choices
@@ -20,110 +26,61 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Make sure we are using the correct packing rules per EFI specification
 //
-#if !defined (__GNUC__) && !defined (__ASSEMBLER__)
-  #pragma pack()
-#endif
-
-#if defined (_MSC_EXTENSIONS)
-
-//
-// Disable some level 4 compilation warnings (same as IA32 and X64)
-//
-
-//
-// Disabling bitfield type checking warnings.
-//
-  #pragma warning ( disable : 4214 )
-
-//
-// Disabling the unreferenced formal parameter warnings.
-//
-  #pragma warning ( disable : 4100 )
-
-//
-// Disable slightly different base types warning as CHAR8 * can not be set
-// to a constant string.
-//
-  #pragma warning ( disable : 4057 )
-
-//
-// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
-//
-  #pragma warning ( disable : 4127 )
-
-//
-// This warning is caused by functions defined but not used. For precompiled header only.
-//
-  #pragma warning ( disable : 4505 )
-
-//
-// This warning is caused by empty (after preprocessing) source file. For precompiled header only.
-//
-  #pragma warning ( disable : 4206 )
-
-//
-// Disable 'potentially uninitialized local variable X used' warnings
-//
-  #pragma warning ( disable : 4701 )
-
-//
-// Disable 'potentially uninitialized local pointer variable X used' warnings
-//
-  #pragma warning ( disable : 4703 )
-
+#ifndef __GNUC__
+#pragma pack()
 #endif
 
 //
-// MSFT doesn't support the __builtin_unreachable() macro
+// RVCT does not support the __builtin_unreachable() macro
 //
-#if defined (_MSC_EXTENSIONS)
+#ifdef __ARMCC_VERSION
 #define UNREACHABLE()
 #endif
 
-#if defined (_MSC_EXTENSIONS)
-//
-// use Microsoft* C compiler dependent integer width types
-//
-typedef unsigned __int64  UINT64;
-typedef __int64           INT64;
-typedef unsigned __int32  UINT32;
-typedef __int32           INT32;
-typedef unsigned short    UINT16;
-typedef unsigned short    CHAR16;
-typedef short             INT16;
-typedef unsigned char     BOOLEAN;
-typedef unsigned char     UINT8;
-typedef char              CHAR8;
-typedef signed char       INT8;
+#if _MSC_EXTENSIONS
+  //
+  // use Microsoft* C compiler dependent integer width types
+  //
+  typedef unsigned __int64    UINT64;
+  typedef __int64             INT64;
+  typedef unsigned __int32    UINT32;
+  typedef __int32             INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
 #else
-//
-// Assume standard ARM alignment.
-// Need to check portability of long long
-//
-typedef unsigned long long  UINT64;
-typedef long long           INT64;
-typedef unsigned int        UINT32;
-typedef int                 INT32;
-typedef unsigned short      UINT16;
-typedef unsigned short      CHAR16;
-typedef short               INT16;
-typedef unsigned char       BOOLEAN;
-typedef unsigned char       UINT8;
-typedef char                CHAR8;
-typedef signed char         INT8;
+  //
+  // Assume standard ARM alignment.
+  // Need to check portability of long long
+  //
+  typedef unsigned long long  UINT64;
+  typedef long long           INT64;
+  typedef unsigned int        UINT32;
+  typedef int                 INT32;
+  typedef unsigned short      UINT16;
+  typedef unsigned short      CHAR16;
+  typedef short               INT16;
+  typedef unsigned char       BOOLEAN;
+  typedef unsigned char       UINT8;
+  typedef char                CHAR8;
+  typedef signed char         INT8;
 #endif
 
 ///
 /// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,
 /// 8 bytes on supported 64-bit processor instructions)
 ///
-typedef UINT32 UINTN;
+typedef UINT32  UINTN;
 
 ///
 /// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
 /// 8 bytes on supported 64-bit processor instructions)
 ///
-typedef INT32 INTN;
+typedef INT32   INTN;
 
 //
 // Processor specific defines
@@ -132,34 +89,24 @@ typedef INT32 INTN;
 ///
 /// A value of native width with the highest bit set.
 ///
-#define MAX_BIT  0x80000000
+#define MAX_BIT      0x80000000
 
 ///
 /// A value of native width with the two highest bits set.
 ///
-#define MAX_2_BITS  0xC0000000
+#define MAX_2_BITS   0xC0000000
 
 ///
 /// Maximum legal ARM address
 ///
 #define MAX_ADDRESS  0xFFFFFFFF
 
-///
-/// Maximum usable address at boot time
-///
-#define MAX_ALLOC_ADDRESS  MAX_ADDRESS
-
 ///
 /// Maximum legal ARM INTN and UINTN values.
 ///
 #define MAX_INTN   ((INTN)0x7FFFFFFF)
 #define MAX_UINTN  ((UINTN)0xFFFFFFFF)
 
-///
-/// Minimum legal ARM INTN value.
-///
-#define MIN_INTN  (((INTN)-2147483647) - 1)
-
 ///
 /// The stack alignment required for ARM
 ///
@@ -168,8 +115,8 @@ typedef INT32 INTN;
 ///
 /// Page allocation granularity for ARM
 ///
-#define DEFAULT_PAGE_ALLOCATION_GRANULARITY  (0x1000)
-#define RUNTIME_PAGE_ALLOCATION_GRANULARITY  (0x1000)
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x1000)
 
 //
 // Modifier to ensure that all protocol member functions and EFI intrinsics
@@ -180,45 +127,40 @@ typedef INT32 INTN;
 
 // When compiling with Clang, we still use GNU as for the assembler, so we still
 // need to define the GCC_ASM* macros.
-#if defined (__GNUC__) || defined (__clang__)
-///
-/// For GNU assembly code, .global or .globl can declare global symbols.
-/// Define this macro to unify the usage.
-///
-#define ASM_GLOBAL  .globl
+#if defined(__GNUC__) || defined(__clang__)
+  ///
+  /// For GNU assembly code, .global or .globl can declare global symbols.
+  /// Define this macro to unify the usage.
+  ///
+  #define ASM_GLOBAL .globl
 
-  #if !defined (__APPLE__)
-///
-/// ARM EABI defines that the linker should not manipulate call relocations
-/// (do bl/blx conversion) unless the target symbol has function type.
-/// CodeSourcery 2010.09 started requiring the .type to function properly
-///
-#define INTERWORK_FUNC(func__)  .type ASM_PFX(func__), %function
+  #if !defined(__APPLE__)
+    ///
+    /// ARM EABI defines that the linker should not manipulate call relocations
+    /// (do bl/blx conversion) unless the target symbol has function type.
+    /// CodeSourcery 2010.09 started requiring the .type to function properly
+    ///
+    #define INTERWORK_FUNC(func__)   .type ASM_PFX(func__), %function
 
-#define GCC_ASM_EXPORT(func__)  \
+    #define GCC_ASM_EXPORT(func__)  \
              .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\
              .type ASM_PFX(func__), %function
 
-#define GCC_ASM_IMPORT(func__)  \
+    #define GCC_ASM_IMPORT(func__)  \
              .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)
 
   #else
-//
-// .type not supported by Apple Xcode tools
-//
-#define INTERWORK_FUNC(func__)
+    //
+    // .type not supported by Apple Xcode tools
+    //
+    #define INTERWORK_FUNC(func__)
 
-#define GCC_ASM_EXPORT(func__)  \
+    #define GCC_ASM_EXPORT(func__)  \
              .globl  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    \
 
-#define GCC_ASM_IMPORT(name)
+    #define GCC_ASM_IMPORT(name)
 
   #endif
-#elif defined (_MSC_EXTENSIONS)
-//
-// PRESERVE8 is not supported by the MSFT assembler.
-//
-#define PRESERVE8
 #endif
 
 /**
@@ -231,10 +173,12 @@ typedef INT32 INTN;
   @return The pointer to the first instruction of a function given a function pointer.
 
 **/
-#define FUNCTION_ENTRY_POINT(FunctionPointer)  (VOID *)(UINTN)(FunctionPointer)
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)
 
 #ifndef __USER_LABEL_PREFIX__
 #define __USER_LABEL_PREFIX__
 #endif
 
 #endif
+
+

src/include/ipxe/efi/Guid/Acpi.h

@@ -5,8 +5,14 @@
   ACPI 2.0 specification defines the ACPI 2.0 GUID. UEFI 2.0 defines the
   ACPI 2.0 Table GUID and ACPI Table GUID.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUIDs defined in UEFI 2.0 spec.
@@ -16,7 +22,7 @@
 #ifndef __ACPI_GUID_H__
 #define __ACPI_GUID_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define ACPI_TABLE_GUID \
   { \
@@ -28,15 +34,15 @@ FILE_LICENCE ( BSD2_PATENT );
     0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \
   }
 
-#define ACPI_10_TABLE_GUID  ACPI_TABLE_GUID
+#define ACPI_10_TABLE_GUID     ACPI_TABLE_GUID
 
 //
 // ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.
 //
-#define EFI_ACPI_20_TABLE_GUID  EFI_ACPI_TABLE_GUID
+#define EFI_ACPI_20_TABLE_GUID EFI_ACPI_TABLE_GUID
 
-extern EFI_GUID  gEfiAcpiTableGuid;
-extern EFI_GUID  gEfiAcpi10TableGuid;
-extern EFI_GUID  gEfiAcpi20TableGuid;
+extern EFI_GUID gEfiAcpiTableGuid;
+extern EFI_GUID gEfiAcpi10TableGuid;
+extern EFI_GUID gEfiAcpi20TableGuid;
 
 #endif

src/include/ipxe/efi/Guid/FileInfo.h

@@ -3,15 +3,21 @@
   and EFI_FILE_PROTOCOL.GetInfo() to set or get generic file information.
   This GUID is defined in UEFI specification.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __FILE_INFO_H__
 #define __FILE_INFO_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define EFI_FILE_INFO_ID \
   { \
@@ -22,35 +28,35 @@ typedef struct {
   ///
   /// The size of the EFI_FILE_INFO structure, including the Null-terminated FileName string.
   ///
-  UINT64      Size;
+  UINT64    Size;
   ///
   /// The size of the file in bytes.
   ///
-  UINT64      FileSize;
+  UINT64    FileSize;
   ///
   /// PhysicalSize The amount of physical space the file consumes on the file system volume.
   ///
-  UINT64      PhysicalSize;
+  UINT64    PhysicalSize;
   ///
   /// The time the file was created.
   ///
-  EFI_TIME    CreateTime;
+  EFI_TIME  CreateTime;
   ///
   /// The time when the file was last accessed.
   ///
-  EFI_TIME    LastAccessTime;
+  EFI_TIME  LastAccessTime;
   ///
   /// The time when the file's contents were last modified.
   ///
-  EFI_TIME    ModificationTime;
+  EFI_TIME  ModificationTime;
   ///
   /// The attribute bits for the file.
   ///
-  UINT64      Attribute;
+  UINT64    Attribute;
   ///
   /// The Null-terminated name of the file.
   ///
-  CHAR16      FileName[1];
+  CHAR16    FileName[1];
 } EFI_FILE_INFO;
 
 ///
@@ -60,8 +66,8 @@ typedef struct {
 /// computes this size correctly no matter how big the FileName array is declared.
 /// This is required to make the EFI_FILE_INFO data structure ANSI compilant.
 ///
-#define SIZE_OF_EFI_FILE_INFO  OFFSET_OF (EFI_FILE_INFO, FileName)
+#define SIZE_OF_EFI_FILE_INFO OFFSET_OF (EFI_FILE_INFO, FileName)
 
-extern EFI_GUID  gEfiFileInfoGuid;
+extern EFI_GUID gEfiFileInfoGuid;
 
 #endif

src/include/ipxe/efi/Guid/FileSystemInfo.h

@@ -3,15 +3,21 @@
   or EFI_FILE_PROTOCOL.SetInfo() to get or set information about the system's volume.
   This GUID is defined in UEFI specification.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __FILE_SYSTEM_INFO_H__
 #define __FILE_SYSTEM_INFO_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define EFI_FILE_SYSTEM_INFO_ID \
   { \
@@ -22,27 +28,27 @@ typedef struct {
   ///
   /// The size of the EFI_FILE_SYSTEM_INFO structure, including the Null-terminated VolumeLabel string.
   ///
-  UINT64     Size;
+  UINT64  Size;
   ///
   /// TRUE if the volume only supports read access.
   ///
-  BOOLEAN    ReadOnly;
+  BOOLEAN ReadOnly;
   ///
   /// The number of bytes managed by the file system.
   ///
-  UINT64     VolumeSize;
+  UINT64  VolumeSize;
   ///
   /// The number of available bytes for use by the file system.
   ///
-  UINT64     FreeSpace;
+  UINT64  FreeSpace;
   ///
   /// The nominal block size by which files are typically grown.
   ///
-  UINT32     BlockSize;
+  UINT32  BlockSize;
   ///
   /// The Null-terminated string that is the volume's label.
   ///
-  CHAR16     VolumeLabel[1];
+  CHAR16  VolumeLabel[1];
 } EFI_FILE_SYSTEM_INFO;
 
 ///
@@ -54,6 +60,6 @@ typedef struct {
 ///
 #define SIZE_OF_EFI_FILE_SYSTEM_INFO  OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)
 
-extern EFI_GUID  gEfiFileSystemInfoGuid;
+extern EFI_GUID gEfiFileSystemInfoGuid;
 
 #endif

src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h

@@ -1,8 +1,14 @@
 /** @file
   Guid used to identify HII FormMap configuration method.
 
-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUID defined in UEFI 2.2 spec.
@@ -11,11 +17,11 @@
 #ifndef __EFI_HII_FORMMAP_GUID_H__
 #define __EFI_HII_FORMMAP_GUID_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define EFI_HII_STANDARD_FORM_GUID \
   { 0x3bd2f4ec, 0xe524, 0x46e4, { 0xa9, 0xd8, 0x51, 0x1, 0x17, 0x42, 0x55, 0x62 } }
 
-extern EFI_GUID  gEfiHiiStandardFormGuid;
+extern EFI_GUID gEfiHiiStandardFormGuid;
 
 #endif

src/include/ipxe/efi/Guid/HiiPlatformSetupFormset.h

@@ -2,8 +2,14 @@
   GUID indicates that the form set contains forms designed to be used
   for platform configuration and this form set will be displayed.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUID defined in UEFI 2.1.
@@ -13,7 +19,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __HII_PLATFORM_SETUP_FORMSET_GUID_H__
 #define __HII_PLATFORM_SETUP_FORMSET_GUID_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define EFI_HII_PLATFORM_SETUP_FORMSET_GUID \
   { 0x93039971, 0x8545, 0x4b04, { 0xb4, 0x5e, 0x32, 0xeb, 0x83, 0x26, 0x4, 0xe } }
@@ -24,12 +30,8 @@ FILE_LICENCE ( BSD2_PATENT );
 #define EFI_HII_USER_CREDENTIAL_FORMSET_GUID \
   { 0x337f4407, 0x5aee, 0x4b83, { 0xb2, 0xa7, 0x4e, 0xad, 0xca, 0x30, 0x88, 0xcd } }
 
-#define EFI_HII_REST_STYLE_FORMSET_GUID \
-  { 0x790217bd, 0xbecf, 0x485b, { 0x91, 0x70, 0x5f, 0xf7, 0x11, 0x31, 0x8b, 0x27 } }
-
-extern EFI_GUID  gEfiHiiPlatformSetupFormsetGuid;
-extern EFI_GUID  gEfiHiiDriverHealthFormsetGuid;
-extern EFI_GUID  gEfiHiiUserCredentialFormsetGuid;
-extern EFI_GUID  gEfiHiiRestStyleFormsetGuid;
+extern EFI_GUID gEfiHiiPlatformSetupFormsetGuid;
+extern EFI_GUID gEfiHiiDriverHealthFormsetGuid;
+extern EFI_GUID gEfiHiiUserCredentialFormsetGuid;
 
 #endif

src/include/ipxe/efi/Guid/MdeModuleHii.h

@@ -1,19 +1,25 @@
 /** @file
   EDKII extented HII IFR guid opcodes.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __MDEMODULE_HII_H__
 #define __MDEMODULE_HII_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
-#define NARROW_CHAR        0xFFF0
-#define WIDE_CHAR          0xFFF1
-#define NON_BREAKING_CHAR  0xFFF2
+#define NARROW_CHAR         0xFFF0
+#define WIDE_CHAR           0xFFF1
+#define NON_BREAKING_CHAR   0xFFF2
 
 ///
 /// State defined for password statemachine .
@@ -32,91 +38,91 @@ FILE_LICENCE ( BSD2_PATENT );
 ///
 /// EDKII implementation extension opcodes, new extension can be added here later.
 ///
-#define EFI_IFR_EXTEND_OP_LABEL     0x0
-#define EFI_IFR_EXTEND_OP_BANNER    0x1
-#define EFI_IFR_EXTEND_OP_TIMEOUT   0x2
-#define EFI_IFR_EXTEND_OP_CLASS     0x3
-#define EFI_IFR_EXTEND_OP_SUBCLASS  0x4
+#define EFI_IFR_EXTEND_OP_LABEL       0x0
+#define EFI_IFR_EXTEND_OP_BANNER      0x1
+#define EFI_IFR_EXTEND_OP_TIMEOUT     0x2
+#define EFI_IFR_EXTEND_OP_CLASS       0x3
+#define EFI_IFR_EXTEND_OP_SUBCLASS    0x4
 
 ///
 /// Label opcode.
 ///
 typedef struct _EFI_IFR_GUID_LABEL {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_TIANO_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_LABEL.
   ///
-  UINT8                ExtendOpCode;
+  UINT8               ExtendOpCode;
   ///
   /// Label Number.
   ///
-  UINT16               Number;
+  UINT16              Number;
 } EFI_IFR_GUID_LABEL;
 
-#define EFI_IFR_BANNER_ALIGN_LEFT    0
-#define EFI_IFR_BANNER_ALIGN_CENTER  1
-#define EFI_IFR_BANNER_ALIGN_RIGHT   2
+#define EFI_IFR_BANNER_ALIGN_LEFT     0
+#define EFI_IFR_BANNER_ALIGN_CENTER   1
+#define EFI_IFR_BANNER_ALIGN_RIGHT    2
 
 ///
 /// Banner opcode.
 ///
 typedef struct _EFI_IFR_GUID_BANNER {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_TIANO_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_BANNER
   ///
-  UINT8                ExtendOpCode;
-  EFI_STRING_ID        Title;       ///< The string token for the banner title.
-  UINT16               LineNumber;  ///< 1-based line number.
-  UINT8                Alignment;   ///< left, center, or right-aligned.
+  UINT8               ExtendOpCode;
+  EFI_STRING_ID       Title;        ///< The string token for the banner title.
+  UINT16              LineNumber;   ///< 1-based line number.
+  UINT8               Alignment;    ///< left, center, or right-aligned.
 } EFI_IFR_GUID_BANNER;
 
 ///
 /// Timeout opcode.
 ///
 typedef struct _EFI_IFR_GUID_TIMEOUT {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_TIANO_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_TIMEOUT.
   ///
-  UINT8                ExtendOpCode;
-  UINT16               TimeOut;      ///< TimeOut Value.
+  UINT8               ExtendOpCode;
+  UINT16              TimeOut;       ///< TimeOut Value.
 } EFI_IFR_GUID_TIMEOUT;
 
-#define EFI_NON_DEVICE_CLASS       0x00
-#define EFI_DISK_DEVICE_CLASS      0x01
-#define EFI_VIDEO_DEVICE_CLASS     0x02
-#define EFI_NETWORK_DEVICE_CLASS   0x04
-#define EFI_INPUT_DEVICE_CLASS     0x08
-#define EFI_ON_BOARD_DEVICE_CLASS  0x10
-#define EFI_OTHER_DEVICE_CLASS     0x20
+#define EFI_NON_DEVICE_CLASS              0x00
+#define EFI_DISK_DEVICE_CLASS             0x01
+#define EFI_VIDEO_DEVICE_CLASS            0x02
+#define EFI_NETWORK_DEVICE_CLASS          0x04
+#define EFI_INPUT_DEVICE_CLASS            0x08
+#define EFI_ON_BOARD_DEVICE_CLASS         0x10
+#define EFI_OTHER_DEVICE_CLASS            0x20
 
 ///
 /// Device Class opcode.
 ///
 typedef struct _EFI_IFR_GUID_CLASS {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_TIANO_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_CLASS.
   ///
-  UINT8                ExtendOpCode;
-  UINT16               Class;          ///< Device Class from the above.
+  UINT8               ExtendOpCode;
+  UINT16              Class;           ///< Device Class from the above.
 } EFI_IFR_GUID_CLASS;
 
 #define EFI_SETUP_APPLICATION_SUBCLASS    0x00
@@ -128,16 +134,16 @@ typedef struct _EFI_IFR_GUID_CLASS {
 /// SubClass opcode
 ///
 typedef struct _EFI_IFR_GUID_SUBCLASS {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_TIANO_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_SUBCLASS.
   ///
-  UINT8                ExtendOpCode;
-  UINT16               SubClass;     ///< Sub Class type from the above.
+  UINT8               ExtendOpCode;
+  UINT16              SubClass;      ///< Sub Class type from the above.
 } EFI_IFR_GUID_SUBCLASS;
 
 ///
@@ -151,83 +157,66 @@ typedef struct _EFI_IFR_GUID_SUBCLASS {
 /// One is for framework OneOf question Option Key value;
 /// another is for framework vareqval.
 ///
-#define EFI_IFR_EXTEND_OP_OPTIONKEY  0x0
-#define EFI_IFR_EXTEND_OP_VAREQNAME  0x1
+#define EFI_IFR_EXTEND_OP_OPTIONKEY   0x0
+#define EFI_IFR_EXTEND_OP_VAREQNAME   0x1
 
 ///
 /// Store the framework vfr option key value.
 ///
 typedef struct _EFI_IFR_GUID_OPTIONKEY {
-  EFI_IFR_OP_HEADER     Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_FRAMEWORK_GUID.
   ///
-  EFI_GUID              Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_OPTIONKEY.
   ///
-  UINT8                 ExtendOpCode;
+  UINT8               ExtendOpCode;
   ///
   /// OneOf Questiond ID binded by OneOf Option.
   ///
-  EFI_QUESTION_ID       QuestionId;
+  EFI_QUESTION_ID     QuestionId;
   ///
   /// The OneOf Option Value.
   ///
-  EFI_IFR_TYPE_VALUE    OptionValue;
+  EFI_IFR_TYPE_VALUE  OptionValue;
   ///
   /// The Framework OneOf Option Key Value.
   ///
-  UINT16                KeyValue;
+  UINT16              KeyValue;
 } EFI_IFR_GUID_OPTIONKEY;
 
 ///
 /// Store the framework vfr vareqval name number.
 ///
 typedef struct _EFI_IFR_GUID_VAREQNAME {
-  EFI_IFR_OP_HEADER    Header;
+  EFI_IFR_OP_HEADER   Header;
   ///
   /// EFI_IFR_FRAMEWORK_GUID.
   ///
-  EFI_GUID             Guid;
+  EFI_GUID            Guid;
   ///
   /// EFI_IFR_EXTEND_OP_VAREQNAME.
   ///
-  UINT8                ExtendOpCode;
+  UINT8               ExtendOpCode;
   ///
   /// Question ID of the Numeric Opcode created.
   ///
-  EFI_QUESTION_ID      QuestionId;
+  EFI_QUESTION_ID     QuestionId;
   ///
   /// For vareqval (0x100), NameId is 0x100.
   /// This value will convert to a Unicode String following this rule;
   ///            sprintf(StringBuffer, "%d", NameId) .
   /// The the Unicode String will be used as a EFI Variable Name.
   ///
-  UINT16               NameId;
+  UINT16              NameId;
 } EFI_IFR_GUID_VAREQNAME;
 
-///
-/// EDKII implementation extension GUID, used to indaicate there are bit fields in the varstore.
-///
-#define EDKII_IFR_BIT_VARSTORE_GUID \
-  {0x82DDD68B, 0x9163, 0x4187, {0x9B, 0x27, 0x20, 0xA8, 0xFD, 0x60,0xA7, 0x1D}}
-
-///
-/// EDKII implementation extension flags, used to indaicate the disply style and bit width for bit filed storage.
-/// Two high bits for display style and the low six bits for bit width.
-///
-#define EDKII_IFR_DISPLAY_BIT           0xC0
-#define EDKII_IFR_DISPLAY_INT_DEC_BIT   0x00
-#define EDKII_IFR_DISPLAY_UINT_DEC_BIT  0x40
-#define EDKII_IFR_DISPLAY_UINT_HEX_BIT  0x80
-
-#define EDKII_IFR_NUMERIC_SIZE_BIT  0x3F
-
 #pragma pack()
 
-extern EFI_GUID  gEfiIfrTianoGuid;
-extern EFI_GUID  gEfiIfrFrameworkGuid;
-extern EFI_GUID  gEdkiiIfrBitVarstoreGuid;
+extern EFI_GUID gEfiIfrTianoGuid;
+extern EFI_GUID gEfiIfrFrameworkGuid;
 
 #endif
+

src/include/ipxe/efi/Guid/PcAnsi.h

@@ -1,8 +1,14 @@
 /** @file
   Terminal Device Path Vendor Guid.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUIDs defined in UEFI 2.0 spec.
@@ -12,7 +18,7 @@
 #ifndef __PC_ANSI_H__
 #define __PC_ANSI_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define EFI_PC_ANSI_GUID \
   { \
@@ -44,11 +50,11 @@ FILE_LICENCE ( BSD2_PATENT );
     0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \
   }
 
-extern EFI_GUID  gEfiPcAnsiGuid;
-extern EFI_GUID  gEfiVT100Guid;
-extern EFI_GUID  gEfiVT100PlusGuid;
-extern EFI_GUID  gEfiVTUTF8Guid;
-extern EFI_GUID  gEfiUartDevicePathGuid;
-extern EFI_GUID  gEfiSasDevicePathGuid;
+extern EFI_GUID gEfiPcAnsiGuid;
+extern EFI_GUID gEfiVT100Guid;
+extern EFI_GUID gEfiVT100PlusGuid;
+extern EFI_GUID gEfiVTUTF8Guid;
+extern EFI_GUID gEfiUartDevicePathGuid;
+extern EFI_GUID gEfiSasDevicePathGuid;
 
 #endif

src/include/ipxe/efi/Guid/SmBios.h

@@ -5,8 +5,14 @@
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS
   tables.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUIDs defined in UEFI 2.5 spec.
@@ -16,7 +22,7 @@
 #ifndef __SMBIOS_GUID_H__
 #define __SMBIOS_GUID_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #define SMBIOS_TABLE_GUID \
   { \
@@ -28,7 +34,7 @@ FILE_LICENCE ( BSD2_PATENT );
     0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94 } \
   }
 
-extern EFI_GUID  gEfiSmbiosTableGuid;
-extern EFI_GUID  gEfiSmbios3TableGuid;
+extern EFI_GUID       gEfiSmbiosTableGuid;
+extern EFI_GUID       gEfiSmbios3TableGuid;
 
 #endif

src/include/ipxe/efi/Guid/WinCertificate.h

@@ -2,7 +2,13 @@
   GUID for UEFI WIN_CERTIFICATE structure.
 
   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   GUID defined in UEFI 2.0 spec.
@@ -11,14 +17,14 @@
 #ifndef __EFI_WIN_CERTIFICATE_H__
 #define __EFI_WIN_CERTIFICATE_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 //
 // _WIN_CERTIFICATE.wCertificateType
 //
-#define WIN_CERT_TYPE_PKCS_SIGNED_DATA  0x0002
-#define WIN_CERT_TYPE_EFI_PKCS115       0x0EF0
-#define WIN_CERT_TYPE_EFI_GUID          0x0EF1
+#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002
+#define WIN_CERT_TYPE_EFI_PKCS115      0x0EF0
+#define WIN_CERT_TYPE_EFI_GUID         0x0EF1
 
 ///
 /// The WIN_CERTIFICATE structure is part of the PE/COFF specification.
@@ -28,18 +34,18 @@ typedef struct {
   /// The length of the entire certificate,
   /// including the length of the header, in bytes.
   ///
-  UINT32    dwLength;
+  UINT32  dwLength;
   ///
   /// The revision level of the WIN_CERTIFICATE
   /// structure. The current revision level is 0x0200.
   ///
-  UINT16    wRevision;
+  UINT16  wRevision;
   ///
   /// The certificate type. See WIN_CERT_TYPE_xxx for the UEFI
   /// certificate types. The UEFI specification reserves the range of
   /// certificate type values from 0x0EF0 to 0x0EFF.
   ///
-  UINT16    wCertificateType;
+  UINT16  wCertificateType;
   ///
   /// The following is the actual certificate. The format of
   /// the certificate depends on wCertificateType.
@@ -58,11 +64,12 @@ typedef struct {
 /// WIN_CERTIFICATE_UEFI_GUID.CertData
 ///
 typedef struct {
-  EFI_GUID    HashType;
-  UINT8       PublicKey[256];
-  UINT8       Signature[256];
+  EFI_GUID  HashType;
+  UINT8     PublicKey[256];
+  UINT8     Signature[256];
 } EFI_CERT_BLOCK_RSA_2048_SHA256;
 
+
 ///
 /// Certificate which encapsulates a GUID-specific digital signature
 ///
@@ -71,21 +78,22 @@ typedef struct {
   /// This is the standard WIN_CERTIFICATE header, where
   /// wCertificateType is set to WIN_CERT_TYPE_EFI_GUID.
   ///
-  WIN_CERTIFICATE    Hdr;
+  WIN_CERTIFICATE   Hdr;
   ///
   /// This is the unique id which determines the
   /// format of the CertData. .
   ///
-  EFI_GUID           CertType;
+  EFI_GUID          CertType;
   ///
   /// The following is the certificate data. The format of
   /// the data is determined by the CertType.
   /// If CertType is EFI_CERT_TYPE_RSA2048_SHA256_GUID,
   /// the CertData will be EFI_CERT_BLOCK_RSA_2048_SHA256 structure.
   ///
-  UINT8              CertData[1];
+  UINT8            CertData[1];
 } WIN_CERTIFICATE_UEFI_GUID;
 
+
 ///
 /// Certificate which encapsulates the RSASSA_PKCS1-v1_5 digital signature.
 ///
@@ -99,12 +107,12 @@ typedef struct {
   /// This is the standard WIN_CERTIFICATE header, where
   /// wCertificateType is set to WIN_CERT_TYPE_UEFI_PKCS1_15.
   ///
-  WIN_CERTIFICATE    Hdr;
+  WIN_CERTIFICATE Hdr;
   ///
   /// This is the hashing algorithm which was performed on the
   /// UEFI executable when creating the digital signature.
   ///
-  EFI_GUID           HashAlgorithm;
+  EFI_GUID        HashAlgorithm;
   ///
   /// The following is the actual digital signature. The
   /// size of the signature is the same size as the key
@@ -117,6 +125,6 @@ typedef struct {
   ///
 } WIN_CERTIFICATE_EFI_PKCS1_15;
 
-extern EFI_GUID  gEfiCertTypeRsa2048Sha256Guid;
+extern EFI_GUID gEfiCertTypeRsa2048Sha256Guid;
 
 #endif

src/include/ipxe/efi/Ia32/ProcessorBind.h

@@ -1,15 +1,21 @@
 /** @file
   Processor or Compiler specific defines and types for IA-32 architecture.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __PROCESSOR_BIND_H__
 #define __PROCESSOR_BIND_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// Define the processor type so other code can make processor based choices.
@@ -19,38 +25,39 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Make sure we are using the correct packing rules per EFI specification
 //
-#if !defined (__GNUC__)
-  #pragma pack()
+#if !defined(__GNUC__)
+#pragma pack()
 #endif
 
-#if defined (__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
 //
 // Disable ICC's remark #869: "Parameter" was never referenced warning.
 // This is legal ANSI C code so we disable the remark that is turned on with -Wall
 //
-  #pragma warning ( disable : 869 )
+#pragma warning ( disable : 869 )
 
 //
 // Disable ICC's remark #1418: external function definition with no prior declaration.
 // This is legal ANSI C code so we disable the remark that is turned on with /W4
 //
-  #pragma warning ( disable : 1418 )
+#pragma warning ( disable : 1418 )
 
 //
 // Disable ICC's remark #1419: external declaration in primary source file
 // This is legal ANSI C code so we disable the remark that is turned on with /W4
 //
-  #pragma warning ( disable : 1419 )
+#pragma warning ( disable : 1419 )
 
 //
 // Disable ICC's remark #593: "Variable" was set but never used.
 // This is legal ANSI C code so we disable the remark that is turned on with /W4
 //
-  #pragma warning ( disable : 593 )
+#pragma warning ( disable : 593 )
 
 #endif
 
-#if defined (_MSC_EXTENSIONS)
+
+#if defined(_MSC_EXTENSIONS)
 
 //
 // Disable warning that make it impossible to compile at /W4
@@ -60,35 +67,35 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Disabling bitfield type checking warnings.
 //
-  #pragma warning ( disable : 4214 )
+#pragma warning ( disable : 4214 )
 
 //
 // Disabling the unreferenced formal parameter warnings.
 //
-  #pragma warning ( disable : 4100 )
+#pragma warning ( disable : 4100 )
 
 //
 // Disable slightly different base types warning as CHAR8 * can not be set
 // to a constant string.
 //
-  #pragma warning ( disable : 4057 )
+#pragma warning ( disable : 4057 )
 
 //
 // ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
 //
-  #pragma warning ( disable : 4127 )
+#pragma warning ( disable : 4127 )
 
 //
 // This warning is caused by functions defined but not used. For precompiled header only.
 //
-  #pragma warning ( disable : 4505 )
+#pragma warning ( disable : 4505 )
 
 //
 // This warning is caused by empty (after preprocessing) source file. For precompiled header only.
 //
-  #pragma warning ( disable : 4206 )
+#pragma warning ( disable : 4206 )
 
-  #if defined (_MSC_VER) && _MSC_VER >= 1800
+#if _MSC_VER == 1800 || _MSC_VER == 1900
 
 //
 // Disable these warnings for VS2013.
@@ -98,129 +105,130 @@ FILE_LICENCE ( BSD2_PATENT );
 // This warning is for potentially uninitialized local variable, and it may cause false
 // positive issues in VS2013 and VS2015 build
 //
-    #pragma warning ( disable : 4701 )
+#pragma warning ( disable : 4701 )
 
 //
 // This warning is for potentially uninitialized local pointer variable, and it may cause
 // false positive issues in VS2013 and VS2015 build
 //
-    #pragma warning ( disable : 4703 )
-
-  #endif
+#pragma warning ( disable : 4703 )
 
 #endif
 
-#if defined (_MSC_EXTENSIONS)
+#endif
 
-//
-// use Microsoft C compiler dependent integer width types
-//
 
-///
-/// 8-byte unsigned value.
-///
-typedef unsigned __int64 UINT64;
-///
-/// 8-byte signed value.
-///
-typedef __int64 INT64;
-///
-/// 4-byte unsigned value.
-///
-typedef unsigned __int32 UINT32;
-///
-/// 4-byte signed value.
-///
-typedef __int32 INT32;
-///
-/// 2-byte unsigned value.
-///
-typedef unsigned short UINT16;
-///
-/// 2-byte Character.  Unless otherwise specified all strings are stored in the
-/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
-///
-typedef unsigned short CHAR16;
-///
-/// 2-byte signed value.
-///
-typedef short INT16;
-///
-/// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-/// values are undefined.
-///
-typedef unsigned char BOOLEAN;
-///
-/// 1-byte unsigned value.
-///
-typedef unsigned char UINT8;
-///
-/// 1-byte Character.
-///
-typedef char CHAR8;
-///
-/// 1-byte signed value.
-///
-typedef signed char INT8;
+#if defined(_MSC_EXTENSIONS)
+
+  //
+  // use Microsoft C compiler dependent integer width types
+  //
+
+  ///
+  /// 8-byte unsigned value.
+  ///
+  typedef unsigned __int64    UINT64;
+  ///
+  /// 8-byte signed value.
+  ///
+  typedef __int64             INT64;
+  ///
+  /// 4-byte unsigned value.
+  ///
+  typedef unsigned __int32    UINT32;
+  ///
+  /// 4-byte signed value.
+  ///
+  typedef __int32             INT32;
+  ///
+  /// 2-byte unsigned value.
+  ///
+  typedef unsigned short      UINT16;
+  ///
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
+  ///
+  typedef unsigned short      CHAR16;
+  ///
+  /// 2-byte signed value.
+  ///
+  typedef short               INT16;
+  ///
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
+  /// values are undefined.
+  ///
+  typedef unsigned char       BOOLEAN;
+  ///
+  /// 1-byte unsigned value.
+  ///
+  typedef unsigned char       UINT8;
+  ///
+  /// 1-byte Character.
+  ///
+  typedef char                CHAR8;
+  ///
+  /// 1-byte signed value.
+  ///
+  typedef signed char         INT8;
 #else
-///
-/// 8-byte unsigned value.
-///
-typedef unsigned long long UINT64;
-///
-/// 8-byte signed value.
-///
-typedef long long INT64;
-///
-/// 4-byte unsigned value.
-///
-typedef unsigned int UINT32;
-///
-/// 4-byte signed value.
-///
-typedef int INT32;
-///
-/// 2-byte unsigned value.
-///
-typedef unsigned short UINT16;
-///
-/// 2-byte Character.  Unless otherwise specified all strings are stored in the
-/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
-///
-typedef unsigned short CHAR16;
-///
-/// 2-byte signed value.
-///
-typedef short INT16;
-///
-/// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
-/// values are undefined.
-///
-typedef unsigned char BOOLEAN;
-///
-/// 1-byte unsigned value.
-///
-typedef unsigned char UINT8;
-///
-/// 1-byte Character
-///
-typedef char CHAR8;
-///
-/// 1-byte signed value
-///
-typedef signed char INT8;
+  ///
+  /// 8-byte unsigned value.
+  ///
+  typedef unsigned long long  UINT64;
+  ///
+  /// 8-byte signed value.
+  ///
+  typedef long long           INT64;
+  ///
+  /// 4-byte unsigned value.
+  ///
+  typedef unsigned int        UINT32;
+  ///
+  /// 4-byte signed value.
+  ///
+  typedef int                 INT32;
+  ///
+  /// 2-byte unsigned value.
+  ///
+  typedef unsigned short      UINT16;
+  ///
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
+  ///
+  typedef unsigned short      CHAR16;
+  ///
+  /// 2-byte signed value.
+  ///
+  typedef short               INT16;
+  ///
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other
+  /// values are undefined.
+  ///
+  typedef unsigned char       BOOLEAN;
+  ///
+  /// 1-byte unsigned value.
+  ///
+  typedef unsigned char       UINT8;
+  ///
+  /// 1-byte Character
+  ///
+  typedef char                CHAR8;
+  ///
+  /// 1-byte signed value
+  ///
+  typedef signed char         INT8;
 #endif
 
 ///
 /// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions;
 /// 8 bytes on supported 64-bit processor instructions.)
 ///
-typedef UINT32 UINTN;
+typedef UINT32  UINTN;
 ///
 /// Signed value of native width.  (4 bytes on supported 32-bit processor instructions;
 /// 8 bytes on supported 64-bit processor instructions.)
 ///
-typedef INT32 INTN;
+typedef INT32   INTN;
 
 //
 // Processor specific defines
@@ -229,7 +237,7 @@ typedef INT32 INTN;
 ///
 /// A value of native width with the highest bit set.
 ///
-#define MAX_BIT  0x80000000
+#define MAX_BIT     0x80000000
 ///
 /// A value of native width with the two highest bits set.
 ///
@@ -238,12 +246,7 @@ typedef INT32 INTN;
 ///
 /// Maximum legal IA-32 address.
 ///
-#define MAX_ADDRESS  0xFFFFFFFF
-
-///
-/// Maximum usable address at boot time
-///
-#define MAX_ALLOC_ADDRESS  MAX_ADDRESS
+#define MAX_ADDRESS   0xFFFFFFFF
 
 ///
 /// Maximum legal IA-32 INTN and UINTN values.
@@ -251,21 +254,16 @@ typedef INT32 INTN;
 #define MAX_INTN   ((INTN)0x7FFFFFFF)
 #define MAX_UINTN  ((UINTN)0xFFFFFFFF)
 
-///
-/// Minimum legal IA-32 INTN value.
-///
-#define MIN_INTN  (((INTN)-2147483647) - 1)
-
 ///
 /// The stack alignment required for IA-32.
 ///
-#define CPU_STACK_ALIGNMENT  sizeof(UINTN)
+#define CPU_STACK_ALIGNMENT   sizeof(UINTN)
 
 ///
 /// Page allocation granularity for IA-32.
 ///
-#define DEFAULT_PAGE_ALLOCATION_GRANULARITY  (0x1000)
-#define RUNTIME_PAGE_ALLOCATION_GRANULARITY  (0x1000)
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x1000)
 
 //
 // Modifier to ensure that all protocol member functions and EFI intrinsics
@@ -273,33 +271,33 @@ typedef INT32 INTN;
 // EFI intrinsics are required to modify their member functions with EFIAPI.
 //
 #ifdef EFIAPI
-///
-/// If EFIAPI is already defined, then we use that definition.
-///
-#elif defined (_MSC_EXTENSIONS)
-///
-/// Microsoft* compiler specific method for EFIAPI calling convention.
-///
-#define EFIAPI  __cdecl
-#elif defined (__GNUC__) || defined (__clang__)
-///
-/// GCC specific method for EFIAPI calling convention.
-///
-#define EFIAPI  __attribute__((cdecl))
+  ///
+  /// If EFIAPI is already defined, then we use that definition.
+  ///
+#elif defined(_MSC_EXTENSIONS)
+  ///
+  /// Microsoft* compiler specific method for EFIAPI calling convention.
+  ///
+  #define EFIAPI __cdecl
+#elif defined(__GNUC__)
+  ///
+  /// GCC specific method for EFIAPI calling convention.
+  ///
+  #define EFIAPI __attribute__((cdecl))
 #else
-///
-/// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI
-/// is the standard.
-///
-#define EFIAPI
+  ///
+  /// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI
+  /// is the standard.
+  ///
+  #define EFIAPI
 #endif
 
-#if defined (__GNUC__) || defined (__clang__)
-///
-/// For GNU assembly code, .global or .globl can declare global symbols.
-/// Define this macro to unify the usage.
-///
-#define ASM_GLOBAL  .globl
+#if defined(__GNUC__)
+  ///
+  /// For GNU assembly code, .global or .globl can declare global symbols.
+  /// Define this macro to unify the usage.
+  ///
+  #define ASM_GLOBAL .globl
 #endif
 
 /**
@@ -312,10 +310,11 @@ typedef INT32 INTN;
   @return The pointer to the first instruction of a function given a function pointer.
 
 **/
-#define FUNCTION_ENTRY_POINT(FunctionPointer)  (VOID *)(UINTN)(FunctionPointer)
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)
 
 #ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__  _
+#define __USER_LABEL_PREFIX__ _
 #endif
 
 #endif
+

src/include/ipxe/efi/IndustryStandard/Acpi10.h

@@ -1,15 +1,20 @@
 /** @file
   ACPI 1.0b definitions from the ACPI Specification, revision 1.0b
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 #ifndef _ACPI_1_0_H_
 #define _ACPI_1_0_H_
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #include <ipxe/efi/IndustryStandard/AcpiAml.h>
 
@@ -18,8 +23,8 @@ FILE_LICENCE ( BSD2_PATENT );
 /// excluding the RSD PTR structure.
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
+  UINT32  Signature;
+  UINT32  Length;
 } EFI_ACPI_COMMON_HEADER;
 
 #pragma pack(1)
@@ -27,84 +32,84 @@ typedef struct {
 /// The common ACPI description table header.  This structure prefaces most ACPI tables.
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
-  UINT8     Revision;
-  UINT8     Checksum;
-  UINT8     OemId[6];
-  UINT64    OemTableId;
-  UINT32    OemRevision;
-  UINT32    CreatorId;
-  UINT32    CreatorRevision;
+  UINT32  Signature;
+  UINT32  Length;
+  UINT8   Revision;
+  UINT8   Checksum;
+  UINT8   OemId[6];
+  UINT64  OemTableId;
+  UINT32  OemRevision;
+  UINT32  CreatorId;
+  UINT32  CreatorRevision;
 } EFI_ACPI_DESCRIPTION_HEADER;
 #pragma pack()
 
 //
-// Define for Descriptor
+// Define for Desriptor
 //
-#define ACPI_SMALL_ITEM_FLAG  0x00
-#define ACPI_LARGE_ITEM_FLAG  0x01
+#define ACPI_SMALL_ITEM_FLAG                   0x00
+#define ACPI_LARGE_ITEM_FLAG                   0x01
 
 //
 // Small Item Descriptor Name
 //
-#define ACPI_SMALL_IRQ_DESCRIPTOR_NAME              0x04
-#define ACPI_SMALL_DMA_DESCRIPTOR_NAME              0x05
-#define ACPI_SMALL_START_DEPENDENT_DESCRIPTOR_NAME  0x06
-#define ACPI_SMALL_END_DEPENDENT_DESCRIPTOR_NAME    0x07
-#define ACPI_SMALL_IO_PORT_DESCRIPTOR_NAME          0x08
-#define ACPI_SMALL_FIXED_IO_PORT_DESCRIPTOR_NAME    0x09
-#define ACPI_SMALL_VENDOR_DEFINED_DESCRIPTOR_NAME   0x0E
-#define ACPI_SMALL_END_TAG_DESCRIPTOR_NAME          0x0F
+#define ACPI_SMALL_IRQ_DESCRIPTOR_NAME                       0x04
+#define ACPI_SMALL_DMA_DESCRIPTOR_NAME                       0x05
+#define ACPI_SMALL_START_DEPENDENT_DESCRIPTOR_NAME           0x06
+#define ACPI_SMALL_END_DEPENDENT_DESCRIPTOR_NAME             0x07
+#define ACPI_SMALL_IO_PORT_DESCRIPTOR_NAME                   0x08
+#define ACPI_SMALL_FIXED_IO_PORT_DESCRIPTOR_NAME             0x09
+#define ACPI_SMALL_VENDOR_DEFINED_DESCRIPTOR_NAME            0x0E
+#define ACPI_SMALL_END_TAG_DESCRIPTOR_NAME                   0x0F
 
 //
 // Large Item Descriptor Name
 //
-#define ACPI_LARGE_24_BIT_MEMORY_RANGE_DESCRIPTOR_NAME        0x01
-#define ACPI_LARGE_VENDOR_DEFINED_DESCRIPTOR_NAME             0x04
-#define ACPI_LARGE_32_BIT_MEMORY_RANGE_DESCRIPTOR_NAME        0x05
-#define ACPI_LARGE_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR_NAME  0x06
-#define ACPI_LARGE_DWORD_ADDRESS_SPACE_DESCRIPTOR_NAME        0x07
-#define ACPI_LARGE_WORD_ADDRESS_SPACE_DESCRIPTOR_NAME         0x08
-#define ACPI_LARGE_EXTENDED_IRQ_DESCRIPTOR_NAME               0x09
-#define ACPI_LARGE_QWORD_ADDRESS_SPACE_DESCRIPTOR_NAME        0x0A
+#define ACPI_LARGE_24_BIT_MEMORY_RANGE_DESCRIPTOR_NAME       0x01
+#define ACPI_LARGE_VENDOR_DEFINED_DESCRIPTOR_NAME            0x04
+#define ACPI_LARGE_32_BIT_MEMORY_RANGE_DESCRIPTOR_NAME       0x05
+#define ACPI_LARGE_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR_NAME 0x06
+#define ACPI_LARGE_DWORD_ADDRESS_SPACE_DESCRIPTOR_NAME       0x07
+#define ACPI_LARGE_WORD_ADDRESS_SPACE_DESCRIPTOR_NAME        0x08
+#define ACPI_LARGE_EXTENDED_IRQ_DESCRIPTOR_NAME              0x09
+#define ACPI_LARGE_QWORD_ADDRESS_SPACE_DESCRIPTOR_NAME       0x0A
 
 //
 // Small Item Descriptor Value
 //
-#define ACPI_IRQ_NOFLAG_DESCRIPTOR              0x22
-#define ACPI_IRQ_DESCRIPTOR                     0x23
-#define ACPI_DMA_DESCRIPTOR                     0x2A
-#define ACPI_START_DEPENDENT_DESCRIPTOR         0x30
-#define ACPI_START_DEPENDENT_EX_DESCRIPTOR      0x31
-#define ACPI_END_DEPENDENT_DESCRIPTOR           0x38
-#define ACPI_IO_PORT_DESCRIPTOR                 0x47
-#define ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR  0x4B
-#define ACPI_END_TAG_DESCRIPTOR                 0x79
+#define ACPI_IRQ_NOFLAG_DESCRIPTOR                0x22
+#define ACPI_IRQ_DESCRIPTOR                       0x23
+#define ACPI_DMA_DESCRIPTOR                       0x2A
+#define ACPI_START_DEPENDENT_DESCRIPTOR           0x30
+#define ACPI_START_DEPENDENT_EX_DESCRIPTOR        0x31
+#define ACPI_END_DEPENDENT_DESCRIPTOR             0x38
+#define ACPI_IO_PORT_DESCRIPTOR                   0x47
+#define ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR    0x4B
+#define ACPI_END_TAG_DESCRIPTOR                   0x79
 
 //
 // Large Item Descriptor Value
 //
-#define ACPI_24_BIT_MEMORY_RANGE_DESCRIPTOR        0x81
-#define ACPI_32_BIT_MEMORY_RANGE_DESCRIPTOR        0x85
-#define ACPI_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR  0x86
-#define ACPI_DWORD_ADDRESS_SPACE_DESCRIPTOR        0x87
-#define ACPI_WORD_ADDRESS_SPACE_DESCRIPTOR         0x88
-#define ACPI_EXTENDED_INTERRUPT_DESCRIPTOR         0x89
-#define ACPI_QWORD_ADDRESS_SPACE_DESCRIPTOR        0x8A
-#define ACPI_ADDRESS_SPACE_DESCRIPTOR              0x8A
+#define ACPI_24_BIT_MEMORY_RANGE_DESCRIPTOR       0x81
+#define ACPI_32_BIT_MEMORY_RANGE_DESCRIPTOR       0x85
+#define ACPI_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR 0x86
+#define ACPI_DWORD_ADDRESS_SPACE_DESCRIPTOR       0x87
+#define ACPI_WORD_ADDRESS_SPACE_DESCRIPTOR        0x88
+#define ACPI_EXTENDED_INTERRUPT_DESCRIPTOR        0x89
+#define ACPI_QWORD_ADDRESS_SPACE_DESCRIPTOR       0x8A
+#define ACPI_ADDRESS_SPACE_DESCRIPTOR             0x8A
 
 //
 // Resource Type
 //
-#define ACPI_ADDRESS_SPACE_TYPE_MEM  0x00
-#define ACPI_ADDRESS_SPACE_TYPE_IO   0x01
-#define ACPI_ADDRESS_SPACE_TYPE_BUS  0x02
+#define ACPI_ADDRESS_SPACE_TYPE_MEM   0x00
+#define ACPI_ADDRESS_SPACE_TYPE_IO    0x01
+#define ACPI_ADDRESS_SPACE_TYPE_BUS   0x02
 
 ///
 /// Power Management Timer frequency is fixed at 3.579545MHz.
 ///
-#define ACPI_TIMER_FREQUENCY  3579545
+#define ACPI_TIMER_FREQUENCY       3579545
 
 //
 // Ensure proper structure formats
@@ -112,87 +117,87 @@ typedef struct {
 #pragma pack(1)
 
 ///
-/// The common definition of QWORD, DWORD, and WORD
+/// The commond definition of QWORD, DWORD, and WORD
 /// Address Space Descriptors.
 ///
 typedef PACKED struct {
-  UINT8     Desc;
-  UINT16    Len;
-  UINT8     ResType;
-  UINT8     GenFlag;
-  UINT8     SpecificFlag;
-  UINT64    AddrSpaceGranularity;
-  UINT64    AddrRangeMin;
-  UINT64    AddrRangeMax;
-  UINT64    AddrTranslationOffset;
-  UINT64    AddrLen;
+  UINT8   Desc;
+  UINT16  Len;
+  UINT8   ResType;
+  UINT8   GenFlag;
+  UINT8   SpecificFlag;
+  UINT64  AddrSpaceGranularity;
+  UINT64  AddrRangeMin;
+  UINT64  AddrRangeMax;
+  UINT64  AddrTranslationOffset;
+  UINT64  AddrLen;
 } EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR;
 
 typedef PACKED union {
-  UINT8    Byte;
+  UINT8     Byte;
   PACKED struct {
-    UINT8    Length : 3;
-    UINT8    Name   : 4;
-    UINT8    Type   : 1;
+    UINT8 Length : 3;
+    UINT8 Name : 4;
+    UINT8 Type : 1;
   } Bits;
 } ACPI_SMALL_RESOURCE_HEADER;
 
 typedef PACKED struct {
   PACKED union {
-    UINT8    Byte;
+    UINT8 Byte;
     PACKED struct {
-      UINT8    Name : 7;
-      UINT8    Type : 1;
-    } Bits;
+      UINT8 Name : 7;
+      UINT8 Type : 1;
+    }Bits;
   } Header;
-  UINT16    Length;
+  UINT16 Length;
 } ACPI_LARGE_RESOURCE_HEADER;
 
 ///
 /// IRQ Descriptor.
 ///
 typedef PACKED struct {
-  ACPI_SMALL_RESOURCE_HEADER    Header;
-  UINT16                        Mask;
+  ACPI_SMALL_RESOURCE_HEADER   Header;
+  UINT16                       Mask;
 } EFI_ACPI_IRQ_NOFLAG_DESCRIPTOR;
 
 ///
 /// IRQ Descriptor.
 ///
 typedef PACKED struct {
-  ACPI_SMALL_RESOURCE_HEADER    Header;
-  UINT16                        Mask;
-  UINT8                         Information;
+  ACPI_SMALL_RESOURCE_HEADER   Header;
+  UINT16                       Mask;
+  UINT8                        Information;
 } EFI_ACPI_IRQ_DESCRIPTOR;
 
 ///
 /// DMA Descriptor.
 ///
 typedef PACKED struct {
-  ACPI_SMALL_RESOURCE_HEADER    Header;
-  UINT8                         ChannelMask;
-  UINT8                         Information;
+  ACPI_SMALL_RESOURCE_HEADER   Header;
+  UINT8                        ChannelMask;
+  UINT8                        Information;
 } EFI_ACPI_DMA_DESCRIPTOR;
 
 ///
 /// I/O Port Descriptor
 ///
 typedef PACKED struct {
-  ACPI_SMALL_RESOURCE_HEADER    Header;
-  UINT8                         Information;
-  UINT16                        BaseAddressMin;
-  UINT16                        BaseAddressMax;
-  UINT8                         Alignment;
-  UINT8                         Length;
+  ACPI_SMALL_RESOURCE_HEADER   Header;
+  UINT8                        Information;
+  UINT16                       BaseAddressMin;
+  UINT16                       BaseAddressMax;
+  UINT8                        Alignment;
+  UINT8                        Length;
 } EFI_ACPI_IO_PORT_DESCRIPTOR;
 
 ///
 /// Fixed Location I/O Port Descriptor.
 ///
 typedef PACKED struct {
-  ACPI_SMALL_RESOURCE_HEADER    Header;
-  UINT16                        BaseAddress;
-  UINT8                         Length;
+  ACPI_SMALL_RESOURCE_HEADER   Header;
+  UINT16                       BaseAddress;
+  UINT8                        Length;
 } EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR;
 
 ///
@@ -290,17 +295,17 @@ typedef PACKED struct {
 /// The End tag identifies an end of resource data.
 ///
 typedef struct {
-  UINT8    Desc;
-  UINT8    Checksum;
+  UINT8 Desc;
+  UINT8 Checksum;
 } EFI_ACPI_END_TAG_DESCRIPTOR;
 
 //
 // General use definitions
 //
-#define EFI_ACPI_RESERVED_BYTE   0x00
-#define EFI_ACPI_RESERVED_WORD   0x0000
-#define EFI_ACPI_RESERVED_DWORD  0x00000000
-#define EFI_ACPI_RESERVED_QWORD  0x0000000000000000
+#define EFI_ACPI_RESERVED_BYTE  0x00
+#define EFI_ACPI_RESERVED_WORD  0x0000
+#define EFI_ACPI_RESERVED_DWORD 0x00000000
+#define EFI_ACPI_RESERVED_QWORD 0x0000000000000000
 
 //
 // Resource Type Specific Flags
@@ -308,86 +313,76 @@ typedef struct {
 //
 // Bit [0]    : Write Status, _RW
 //
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE  (1 << 0)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY   (0 << 0)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_WRITE                (1 << 0)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_READ_ONLY                 (0 << 0)
 //
 // Bit [2:1]  : Memory Attributes, _MEM
 //
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE              (0 << 1)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                  (1 << 1)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING  (2 << 1)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE     (3 << 1)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE             (0 << 1)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE                 (1 << 1)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_WRITE_COMBINING (2 << 1)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE    (3 << 1)
 //
 // Bit [4:3]  : Memory Attributes, _MTP
 //
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY    (0 << 3)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED  (1 << 3)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI      (2 << 3)
-#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS       (3 << 3)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_MEMORY      (0 << 3)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_RESERVED    (1 << 3)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_ACPI        (2 << 3)
+#define EFI_APCI_MEMORY_RESOURCE_SPECIFIC_FLAG_ADDRESS_RANGE_NVS         (3 << 3)
 //
 // Bit [5]    : Memory to I/O Translation, _TTP
 //
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION  (1 << 5)
-#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC       (0 << 5)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_TRANSLATION          (1 << 5)
+#define EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_TYPE_STATIC               (0 << 5)
 
 //
 // IRQ Information
 // Ref ACPI specification 6.4.2.1
 //
-#define EFI_ACPI_IRQ_SHARABLE_MASK  0x10
-#define   EFI_ACPI_IRQ_SHARABLE     0x10
+#define EFI_ACPI_IRQ_SHARABLE_MASK                      0x10
+#define   EFI_ACPI_IRQ_SHARABLE                         0x10
 
-#define EFI_ACPI_IRQ_POLARITY_MASK  0x08
-#define   EFI_ACPI_IRQ_HIGH_TRUE    0x00
-#define   EFI_ACPI_IRQ_LOW_FALSE    0x08
+#define EFI_ACPI_IRQ_POLARITY_MASK                      0x08
+#define   EFI_ACPI_IRQ_HIGH_TRUE                        0x00
+#define   EFI_ACPI_IRQ_LOW_FALSE                        0x08
 
-#define EFI_ACPI_IRQ_MODE               0x01
-#define   EFI_ACPI_IRQ_LEVEL_TRIGGERED  0x00
-#define   EFI_ACPI_IRQ_EDGE_TRIGGERED   0x01
+#define EFI_ACPI_IRQ_MODE                               0x01
+#define   EFI_ACPI_IRQ_LEVEL_TRIGGERED                  0x00
+#define   EFI_ACPI_IRQ_EDGE_TRIGGERED                   0x01
 
 //
 // DMA Information
 // Ref ACPI specification 6.4.2.2
 //
-#define EFI_ACPI_DMA_SPEED_TYPE_MASK             0x60
-#define   EFI_ACPI_DMA_SPEED_TYPE_COMPATIBILITY  0x00
-#define   EFI_ACPI_DMA_SPEED_TYPE_A              0x20
-#define   EFI_ACPI_DMA_SPEED_TYPE_B              0x40
-#define   EFI_ACPI_DMA_SPEED_TYPE_F              0x60
+#define EFI_ACPI_DMA_SPEED_TYPE_MASK                    0x60
+#define   EFI_ACPI_DMA_SPEED_TYPE_COMPATIBILITY         0x00
+#define   EFI_ACPI_DMA_SPEED_TYPE_A                     0x20
+#define   EFI_ACPI_DMA_SPEED_TYPE_B                     0x40
+#define   EFI_ACPI_DMA_SPEED_TYPE_F                     0x60
 
-#define EFI_ACPI_DMA_BUS_MASTER_MASK  0x04
-#define   EFI_ACPI_DMA_BUS_MASTER     0x04
+#define EFI_ACPI_DMA_BUS_MASTER_MASK                    0x04
+#define   EFI_ACPI_DMA_BUS_MASTER                       0x04
 
-#define EFI_ACPI_DMA_TRANSFER_TYPE_MASK                0x03
-#define   EFI_ACPI_DMA_TRANSFER_TYPE_8_BIT             0x00
-#define   EFI_ACPI_DMA_TRANSFER_TYPE_8_BIT_AND_16_BIT  0x01
-#define   EFI_ACPI_DMA_TRANSFER_TYPE_16_BIT            0x02
+#define EFI_ACPI_DMA_TRANSFER_TYPE_MASK                 0x03
+#define   EFI_ACPI_DMA_TRANSFER_TYPE_8_BIT              0x00
+#define   EFI_ACPI_DMA_TRANSFER_TYPE_8_BIT_AND_16_BIT   0x01
+#define   EFI_ACPI_DMA_TRANSFER_TYPE_16_BIT             0x10
 
 //
 // IO Information
 // Ref ACPI specification 6.4.2.5
 //
-#define EFI_ACPI_IO_DECODE_MASK      0x01
-#define   EFI_ACPI_IO_DECODE_16_BIT  0x01
-#define   EFI_ACPI_IO_DECODE_10_BIT  0x00
+#define EFI_ACPI_IO_DECODE_MASK                         0x01
+#define   EFI_ACPI_IO_DECODE_16_BIT                     0x01
+#define   EFI_ACPI_IO_DECODE_10_BIT                     0x00
 
 //
 // Memory Information
 // Ref ACPI specification 6.4.3.4
 //
-#define EFI_ACPI_MEMORY_WRITE_STATUS_MASK  0x01
-#define   EFI_ACPI_MEMORY_WRITABLE         0x01
-#define   EFI_ACPI_MEMORY_NON_WRITABLE     0x00
-
-//
-// Interrupt Vector Flags definitions for Extended Interrupt Descriptor
-// Ref ACPI specification 6.4.3.6
-//
-#define EFI_ACPI_EXTENDED_INTERRUPT_FLAG_PRODUCER_CONSUMER_MASK  BIT0
-#define EFI_ACPI_EXTENDED_INTERRUPT_FLAG_MODE_MASK               BIT1
-#define EFI_ACPI_EXTENDED_INTERRUPT_FLAG_POLARITY_MASK           BIT2
-#define EFI_ACPI_EXTENDED_INTERRUPT_FLAG_SHARABLE_MASK           BIT3
-#define EFI_ACPI_EXTENDED_INTERRUPT_FLAG_WAKE_CAPABLITY_MASK     BIT4
+#define EFI_ACPI_MEMORY_WRITE_STATUS_MASK               0x01
+#define   EFI_ACPI_MEMORY_WRITABLE                      0x01
+#define   EFI_ACPI_MEMORY_NON_WRITABLE                  0x00
 
 //
 // Ensure proper structure formats
@@ -401,11 +396,11 @@ typedef struct {
 /// Root System Description Pointer Structure.
 ///
 typedef struct {
-  UINT64    Signature;
-  UINT8     Checksum;
-  UINT8     OemId[6];
-  UINT8     Reserved;
-  UINT32    RsdtAddress;
+  UINT64  Signature;
+  UINT8   Checksum;
+  UINT8   OemId[6];
+  UINT8   Reserved;
+  UINT32  RsdtAddress;
 } EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER;
 
 //
@@ -417,52 +412,52 @@ typedef struct {
 ///
 /// RSDT Revision (as defined in ACPI 1.0b specification).
 ///
-#define EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Fixed ACPI Description Table Structure (FADT).
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         FirmwareCtrl;
-  UINT32                         Dsdt;
-  UINT8                          IntModel;
-  UINT8                          Reserved1;
-  UINT16                         SciInt;
-  UINT32                         SmiCmd;
-  UINT8                          AcpiEnable;
-  UINT8                          AcpiDisable;
-  UINT8                          S4BiosReq;
-  UINT8                          Reserved2;
-  UINT32                         Pm1aEvtBlk;
-  UINT32                         Pm1bEvtBlk;
-  UINT32                         Pm1aCntBlk;
-  UINT32                         Pm1bCntBlk;
-  UINT32                         Pm2CntBlk;
-  UINT32                         PmTmrBlk;
-  UINT32                         Gpe0Blk;
-  UINT32                         Gpe1Blk;
-  UINT8                          Pm1EvtLen;
-  UINT8                          Pm1CntLen;
-  UINT8                          Pm2CntLen;
-  UINT8                          PmTmLen;
-  UINT8                          Gpe0BlkLen;
-  UINT8                          Gpe1BlkLen;
-  UINT8                          Gpe1Base;
-  UINT8                          Reserved3;
-  UINT16                         PLvl2Lat;
-  UINT16                         PLvl3Lat;
-  UINT16                         FlushSize;
-  UINT16                         FlushStride;
-  UINT8                          DutyOffset;
-  UINT8                          DutyWidth;
-  UINT8                          DayAlrm;
-  UINT8                          MonAlrm;
-  UINT8                          Century;
-  UINT8                          Reserved4;
-  UINT8                          Reserved5;
-  UINT8                          Reserved6;
-  UINT32                         Flags;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      FirmwareCtrl;
+  UINT32                      Dsdt;
+  UINT8                       IntModel;
+  UINT8                       Reserved1;
+  UINT16                      SciInt;
+  UINT32                      SmiCmd;
+  UINT8                       AcpiEnable;
+  UINT8                       AcpiDisable;
+  UINT8                       S4BiosReq;
+  UINT8                       Reserved2;
+  UINT32                      Pm1aEvtBlk;
+  UINT32                      Pm1bEvtBlk;
+  UINT32                      Pm1aCntBlk;
+  UINT32                      Pm1bCntBlk;
+  UINT32                      Pm2CntBlk;
+  UINT32                      PmTmrBlk;
+  UINT32                      Gpe0Blk;
+  UINT32                      Gpe1Blk;
+  UINT8                       Pm1EvtLen;
+  UINT8                       Pm1CntLen;
+  UINT8                       Pm2CntLen;
+  UINT8                       PmTmLen;
+  UINT8                       Gpe0BlkLen;
+  UINT8                       Gpe1BlkLen;
+  UINT8                       Gpe1Base;
+  UINT8                       Reserved3;
+  UINT16                      PLvl2Lat;
+  UINT16                      PLvl3Lat;
+  UINT16                      FlushSize;
+  UINT16                      FlushStride;
+  UINT8                       DutyOffset;
+  UINT8                       DutyWidth;
+  UINT8                       DayAlrm;
+  UINT8                       MonAlrm;
+  UINT8                       Century;
+  UINT8                       Reserved4;
+  UINT8                       Reserved5;
+  UINT8                       Reserved6;
+  UINT32                      Flags;
 } EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE;
 
 ///
@@ -470,63 +465,63 @@ typedef struct {
 ///
 #define EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION  0x01
 
-#define EFI_ACPI_1_0_INT_MODE_DUAL_PIC       0
-#define EFI_ACPI_1_0_INT_MODE_MULTIPLE_APIC  1
+#define EFI_ACPI_1_0_INT_MODE_DUAL_PIC         0
+#define EFI_ACPI_1_0_INT_MODE_MULTIPLE_APIC    1
 
 //
 // Fixed ACPI Description Table Fixed Feature Flags
 // All other bits are reserved and must be set to 0.
 //
-#define EFI_ACPI_1_0_WBINVD        BIT0
-#define EFI_ACPI_1_0_WBINVD_FLUSH  BIT1
-#define EFI_ACPI_1_0_PROC_C1       BIT2
-#define EFI_ACPI_1_0_P_LVL2_UP     BIT3
-#define EFI_ACPI_1_0_PWR_BUTTON    BIT4
-#define EFI_ACPI_1_0_SLP_BUTTON    BIT5
-#define EFI_ACPI_1_0_FIX_RTC       BIT6
-#define EFI_ACPI_1_0_RTC_S4        BIT7
-#define EFI_ACPI_1_0_TMR_VAL_EXT   BIT8
-#define EFI_ACPI_1_0_DCK_CAP       BIT9
+#define EFI_ACPI_1_0_WBINVD               BIT0
+#define EFI_ACPI_1_0_WBINVD_FLUSH         BIT1
+#define EFI_ACPI_1_0_PROC_C1              BIT2
+#define EFI_ACPI_1_0_P_LVL2_UP            BIT3
+#define EFI_ACPI_1_0_PWR_BUTTON           BIT4
+#define EFI_ACPI_1_0_SLP_BUTTON           BIT5
+#define EFI_ACPI_1_0_FIX_RTC              BIT6
+#define EFI_ACPI_1_0_RTC_S4               BIT7
+#define EFI_ACPI_1_0_TMR_VAL_EXT          BIT8
+#define EFI_ACPI_1_0_DCK_CAP              BIT9
 
 ///
 /// Firmware ACPI Control Structure.
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
-  UINT32    HardwareSignature;
-  UINT32    FirmwareWakingVector;
-  UINT32    GlobalLock;
-  UINT32    Flags;
-  UINT8     Reserved[40];
+  UINT32  Signature;
+  UINT32  Length;
+  UINT32  HardwareSignature;
+  UINT32  FirmwareWakingVector;
+  UINT32  GlobalLock;
+  UINT32  Flags;
+  UINT8   Reserved[40];
 } EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE;
 
 ///
 /// Firmware Control Structure Feature Flags.
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_1_0_S4BIOS_F  BIT0
+#define EFI_ACPI_1_0_S4BIOS_F             BIT0
 
 ///
 /// Multiple APIC Description Table header definition.  The rest of the table
 /// must be defined in a platform-specific manner.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         LocalApicAddress;
-  UINT32                         Flags;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      LocalApicAddress;
+  UINT32                      Flags;
 } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER;
 
 ///
 /// MADT Revision (as defined in ACPI 1.0b specification).
 ///
-#define EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Multiple APIC Flags
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_1_0_PCAT_COMPAT  BIT0
+#define EFI_ACPI_1_0_PCAT_COMPAT           BIT0
 
 //
 // Multiple APIC Description Table APIC structure types
@@ -547,71 +542,71 @@ typedef struct {
 /// Processor Local APIC Structure Definition.
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT8     ApicId;
-  UINT32    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT8   ApicId;
+  UINT32  Flags;
 } EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE;
 
 ///
 /// Local APIC Flags.  All other bits are reserved and must be 0.
 ///
-#define EFI_ACPI_1_0_LOCAL_APIC_ENABLED  BIT0
+#define EFI_ACPI_1_0_LOCAL_APIC_ENABLED      BIT0
 
 ///
 /// IO APIC Structure.
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     IoApicId;
-  UINT8     Reserved;
-  UINT32    IoApicAddress;
-  UINT32    SystemVectorBase;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   IoApicId;
+  UINT8   Reserved;
+  UINT32  IoApicAddress;
+  UINT32  SystemVectorBase;
 } EFI_ACPI_1_0_IO_APIC_STRUCTURE;
 
 ///
 /// Interrupt Source Override Structure.
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     Bus;
-  UINT8     Source;
-  UINT32    GlobalSystemInterruptVector;
-  UINT16    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   Bus;
+  UINT8   Source;
+  UINT32  GlobalSystemInterruptVector;
+  UINT16  Flags;
 } EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE;
 
 ///
 /// Non-Maskable Interrupt Source Structure.
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT32    GlobalSystemInterruptVector;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT32  GlobalSystemInterruptVector;
 } EFI_ACPI_1_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;
 
 ///
 /// Local APIC NMI Structure.
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT16    Flags;
-  UINT8     LocalApicInti;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT16  Flags;
+  UINT8   LocalApicInti;
 } EFI_ACPI_1_0_LOCAL_APIC_NMI_STRUCTURE;
 
 ///
 /// Smart Battery Description Table (SBST)
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         WarningEnergyLevel;
-  UINT32                         LowEnergyLevel;
-  UINT32                         CriticalEnergyLevel;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      WarningEnergyLevel;
+  UINT32                      LowEnergyLevel;
+  UINT32                      CriticalEnergyLevel;
 } EFI_ACPI_1_0_SMART_BATTERY_DESCRIPTION_TABLE;
 
 //

src/include/ipxe/efi/IndustryStandard/Acpi20.h

@@ -1,23 +1,29 @@
 /** @file
   ACPI 2.0 definitions from the ACPI Specification, revision 2.0
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 #ifndef _ACPI_2_0_H_
 #define _ACPI_2_0_H_
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #include <ipxe/efi/IndustryStandard/Acpi10.h>
 
 //
-// Define for Descriptor
+// Define for Desriptor
 //
-#define ACPI_LARGE_GENERIC_REGISTER_DESCRIPTOR_NAME  0x02
+#define ACPI_LARGE_GENERIC_REGISTER_DESCRIPTOR_NAME          0x02
 
-#define ACPI_GENERIC_REGISTER_DESCRIPTOR  0x82
+#define ACPI_GENERIC_REGISTER_DESCRIPTOR          0x82
 
 //
 // Ensure proper structure formats
@@ -47,11 +53,11 @@ typedef PACKED struct {
 /// ACPI 2.0 Generic Address Space definition
 ///
 typedef struct {
-  UINT8     AddressSpaceId;
-  UINT8     RegisterBitWidth;
-  UINT8     RegisterBitOffset;
-  UINT8     Reserved;
-  UINT64    Address;
+  UINT8   AddressSpaceId;
+  UINT8   RegisterBitWidth;
+  UINT8   RegisterBitOffset;
+  UINT8   Reserved;
+  UINT64  Address;
 } EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE;
 
 //
@@ -72,29 +78,29 @@ typedef struct {
 /// Root System Description Pointer Structure
 ///
 typedef struct {
-  UINT64    Signature;
-  UINT8     Checksum;
-  UINT8     OemId[6];
-  UINT8     Revision;
-  UINT32    RsdtAddress;
-  UINT32    Length;
-  UINT64    XsdtAddress;
-  UINT8     ExtendedChecksum;
-  UINT8     Reserved[3];
+  UINT64  Signature;
+  UINT8   Checksum;
+  UINT8   OemId[6];
+  UINT8   Revision;
+  UINT32  RsdtAddress;
+  UINT32  Length;
+  UINT64  XsdtAddress;
+  UINT8   ExtendedChecksum;
+  UINT8   Reserved[3];
 } EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER;
 
 ///
 /// RSD_PTR Revision (as defined in ACPI 2.0 spec.)
 ///
-#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION  0x02
+#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION 0x02
 
 ///
 /// Common table header, this prefaces all ACPI tables, including FACS, but
 /// excluding the RSD PTR structure
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
+  UINT32  Signature;
+  UINT32  Length;
 } EFI_ACPI_2_0_COMMON_HEADER;
 
 //
@@ -106,7 +112,7 @@ typedef struct {
 ///
 /// RSDT Revision (as defined in ACPI 2.0 spec.)
 ///
-#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01
 
 //
 // Extended System Description Table
@@ -117,64 +123,64 @@ typedef struct {
 ///
 /// XSDT Revision (as defined in ACPI 2.0 spec.)
 ///
-#define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Fixed ACPI Description Table Structure (FADT)
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER               Header;
-  UINT32                                    FirmwareCtrl;
-  UINT32                                    Dsdt;
-  UINT8                                     Reserved0;
-  UINT8                                     PreferredPmProfile;
-  UINT16                                    SciInt;
-  UINT32                                    SmiCmd;
-  UINT8                                     AcpiEnable;
-  UINT8                                     AcpiDisable;
-  UINT8                                     S4BiosReq;
-  UINT8                                     PstateCnt;
-  UINT32                                    Pm1aEvtBlk;
-  UINT32                                    Pm1bEvtBlk;
-  UINT32                                    Pm1aCntBlk;
-  UINT32                                    Pm1bCntBlk;
-  UINT32                                    Pm2CntBlk;
-  UINT32                                    PmTmrBlk;
-  UINT32                                    Gpe0Blk;
-  UINT32                                    Gpe1Blk;
-  UINT8                                     Pm1EvtLen;
-  UINT8                                     Pm1CntLen;
-  UINT8                                     Pm2CntLen;
-  UINT8                                     PmTmrLen;
-  UINT8                                     Gpe0BlkLen;
-  UINT8                                     Gpe1BlkLen;
-  UINT8                                     Gpe1Base;
-  UINT8                                     CstCnt;
-  UINT16                                    PLvl2Lat;
-  UINT16                                    PLvl3Lat;
-  UINT16                                    FlushSize;
-  UINT16                                    FlushStride;
-  UINT8                                     DutyOffset;
-  UINT8                                     DutyWidth;
-  UINT8                                     DayAlrm;
-  UINT8                                     MonAlrm;
-  UINT8                                     Century;
-  UINT16                                    IaPcBootArch;
-  UINT8                                     Reserved1;
-  UINT32                                    Flags;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    ResetReg;
-  UINT8                                     ResetValue;
-  UINT8                                     Reserved2[3];
-  UINT64                                    XFirmwareCtrl;
-  UINT64                                    XDsdt;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPm1aEvtBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPm1bEvtBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPm1aCntBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPm1bCntBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPm2CntBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XPmTmrBlk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XGpe0Blk;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    XGpe1Blk;
+  EFI_ACPI_DESCRIPTION_HEADER             Header;
+  UINT32                                  FirmwareCtrl;
+  UINT32                                  Dsdt;
+  UINT8                                   Reserved0;
+  UINT8                                   PreferredPmProfile;
+  UINT16                                  SciInt;
+  UINT32                                  SmiCmd;
+  UINT8                                   AcpiEnable;
+  UINT8                                   AcpiDisable;
+  UINT8                                   S4BiosReq;
+  UINT8                                   PstateCnt;
+  UINT32                                  Pm1aEvtBlk;
+  UINT32                                  Pm1bEvtBlk;
+  UINT32                                  Pm1aCntBlk;
+  UINT32                                  Pm1bCntBlk;
+  UINT32                                  Pm2CntBlk;
+  UINT32                                  PmTmrBlk;
+  UINT32                                  Gpe0Blk;
+  UINT32                                  Gpe1Blk;
+  UINT8                                   Pm1EvtLen;
+  UINT8                                   Pm1CntLen;
+  UINT8                                   Pm2CntLen;
+  UINT8                                   PmTmrLen;
+  UINT8                                   Gpe0BlkLen;
+  UINT8                                   Gpe1BlkLen;
+  UINT8                                   Gpe1Base;
+  UINT8                                   CstCnt;
+  UINT16                                  PLvl2Lat;
+  UINT16                                  PLvl3Lat;
+  UINT16                                  FlushSize;
+  UINT16                                  FlushStride;
+  UINT8                                   DutyOffset;
+  UINT8                                   DutyWidth;
+  UINT8                                   DayAlrm;
+  UINT8                                   MonAlrm;
+  UINT8                                   Century;
+  UINT16                                  IaPcBootArch;
+  UINT8                                   Reserved1;
+  UINT32                                  Flags;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  ResetReg;
+  UINT8                                   ResetValue;
+  UINT8                                   Reserved2[3];
+  UINT64                                  XFirmwareCtrl;
+  UINT64                                  XDsdt;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPm1aEvtBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPm1bEvtBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPm1aCntBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPm1bCntBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPm2CntBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XPmTmrBlk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk;
 } EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE;
 
 ///
@@ -185,53 +191,53 @@ typedef struct {
 //
 // Fixed ACPI Description Table Preferred Power Management Profile
 //
-#define EFI_ACPI_2_0_PM_PROFILE_UNSPECIFIED        0
-#define EFI_ACPI_2_0_PM_PROFILE_DESKTOP            1
-#define EFI_ACPI_2_0_PM_PROFILE_MOBILE             2
-#define EFI_ACPI_2_0_PM_PROFILE_WORKSTATION        3
-#define EFI_ACPI_2_0_PM_PROFILE_ENTERPRISE_SERVER  4
-#define EFI_ACPI_2_0_PM_PROFILE_SOHO_SERVER        5
-#define EFI_ACPI_2_0_PM_PROFILE_APPLIANCE_PC       6
+#define EFI_ACPI_2_0_PM_PROFILE_UNSPECIFIED         0
+#define EFI_ACPI_2_0_PM_PROFILE_DESKTOP             1
+#define EFI_ACPI_2_0_PM_PROFILE_MOBILE              2
+#define EFI_ACPI_2_0_PM_PROFILE_WORKSTATION         3
+#define EFI_ACPI_2_0_PM_PROFILE_ENTERPRISE_SERVER   4
+#define EFI_ACPI_2_0_PM_PROFILE_SOHO_SERVER         5
+#define EFI_ACPI_2_0_PM_PROFILE_APPLIANCE_PC        6
 
 //
 // Fixed ACPI Description Table Boot Architecture Flags
 // All other bits are reserved and must be set to 0.
 //
-#define EFI_ACPI_2_0_LEGACY_DEVICES  BIT0
-#define EFI_ACPI_2_0_8042            BIT1
+#define EFI_ACPI_2_0_LEGACY_DEVICES          BIT0
+#define EFI_ACPI_2_0_8042                    BIT1
 
 //
 // Fixed ACPI Description Table Fixed Feature Flags
 // All other bits are reserved and must be set to 0.
 //
-#define EFI_ACPI_2_0_WBINVD         BIT0
-#define EFI_ACPI_2_0_WBINVD_FLUSH   BIT1
-#define EFI_ACPI_2_0_PROC_C1        BIT2
-#define EFI_ACPI_2_0_P_LVL2_UP      BIT3
-#define EFI_ACPI_2_0_PWR_BUTTON     BIT4
-#define EFI_ACPI_2_0_SLP_BUTTON     BIT5
-#define EFI_ACPI_2_0_FIX_RTC        BIT6
-#define EFI_ACPI_2_0_RTC_S4         BIT7
-#define EFI_ACPI_2_0_TMR_VAL_EXT    BIT8
-#define EFI_ACPI_2_0_DCK_CAP        BIT9
-#define EFI_ACPI_2_0_RESET_REG_SUP  BIT10
-#define EFI_ACPI_2_0_SEALED_CASE    BIT11
-#define EFI_ACPI_2_0_HEADLESS       BIT12
-#define EFI_ACPI_2_0_CPU_SW_SLP     BIT13
+#define EFI_ACPI_2_0_WBINVD                  BIT0
+#define EFI_ACPI_2_0_WBINVD_FLUSH            BIT1
+#define EFI_ACPI_2_0_PROC_C1                 BIT2
+#define EFI_ACPI_2_0_P_LVL2_UP               BIT3
+#define EFI_ACPI_2_0_PWR_BUTTON              BIT4
+#define EFI_ACPI_2_0_SLP_BUTTON              BIT5
+#define EFI_ACPI_2_0_FIX_RTC                 BIT6
+#define EFI_ACPI_2_0_RTC_S4                  BIT7
+#define EFI_ACPI_2_0_TMR_VAL_EXT             BIT8
+#define EFI_ACPI_2_0_DCK_CAP                 BIT9
+#define EFI_ACPI_2_0_RESET_REG_SUP           BIT10
+#define EFI_ACPI_2_0_SEALED_CASE             BIT11
+#define EFI_ACPI_2_0_HEADLESS                BIT12
+#define EFI_ACPI_2_0_CPU_SW_SLP              BIT13
 
 ///
 /// Firmware ACPI Control Structure
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
-  UINT32    HardwareSignature;
-  UINT32    FirmwareWakingVector;
-  UINT32    GlobalLock;
-  UINT32    Flags;
-  UINT64    XFirmwareWakingVector;
-  UINT8     Version;
-  UINT8     Reserved[31];
+  UINT32  Signature;
+  UINT32  Length;
+  UINT32  HardwareSignature;
+  UINT32  FirmwareWakingVector;
+  UINT32  GlobalLock;
+  UINT32  Flags;
+  UINT64  XFirmwareWakingVector;
+  UINT8   Version;
+  UINT8   Reserved[31];
 } EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE;
 
 ///
@@ -243,28 +249,28 @@ typedef struct {
 /// Firmware Control Structure Feature Flags
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_2_0_S4BIOS_F  BIT0
+#define EFI_ACPI_2_0_S4BIOS_F        BIT0
 
 ///
 /// Multiple APIC Description Table header definition.  The rest of the table
 /// must be defined in a platform specific manner.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         LocalApicAddress;
-  UINT32                         Flags;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      LocalApicAddress;
+  UINT32                      Flags;
 } EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER;
 
 ///
 /// MADT Revision (as defined in ACPI 2.0 spec.)
 ///
-#define EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Multiple APIC Flags
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_2_0_PCAT_COMPAT  BIT0
+#define EFI_ACPI_2_0_PCAT_COMPAT          BIT0
 
 //
 // Multiple APIC Description Table APIC structure types
@@ -289,127 +295,127 @@ typedef struct {
 /// Processor Local APIC Structure Definition
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT8     ApicId;
-  UINT32    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT8   ApicId;
+  UINT32  Flags;
 } EFI_ACPI_2_0_PROCESSOR_LOCAL_APIC_STRUCTURE;
 
 ///
 /// Local APIC Flags.  All other bits are reserved and must be 0.
 ///
-#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED  BIT0
+#define EFI_ACPI_2_0_LOCAL_APIC_ENABLED         BIT0
 
 ///
 /// IO APIC Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     IoApicId;
-  UINT8     Reserved;
-  UINT32    IoApicAddress;
-  UINT32    GlobalSystemInterruptBase;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   IoApicId;
+  UINT8   Reserved;
+  UINT32  IoApicAddress;
+  UINT32  GlobalSystemInterruptBase;
 } EFI_ACPI_2_0_IO_APIC_STRUCTURE;
 
 ///
 /// Interrupt Source Override Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     Bus;
-  UINT8     Source;
-  UINT32    GlobalSystemInterrupt;
-  UINT16    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   Bus;
+  UINT8   Source;
+  UINT32  GlobalSystemInterrupt;
+  UINT16  Flags;
 } EFI_ACPI_2_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE;
 
 ///
 /// Non-Maskable Interrupt Source Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT32    GlobalSystemInterrupt;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT32  GlobalSystemInterrupt;
 } EFI_ACPI_2_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;
 
 ///
 /// Local APIC NMI Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT16    Flags;
-  UINT8     LocalApicLint;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT16  Flags;
+  UINT8   LocalApicLint;
 } EFI_ACPI_2_0_LOCAL_APIC_NMI_STRUCTURE;
 
 ///
 /// Local APIC Address Override Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Reserved;
-  UINT64    LocalApicAddress;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Reserved;
+  UINT64  LocalApicAddress;
 } EFI_ACPI_2_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE;
 
 ///
 /// IO SAPIC Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     IoApicId;
-  UINT8     Reserved;
-  UINT32    GlobalSystemInterruptBase;
-  UINT64    IoSapicAddress;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   IoApicId;
+  UINT8   Reserved;
+  UINT32  GlobalSystemInterruptBase;
+  UINT64  IoSapicAddress;
 } EFI_ACPI_2_0_IO_SAPIC_STRUCTURE;
 
 ///
 /// Local SAPIC Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT8     LocalSapicId;
-  UINT8     LocalSapicEid;
-  UINT8     Reserved[3];
-  UINT32    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT8   LocalSapicId;
+  UINT8   LocalSapicEid;
+  UINT8   Reserved[3];
+  UINT32  Flags;
 } EFI_ACPI_2_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE;
 
 ///
 /// Platform Interrupt Sources Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT8     InterruptType;
-  UINT8     ProcessorId;
-  UINT8     ProcessorEid;
-  UINT8     IoSapicVector;
-  UINT32    GlobalSystemInterrupt;
-  UINT32    Reserved;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT8   InterruptType;
+  UINT8   ProcessorId;
+  UINT8   ProcessorEid;
+  UINT8   IoSapicVector;
+  UINT32  GlobalSystemInterrupt;
+  UINT32  Reserved;
 } EFI_ACPI_2_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE;
 
 ///
 /// Smart Battery Description Table (SBST)
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         WarningEnergyLevel;
-  UINT32                         LowEnergyLevel;
-  UINT32                         CriticalEnergyLevel;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      WarningEnergyLevel;
+  UINT32                      LowEnergyLevel;
+  UINT32                      CriticalEnergyLevel;
 } EFI_ACPI_2_0_SMART_BATTERY_DESCRIPTION_TABLE;
 
 ///
 /// SBST Version (as defined in ACPI 2.0 spec.)
 ///
-#define EFI_ACPI_2_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_2_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Embedded Controller Boot Resources Table (ECDT)
@@ -417,11 +423,11 @@ typedef struct {
 /// a fully qualified reference to the name space object.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER               Header;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    EcControl;
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    EcData;
-  UINT32                                    Uid;
-  UINT8                                     GpeBit;
+  EFI_ACPI_DESCRIPTION_HEADER             Header;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  EcControl;
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  EcData;
+  UINT32                                  Uid;
+  UINT8                                   GpeBit;
 } EFI_ACPI_2_0_EMBEDDED_CONTROLLER_BOOT_RESOURCES_TABLE;
 
 ///
@@ -507,7 +513,7 @@ typedef struct {
 #define EFI_ACPI_2_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE  SIGNATURE_32('S', 'L', 'I', 'T')
 
 ///
-/// "SPCR" Serial Port Console Redirection Table
+/// "SPCR" Serial Port Concole Redirection Table
 ///
 #define EFI_ACPI_2_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE  SIGNATURE_32('S', 'P', 'C', 'R')
 

src/include/ipxe/efi/IndustryStandard/Acpi30.h

@@ -1,23 +1,29 @@
 /** @file
   ACPI 3.0 definitions from the ACPI Specification Revision 3.0b October 10, 2006
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 #ifndef _ACPI_3_0_H_
 #define _ACPI_3_0_H_
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #include <ipxe/efi/IndustryStandard/Acpi20.h>
 
 //
-// Define for Descriptor
+// Define for Desriptor
 //
-#define ACPI_LARGE_EXTENDED_ADDRESS_SPACE_DESCRIPTOR_NAME  0x0B
+#define ACPI_LARGE_EXTENDED_ADDRESS_SPACE_DESCRIPTOR_NAME    0x0B
 
-#define ACPI_EXTENDED_ADDRESS_SPACE_DESCRIPTOR  0x8B
+#define ACPI_EXTENDED_ADDRESS_SPACE_DESCRIPTOR    0x8B
 
 //
 // Ensure proper structure formats
@@ -47,12 +53,12 @@ typedef PACKED struct {
 //
 // Memory Type Specific Flags
 //
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_UC   0x0000000000000001
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WC   0x0000000000000002
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WT   0x0000000000000004
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WB   0x0000000000000008
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_UCE  0x0000000000000010
-#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_NV   0x0000000000008000
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_UC  0x0000000000000001
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WC  0x0000000000000002
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WT  0x0000000000000004
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_WB  0x0000000000000008
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_UCE 0x0000000000000010
+#define EFI_ACPI_MEMORY_TYPE_SPECIFIC_ATTRIBUTES_NV  0x0000000000008000
 
 //
 // Ensure proper structure formats
@@ -63,11 +69,11 @@ typedef PACKED struct {
 /// ACPI 3.0 Generic Address Space definition
 ///
 typedef struct {
-  UINT8     AddressSpaceId;
-  UINT8     RegisterBitWidth;
-  UINT8     RegisterBitOffset;
-  UINT8     AccessSize;
-  UINT64    Address;
+  UINT8   AddressSpaceId;
+  UINT8   RegisterBitWidth;
+  UINT8   RegisterBitOffset;
+  UINT8   AccessSize;
+  UINT64  Address;
 } EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE;
 
 //
@@ -97,29 +103,29 @@ typedef struct {
 /// Root System Description Pointer Structure
 ///
 typedef struct {
-  UINT64    Signature;
-  UINT8     Checksum;
-  UINT8     OemId[6];
-  UINT8     Revision;
-  UINT32    RsdtAddress;
-  UINT32    Length;
-  UINT64    XsdtAddress;
-  UINT8     ExtendedChecksum;
-  UINT8     Reserved[3];
+  UINT64  Signature;
+  UINT8   Checksum;
+  UINT8   OemId[6];
+  UINT8   Revision;
+  UINT32  RsdtAddress;
+  UINT32  Length;
+  UINT64  XsdtAddress;
+  UINT8   ExtendedChecksum;
+  UINT8   Reserved[3];
 } EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER;
 
 ///
 /// RSD_PTR Revision (as defined in ACPI 3.0b spec.)
 ///
-#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION  0x02 ///< ACPISpec (Revision 3.0b) says current value is 2
+#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION 0x02  ///< ACPISpec (Revision 3.0b) says current value is 2
 
 ///
 /// Common table header, this prefaces all ACPI tables, including FACS, but
 /// excluding the RSD PTR structure
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
+  UINT32  Signature;
+  UINT32  Length;
 } EFI_ACPI_3_0_COMMON_HEADER;
 
 //
@@ -131,7 +137,7 @@ typedef struct {
 ///
 /// RSDT Revision (as defined in ACPI 3.0 spec.)
 ///
-#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01
 
 //
 // Extended System Description Table
@@ -142,64 +148,64 @@ typedef struct {
 ///
 /// XSDT Revision (as defined in ACPI 3.0 spec.)
 ///
-#define EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Fixed ACPI Description Table Structure (FADT)
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER               Header;
-  UINT32                                    FirmwareCtrl;
-  UINT32                                    Dsdt;
-  UINT8                                     Reserved0;
-  UINT8                                     PreferredPmProfile;
-  UINT16                                    SciInt;
-  UINT32                                    SmiCmd;
-  UINT8                                     AcpiEnable;
-  UINT8                                     AcpiDisable;
-  UINT8                                     S4BiosReq;
-  UINT8                                     PstateCnt;
-  UINT32                                    Pm1aEvtBlk;
-  UINT32                                    Pm1bEvtBlk;
-  UINT32                                    Pm1aCntBlk;
-  UINT32                                    Pm1bCntBlk;
-  UINT32                                    Pm2CntBlk;
-  UINT32                                    PmTmrBlk;
-  UINT32                                    Gpe0Blk;
-  UINT32                                    Gpe1Blk;
-  UINT8                                     Pm1EvtLen;
-  UINT8                                     Pm1CntLen;
-  UINT8                                     Pm2CntLen;
-  UINT8                                     PmTmrLen;
-  UINT8                                     Gpe0BlkLen;
-  UINT8                                     Gpe1BlkLen;
-  UINT8                                     Gpe1Base;
-  UINT8                                     CstCnt;
-  UINT16                                    PLvl2Lat;
-  UINT16                                    PLvl3Lat;
-  UINT16                                    FlushSize;
-  UINT16                                    FlushStride;
-  UINT8                                     DutyOffset;
-  UINT8                                     DutyWidth;
-  UINT8                                     DayAlrm;
-  UINT8                                     MonAlrm;
-  UINT8                                     Century;
-  UINT16                                    IaPcBootArch;
-  UINT8                                     Reserved1;
-  UINT32                                    Flags;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    ResetReg;
-  UINT8                                     ResetValue;
-  UINT8                                     Reserved2[3];
-  UINT64                                    XFirmwareCtrl;
-  UINT64                                    XDsdt;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPm1aEvtBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPm1bEvtBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPm1aCntBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPm1bCntBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPm2CntBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XPmTmrBlk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XGpe0Blk;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    XGpe1Blk;
+  EFI_ACPI_DESCRIPTION_HEADER             Header;
+  UINT32                                  FirmwareCtrl;
+  UINT32                                  Dsdt;
+  UINT8                                   Reserved0;
+  UINT8                                   PreferredPmProfile;
+  UINT16                                  SciInt;
+  UINT32                                  SmiCmd;
+  UINT8                                   AcpiEnable;
+  UINT8                                   AcpiDisable;
+  UINT8                                   S4BiosReq;
+  UINT8                                   PstateCnt;
+  UINT32                                  Pm1aEvtBlk;
+  UINT32                                  Pm1bEvtBlk;
+  UINT32                                  Pm1aCntBlk;
+  UINT32                                  Pm1bCntBlk;
+  UINT32                                  Pm2CntBlk;
+  UINT32                                  PmTmrBlk;
+  UINT32                                  Gpe0Blk;
+  UINT32                                  Gpe1Blk;
+  UINT8                                   Pm1EvtLen;
+  UINT8                                   Pm1CntLen;
+  UINT8                                   Pm2CntLen;
+  UINT8                                   PmTmrLen;
+  UINT8                                   Gpe0BlkLen;
+  UINT8                                   Gpe1BlkLen;
+  UINT8                                   Gpe1Base;
+  UINT8                                   CstCnt;
+  UINT16                                  PLvl2Lat;
+  UINT16                                  PLvl3Lat;
+  UINT16                                  FlushSize;
+  UINT16                                  FlushStride;
+  UINT8                                   DutyOffset;
+  UINT8                                   DutyWidth;
+  UINT8                                   DayAlrm;
+  UINT8                                   MonAlrm;
+  UINT8                                   Century;
+  UINT16                                  IaPcBootArch;
+  UINT8                                   Reserved1;
+  UINT32                                  Flags;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  ResetReg;
+  UINT8                                   ResetValue;
+  UINT8                                   Reserved2[3];
+  UINT64                                  XFirmwareCtrl;
+  UINT64                                  XDsdt;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPm1aEvtBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPm1bEvtBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPm1aCntBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPm1bCntBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPm2CntBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XPmTmrBlk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk;
 } EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE;
 
 ///
@@ -223,50 +229,50 @@ typedef struct {
 // Fixed ACPI Description Table Boot Architecture Flags
 // All other bits are reserved and must be set to 0.
 //
-#define EFI_ACPI_3_0_LEGACY_DEVICES      BIT0
-#define EFI_ACPI_3_0_8042                BIT1
-#define EFI_ACPI_3_0_VGA_NOT_PRESENT     BIT2
-#define EFI_ACPI_3_0_MSI_NOT_SUPPORTED   BIT3
-#define EFI_ACPI_3_0_PCIE_ASPM_CONTROLS  BIT4
+#define EFI_ACPI_3_0_LEGACY_DEVICES              BIT0
+#define EFI_ACPI_3_0_8042                        BIT1
+#define EFI_ACPI_3_0_VGA_NOT_PRESENT             BIT2
+#define EFI_ACPI_3_0_MSI_NOT_SUPPORTED           BIT3
+#define EFI_ACPI_3_0_PCIE_ASPM_CONTROLS          BIT4
 
 //
 // Fixed ACPI Description Table Fixed Feature Flags
 // All other bits are reserved and must be set to 0.
 //
-#define EFI_ACPI_3_0_WBINVD                                BIT0
-#define EFI_ACPI_3_0_WBINVD_FLUSH                          BIT1
-#define EFI_ACPI_3_0_PROC_C1                               BIT2
-#define EFI_ACPI_3_0_P_LVL2_UP                             BIT3
-#define EFI_ACPI_3_0_PWR_BUTTON                            BIT4
-#define EFI_ACPI_3_0_SLP_BUTTON                            BIT5
-#define EFI_ACPI_3_0_FIX_RTC                               BIT6
-#define EFI_ACPI_3_0_RTC_S4                                BIT7
-#define EFI_ACPI_3_0_TMR_VAL_EXT                           BIT8
-#define EFI_ACPI_3_0_DCK_CAP                               BIT9
-#define EFI_ACPI_3_0_RESET_REG_SUP                         BIT10
-#define EFI_ACPI_3_0_SEALED_CASE                           BIT11
-#define EFI_ACPI_3_0_HEADLESS                              BIT12
-#define EFI_ACPI_3_0_CPU_SW_SLP                            BIT13
-#define EFI_ACPI_3_0_PCI_EXP_WAK                           BIT14
-#define EFI_ACPI_3_0_USE_PLATFORM_CLOCK                    BIT15
-#define EFI_ACPI_3_0_S4_RTC_STS_VALID                      BIT16
-#define EFI_ACPI_3_0_REMOTE_POWER_ON_CAPABLE               BIT17
-#define EFI_ACPI_3_0_FORCE_APIC_CLUSTER_MODEL              BIT18
-#define EFI_ACPI_3_0_FORCE_APIC_PHYSICAL_DESTINATION_MODE  BIT19
+#define EFI_ACPI_3_0_WBINVD                                 BIT0
+#define EFI_ACPI_3_0_WBINVD_FLUSH                           BIT1
+#define EFI_ACPI_3_0_PROC_C1                                BIT2
+#define EFI_ACPI_3_0_P_LVL2_UP                              BIT3
+#define EFI_ACPI_3_0_PWR_BUTTON                             BIT4
+#define EFI_ACPI_3_0_SLP_BUTTON                             BIT5
+#define EFI_ACPI_3_0_FIX_RTC                                BIT6
+#define EFI_ACPI_3_0_RTC_S4                                 BIT7
+#define EFI_ACPI_3_0_TMR_VAL_EXT                            BIT8
+#define EFI_ACPI_3_0_DCK_CAP                                BIT9
+#define EFI_ACPI_3_0_RESET_REG_SUP                          BIT10
+#define EFI_ACPI_3_0_SEALED_CASE                            BIT11
+#define EFI_ACPI_3_0_HEADLESS                               BIT12
+#define EFI_ACPI_3_0_CPU_SW_SLP                             BIT13
+#define EFI_ACPI_3_0_PCI_EXP_WAK                            BIT14
+#define EFI_ACPI_3_0_USE_PLATFORM_CLOCK                     BIT15
+#define EFI_ACPI_3_0_S4_RTC_STS_VALID                       BIT16
+#define EFI_ACPI_3_0_REMOTE_POWER_ON_CAPABLE                BIT17
+#define EFI_ACPI_3_0_FORCE_APIC_CLUSTER_MODEL               BIT18
+#define EFI_ACPI_3_0_FORCE_APIC_PHYSICAL_DESTINATION_MODE   BIT19
 
 ///
 /// Firmware ACPI Control Structure
 ///
 typedef struct {
-  UINT32    Signature;
-  UINT32    Length;
-  UINT32    HardwareSignature;
-  UINT32    FirmwareWakingVector;
-  UINT32    GlobalLock;
-  UINT32    Flags;
-  UINT64    XFirmwareWakingVector;
-  UINT8     Version;
-  UINT8     Reserved[31];
+  UINT32  Signature;
+  UINT32  Length;
+  UINT32  HardwareSignature;
+  UINT32  FirmwareWakingVector;
+  UINT32  GlobalLock;
+  UINT32  Flags;
+  UINT64  XFirmwareWakingVector;
+  UINT8   Version;
+  UINT8   Reserved[31];
 } EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE;
 
 ///
@@ -278,7 +284,7 @@ typedef struct {
 /// Firmware Control Structure Feature Flags
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_3_0_S4BIOS_F  BIT0
+#define EFI_ACPI_3_0_S4BIOS_F       BIT0
 
 //
 // Differentiated System Description Table,
@@ -287,29 +293,29 @@ typedef struct {
 // no definition needed as they are common description table header, the same with
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a definition block.
 //
-#define EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION  0x02
-#define EFI_ACPI_3_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION       0x02
+#define EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION   0x02
+#define EFI_ACPI_3_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION        0x02
 
 ///
 /// Multiple APIC Description Table header definition.  The rest of the table
 /// must be defined in a platform specific manner.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         LocalApicAddress;
-  UINT32                         Flags;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      LocalApicAddress;
+  UINT32                      Flags;
 } EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER;
 
 ///
 /// MADT Revision (as defined in ACPI 3.0 spec.)
 ///
-#define EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION  0x02
+#define EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION 0x02
 
 ///
 /// Multiple APIC Flags
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_3_0_PCAT_COMPAT  BIT0
+#define EFI_ACPI_3_0_PCAT_COMPAT         BIT0
 
 //
 // Multiple APIC Description Table APIC structure types
@@ -334,57 +340,57 @@ typedef struct {
 /// Processor Local APIC Structure Definition
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT8     ApicId;
-  UINT32    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT8   ApicId;
+  UINT32  Flags;
 } EFI_ACPI_3_0_PROCESSOR_LOCAL_APIC_STRUCTURE;
 
 ///
 /// Local APIC Flags.  All other bits are reserved and must be 0.
 ///
-#define EFI_ACPI_3_0_LOCAL_APIC_ENABLED  BIT0
+#define EFI_ACPI_3_0_LOCAL_APIC_ENABLED        BIT0
 
 ///
 /// IO APIC Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     IoApicId;
-  UINT8     Reserved;
-  UINT32    IoApicAddress;
-  UINT32    GlobalSystemInterruptBase;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   IoApicId;
+  UINT8   Reserved;
+  UINT32  IoApicAddress;
+  UINT32  GlobalSystemInterruptBase;
 } EFI_ACPI_3_0_IO_APIC_STRUCTURE;
 
 ///
 /// Interrupt Source Override Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     Bus;
-  UINT8     Source;
-  UINT32    GlobalSystemInterrupt;
-  UINT16    Flags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   Bus;
+  UINT8   Source;
+  UINT32  GlobalSystemInterrupt;
+  UINT16  Flags;
 } EFI_ACPI_3_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE;
 
 ///
 /// Platform Interrupt Sources Structure Definition
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT8     InterruptType;
-  UINT8     ProcessorId;
-  UINT8     ProcessorEid;
-  UINT8     IoSapicVector;
-  UINT32    GlobalSystemInterrupt;
-  UINT32    PlatformInterruptSourceFlags;
-  UINT8     CpeiProcessorOverride;
-  UINT8     Reserved[31];
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT8   InterruptType;
+  UINT8   ProcessorId;
+  UINT8   ProcessorEid;
+  UINT8   IoSapicVector;
+  UINT32  GlobalSystemInterrupt;
+  UINT32  PlatformInterruptSourceFlags;
+  UINT8   CpeiProcessorOverride;
+  UINT8   Reserved[31];
 } EFI_ACPI_3_0_PLATFORM_INTERRUPT_APIC_STRUCTURE;
 
 //
@@ -398,43 +404,43 @@ typedef struct {
 /// Non-Maskable Interrupt Source Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT32    GlobalSystemInterrupt;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT32  GlobalSystemInterrupt;
 } EFI_ACPI_3_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE;
 
 ///
 /// Local APIC NMI Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT16    Flags;
-  UINT8     LocalApicLint;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT16  Flags;
+  UINT8   LocalApicLint;
 } EFI_ACPI_3_0_LOCAL_APIC_NMI_STRUCTURE;
 
 ///
 /// Local APIC Address Override Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Reserved;
-  UINT64    LocalApicAddress;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Reserved;
+  UINT64  LocalApicAddress;
 } EFI_ACPI_3_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE;
 
 ///
 /// IO SAPIC Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     IoApicId;
-  UINT8     Reserved;
-  UINT32    GlobalSystemInterruptBase;
-  UINT64    IoSapicAddress;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   IoApicId;
+  UINT8   Reserved;
+  UINT32  GlobalSystemInterruptBase;
+  UINT64  IoSapicAddress;
 } EFI_ACPI_3_0_IO_SAPIC_STRUCTURE;
 
 ///
@@ -442,51 +448,51 @@ typedef struct {
 /// This struct followed by a null-terminated ASCII string - ACPI Processor UID String
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     AcpiProcessorId;
-  UINT8     LocalSapicId;
-  UINT8     LocalSapicEid;
-  UINT8     Reserved[3];
-  UINT32    Flags;
-  UINT32    ACPIProcessorUIDValue;
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   AcpiProcessorId;
+  UINT8   LocalSapicId;
+  UINT8   LocalSapicEid;
+  UINT8   Reserved[3];
+  UINT32  Flags;
+  UINT32  ACPIProcessorUIDValue;
 } EFI_ACPI_3_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE;
 
 ///
 /// Platform Interrupt Sources Structure
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT16    Flags;
-  UINT8     InterruptType;
-  UINT8     ProcessorId;
-  UINT8     ProcessorEid;
-  UINT8     IoSapicVector;
-  UINT32    GlobalSystemInterrupt;
-  UINT32    PlatformInterruptSourceFlags;
+  UINT8   Type;
+  UINT8   Length;
+  UINT16  Flags;
+  UINT8   InterruptType;
+  UINT8   ProcessorId;
+  UINT8   ProcessorEid;
+  UINT8   IoSapicVector;
+  UINT32  GlobalSystemInterrupt;
+  UINT32  PlatformInterruptSourceFlags;
 } EFI_ACPI_3_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE;
 
 ///
 /// Platform Interrupt Source Flags.
 /// All other bits are reserved and must be set to 0.
 ///
-#define EFI_ACPI_3_0_CPEI_PROCESSOR_OVERRIDE  BIT0
+#define EFI_ACPI_3_0_CPEI_PROCESSOR_OVERRIDE          BIT0
 
 ///
 /// Smart Battery Description Table (SBST)
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         WarningEnergyLevel;
-  UINT32                         LowEnergyLevel;
-  UINT32                         CriticalEnergyLevel;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      WarningEnergyLevel;
+  UINT32                      LowEnergyLevel;
+  UINT32                      CriticalEnergyLevel;
 } EFI_ACPI_3_0_SMART_BATTERY_DESCRIPTION_TABLE;
 
 ///
 /// SBST Version (as defined in ACPI 3.0 spec.)
 ///
-#define EFI_ACPI_3_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION  0x01
+#define EFI_ACPI_3_0_SMART_BATTERY_DESCRIPTION_TABLE_REVISION 0x01
 
 ///
 /// Embedded Controller Boot Resources Table (ECDT)
@@ -494,11 +500,11 @@ typedef struct {
 /// a fully qualified reference to the name space object.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER               Header;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    EcControl;
-  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE    EcData;
-  UINT32                                    Uid;
-  UINT8                                     GpeBit;
+  EFI_ACPI_DESCRIPTION_HEADER             Header;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  EcControl;
+  EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  EcData;
+  UINT32                                  Uid;
+  UINT8                                   GpeBit;
 } EFI_ACPI_3_0_EMBEDDED_CONTROLLER_BOOT_RESOURCES_TABLE;
 
 ///
@@ -511,9 +517,9 @@ typedef struct {
 /// must be defined in a platform specific manner.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT32                         Reserved1; ///< Must be set to 1
-  UINT64                         Reserved2;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT32                      Reserved1;  ///< Must be set to 1
+  UINT64                      Reserved2;
 } EFI_ACPI_3_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER;
 
 ///
@@ -533,52 +539,52 @@ typedef struct {
 /// Processor Local APIC/SAPIC Affinity Structure Definition
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT8     ProximityDomain7To0;
-  UINT8     ApicId;
-  UINT32    Flags;
-  UINT8     LocalSapicEid;
-  UINT8     ProximityDomain31To8[3];
-  UINT8     Reserved[4];
+  UINT8   Type;
+  UINT8   Length;
+  UINT8   ProximityDomain7To0;
+  UINT8   ApicId;
+  UINT32  Flags;
+  UINT8   LocalSapicEid;
+  UINT8   ProximityDomain31To8[3];
+  UINT8   Reserved[4];
 } EFI_ACPI_3_0_PROCESSOR_LOCAL_APIC_SAPIC_AFFINITY_STRUCTURE;
 
 ///
 /// Local APIC/SAPIC Flags.  All other bits are reserved and must be 0.
 ///
-#define EFI_ACPI_3_0_PROCESSOR_LOCAL_APIC_SAPIC_ENABLED  (1 << 0)
+#define EFI_ACPI_3_0_PROCESSOR_LOCAL_APIC_SAPIC_ENABLED (1 << 0)
 
 ///
 /// Memory Affinity Structure Definition
 ///
 typedef struct {
-  UINT8     Type;
-  UINT8     Length;
-  UINT32    ProximityDomain;
-  UINT16    Reserved1;
-  UINT32    AddressBaseLow;
-  UINT32    AddressBaseHigh;
-  UINT32    LengthLow;
-  UINT32    LengthHigh;
-  UINT32    Reserved2;
-  UINT32    Flags;
-  UINT64    Reserved3;
+  UINT8   Type;
+  UINT8   Length;
+  UINT32  ProximityDomain;
+  UINT16  Reserved1;
+  UINT32  AddressBaseLow;
+  UINT32  AddressBaseHigh;
+  UINT32  LengthLow;
+  UINT32  LengthHigh;
+  UINT32  Reserved2;
+  UINT32  Flags;
+  UINT64  Reserved3;
 } EFI_ACPI_3_0_MEMORY_AFFINITY_STRUCTURE;
 
 //
 // Memory Flags.  All other bits are reserved and must be 0.
 //
-#define EFI_ACPI_3_0_MEMORY_ENABLED        (1 << 0)
-#define EFI_ACPI_3_0_MEMORY_HOT_PLUGGABLE  (1 << 1)
-#define EFI_ACPI_3_0_MEMORY_NONVOLATILE    (1 << 2)
+#define EFI_ACPI_3_0_MEMORY_ENABLED       (1 << 0)
+#define EFI_ACPI_3_0_MEMORY_HOT_PLUGGABLE (1 << 1)
+#define EFI_ACPI_3_0_MEMORY_NONVOLATILE   (1 << 2)
 
 ///
 /// System Locality Distance Information Table (SLIT).
 /// The rest of the table is a matrix.
 ///
 typedef struct {
-  EFI_ACPI_DESCRIPTION_HEADER    Header;
-  UINT64                         NumberOfSystemLocalities;
+  EFI_ACPI_DESCRIPTION_HEADER Header;
+  UINT64                      NumberOfSystemLocalities;
 } EFI_ACPI_3_0_SYSTEM_LOCALITY_DISTANCE_INFORMATION_TABLE_HEADER;
 
 ///
@@ -686,7 +692,7 @@ typedef struct {
 #define EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE  SIGNATURE_32('M', 'C', 'F', 'G')
 
 ///
-/// "SPCR" Serial Port Console Redirection Table
+/// "SPCR" Serial Port Concole Redirection Table
 ///
 #define EFI_ACPI_3_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE  SIGNATURE_32('S', 'P', 'C', 'R')
 

src/include/ipxe/efi/IndustryStandard/AcpiAml.h

@@ -2,15 +2,20 @@
   This file contains AML code definition in the latest ACPI spec.
 
   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef _ACPI_AML_H_
 #define _ACPI_AML_H_
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 //
 // ACPI AML definition
@@ -19,168 +24,154 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Primary OpCode
 //
-#define AML_ZERO_OP                0x00
-#define AML_ONE_OP                 0x01
-#define AML_ALIAS_OP               0x06
-#define AML_NAME_OP                0x08
-#define AML_BYTE_PREFIX            0x0a
-#define AML_WORD_PREFIX            0x0b
-#define AML_DWORD_PREFIX           0x0c
-#define AML_STRING_PREFIX          0x0d
-#define AML_QWORD_PREFIX           0x0e
-#define AML_SCOPE_OP               0x10
-#define AML_BUFFER_OP              0x11
-#define AML_PACKAGE_OP             0x12
-#define AML_VAR_PACKAGE_OP         0x13
-#define AML_METHOD_OP              0x14
-#define AML_EXTERNAL_OP            0x15
-#define AML_DUAL_NAME_PREFIX       0x2e
-#define AML_MULTI_NAME_PREFIX      0x2f
-#define AML_NAME_CHAR_A            0x41
-#define AML_NAME_CHAR_B            0x42
-#define AML_NAME_CHAR_C            0x43
-#define AML_NAME_CHAR_D            0x44
-#define AML_NAME_CHAR_E            0x45
-#define AML_NAME_CHAR_F            0x46
-#define AML_NAME_CHAR_G            0x47
-#define AML_NAME_CHAR_H            0x48
-#define AML_NAME_CHAR_I            0x49
-#define AML_NAME_CHAR_J            0x4a
-#define AML_NAME_CHAR_K            0x4b
-#define AML_NAME_CHAR_L            0x4c
-#define AML_NAME_CHAR_M            0x4d
-#define AML_NAME_CHAR_N            0x4e
-#define AML_NAME_CHAR_O            0x4f
-#define AML_NAME_CHAR_P            0x50
-#define AML_NAME_CHAR_Q            0x51
-#define AML_NAME_CHAR_R            0x52
-#define AML_NAME_CHAR_S            0x53
-#define AML_NAME_CHAR_T            0x54
-#define AML_NAME_CHAR_U            0x55
-#define AML_NAME_CHAR_V            0x56
-#define AML_NAME_CHAR_W            0x57
-#define AML_NAME_CHAR_X            0x58
-#define AML_NAME_CHAR_Y            0x59
-#define AML_NAME_CHAR_Z            0x5a
-#define AML_ROOT_CHAR              0x5c
-#define AML_PARENT_PREFIX_CHAR     0x5e
-#define AML_NAME_CHAR__            0x5f
-#define AML_LOCAL0                 0x60
-#define AML_LOCAL1                 0x61
-#define AML_LOCAL2                 0x62
-#define AML_LOCAL3                 0x63
-#define AML_LOCAL4                 0x64
-#define AML_LOCAL5                 0x65
-#define AML_LOCAL6                 0x66
-#define AML_LOCAL7                 0x67
-#define AML_ARG0                   0x68
-#define AML_ARG1                   0x69
-#define AML_ARG2                   0x6a
-#define AML_ARG3                   0x6b
-#define AML_ARG4                   0x6c
-#define AML_ARG5                   0x6d
-#define AML_ARG6                   0x6e
-#define AML_STORE_OP               0x70
-#define AML_REF_OF_OP              0x71
-#define AML_ADD_OP                 0x72
-#define AML_CONCAT_OP              0x73
-#define AML_SUBTRACT_OP            0x74
-#define AML_INCREMENT_OP           0x75
-#define AML_DECREMENT_OP           0x76
-#define AML_MULTIPLY_OP            0x77
-#define AML_DIVIDE_OP              0x78
-#define AML_SHIFT_LEFT_OP          0x79
-#define AML_SHIFT_RIGHT_OP         0x7a
-#define AML_AND_OP                 0x7b
-#define AML_NAND_OP                0x7c
-#define AML_OR_OP                  0x7d
-#define AML_NOR_OP                 0x7e
-#define AML_XOR_OP                 0x7f
-#define AML_NOT_OP                 0x80
-#define AML_FIND_SET_LEFT_BIT_OP   0x81
-#define AML_FIND_SET_RIGHT_BIT_OP  0x82
-#define AML_DEREF_OF_OP            0x83
-#define AML_CONCAT_RES_OP          0x84
-#define AML_MOD_OP                 0x85
-#define AML_NOTIFY_OP              0x86
-#define AML_SIZE_OF_OP             0x87
-#define AML_INDEX_OP               0x88
-#define AML_MATCH_OP               0x89
-#define AML_CREATE_DWORD_FIELD_OP  0x8a
-#define AML_CREATE_WORD_FIELD_OP   0x8b
-#define AML_CREATE_BYTE_FIELD_OP   0x8c
-#define AML_CREATE_BIT_FIELD_OP    0x8d
-#define AML_OBJECT_TYPE_OP         0x8e
-#define AML_CREATE_QWORD_FIELD_OP  0x8f
-#define AML_LAND_OP                0x90
-#define AML_LOR_OP                 0x91
-#define AML_LNOT_OP                0x92
-#define AML_LEQUAL_OP              0x93
-#define AML_LGREATER_OP            0x94
-#define AML_LLESS_OP               0x95
-#define AML_TO_BUFFER_OP           0x96
-#define AML_TO_DEC_STRING_OP       0x97
-#define AML_TO_HEX_STRING_OP       0x98
-#define AML_TO_INTEGER_OP          0x99
-#define AML_TO_STRING_OP           0x9c
-#define AML_COPY_OBJECT_OP         0x9d
-#define AML_MID_OP                 0x9e
-#define AML_CONTINUE_OP            0x9f
-#define AML_IF_OP                  0xa0
-#define AML_ELSE_OP                0xa1
-#define AML_WHILE_OP               0xa2
-#define AML_NOOP_OP                0xa3
-#define AML_RETURN_OP              0xa4
-#define AML_BREAK_OP               0xa5
-#define AML_BREAK_POINT_OP         0xcc
-#define AML_ONES_OP                0xff
+#define AML_ZERO_OP                  0x00
+#define AML_ONE_OP                   0x01
+#define AML_ALIAS_OP                 0x06
+#define AML_NAME_OP                  0x08
+#define AML_BYTE_PREFIX              0x0a
+#define AML_WORD_PREFIX              0x0b
+#define AML_DWORD_PREFIX             0x0c
+#define AML_STRING_PREFIX            0x0d
+#define AML_QWORD_PREFIX             0x0e
+#define AML_SCOPE_OP                 0x10
+#define AML_BUFFER_OP                0x11
+#define AML_PACKAGE_OP               0x12
+#define AML_VAR_PACKAGE_OP           0x13
+#define AML_METHOD_OP                0x14
+#define AML_DUAL_NAME_PREFIX         0x2e
+#define AML_MULTI_NAME_PREFIX        0x2f
+#define AML_NAME_CHAR_A              0x41
+#define AML_NAME_CHAR_B              0x42
+#define AML_NAME_CHAR_C              0x43
+#define AML_NAME_CHAR_D              0x44
+#define AML_NAME_CHAR_E              0x45
+#define AML_NAME_CHAR_F              0x46
+#define AML_NAME_CHAR_G              0x47
+#define AML_NAME_CHAR_H              0x48
+#define AML_NAME_CHAR_I              0x49
+#define AML_NAME_CHAR_J              0x4a
+#define AML_NAME_CHAR_K              0x4b
+#define AML_NAME_CHAR_L              0x4c
+#define AML_NAME_CHAR_M              0x4d
+#define AML_NAME_CHAR_N              0x4e
+#define AML_NAME_CHAR_O              0x4f
+#define AML_NAME_CHAR_P              0x50
+#define AML_NAME_CHAR_Q              0x51
+#define AML_NAME_CHAR_R              0x52
+#define AML_NAME_CHAR_S              0x53
+#define AML_NAME_CHAR_T              0x54
+#define AML_NAME_CHAR_U              0x55
+#define AML_NAME_CHAR_V              0x56
+#define AML_NAME_CHAR_W              0x57
+#define AML_NAME_CHAR_X              0x58
+#define AML_NAME_CHAR_Y              0x59
+#define AML_NAME_CHAR_Z              0x5a
+#define AML_ROOT_CHAR                0x5c
+#define AML_PARENT_PREFIX_CHAR       0x5e
+#define AML_NAME_CHAR__              0x5f
+#define AML_LOCAL0                   0x60
+#define AML_LOCAL1                   0x61
+#define AML_LOCAL2                   0x62
+#define AML_LOCAL3                   0x63
+#define AML_LOCAL4                   0x64
+#define AML_LOCAL5                   0x65
+#define AML_LOCAL6                   0x66
+#define AML_LOCAL7                   0x67
+#define AML_ARG0                     0x68
+#define AML_ARG1                     0x69
+#define AML_ARG2                     0x6a
+#define AML_ARG3                     0x6b
+#define AML_ARG4                     0x6c
+#define AML_ARG5                     0x6d
+#define AML_ARG6                     0x6e
+#define AML_STORE_OP                 0x70
+#define AML_REF_OF_OP                0x71
+#define AML_ADD_OP                   0x72
+#define AML_CONCAT_OP                0x73
+#define AML_SUBTRACT_OP              0x74
+#define AML_INCREMENT_OP             0x75
+#define AML_DECREMENT_OP             0x76
+#define AML_MULTIPLY_OP              0x77
+#define AML_DIVIDE_OP                0x78
+#define AML_SHIFT_LEFT_OP            0x79
+#define AML_SHIFT_RIGHT_OP           0x7a
+#define AML_AND_OP                   0x7b
+#define AML_NAND_OP                  0x7c
+#define AML_OR_OP                    0x7d
+#define AML_NOR_OP                   0x7e
+#define AML_XOR_OP                   0x7f
+#define AML_NOT_OP                   0x80
+#define AML_FIND_SET_LEFT_BIT_OP     0x81
+#define AML_FIND_SET_RIGHT_BIT_OP    0x82
+#define AML_DEREF_OF_OP              0x83
+#define AML_CONCAT_RES_OP            0x84
+#define AML_MOD_OP                   0x85
+#define AML_NOTIFY_OP                0x86
+#define AML_SIZE_OF_OP               0x87
+#define AML_INDEX_OP                 0x88
+#define AML_MATCH_OP                 0x89
+#define AML_CREATE_DWORD_FIELD_OP    0x8a
+#define AML_CREATE_WORD_FIELD_OP     0x8b
+#define AML_CREATE_BYTE_FIELD_OP     0x8c
+#define AML_CREATE_BIT_FIELD_OP      0x8d
+#define AML_OBJECT_TYPE_OP           0x8e
+#define AML_CREATE_QWORD_FIELD_OP    0x8f
+#define AML_LAND_OP                  0x90
+#define AML_LOR_OP                   0x91
+#define AML_LNOT_OP                  0x92
+#define AML_LEQUAL_OP                0x93
+#define AML_LGREATER_OP              0x94
+#define AML_LLESS_OP                 0x95
+#define AML_TO_BUFFER_OP             0x96
+#define AML_TO_DEC_STRING_OP         0x97
+#define AML_TO_HEX_STRING_OP         0x98
+#define AML_TO_INTEGER_OP            0x99
+#define AML_TO_STRING_OP             0x9c
+#define AML_COPY_OBJECT_OP           0x9d
+#define AML_MID_OP                   0x9e
+#define AML_CONTINUE_OP              0x9f
+#define AML_IF_OP                    0xa0
+#define AML_ELSE_OP                  0xa1
+#define AML_WHILE_OP                 0xa2
+#define AML_NOOP_OP                  0xa3
+#define AML_RETURN_OP                0xa4
+#define AML_BREAK_OP                 0xa5
+#define AML_BREAK_POINT_OP           0xcc
+#define AML_ONES_OP                  0xff
 
 //
 // Extended OpCode
 //
-#define AML_EXT_OP  0x5b
+#define AML_EXT_OP                   0x5b
 
-#define AML_EXT_MUTEX_OP         0x01
-#define AML_EXT_EVENT_OP         0x02
-#define AML_EXT_COND_REF_OF_OP   0x12
-#define AML_EXT_CREATE_FIELD_OP  0x13
-#define AML_EXT_LOAD_TABLE_OP    0x1f
-#define AML_EXT_LOAD_OP          0x20
-#define AML_EXT_STALL_OP         0x21
-#define AML_EXT_SLEEP_OP         0x22
-#define AML_EXT_ACQUIRE_OP       0x23
-#define AML_EXT_SIGNAL_OP        0x24
-#define AML_EXT_WAIT_OP          0x25
-#define AML_EXT_RESET_OP         0x26
-#define AML_EXT_RELEASE_OP       0x27
-#define AML_EXT_FROM_BCD_OP      0x28
-#define AML_EXT_TO_BCD_OP        0x29
-#define AML_EXT_UNLOAD_OP        0x2a
-#define AML_EXT_REVISION_OP      0x30
-#define AML_EXT_DEBUG_OP         0x31
-#define AML_EXT_FATAL_OP         0x32
-#define AML_EXT_TIMER_OP         0x33
-#define AML_EXT_REGION_OP        0x80
-#define AML_EXT_FIELD_OP         0x81
-#define AML_EXT_DEVICE_OP        0x82
-#define AML_EXT_PROCESSOR_OP     0x83
-#define AML_EXT_POWER_RES_OP     0x84
-#define AML_EXT_THERMAL_ZONE_OP  0x85
-#define AML_EXT_INDEX_FIELD_OP   0x86
-#define AML_EXT_BANK_FIELD_OP    0x87
-#define AML_EXT_DATA_REGION_OP   0x88
-
-//
-// FieldElement OpCode
-//
-#define AML_FIELD_RESERVED_OP    0x00
-#define AML_FIELD_ACCESS_OP      0x01
-#define AML_FIELD_CONNECTION_OP  0x02
-#define AML_FIELD_EXT_ACCESS_OP  0x03
-
-//
-// AML Name segment definitions
-//
-#define AML_NAME_SEG_SIZE  4
+#define AML_EXT_MUTEX_OP             0x01
+#define AML_EXT_EVENT_OP             0x02
+#define AML_EXT_COND_REF_OF_OP       0x12
+#define AML_EXT_CREATE_FIELD_OP      0x13
+#define AML_EXT_LOAD_TABLE_OP        0x1f
+#define AML_EXT_LOAD_OP              0x20
+#define AML_EXT_STALL_OP             0x21
+#define AML_EXT_SLEEP_OP             0x22
+#define AML_EXT_ACQUIRE_OP           0x23
+#define AML_EXT_SIGNAL_OP            0x24
+#define AML_EXT_WAIT_OP              0x25
+#define AML_EXT_RESET_OP             0x26
+#define AML_EXT_RELEASE_OP           0x27
+#define AML_EXT_FROM_BCD_OP          0x28
+#define AML_EXT_TO_BCD_OP            0x29
+#define AML_EXT_UNLOAD_OP            0x2a
+#define AML_EXT_REVISION_OP          0x30
+#define AML_EXT_DEBUG_OP             0x31
+#define AML_EXT_FATAL_OP             0x32
+#define AML_EXT_TIMER_OP             0x33
+#define AML_EXT_REGION_OP            0x80
+#define AML_EXT_FIELD_OP             0x81
+#define AML_EXT_DEVICE_OP            0x82
+#define AML_EXT_PROCESSOR_OP         0x83
+#define AML_EXT_POWER_RES_OP         0x84
+#define AML_EXT_THERMAL_ZONE_OP      0x85
+#define AML_EXT_INDEX_FIELD_OP       0x86
+#define AML_EXT_BANK_FIELD_OP        0x87
+#define AML_EXT_DATA_REGION_OP       0x88
 
 #endif

src/include/ipxe/efi/IndustryStandard/Bluetooth.h

@@ -2,15 +2,21 @@
   This file contains the Bluetooth definitions that are consumed by drivers.
   These definitions are from Bluetooth Core Specification Version 4.0 June, 2010
 
-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef _BLUETOOTH_H_
 #define _BLUETOOTH_H_
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #pragma pack(1)
 
@@ -21,38 +27,23 @@ typedef struct {
   ///
   /// 48bit Bluetooth device address.
   ///
-  UINT8    Address[6];
+  UINT8      Address[6];
 } BLUETOOTH_ADDRESS;
 
 ///
 /// BLUETOOTH_CLASS_OF_DEVICE. See Bluetooth specification for detail.
 ///
 typedef struct {
-  UINT8     FormatType        : 2;
-  UINT8     MinorDeviceClass  : 6;
-  UINT16    MajorDeviceClass  : 5;
-  UINT16    MajorServiceClass : 11;
+  UINT8      FormatType:2;
+  UINT8      MinorDeviceClass: 6;
+  UINT16     MajorDeviceClass: 5;
+  UINT16     MajorServiceClass:11;
 } BLUETOOTH_CLASS_OF_DEVICE;
 
-///
-/// BLUETOOTH_LE_ADDRESS
-///
-typedef struct {
-  ///
-  /// 48-bit Bluetooth device address
-  ///
-  UINT8    Address[6];
-  ///
-  /// 0x00 - Public Device Address
-  /// 0x01 - Random Device Address
-  ///
-  UINT8    Type;
-} BLUETOOTH_LE_ADDRESS;
-
 #pragma pack()
 
-#define BLUETOOTH_HCI_COMMAND_LOCAL_READABLE_NAME_MAX_SIZE  248
+#define BLUETOOTH_HCI_COMMAND_LOCAL_READABLE_NAME_MAX_SIZE    248
 
-#define BLUETOOTH_HCI_LINK_KEY_SIZE  16
+#define BLUETOOTH_HCI_LINK_KEY_SIZE                           16
 
 #endif

src/include/ipxe/efi/IndustryStandard/PeImage.h

@@ -7,27 +7,31 @@
   Common Object File Format Specification, Revision 8.3 - February 6, 2013.
   This file also includes some definitions in PI Specification, Revision 1.0.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-Portions Copyright (c) 2016 - 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
-Portions Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR>
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
-SPDX-License-Identifier: BSD-2-Clause-Patent
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __PE_IMAGE_H__
 #define __PE_IMAGE_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 //
 // PE32+ Subsystem type for EFI images
 //
-#define EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION          10
-#define EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER  11
-#define EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER       12
-#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER       13///< defined PI Specification, 1.0
+#define EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION         10
+#define EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
+#define EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER      12
+#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER      13 ///< defined PI Specification, 1.0
+
 
 //
 // PE32+ Machine type for EFI images
@@ -38,11 +42,6 @@ FILE_LICENCE ( BSD2_PATENT );
 #define IMAGE_FILE_MACHINE_X64             0x8664
 #define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED  0x01c2
 #define IMAGE_FILE_MACHINE_ARM64           0xAA64
-#define IMAGE_FILE_MACHINE_RISCV32         0x5032
-#define IMAGE_FILE_MACHINE_RISCV64         0x5064
-#define IMAGE_FILE_MACHINE_RISCV128        0x5128
-#define IMAGE_FILE_MACHINE_LOONGARCH32     0x6232
-#define IMAGE_FILE_MACHINE_LOONGARCH64     0x6264
 
 //
 // EXE file formats
@@ -57,51 +56,51 @@ FILE_LICENCE ( BSD2_PATENT );
 /// under DOS it can print an error message.
 ///
 typedef struct {
-  UINT16    e_magic;    ///< Magic number.
-  UINT16    e_cblp;     ///< Bytes on last page of file.
-  UINT16    e_cp;       ///< Pages in file.
-  UINT16    e_crlc;     ///< Relocations.
-  UINT16    e_cparhdr;  ///< Size of header in paragraphs.
-  UINT16    e_minalloc; ///< Minimum extra paragraphs needed.
-  UINT16    e_maxalloc; ///< Maximum extra paragraphs needed.
-  UINT16    e_ss;       ///< Initial (relative) SS value.
-  UINT16    e_sp;       ///< Initial SP value.
-  UINT16    e_csum;     ///< Checksum.
-  UINT16    e_ip;       ///< Initial IP value.
-  UINT16    e_cs;       ///< Initial (relative) CS value.
-  UINT16    e_lfarlc;   ///< File address of relocation table.
-  UINT16    e_ovno;     ///< Overlay number.
-  UINT16    e_res[4];   ///< Reserved words.
-  UINT16    e_oemid;    ///< OEM identifier (for e_oeminfo).
-  UINT16    e_oeminfo;  ///< OEM information; e_oemid specific.
-  UINT16    e_res2[10]; ///< Reserved words.
-  UINT32    e_lfanew;   ///< File address of new exe header.
+  UINT16  e_magic;    ///< Magic number.
+  UINT16  e_cblp;     ///< Bytes on last page of file.
+  UINT16  e_cp;       ///< Pages in file.
+  UINT16  e_crlc;     ///< Relocations.
+  UINT16  e_cparhdr;  ///< Size of header in paragraphs.
+  UINT16  e_minalloc; ///< Minimum extra paragraphs needed.
+  UINT16  e_maxalloc; ///< Maximum extra paragraphs needed.
+  UINT16  e_ss;       ///< Initial (relative) SS value.
+  UINT16  e_sp;       ///< Initial SP value.
+  UINT16  e_csum;     ///< Checksum.
+  UINT16  e_ip;       ///< Initial IP value.
+  UINT16  e_cs;       ///< Initial (relative) CS value.
+  UINT16  e_lfarlc;   ///< File address of relocation table.
+  UINT16  e_ovno;     ///< Overlay number.
+  UINT16  e_res[4];   ///< Reserved words.
+  UINT16  e_oemid;    ///< OEM identifier (for e_oeminfo).
+  UINT16  e_oeminfo;  ///< OEM information; e_oemid specific.
+  UINT16  e_res2[10]; ///< Reserved words.
+  UINT32  e_lfanew;   ///< File address of new exe header.
 } EFI_IMAGE_DOS_HEADER;
 
 ///
 /// COFF File Header (Object and Image).
 ///
 typedef struct {
-  UINT16    Machine;
-  UINT16    NumberOfSections;
-  UINT32    TimeDateStamp;
-  UINT32    PointerToSymbolTable;
-  UINT32    NumberOfSymbols;
-  UINT16    SizeOfOptionalHeader;
-  UINT16    Characteristics;
+  UINT16  Machine;
+  UINT16  NumberOfSections;
+  UINT32  TimeDateStamp;
+  UINT32  PointerToSymbolTable;
+  UINT32  NumberOfSymbols;
+  UINT16  SizeOfOptionalHeader;
+  UINT16  Characteristics;
 } EFI_IMAGE_FILE_HEADER;
 
 ///
 /// Size of EFI_IMAGE_FILE_HEADER.
 ///
-#define EFI_IMAGE_SIZEOF_FILE_HEADER  20
+#define EFI_IMAGE_SIZEOF_FILE_HEADER        20
 
 //
 // Characteristics
 //
 #define EFI_IMAGE_FILE_RELOCS_STRIPPED      BIT0     ///< 0x0001  Relocation info stripped from file.
 #define EFI_IMAGE_FILE_EXECUTABLE_IMAGE     BIT1     ///< 0x0002  File is executable  (i.e. no unresolved externel references).
-#define EFI_IMAGE_FILE_LINE_NUMS_STRIPPED   BIT2     ///< 0x0004  Line numbers stripped from file.
+#define EFI_IMAGE_FILE_LINE_NUMS_STRIPPED   BIT2     ///< 0x0004  Line nunbers stripped from file.
 #define EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED  BIT3     ///< 0x0008  Local symbols stripped from file.
 #define EFI_IMAGE_FILE_BYTES_REVERSED_LO    BIT7     ///< 0x0080  Bytes of machine word are reversed.
 #define EFI_IMAGE_FILE_32BIT_MACHINE        BIT8     ///< 0x0100  32 bit word machine.
@@ -114,26 +113,26 @@ typedef struct {
 /// Header Data Directories.
 ///
 typedef struct {
-  UINT32    VirtualAddress;
-  UINT32    Size;
+  UINT32  VirtualAddress;
+  UINT32  Size;
 } EFI_IMAGE_DATA_DIRECTORY;
 
 //
 // Directory Entries
 //
-#define EFI_IMAGE_DIRECTORY_ENTRY_EXPORT       0
-#define EFI_IMAGE_DIRECTORY_ENTRY_IMPORT       1
-#define EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE     2
-#define EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION    3
-#define EFI_IMAGE_DIRECTORY_ENTRY_SECURITY     4
-#define EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC    5
-#define EFI_IMAGE_DIRECTORY_ENTRY_DEBUG        6
-#define EFI_IMAGE_DIRECTORY_ENTRY_COPYRIGHT    7
-#define EFI_IMAGE_DIRECTORY_ENTRY_GLOBALPTR    8
-#define EFI_IMAGE_DIRECTORY_ENTRY_TLS          9
-#define EFI_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG  10
+#define EFI_IMAGE_DIRECTORY_ENTRY_EXPORT      0
+#define EFI_IMAGE_DIRECTORY_ENTRY_IMPORT      1
+#define EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE    2
+#define EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION   3
+#define EFI_IMAGE_DIRECTORY_ENTRY_SECURITY    4
+#define EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC   5
+#define EFI_IMAGE_DIRECTORY_ENTRY_DEBUG       6
+#define EFI_IMAGE_DIRECTORY_ENTRY_COPYRIGHT   7
+#define EFI_IMAGE_DIRECTORY_ENTRY_GLOBALPTR   8
+#define EFI_IMAGE_DIRECTORY_ENTRY_TLS         9
+#define EFI_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10
 
-#define EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES  16
+#define EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES 16
 
 ///
 /// @attention
@@ -141,7 +140,7 @@ typedef struct {
 /// EFI_IMAGE_OPTIONAL_HEADER32 must be used. The data structures only vary
 /// after NT additional fields.
 ///
-#define EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC  0x10b
+#define EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b
 
 ///
 /// Optional Header Standard Fields for PE32.
@@ -150,40 +149,40 @@ typedef struct {
   ///
   /// Standard fields.
   ///
-  UINT16                      Magic;
-  UINT8                       MajorLinkerVersion;
-  UINT8                       MinorLinkerVersion;
-  UINT32                      SizeOfCode;
-  UINT32                      SizeOfInitializedData;
-  UINT32                      SizeOfUninitializedData;
-  UINT32                      AddressOfEntryPoint;
-  UINT32                      BaseOfCode;
-  UINT32                      BaseOfData; ///< PE32 contains this additional field, which is absent in PE32+.
+  UINT16                    Magic;
+  UINT8                     MajorLinkerVersion;
+  UINT8                     MinorLinkerVersion;
+  UINT32                    SizeOfCode;
+  UINT32                    SizeOfInitializedData;
+  UINT32                    SizeOfUninitializedData;
+  UINT32                    AddressOfEntryPoint;
+  UINT32                    BaseOfCode;
+  UINT32                    BaseOfData;  ///< PE32 contains this additional field, which is absent in PE32+.
   ///
   /// Optional Header Windows-Specific Fields.
   ///
-  UINT32                      ImageBase;
-  UINT32                      SectionAlignment;
-  UINT32                      FileAlignment;
-  UINT16                      MajorOperatingSystemVersion;
-  UINT16                      MinorOperatingSystemVersion;
-  UINT16                      MajorImageVersion;
-  UINT16                      MinorImageVersion;
-  UINT16                      MajorSubsystemVersion;
-  UINT16                      MinorSubsystemVersion;
-  UINT32                      Win32VersionValue;
-  UINT32                      SizeOfImage;
-  UINT32                      SizeOfHeaders;
-  UINT32                      CheckSum;
-  UINT16                      Subsystem;
-  UINT16                      DllCharacteristics;
-  UINT32                      SizeOfStackReserve;
-  UINT32                      SizeOfStackCommit;
-  UINT32                      SizeOfHeapReserve;
-  UINT32                      SizeOfHeapCommit;
-  UINT32                      LoaderFlags;
-  UINT32                      NumberOfRvaAndSizes;
-  EFI_IMAGE_DATA_DIRECTORY    DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
+  UINT32                    ImageBase;
+  UINT32                    SectionAlignment;
+  UINT32                    FileAlignment;
+  UINT16                    MajorOperatingSystemVersion;
+  UINT16                    MinorOperatingSystemVersion;
+  UINT16                    MajorImageVersion;
+  UINT16                    MinorImageVersion;
+  UINT16                    MajorSubsystemVersion;
+  UINT16                    MinorSubsystemVersion;
+  UINT32                    Win32VersionValue;
+  UINT32                    SizeOfImage;
+  UINT32                    SizeOfHeaders;
+  UINT32                    CheckSum;
+  UINT16                    Subsystem;
+  UINT16                    DllCharacteristics;
+  UINT32                    SizeOfStackReserve;
+  UINT32                    SizeOfStackCommit;
+  UINT32                    SizeOfHeapReserve;
+  UINT32                    SizeOfHeapCommit;
+  UINT32                    LoaderFlags;
+  UINT32                    NumberOfRvaAndSizes;
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
 } EFI_IMAGE_OPTIONAL_HEADER32;
 
 ///
@@ -192,7 +191,7 @@ typedef struct {
 /// EFI_IMAGE_OPTIONAL_HEADER64 must be used. The data structures only vary
 /// after NT additional fields.
 ///
-#define EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC  0x20b
+#define EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b
 
 ///
 /// Optional Header Standard Fields for PE32+.
@@ -201,165 +200,166 @@ typedef struct {
   ///
   /// Standard fields.
   ///
-  UINT16                      Magic;
-  UINT8                       MajorLinkerVersion;
-  UINT8                       MinorLinkerVersion;
-  UINT32                      SizeOfCode;
-  UINT32                      SizeOfInitializedData;
-  UINT32                      SizeOfUninitializedData;
-  UINT32                      AddressOfEntryPoint;
-  UINT32                      BaseOfCode;
+  UINT16                    Magic;
+  UINT8                     MajorLinkerVersion;
+  UINT8                     MinorLinkerVersion;
+  UINT32                    SizeOfCode;
+  UINT32                    SizeOfInitializedData;
+  UINT32                    SizeOfUninitializedData;
+  UINT32                    AddressOfEntryPoint;
+  UINT32                    BaseOfCode;
   ///
   /// Optional Header Windows-Specific Fields.
   ///
-  UINT64                      ImageBase;
-  UINT32                      SectionAlignment;
-  UINT32                      FileAlignment;
-  UINT16                      MajorOperatingSystemVersion;
-  UINT16                      MinorOperatingSystemVersion;
-  UINT16                      MajorImageVersion;
-  UINT16                      MinorImageVersion;
-  UINT16                      MajorSubsystemVersion;
-  UINT16                      MinorSubsystemVersion;
-  UINT32                      Win32VersionValue;
-  UINT32                      SizeOfImage;
-  UINT32                      SizeOfHeaders;
-  UINT32                      CheckSum;
-  UINT16                      Subsystem;
-  UINT16                      DllCharacteristics;
-  UINT64                      SizeOfStackReserve;
-  UINT64                      SizeOfStackCommit;
-  UINT64                      SizeOfHeapReserve;
-  UINT64                      SizeOfHeapCommit;
-  UINT32                      LoaderFlags;
-  UINT32                      NumberOfRvaAndSizes;
-  EFI_IMAGE_DATA_DIRECTORY    DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
+  UINT64                    ImageBase;
+  UINT32                    SectionAlignment;
+  UINT32                    FileAlignment;
+  UINT16                    MajorOperatingSystemVersion;
+  UINT16                    MinorOperatingSystemVersion;
+  UINT16                    MajorImageVersion;
+  UINT16                    MinorImageVersion;
+  UINT16                    MajorSubsystemVersion;
+  UINT16                    MinorSubsystemVersion;
+  UINT32                    Win32VersionValue;
+  UINT32                    SizeOfImage;
+  UINT32                    SizeOfHeaders;
+  UINT32                    CheckSum;
+  UINT16                    Subsystem;
+  UINT16                    DllCharacteristics;
+  UINT64                    SizeOfStackReserve;
+  UINT64                    SizeOfStackCommit;
+  UINT64                    SizeOfHeapReserve;
+  UINT64                    SizeOfHeapCommit;
+  UINT32                    LoaderFlags;
+  UINT32                    NumberOfRvaAndSizes;
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
 } EFI_IMAGE_OPTIONAL_HEADER64;
 
+
 ///
 /// @attention
 /// EFI_IMAGE_NT_HEADERS32 is for use ONLY by tools.
 ///
 typedef struct {
-  UINT32                         Signature;
-  EFI_IMAGE_FILE_HEADER          FileHeader;
-  EFI_IMAGE_OPTIONAL_HEADER32    OptionalHeader;
+  UINT32                      Signature;
+  EFI_IMAGE_FILE_HEADER       FileHeader;
+  EFI_IMAGE_OPTIONAL_HEADER32 OptionalHeader;
 } EFI_IMAGE_NT_HEADERS32;
 
-#define EFI_IMAGE_SIZEOF_NT_OPTIONAL32_HEADER  sizeof (EFI_IMAGE_NT_HEADERS32)
+#define EFI_IMAGE_SIZEOF_NT_OPTIONAL32_HEADER sizeof (EFI_IMAGE_NT_HEADERS32)
 
 ///
 /// @attention
 /// EFI_IMAGE_HEADERS64 is for use ONLY by tools.
 ///
 typedef struct {
-  UINT32                         Signature;
-  EFI_IMAGE_FILE_HEADER          FileHeader;
-  EFI_IMAGE_OPTIONAL_HEADER64    OptionalHeader;
+  UINT32                      Signature;
+  EFI_IMAGE_FILE_HEADER       FileHeader;
+  EFI_IMAGE_OPTIONAL_HEADER64 OptionalHeader;
 } EFI_IMAGE_NT_HEADERS64;
 
-#define EFI_IMAGE_SIZEOF_NT_OPTIONAL64_HEADER  sizeof (EFI_IMAGE_NT_HEADERS64)
+#define EFI_IMAGE_SIZEOF_NT_OPTIONAL64_HEADER sizeof (EFI_IMAGE_NT_HEADERS64)
 
 //
 // Other Windows Subsystem Values
 //
-#define EFI_IMAGE_SUBSYSTEM_UNKNOWN      0
-#define EFI_IMAGE_SUBSYSTEM_NATIVE       1
-#define EFI_IMAGE_SUBSYSTEM_WINDOWS_GUI  2
-#define EFI_IMAGE_SUBSYSTEM_WINDOWS_CUI  3
-#define EFI_IMAGE_SUBSYSTEM_OS2_CUI      5
-#define EFI_IMAGE_SUBSYSTEM_POSIX_CUI    7
+#define EFI_IMAGE_SUBSYSTEM_UNKNOWN     0
+#define EFI_IMAGE_SUBSYSTEM_NATIVE      1
+#define EFI_IMAGE_SUBSYSTEM_WINDOWS_GUI 2
+#define EFI_IMAGE_SUBSYSTEM_WINDOWS_CUI 3
+#define EFI_IMAGE_SUBSYSTEM_OS2_CUI     5
+#define EFI_IMAGE_SUBSYSTEM_POSIX_CUI   7
 
 ///
 /// Length of ShortName.
 ///
-#define EFI_IMAGE_SIZEOF_SHORT_NAME  8
+#define EFI_IMAGE_SIZEOF_SHORT_NAME 8
 
 ///
 /// Section Table. This table immediately follows the optional header.
 ///
 typedef struct {
-  UINT8     Name[EFI_IMAGE_SIZEOF_SHORT_NAME];
+  UINT8 Name[EFI_IMAGE_SIZEOF_SHORT_NAME];
   union {
-    UINT32    PhysicalAddress;
-    UINT32    VirtualSize;
+    UINT32  PhysicalAddress;
+    UINT32  VirtualSize;
   } Misc;
-  UINT32    VirtualAddress;
-  UINT32    SizeOfRawData;
-  UINT32    PointerToRawData;
-  UINT32    PointerToRelocations;
-  UINT32    PointerToLinenumbers;
-  UINT16    NumberOfRelocations;
-  UINT16    NumberOfLinenumbers;
-  UINT32    Characteristics;
+  UINT32  VirtualAddress;
+  UINT32  SizeOfRawData;
+  UINT32  PointerToRawData;
+  UINT32  PointerToRelocations;
+  UINT32  PointerToLinenumbers;
+  UINT16  NumberOfRelocations;
+  UINT16  NumberOfLinenumbers;
+  UINT32  Characteristics;
 } EFI_IMAGE_SECTION_HEADER;
 
 ///
 /// Size of EFI_IMAGE_SECTION_HEADER.
 ///
-#define EFI_IMAGE_SIZEOF_SECTION_HEADER  40
+#define EFI_IMAGE_SIZEOF_SECTION_HEADER       40
 
 //
 // Section Flags Values
 //
-#define EFI_IMAGE_SCN_TYPE_NO_PAD             BIT3        ///< 0x00000008  ///< Reserved.
-#define EFI_IMAGE_SCN_CNT_CODE                BIT5        ///< 0x00000020
-#define EFI_IMAGE_SCN_CNT_INITIALIZED_DATA    BIT6        ///< 0x00000040
-#define EFI_IMAGE_SCN_CNT_UNINITIALIZED_DATA  BIT7        ///< 0x00000080
+#define EFI_IMAGE_SCN_TYPE_NO_PAD                  BIT3   ///< 0x00000008  ///< Reserved.
+#define EFI_IMAGE_SCN_CNT_CODE                     BIT5   ///< 0x00000020
+#define EFI_IMAGE_SCN_CNT_INITIALIZED_DATA         BIT6   ///< 0x00000040
+#define EFI_IMAGE_SCN_CNT_UNINITIALIZED_DATA       BIT7   ///< 0x00000080
 
-#define EFI_IMAGE_SCN_LNK_OTHER   BIT8                    ///< 0x00000100  ///< Reserved.
-#define EFI_IMAGE_SCN_LNK_INFO    BIT9                    ///< 0x00000200  ///< Section contains comments or some other type of information.
-#define EFI_IMAGE_SCN_LNK_REMOVE  BIT11                   ///< 0x00000800  ///< Section contents will not become part of image.
-#define EFI_IMAGE_SCN_LNK_COMDAT  BIT12                   ///< 0x00001000
+#define EFI_IMAGE_SCN_LNK_OTHER                    BIT8   ///< 0x00000100  ///< Reserved.
+#define EFI_IMAGE_SCN_LNK_INFO                     BIT9   ///< 0x00000200  ///< Section contains comments or some other type of information.
+#define EFI_IMAGE_SCN_LNK_REMOVE                   BIT11  ///< 0x00000800  ///< Section contents will not become part of image.
+#define EFI_IMAGE_SCN_LNK_COMDAT                   BIT12  ///< 0x00001000
 
-#define EFI_IMAGE_SCN_ALIGN_1BYTES   BIT20                ///< 0x00100000
-#define EFI_IMAGE_SCN_ALIGN_2BYTES   BIT21                ///< 0x00200000
-#define EFI_IMAGE_SCN_ALIGN_4BYTES   (BIT20|BIT21)        ///< 0x00300000
-#define EFI_IMAGE_SCN_ALIGN_8BYTES   BIT22                ///< 0x00400000
-#define EFI_IMAGE_SCN_ALIGN_16BYTES  (BIT20|BIT22)        ///< 0x00500000
-#define EFI_IMAGE_SCN_ALIGN_32BYTES  (BIT21|BIT22)        ///< 0x00600000
-#define EFI_IMAGE_SCN_ALIGN_64BYTES  (BIT20|BIT21|BIT22)  ///< 0x00700000
+#define EFI_IMAGE_SCN_ALIGN_1BYTES                 BIT20  ///< 0x00100000
+#define EFI_IMAGE_SCN_ALIGN_2BYTES                 BIT21  ///< 0x00200000
+#define EFI_IMAGE_SCN_ALIGN_4BYTES          (BIT20|BIT21) ///< 0x00300000
+#define EFI_IMAGE_SCN_ALIGN_8BYTES                 BIT22  ///< 0x00400000
+#define EFI_IMAGE_SCN_ALIGN_16BYTES         (BIT20|BIT22) ///< 0x00500000
+#define EFI_IMAGE_SCN_ALIGN_32BYTES         (BIT21|BIT22) ///< 0x00600000
+#define EFI_IMAGE_SCN_ALIGN_64BYTES   (BIT20|BIT21|BIT22) ///< 0x00700000
 
-#define EFI_IMAGE_SCN_MEM_DISCARDABLE  BIT25              ///< 0x02000000
-#define EFI_IMAGE_SCN_MEM_NOT_CACHED   BIT26              ///< 0x04000000
-#define EFI_IMAGE_SCN_MEM_NOT_PAGED    BIT27              ///< 0x08000000
-#define EFI_IMAGE_SCN_MEM_SHARED       BIT28              ///< 0x10000000
-#define EFI_IMAGE_SCN_MEM_EXECUTE      BIT29              ///< 0x20000000
-#define EFI_IMAGE_SCN_MEM_READ         BIT30              ///< 0x40000000
-#define EFI_IMAGE_SCN_MEM_WRITE        BIT31              ///< 0x80000000
+#define EFI_IMAGE_SCN_MEM_DISCARDABLE              BIT25  ///< 0x02000000
+#define EFI_IMAGE_SCN_MEM_NOT_CACHED               BIT26  ///< 0x04000000
+#define EFI_IMAGE_SCN_MEM_NOT_PAGED                BIT27  ///< 0x08000000
+#define EFI_IMAGE_SCN_MEM_SHARED                   BIT28  ///< 0x10000000
+#define EFI_IMAGE_SCN_MEM_EXECUTE                  BIT29  ///< 0x20000000
+#define EFI_IMAGE_SCN_MEM_READ                     BIT30  ///< 0x40000000
+#define EFI_IMAGE_SCN_MEM_WRITE                    BIT31  ///< 0x80000000
 
 ///
 /// Size of a Symbol Table Record.
 ///
-#define EFI_IMAGE_SIZEOF_SYMBOL  18
+#define EFI_IMAGE_SIZEOF_SYMBOL 18
 
 //
 // Symbols have a section number of the section in which they are
 // defined. Otherwise, section numbers have the following meanings:
 //
-#define EFI_IMAGE_SYM_UNDEFINED  (UINT16) 0  ///< Symbol is undefined or is common.
-#define EFI_IMAGE_SYM_ABSOLUTE   (UINT16) -1 ///< Symbol is an absolute value.
-#define EFI_IMAGE_SYM_DEBUG      (UINT16) -2 ///< Symbol is a special debug item.
+#define EFI_IMAGE_SYM_UNDEFINED (UINT16) 0  ///< Symbol is undefined or is common.
+#define EFI_IMAGE_SYM_ABSOLUTE  (UINT16) -1 ///< Symbol is an absolute value.
+#define EFI_IMAGE_SYM_DEBUG     (UINT16) -2 ///< Symbol is a special debug item.
 
 //
 // Symbol Type (fundamental) values.
 //
-#define EFI_IMAGE_SYM_TYPE_NULL    0  ///< no type.
-#define EFI_IMAGE_SYM_TYPE_VOID    1  ///< no valid type.
-#define EFI_IMAGE_SYM_TYPE_CHAR    2  ///< type character.
-#define EFI_IMAGE_SYM_TYPE_SHORT   3  ///< type short integer.
-#define EFI_IMAGE_SYM_TYPE_INT     4
-#define EFI_IMAGE_SYM_TYPE_LONG    5
-#define EFI_IMAGE_SYM_TYPE_FLOAT   6
-#define EFI_IMAGE_SYM_TYPE_DOUBLE  7
-#define EFI_IMAGE_SYM_TYPE_STRUCT  8
-#define EFI_IMAGE_SYM_TYPE_UNION   9
-#define EFI_IMAGE_SYM_TYPE_ENUM    10 ///< enumeration.
-#define EFI_IMAGE_SYM_TYPE_MOE     11 ///< member of enumeration.
-#define EFI_IMAGE_SYM_TYPE_BYTE    12
-#define EFI_IMAGE_SYM_TYPE_WORD    13
-#define EFI_IMAGE_SYM_TYPE_UINT    14
-#define EFI_IMAGE_SYM_TYPE_DWORD   15
+#define EFI_IMAGE_SYM_TYPE_NULL   0   ///< no type.
+#define EFI_IMAGE_SYM_TYPE_VOID   1   ///< no valid type.
+#define EFI_IMAGE_SYM_TYPE_CHAR   2   ///< type character.
+#define EFI_IMAGE_SYM_TYPE_SHORT  3   ///< type short integer.
+#define EFI_IMAGE_SYM_TYPE_INT    4
+#define EFI_IMAGE_SYM_TYPE_LONG   5
+#define EFI_IMAGE_SYM_TYPE_FLOAT  6
+#define EFI_IMAGE_SYM_TYPE_DOUBLE 7
+#define EFI_IMAGE_SYM_TYPE_STRUCT 8
+#define EFI_IMAGE_SYM_TYPE_UNION  9
+#define EFI_IMAGE_SYM_TYPE_ENUM   10  ///< enumeration.
+#define EFI_IMAGE_SYM_TYPE_MOE    11  ///< member of enumeration.
+#define EFI_IMAGE_SYM_TYPE_BYTE   12
+#define EFI_IMAGE_SYM_TYPE_WORD   13
+#define EFI_IMAGE_SYM_TYPE_UINT   14
+#define EFI_IMAGE_SYM_TYPE_DWORD  15
 
 //
 // Symbol Type (derived) values.
@@ -412,11 +412,11 @@ typedef struct {
 //
 // Communal selection types.
 //
-#define EFI_IMAGE_COMDAT_SELECT_NODUPLICATES  1
-#define EFI_IMAGE_COMDAT_SELECT_ANY           2
-#define EFI_IMAGE_COMDAT_SELECT_SAME_SIZE     3
-#define EFI_IMAGE_COMDAT_SELECT_EXACT_MATCH   4
-#define EFI_IMAGE_COMDAT_SELECT_ASSOCIATIVE   5
+#define EFI_IMAGE_COMDAT_SELECT_NODUPLICATES    1
+#define EFI_IMAGE_COMDAT_SELECT_ANY             2
+#define EFI_IMAGE_COMDAT_SELECT_SAME_SIZE       3
+#define EFI_IMAGE_COMDAT_SELECT_EXACT_MATCH     4
+#define EFI_IMAGE_COMDAT_SELECT_ASSOCIATIVE     5
 
 //
 // the following values only be referred in PeCoff, not defined in PECOFF.
@@ -429,28 +429,28 @@ typedef struct {
 /// Relocation format.
 ///
 typedef struct {
-  UINT32    VirtualAddress;
-  UINT32    SymbolTableIndex;
-  UINT16    Type;
+  UINT32  VirtualAddress;
+  UINT32  SymbolTableIndex;
+  UINT16  Type;
 } EFI_IMAGE_RELOCATION;
 
 ///
 /// Size of EFI_IMAGE_RELOCATION
 ///
-#define EFI_IMAGE_SIZEOF_RELOCATION  10
+#define EFI_IMAGE_SIZEOF_RELOCATION 10
 
 //
 // I386 relocation types.
 //
-#define EFI_IMAGE_REL_I386_ABSOLUTE  0x0000 ///< Reference is absolute, no relocation is necessary.
-#define EFI_IMAGE_REL_I386_DIR16     0x0001 ///< Direct 16-bit reference to the symbols virtual address.
-#define EFI_IMAGE_REL_I386_REL16     0x0002 ///< PC-relative 16-bit reference to the symbols virtual address.
-#define EFI_IMAGE_REL_I386_DIR32     0x0006 ///< Direct 32-bit reference to the symbols virtual address.
-#define EFI_IMAGE_REL_I386_DIR32NB   0x0007 ///< Direct 32-bit reference to the symbols virtual address, base not included.
-#define EFI_IMAGE_REL_I386_SEG12     0x0009 ///< Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address.
-#define EFI_IMAGE_REL_I386_SECTION   0x000A
-#define EFI_IMAGE_REL_I386_SECREL    0x000B
-#define EFI_IMAGE_REL_I386_REL32     0x0014 ///< PC-relative 32-bit reference to the symbols virtual address.
+#define EFI_IMAGE_REL_I386_ABSOLUTE 0x0000  ///< Reference is absolute, no relocation is necessary.
+#define EFI_IMAGE_REL_I386_DIR16    0x0001  ///< Direct 16-bit reference to the symbols virtual address.
+#define EFI_IMAGE_REL_I386_REL16    0x0002  ///< PC-relative 16-bit reference to the symbols virtual address.
+#define EFI_IMAGE_REL_I386_DIR32    0x0006  ///< Direct 32-bit reference to the symbols virtual address.
+#define EFI_IMAGE_REL_I386_DIR32NB  0x0007  ///< Direct 32-bit reference to the symbols virtual address, base not included.
+#define EFI_IMAGE_REL_I386_SEG12    0x0009  ///< Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address.
+#define EFI_IMAGE_REL_I386_SECTION  0x000A
+#define EFI_IMAGE_REL_I386_SECREL   0x000B
+#define EFI_IMAGE_REL_I386_REL32    0x0014  ///< PC-relative 32-bit reference to the symbols virtual address.
 
 //
 // x64 processor relocation types.
@@ -477,8 +477,8 @@ typedef struct {
 /// Based relocation format.
 ///
 typedef struct {
-  UINT32    VirtualAddress;
-  UINT32    SizeOfBlock;
+  UINT32  VirtualAddress;
+  UINT32  SizeOfBlock;
 } EFI_IMAGE_BASE_RELOCATION;
 
 ///
@@ -501,34 +501,21 @@ typedef struct {
 #define EFI_IMAGE_REL_BASED_MIPS_JMPADDR16  9
 #define EFI_IMAGE_REL_BASED_DIR64           10
 
-///
-/// Relocation types of RISC-V processor.
-///
-#define EFI_IMAGE_REL_BASED_RISCV_HI20    5
-#define EFI_IMAGE_REL_BASED_RISCV_LOW12I  7
-#define EFI_IMAGE_REL_BASED_RISCV_LOW12S  8
-
-//
-// Relocation types of LoongArch processor.
-//
-#define EFI_IMAGE_REL_BASED_LOONGARCH32_MARK_LA  8
-#define EFI_IMAGE_REL_BASED_LOONGARCH64_MARK_LA  8
-
 ///
 /// Line number format.
 ///
 typedef struct {
   union {
-    UINT32    SymbolTableIndex; ///< Symbol table index of function name if Linenumber is 0.
-    UINT32    VirtualAddress;   ///< Virtual address of line number.
+    UINT32  SymbolTableIndex; ///< Symbol table index of function name if Linenumber is 0.
+    UINT32  VirtualAddress;   ///< Virtual address of line number.
   } Type;
-  UINT16    Linenumber;       ///< Line number.
+  UINT16  Linenumber;         ///< Line number.
 } EFI_IMAGE_LINENUMBER;
 
 ///
 /// Size of EFI_IMAGE_LINENUMBER.
 ///
-#define EFI_IMAGE_SIZEOF_LINENUMBER  6
+#define EFI_IMAGE_SIZEOF_LINENUMBER 6
 
 //
 // Archive format.
@@ -544,19 +531,20 @@ typedef struct {
 /// Archive Member Headers
 ///
 typedef struct {
-  UINT8    Name[16];     ///< File member name - `/' terminated.
-  UINT8    Date[12];     ///< File member date - decimal.
-  UINT8    UserID[6];    ///< File member user id - decimal.
-  UINT8    GroupID[6];   ///< File member group id - decimal.
-  UINT8    Mode[8];      ///< File member mode - octal.
-  UINT8    Size[10];     ///< File member size - decimal.
-  UINT8    EndHeader[2]; ///< String to end header. (0x60 0x0A).
+  UINT8 Name[16];     ///< File member name - `/' terminated.
+  UINT8 Date[12];     ///< File member date - decimal.
+  UINT8 UserID[6];    ///< File member user id - decimal.
+  UINT8 GroupID[6];   ///< File member group id - decimal.
+  UINT8 Mode[8];      ///< File member mode - octal.
+  UINT8 Size[10];     ///< File member size - decimal.
+  UINT8 EndHeader[2]; ///< String to end header. (0x60 0x0A).
 } EFI_IMAGE_ARCHIVE_MEMBER_HEADER;
 
 ///
 /// Size of EFI_IMAGE_ARCHIVE_MEMBER_HEADER.
 ///
-#define EFI_IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR  60
+#define EFI_IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60
+
 
 //
 // DLL Support
@@ -566,25 +554,25 @@ typedef struct {
 /// Export Directory Table.
 ///
 typedef struct {
-  UINT32    Characteristics;
-  UINT32    TimeDateStamp;
-  UINT16    MajorVersion;
-  UINT16    MinorVersion;
-  UINT32    Name;
-  UINT32    Base;
-  UINT32    NumberOfFunctions;
-  UINT32    NumberOfNames;
-  UINT32    AddressOfFunctions;
-  UINT32    AddressOfNames;
-  UINT32    AddressOfNameOrdinals;
+  UINT32  Characteristics;
+  UINT32  TimeDateStamp;
+  UINT16  MajorVersion;
+  UINT16  MinorVersion;
+  UINT32  Name;
+  UINT32  Base;
+  UINT32  NumberOfFunctions;
+  UINT32  NumberOfNames;
+  UINT32  AddressOfFunctions;
+  UINT32  AddressOfNames;
+  UINT32  AddressOfNameOrdinals;
 } EFI_IMAGE_EXPORT_DIRECTORY;
 
 ///
 /// Hint/Name Table.
 ///
 typedef struct {
-  UINT16    Hint;
-  UINT8     Name[1];
+  UINT16  Hint;
+  UINT8   Name[1];
 } EFI_IMAGE_IMPORT_BY_NAME;
 
 ///
@@ -592,13 +580,13 @@ typedef struct {
 ///
 typedef struct {
   union {
-    UINT32                      Function;
-    UINT32                      Ordinal;
-    EFI_IMAGE_IMPORT_BY_NAME    *AddressOfData;
+    UINT32                    Function;
+    UINT32                    Ordinal;
+    EFI_IMAGE_IMPORT_BY_NAME  *AddressOfData;
   } u1;
 } EFI_IMAGE_THUNK_DATA;
 
-#define EFI_IMAGE_ORDINAL_FLAG  BIT31                ///< Flag for PE32.
+#define EFI_IMAGE_ORDINAL_FLAG              BIT31    ///< Flag for PE32.
 #define EFI_IMAGE_SNAP_BY_ORDINAL(Ordinal)  ((Ordinal & EFI_IMAGE_ORDINAL_FLAG) != 0)
 #define EFI_IMAGE_ORDINAL(Ordinal)          (Ordinal & 0xffff)
 
@@ -606,38 +594,39 @@ typedef struct {
 /// Import Directory Table
 ///
 typedef struct {
-  UINT32                  Characteristics;
-  UINT32                  TimeDateStamp;
-  UINT32                  ForwarderChain;
-  UINT32                  Name;
-  EFI_IMAGE_THUNK_DATA    *FirstThunk;
+  UINT32                Characteristics;
+  UINT32                TimeDateStamp;
+  UINT32                ForwarderChain;
+  UINT32                Name;
+  EFI_IMAGE_THUNK_DATA  *FirstThunk;
 } EFI_IMAGE_IMPORT_DESCRIPTOR;
 
+
 ///
 /// Debug Directory Format.
 ///
 typedef struct {
-  UINT32    Characteristics;
-  UINT32    TimeDateStamp;
-  UINT16    MajorVersion;
-  UINT16    MinorVersion;
-  UINT32    Type;
-  UINT32    SizeOfData;
-  UINT32    RVA;         ///< The address of the debug data when loaded, relative to the image base.
-  UINT32    FileOffset;  ///< The file pointer to the debug data.
+  UINT32  Characteristics;
+  UINT32  TimeDateStamp;
+  UINT16  MajorVersion;
+  UINT16  MinorVersion;
+  UINT32  Type;
+  UINT32  SizeOfData;
+  UINT32  RVA;           ///< The address of the debug data when loaded, relative to the image base.
+  UINT32  FileOffset;    ///< The file pointer to the debug data.
 } EFI_IMAGE_DEBUG_DIRECTORY_ENTRY;
 
-#define EFI_IMAGE_DEBUG_TYPE_CODEVIEW  2    ///< The Visual C++ debug information.
+#define EFI_IMAGE_DEBUG_TYPE_CODEVIEW 2     ///< The Visual C++ debug information.
 
 ///
 /// Debug Data Structure defined in Microsoft C++.
 ///
 #define CODEVIEW_SIGNATURE_NB10  SIGNATURE_32('N', 'B', '1', '0')
 typedef struct {
-  UINT32    Signature;                      ///< "NB10"
-  UINT32    Unknown;
-  UINT32    Unknown2;
-  UINT32    Unknown3;
+  UINT32  Signature;                        ///< "NB10"
+  UINT32  Unknown;
+  UINT32  Unknown2;
+  UINT32  Unknown3;
   //
   // Filename of .PDB goes here
   //
@@ -648,17 +637,18 @@ typedef struct {
 ///
 #define CODEVIEW_SIGNATURE_RSDS  SIGNATURE_32('R', 'S', 'D', 'S')
 typedef struct {
-  UINT32    Signature;                      ///< "RSDS".
-  UINT32    Unknown;
-  UINT32    Unknown2;
-  UINT32    Unknown3;
-  UINT32    Unknown4;
-  UINT32    Unknown5;
+  UINT32  Signature;                        ///< "RSDS".
+  UINT32  Unknown;
+  UINT32  Unknown2;
+  UINT32  Unknown3;
+  UINT32  Unknown4;
+  UINT32  Unknown5;
   //
   // Filename of .PDB goes here
   //
 } EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY;
 
+
 ///
 /// Debug Data Structure defined by Apple Mach-O to Coff utility.
 ///
@@ -675,12 +665,12 @@ typedef struct {
 /// Resource format.
 ///
 typedef struct {
-  UINT32    Characteristics;
-  UINT32    TimeDateStamp;
-  UINT16    MajorVersion;
-  UINT16    MinorVersion;
-  UINT16    NumberOfNamedEntries;
-  UINT16    NumberOfIdEntries;
+  UINT32  Characteristics;
+  UINT32  TimeDateStamp;
+  UINT16  MajorVersion;
+  UINT16  MinorVersion;
+  UINT16  NumberOfNamedEntries;
+  UINT16  NumberOfIdEntries;
   //
   // Array of EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY entries goes here.
   //
@@ -692,16 +682,16 @@ typedef struct {
 typedef struct {
   union {
     struct {
-      UINT32    NameOffset   : 31;
-      UINT32    NameIsString : 1;
+      UINT32  NameOffset:31;
+      UINT32  NameIsString:1;
     } s;
-    UINT32    Id;
+    UINT32  Id;
   } u1;
   union {
-    UINT32    OffsetToData;
+    UINT32  OffsetToData;
     struct {
-      UINT32    OffsetToDirectory : 31;
-      UINT32    DataIsDirectory   : 1;
+      UINT32  OffsetToDirectory:31;
+      UINT32  DataIsDirectory:1;
     } s;
   } u2;
 } EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY;
@@ -710,35 +700,36 @@ typedef struct {
 /// Resource directory entry for string.
 ///
 typedef struct {
-  UINT16    Length;
-  CHAR16    String[1];
+  UINT16  Length;
+  CHAR16  String[1];
 } EFI_IMAGE_RESOURCE_DIRECTORY_STRING;
 
 ///
 /// Resource directory entry for data array.
 ///
 typedef struct {
-  UINT32    OffsetToData;
-  UINT32    Size;
-  UINT32    CodePage;
-  UINT32    Reserved;
+  UINT32  OffsetToData;
+  UINT32  Size;
+  UINT32  CodePage;
+  UINT32  Reserved;
 } EFI_IMAGE_RESOURCE_DATA_ENTRY;
 
 ///
 /// Header format for TE images, defined in the PI Specification, 1.0.
 ///
 typedef struct {
-  UINT16                      Signature;           ///< The signature for TE format = "VZ".
-  UINT16                      Machine;             ///< From the original file header.
-  UINT8                       NumberOfSections;    ///< From the original file header.
-  UINT8                       Subsystem;           ///< From original optional header.
-  UINT16                      StrippedSize;        ///< Number of bytes we removed from the header.
-  UINT32                      AddressOfEntryPoint; ///< Offset to entry point -- from original optional header.
-  UINT32                      BaseOfCode;          ///< From original image -- required for ITP debug.
-  UINT64                      ImageBase;           ///< From original file header.
-  EFI_IMAGE_DATA_DIRECTORY    DataDirectory[2];    ///< Only base relocation and debug directory.
+  UINT16                    Signature;            ///< The signature for TE format = "VZ".
+  UINT16                    Machine;              ///< From the original file header.
+  UINT8                     NumberOfSections;     ///< From the original file header.
+  UINT8                     Subsystem;            ///< From original optional header.
+  UINT16                    StrippedSize;         ///< Number of bytes we removed from the header.
+  UINT32                    AddressOfEntryPoint;  ///< Offset to entry point -- from original optional header.
+  UINT32                    BaseOfCode;           ///< From original image -- required for ITP debug.
+  UINT64                    ImageBase;            ///< From original file header.
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[2];     ///< Only base relocation and debug directory.
 } EFI_TE_IMAGE_HEADER;
 
+
 #define EFI_TE_IMAGE_HEADER_SIGNATURE  SIGNATURE_16('V', 'Z')
 
 //
@@ -747,20 +738,21 @@ typedef struct {
 #define EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC  0
 #define EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG      1
 
+
 ///
 /// Union of PE32, PE32+, and TE headers.
 ///
 typedef union {
-  EFI_IMAGE_NT_HEADERS32    Pe32;
-  EFI_IMAGE_NT_HEADERS64    Pe32Plus;
-  EFI_TE_IMAGE_HEADER       Te;
+  EFI_IMAGE_NT_HEADERS32   Pe32;
+  EFI_IMAGE_NT_HEADERS64   Pe32Plus;
+  EFI_TE_IMAGE_HEADER      Te;
 } EFI_IMAGE_OPTIONAL_HEADER_UNION;
 
 typedef union {
-  EFI_IMAGE_NT_HEADERS32             *Pe32;
-  EFI_IMAGE_NT_HEADERS64             *Pe32Plus;
-  EFI_TE_IMAGE_HEADER                *Te;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION    *Union;
+  EFI_IMAGE_NT_HEADERS32            *Pe32;
+  EFI_IMAGE_NT_HEADERS64            *Pe32Plus;
+  EFI_TE_IMAGE_HEADER               *Te;
+  EFI_IMAGE_OPTIONAL_HEADER_UNION   *Union;
 } EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION;
 
 #endif

src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h

@@ -1,16 +1,21 @@
 /** @file
-  TCG EFI Platform Definition in TCG_EFI_Platform_1_20_Final and
-  TCG PC Client Platform Firmware Profile Specification, Revision 1.05
+  TCG EFI Platform Definition in TCG_EFI_Platform_1_20_Final
 
-  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __UEFI_TCG_PLATFORM_H__
 #define __UEFI_TCG_PLATFORM_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #include <ipxe/efi/IndustryStandard/Tpm12.h>
 #include <ipxe/efi/IndustryStandard/Tpm20.h>
@@ -19,46 +24,32 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Standard event types
 //
-#define EV_PREBOOT_CERT             ((TCG_EVENTTYPE) 0x00000000)
 #define EV_POST_CODE                ((TCG_EVENTTYPE) 0x00000001)
 #define EV_NO_ACTION                ((TCG_EVENTTYPE) 0x00000003)
 #define EV_SEPARATOR                ((TCG_EVENTTYPE) 0x00000004)
-#define EV_ACTION                   ((TCG_EVENTTYPE) 0x00000005)
-#define EV_EVENT_TAG                ((TCG_EVENTTYPE) 0x00000006)
 #define EV_S_CRTM_CONTENTS          ((TCG_EVENTTYPE) 0x00000007)
 #define EV_S_CRTM_VERSION           ((TCG_EVENTTYPE) 0x00000008)
 #define EV_CPU_MICROCODE            ((TCG_EVENTTYPE) 0x00000009)
-#define EV_PLATFORM_CONFIG_FLAGS    ((TCG_EVENTTYPE) 0x0000000A)
 #define EV_TABLE_OF_DEVICES         ((TCG_EVENTTYPE) 0x0000000B)
-#define EV_COMPACT_HASH             ((TCG_EVENTTYPE) 0x0000000C)
-#define EV_NONHOST_CODE             ((TCG_EVENTTYPE) 0x0000000F)
-#define EV_NONHOST_CONFIG           ((TCG_EVENTTYPE) 0x00000010)
-#define EV_NONHOST_INFO             ((TCG_EVENTTYPE) 0x00000011)
-#define EV_OMIT_BOOT_DEVICE_EVENTS  ((TCG_EVENTTYPE) 0x00000012)
 
 //
 // EFI specific event types
 //
-#define EV_EFI_EVENT_BASE                 ((TCG_EVENTTYPE) 0x80000000)
-#define EV_EFI_VARIABLE_DRIVER_CONFIG     (EV_EFI_EVENT_BASE + 1)
-#define EV_EFI_VARIABLE_BOOT              (EV_EFI_EVENT_BASE + 2)
-#define EV_EFI_BOOT_SERVICES_APPLICATION  (EV_EFI_EVENT_BASE + 3)
-#define EV_EFI_BOOT_SERVICES_DRIVER       (EV_EFI_EVENT_BASE + 4)
-#define EV_EFI_RUNTIME_SERVICES_DRIVER    (EV_EFI_EVENT_BASE + 5)
-#define EV_EFI_GPT_EVENT                  (EV_EFI_EVENT_BASE + 6)
-#define EV_EFI_ACTION                     (EV_EFI_EVENT_BASE + 7)
-#define EV_EFI_PLATFORM_FIRMWARE_BLOB     (EV_EFI_EVENT_BASE + 8)
-#define EV_EFI_HANDOFF_TABLES             (EV_EFI_EVENT_BASE + 9)
-#define EV_EFI_PLATFORM_FIRMWARE_BLOB2    (EV_EFI_EVENT_BASE + 0xA)
-#define EV_EFI_HANDOFF_TABLES2            (EV_EFI_EVENT_BASE + 0xB)
-#define EV_EFI_HCRTM_EVENT                (EV_EFI_EVENT_BASE + 0x10)
-#define EV_EFI_VARIABLE_AUTHORITY         (EV_EFI_EVENT_BASE + 0xE0)
-#define EV_EFI_SPDM_FIRMWARE_BLOB         (EV_EFI_EVENT_BASE + 0xE1)
-#define EV_EFI_SPDM_FIRMWARE_CONFIG       (EV_EFI_EVENT_BASE + 0xE2)
+#define EV_EFI_EVENT_BASE                   ((TCG_EVENTTYPE) 0x80000000)
+#define EV_EFI_VARIABLE_DRIVER_CONFIG       (EV_EFI_EVENT_BASE + 1)
+#define EV_EFI_VARIABLE_BOOT                (EV_EFI_EVENT_BASE + 2)
+#define EV_EFI_BOOT_SERVICES_APPLICATION    (EV_EFI_EVENT_BASE + 3)
+#define EV_EFI_BOOT_SERVICES_DRIVER         (EV_EFI_EVENT_BASE + 4)
+#define EV_EFI_RUNTIME_SERVICES_DRIVER      (EV_EFI_EVENT_BASE + 5)
+#define EV_EFI_GPT_EVENT                    (EV_EFI_EVENT_BASE + 6)
+#define EV_EFI_ACTION                       (EV_EFI_EVENT_BASE + 7)
+#define EV_EFI_PLATFORM_FIRMWARE_BLOB       (EV_EFI_EVENT_BASE + 8)
+#define EV_EFI_HANDOFF_TABLES               (EV_EFI_EVENT_BASE + 9)
+#define EV_EFI_VARIABLE_AUTHORITY           (EV_EFI_EVENT_BASE + 0xE0)
 
 #define EFI_CALLING_EFI_APPLICATION         \
   "Calling EFI Application from Boot Option"
-#define EFI_RETURNING_FROM_EFI_APPLICATION  \
+#define EFI_RETURNING_FROM_EFI_APPLICATOIN  \
   "Returning from EFI Application from Boot Option"
 #define EFI_EXIT_BOOT_SERVICES_INVOCATION   \
   "Exit Boot Services Invocation"
@@ -67,26 +58,24 @@ FILE_LICENCE ( BSD2_PATENT );
 #define EFI_EXIT_BOOT_SERVICES_SUCCEEDED    \
   "Exit Boot Services Returned with Success"
 
-#define EV_POSTCODE_INFO_POST_CODE  "POST CODE"
-#define POST_CODE_STR_LEN           (sizeof(EV_POSTCODE_INFO_POST_CODE) - 1)
 
-#define EV_POSTCODE_INFO_SMM_CODE  "SMM CODE"
-#define SMM_CODE_STR_LEN           (sizeof(EV_POSTCODE_INFO_SMM_CODE) - 1)
+#define EV_POSTCODE_INFO_POST_CODE    "POST CODE"
+#define POST_CODE_STR_LEN             (sizeof(EV_POSTCODE_INFO_POST_CODE) - 1)
 
-#define EV_POSTCODE_INFO_ACPI_DATA  "ACPI DATA"
-#define ACPI_DATA_LEN               (sizeof(EV_POSTCODE_INFO_ACPI_DATA) - 1)
+#define EV_POSTCODE_INFO_SMM_CODE     "SMM CODE"
+#define SMM_CODE_STR_LEN              (sizeof(EV_POSTCODE_INFO_SMM_CODE) - 1)
 
-#define EV_POSTCODE_INFO_BIS_CODE  "BIS CODE"
-#define BIS_CODE_LEN               (sizeof(EV_POSTCODE_INFO_BIS_CODE) - 1)
+#define EV_POSTCODE_INFO_ACPI_DATA    "ACPI DATA"
+#define ACPI_DATA_LEN                 (sizeof(EV_POSTCODE_INFO_ACPI_DATA) - 1)
 
-#define EV_POSTCODE_INFO_UEFI_PI  "UEFI PI"
-#define UEFI_PI_LEN               (sizeof(EV_POSTCODE_INFO_UEFI_PI) - 1)
+#define EV_POSTCODE_INFO_BIS_CODE     "BIS CODE"
+#define BIS_CODE_LEN                  (sizeof(EV_POSTCODE_INFO_BIS_CODE) - 1)
 
-#define EV_POSTCODE_INFO_OPROM  "Embedded Option ROM"
-#define OPROM_LEN               (sizeof(EV_POSTCODE_INFO_OPROM) - 1)
+#define EV_POSTCODE_INFO_UEFI_PI      "UEFI PI"
+#define UEFI_PI_LEN                   (sizeof(EV_POSTCODE_INFO_UEFI_PI) - 1)
 
-#define EV_POSTCODE_INFO_EMBEDDED_UEFI_DRIVER  "Embedded UEFI Driver"
-#define EMBEDDED_UEFI_DRIVER_LEN               (sizeof(EV_POSTCODE_INFO_EMBEDDED_UEFI_DRIVER) - 1)
+#define EV_POSTCODE_INFO_OPROM        "Embedded Option ROM"
+#define OPROM_LEN                     (sizeof(EV_POSTCODE_INFO_OPROM) - 1)
 
 #define FIRMWARE_DEBUGGER_EVENT_STRING      "UEFI Debug Mode"
 #define FIRMWARE_DEBUGGER_EVENT_STRING_LEN  (sizeof(FIRMWARE_DEBUGGER_EVENT_STRING) - 1)
@@ -96,30 +85,30 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 #pragma pack (1)
 
-typedef UINT32        TCG_EVENTTYPE;
-typedef TPM_PCRINDEX  TCG_PCRINDEX;
-typedef TPM_DIGEST    TCG_DIGEST;
+typedef UINT32                     TCG_EVENTTYPE;
+typedef TPM_PCRINDEX               TCG_PCRINDEX;
+typedef TPM_DIGEST                 TCG_DIGEST;
 ///
 /// Event Log Entry Structure Definition
 ///
 typedef struct tdTCG_PCR_EVENT {
-  TCG_PCRINDEX     PCRIndex;                   ///< PCRIndex event extended to
-  TCG_EVENTTYPE    EventType;                  ///< TCG EFI event type
-  TCG_DIGEST       Digest;                     ///< Value extended into PCRIndex
-  UINT32           EventSize;                  ///< Size of the event data
-  UINT8            Event[1];                   ///< The event data
+  TCG_PCRINDEX                      PCRIndex;  ///< PCRIndex event extended to
+  TCG_EVENTTYPE                     EventType; ///< TCG EFI event type
+  TCG_DIGEST                        Digest;    ///< Value extended into PCRIndex
+  UINT32                            EventSize; ///< Size of the event data
+  UINT8                             Event[1];  ///< The event data
 } TCG_PCR_EVENT;
 
-#define TSS_EVENT_DATA_MAX_SIZE  256
+#define TSS_EVENT_DATA_MAX_SIZE   256
 
 ///
 /// TCG_PCR_EVENT_HDR
 ///
 typedef struct tdTCG_PCR_EVENT_HDR {
-  TCG_PCRINDEX     PCRIndex;
-  TCG_EVENTTYPE    EventType;
-  TCG_DIGEST       Digest;
-  UINT32           EventSize;
+  TCG_PCRINDEX                      PCRIndex;
+  TCG_EVENTTYPE                     EventType;
+  TCG_DIGEST                        Digest;
+  UINT32                            EventSize;
 } TCG_PCR_EVENT_HDR;
 
 ///
@@ -129,34 +118,10 @@ typedef struct tdTCG_PCR_EVENT_HDR {
 /// because PEI is 32-bit while DXE is 64-bit on x64 platforms
 ///
 typedef struct tdEFI_PLATFORM_FIRMWARE_BLOB {
-  EFI_PHYSICAL_ADDRESS    BlobBase;
-  UINT64                  BlobLength;
+  EFI_PHYSICAL_ADDRESS              BlobBase;
+  UINT64                            BlobLength;
 } EFI_PLATFORM_FIRMWARE_BLOB;
 
-///
-/// UEFI_PLATFORM_FIRMWARE_BLOB
-///
-/// This structure is used in EV_EFI_PLATFORM_FIRMWARE_BLOB
-/// event to facilitate the measurement of firmware volume.
-///
-typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB {
-  EFI_PHYSICAL_ADDRESS    BlobBase;
-  UINT64                  BlobLength;
-} UEFI_PLATFORM_FIRMWARE_BLOB;
-
-///
-/// UEFI_PLATFORM_FIRMWARE_BLOB2
-///
-/// This structure is used in EV_EFI_PLATFORM_FIRMWARE_BLOB2
-/// event to facilitate the measurement of firmware volume.
-///
-typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB2 {
-  UINT8    BlobDescriptionSize;
-  // UINT8                             BlobDescription[BlobDescriptionSize];
-  // EFI_PHYSICAL_ADDRESS              BlobBase;
-  // UINT64                            BlobLength;
-} UEFI_PLATFORM_FIRMWARE_BLOB2;
-
 ///
 /// EFI_IMAGE_LOAD_EVENT
 ///
@@ -164,27 +129,13 @@ typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB2 {
 /// EV_EFI_BOOT_SERVICES_DRIVER and EV_EFI_RUNTIME_SERVICES_DRIVER
 ///
 typedef struct tdEFI_IMAGE_LOAD_EVENT {
-  EFI_PHYSICAL_ADDRESS        ImageLocationInMemory;
-  UINTN                       ImageLengthInMemory;
-  UINTN                       ImageLinkTimeAddress;
-  UINTN                       LengthOfDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL    DevicePath[1];
+  EFI_PHYSICAL_ADDRESS              ImageLocationInMemory;
+  UINTN                             ImageLengthInMemory;
+  UINTN                             ImageLinkTimeAddress;
+  UINTN                             LengthOfDevicePath;
+  EFI_DEVICE_PATH_PROTOCOL          DevicePath[1];
 } EFI_IMAGE_LOAD_EVENT;
 
-///
-/// UEFI_IMAGE_LOAD_EVENT
-///
-/// This structure is used in EV_EFI_BOOT_SERVICES_APPLICATION,
-/// EV_EFI_BOOT_SERVICES_DRIVER and EV_EFI_RUNTIME_SERVICES_DRIVER
-///
-typedef struct tdUEFI_IMAGE_LOAD_EVENT {
-  EFI_PHYSICAL_ADDRESS        ImageLocationInMemory;
-  UINT64                      ImageLengthInMemory;
-  UINT64                      ImageLinkTimeAddress;
-  UINT64                      LengthOfDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL    DevicePath[1];
-} UEFI_IMAGE_LOAD_EVENT;
-
 ///
 /// EFI_HANDOFF_TABLE_POINTERS
 ///
@@ -192,34 +143,10 @@ typedef struct tdUEFI_IMAGE_LOAD_EVENT {
 /// the measurement of given configuration tables.
 ///
 typedef struct tdEFI_HANDOFF_TABLE_POINTERS {
-  UINTN                      NumberOfTables;
-  EFI_CONFIGURATION_TABLE    TableEntry[1];
+  UINTN                             NumberOfTables;
+  EFI_CONFIGURATION_TABLE           TableEntry[1];
 } EFI_HANDOFF_TABLE_POINTERS;
 
-///
-/// UEFI_HANDOFF_TABLE_POINTERS
-///
-/// This structure is used in EV_EFI_HANDOFF_TABLES event to facilitate
-/// the measurement of given configuration tables.
-///
-typedef struct tdUEFI_HANDOFF_TABLE_POINTERS {
-  UINT64                     NumberOfTables;
-  EFI_CONFIGURATION_TABLE    TableEntry[1];
-} UEFI_HANDOFF_TABLE_POINTERS;
-
-///
-/// UEFI_HANDOFF_TABLE_POINTERS2
-///
-/// This structure is used in EV_EFI_HANDOFF_TABLES2 event to facilitate
-/// the measurement of given configuration tables.
-///
-typedef struct tdUEFI_HANDOFF_TABLE_POINTERS2 {
-  UINT8    TableDescriptionSize;
-  // UINT8                             TableDescription[TableDescriptionSize];
-  // UINT64                            NumberOfTables;
-  // EFI_CONFIGURATION_TABLE           TableEntry[1];
-} UEFI_HANDOFF_TABLE_POINTERS2;
-
 ///
 /// EFI_VARIABLE_DATA
 ///
@@ -229,11 +156,11 @@ typedef struct tdUEFI_HANDOFF_TABLE_POINTERS2 {
 /// This is defined in TCG EFI Platform Spec for TPM1.1 or 1.2 V1.22
 ///
 typedef struct tdEFI_VARIABLE_DATA {
-  EFI_GUID    VariableName;
-  UINTN       UnicodeNameLength;
-  UINTN       VariableDataLength;
-  CHAR16      UnicodeName[1];
-  INT8        VariableData[1];                        ///< Driver or platform-specific data
+  EFI_GUID                          VariableName;
+  UINTN                             UnicodeNameLength;
+  UINTN                             VariableDataLength;
+  CHAR16                            UnicodeName[1];
+  INT8                              VariableData[1];  ///< Driver or platform-specific data
 } EFI_VARIABLE_DATA;
 
 ///
@@ -245,110 +172,50 @@ typedef struct tdEFI_VARIABLE_DATA {
 /// This is defined in TCG PC Client Firmware Profile Spec 00.21
 ///
 typedef struct tdUEFI_VARIABLE_DATA {
-  EFI_GUID    VariableName;
-  UINT64      UnicodeNameLength;
-  UINT64      VariableDataLength;
-  CHAR16      UnicodeName[1];
-  INT8        VariableData[1];                        ///< Driver or platform-specific data
+  EFI_GUID                          VariableName;
+  UINT64                            UnicodeNameLength;
+  UINT64                            VariableDataLength;
+  CHAR16                            UnicodeName[1];
+  INT8                              VariableData[1];  ///< Driver or platform-specific data
 } UEFI_VARIABLE_DATA;
 
 //
 // For TrEE1.0 compatibility
 //
 typedef struct {
-  EFI_GUID    VariableName;
-  UINT64      UnicodeNameLength;                         // The TCG Definition used UINTN
-  UINT64      VariableDataLength;                        // The TCG Definition used UINTN
-  CHAR16      UnicodeName[1];
-  INT8        VariableData[1];
+  EFI_GUID                          VariableName;
+  UINT64                            UnicodeNameLength;   // The TCG Definition used UINTN
+  UINT64                            VariableDataLength;  // The TCG Definition used UINTN
+  CHAR16                            UnicodeName[1];
+  INT8                              VariableData[1];
 } EFI_VARIABLE_DATA_TREE;
 
 typedef struct tdEFI_GPT_DATA {
-  EFI_PARTITION_TABLE_HEADER    EfiPartitionHeader;
-  UINTN                         NumberOfPartitions;
-  EFI_PARTITION_ENTRY           Partitions[1];
+  EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;
+  UINTN                       NumberOfPartitions;
+  EFI_PARTITION_ENTRY         Partitions[1];
 } EFI_GPT_DATA;
 
-typedef struct tdUEFI_GPT_DATA {
-  EFI_PARTITION_TABLE_HEADER    EfiPartitionHeader;
-  UINT64                        NumberOfPartitions;
-  EFI_PARTITION_ENTRY           Partitions[1];
-} UEFI_GPT_DATA;
-
-#define TCG_DEVICE_SECURITY_EVENT_DATA_SIGNATURE  "SPDM Device Sec"
-#define TCG_DEVICE_SECURITY_EVENT_DATA_VERSION    1
-
-#define TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_TYPE_NULL  0
-#define TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_TYPE_PCI   1
-#define TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_TYPE_USB   2
-
-///
-/// TCG_DEVICE_SECURITY_EVENT_DATA_HEADER
-/// This is the header of TCG_DEVICE_SECURITY_EVENT_DATA, which is
-/// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.
-///
-typedef struct {
-  UINT8     Signature[16];
-  UINT16    Version;
-  UINT16    Length;
-  UINT32    SpdmHashAlgo;
-  UINT32    DeviceType;
-  // SPDM_MEASUREMENT_BLOCK         SpdmMeasurementBlock;
-} TCG_DEVICE_SECURITY_EVENT_DATA_HEADER;
-
-#define TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT_VERSION  0
-
-///
-/// TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT
-/// This is the PCI context data of TCG_DEVICE_SECURITY_EVENT_DATA, which is
-/// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.
-///
-typedef struct {
-  UINT16    Version;
-  UINT16    Length;
-  UINT16    VendorId;
-  UINT16    DeviceId;
-  UINT8     RevisionID;
-  UINT8     ClassCode[3];
-  UINT16    SubsystemVendorID;
-  UINT16    SubsystemID;
-} TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT;
-
-#define TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT_VERSION  0
-
-///
-/// TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT
-/// This is the USB context data of TCG_DEVICE_SECURITY_EVENT_DATA, which is
-/// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.
-///
-typedef struct {
-  UINT16    Version;
-  UINT16    Length;
-  // UINT8   DeviceDescriptor[DescLen];
-  // UINT8   BodDescriptor[DescLen];
-  // UINT8   ConfigurationDescriptor[DescLen][NumOfConfiguration];
-} TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT;
-
 //
 // Crypto Agile Log Entry Format
 //
 typedef struct tdTCG_PCR_EVENT2 {
-  TCG_PCRINDEX          PCRIndex;
-  TCG_EVENTTYPE         EventType;
-  TPML_DIGEST_VALUES    Digest;
-  UINT32                EventSize;
-  UINT8                 Event[1];
+  TCG_PCRINDEX        PCRIndex;
+  TCG_EVENTTYPE       EventType;
+  TPML_DIGEST_VALUES  Digest;
+  UINT32              EventSize;
+  UINT8               Event[1];
 } TCG_PCR_EVENT2;
 
 //
 // TCG PCR Event2 Header
 // Follow TCG EFI Protocol Spec 5.2 Crypto Agile Log Entry Format
 //
-typedef struct tdTCG_PCR_EVENT2_HDR {
-  TCG_PCRINDEX          PCRIndex;
-  TCG_EVENTTYPE         EventType;
-  TPML_DIGEST_VALUES    Digests;
-  UINT32                EventSize;
+typedef struct tdTCG_PCR_EVENT2_HDR{
+  TCG_PCRINDEX        PCRIndex;
+  TCG_EVENTTYPE       EventType;
+  TPML_DIGEST_VALUES  Digests;
+  UINT32              EventSize;
 } TCG_PCR_EVENT2_HDR;
 
 //
@@ -358,140 +225,111 @@ typedef struct {
   //
   // TCG defined hashing algorithm ID.
   //
-  UINT16    algorithmId;
+  UINT16              algorithmId;
   //
   // The size of the digest for the respective hashing algorithm.
   //
-  UINT16    digestSize;
+  UINT16              digestSize;
 } TCG_EfiSpecIdEventAlgorithmSize;
 
-#define TCG_EfiSpecIDEventStruct_SIGNATURE_02  "Spec ID Event02"
-#define TCG_EfiSpecIDEventStruct_SIGNATURE_03  "Spec ID Event03"
+#define TCG_EfiSpecIDEventStruct_SIGNATURE_02 "Spec ID Event02"
+#define TCG_EfiSpecIDEventStruct_SIGNATURE_03 "Spec ID Event03"
 
-#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM12  1
-#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM12  2
-#define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM12         2
+#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM12   1
+#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM12   2
+#define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM12          2
 
 #define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM2   2
 #define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM2   0
 #define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2          0
-#define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105  105
 
 typedef struct {
-  UINT8     signature[16];
+  UINT8               signature[16];
   //
   // The value for the Platform Class.
   // The enumeration is defined in the TCG ACPI Specification Client Common Header.
   //
-  UINT32    platformClass;
+  UINT32              platformClass;
   //
   // The TCG EFI Platform Specification minor version number this BIOS supports.
   // Any BIOS supporting version (1.22) MUST set this value to 02h.
   // Any BIOS supporting version (2.0) SHALL set this value to 0x00.
   //
-  UINT8     specVersionMinor;
+  UINT8               specVersionMinor;
   //
   // The TCG EFI Platform Specification major version number this BIOS supports.
   // Any BIOS supporting version (1.22) MUST set this value to 01h.
   // Any BIOS supporting version (2.0) SHALL set this value to 0x02.
   //
-  UINT8     specVersionMajor;
+  UINT8               specVersionMajor;
   //
   // The TCG EFI Platform Specification errata for this specification this BIOS supports.
   // Any BIOS supporting version and errata (1.22) MUST set this value to 02h.
   // Any BIOS supporting version and errata (2.0) SHALL set this value to 0x00.
   //
-  UINT8     specErrata;
+  UINT8               specErrata;
   //
   // Specifies the size of the UINTN fields used in various data structures used in this specification.
   // 0x01 indicates UINT32 and 0x02 indicates UINT64.
   //
-  UINT8     uintnSize;
+  UINT8               uintnSize;
   //
   // This field is added in "Spec ID Event03".
   // The number of hashing algorithms used in this event log (except the first event).
   // All events in this event log use all hashing algorithms defined here.
   //
-  // UINT32              numberOfAlgorithms;
+//UINT32              numberOfAlgorithms;
   //
   // This field is added in "Spec ID Event03".
   // An array of size numberOfAlgorithms of value pairs.
   //
-  // TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];
+//TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];
   //
   // Size in bytes of the VendorInfo field.
   // Maximum value SHALL be FFh bytes.
   //
-  // UINT8               vendorInfoSize;
+//UINT8               vendorInfoSize;
   //
   // Provided for use by the BIOS implementer.
   // The value might be used, for example, to provide more detailed information about the specific BIOS such as BIOS revision numbers, etc.
   // The values within this field are not standardized and are implementer-specific.
   // Platform-specific or -unique information SHALL NOT be provided in this field.
   //
-  // UINT8               vendorInfo[vendorInfoSize];
+//UINT8               vendorInfo[vendorInfoSize];
 } TCG_EfiSpecIDEventStruct;
 
-typedef struct tdTCG_PCClientTaggedEvent {
-  UINT32    taggedEventID;
-  UINT32    taggedEventDataSize;
-  // UINT8               taggedEventData[taggedEventDataSize];
-} TCG_PCClientTaggedEvent;
 
-#define TCG_Sp800_155_PlatformId_Event_SIGNATURE   "SP800-155 Event"
-#define TCG_Sp800_155_PlatformId_Event2_SIGNATURE  "SP800-155 Event2"
 
-typedef struct tdTCG_Sp800_155_PlatformId_Event2 {
-  UINT8       Signature[16];
-  //
-  // Where Vendor ID is an integer defined
-  // at http://www.iana.org/assignments/enterprisenumbers
-  //
-  UINT32      VendorId;
-  //
-  // 16-byte identifier of a given platform's static configuration of code
-  //
-  EFI_GUID    ReferenceManifestGuid;
-  //
-  // Below structure is newly added in TCG_Sp800_155_PlatformId_Event2.
-  //
-  // UINT8               PlatformManufacturerStrSize;
-  // UINT8               PlatformManufacturerStr[PlatformManufacturerStrSize];
-  // UINT8               PlatformModelSize;
-  // UINT8               PlatformModel[PlatformModelSize];
-  // UINT8               PlatformVersionSize;
-  // UINT8               PlatformVersion[PlatformVersionSize];
-  // UINT8               PlatformModelSize;
-  // UINT8               PlatformModel[PlatformModelSize];
-  // UINT8               FirmwareManufacturerStrSize;
-  // UINT8               FirmwareManufacturerStr[FirmwareManufacturerStrSize];
-  // UINT32              FirmwareManufacturerId;
-  // UINT8               FirmwareVersion;
-  // UINT8               FirmwareVersion[FirmwareVersionSize]];
-} TCG_Sp800_155_PlatformId_Event2;
+#define TCG_EfiStartupLocalityEvent_SIGNATURE      "StartupLocality"
 
-#define TCG_EfiStartupLocalityEvent_SIGNATURE  "StartupLocality"
 
 //
-// The Locality Indicator which sent the TPM2_Startup command
+// PC Client PTP spec Table 8 Relationship between Locality and Locality Attribute
 //
-#define LOCALITY_0_INDICATOR  0x00
-#define LOCALITY_3_INDICATOR  0x03
+#define LOCALITY_0_INDICATOR        0x01
+#define LOCALITY_1_INDICATOR        0x02
+#define LOCALITY_2_INDICATOR        0x03
+#define LOCALITY_3_INDICATOR        0x04
+#define LOCALITY_4_INDICATOR        0x05
+
 
 //
 // Startup Locality Event
 //
-typedef struct tdTCG_EfiStartupLocalityEvent {
-  UINT8    Signature[16];
+typedef struct tdTCG_EfiStartupLocalityEvent{
+  UINT8       Signature[16];
   //
   // The Locality Indicator which sent the TPM2_Startup command
   //
-  UINT8    StartupLocality;
+  UINT8       StartupLocality;
 } TCG_EfiStartupLocalityEvent;
 
+
 //
 // Restore original structure alignment
 //
 #pragma pack ()
 
 #endif
+
+

src/include/ipxe/efi/IndustryStandard/Usb.h

@@ -2,14 +2,20 @@
   Support for USB 2.0 standard.
 
   Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 #ifndef __USB_H__
 #define __USB_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 //
 // Subset of Class and Subclass definitions from USB Specs
@@ -18,52 +24,52 @@ FILE_LICENCE ( BSD2_PATENT );
 //
 // Usb mass storage class code
 //
-#define USB_MASS_STORE_CLASS  0x08
+#define USB_MASS_STORE_CLASS    0x08
 
 //
 // Usb mass storage subclass code, specify the command set used.
 //
-#define USB_MASS_STORE_RBC    0x01   ///< Reduced Block Commands
-#define USB_MASS_STORE_8020I  0x02   ///< SFF-8020i, typically a CD/DVD device
-#define USB_MASS_STORE_QIC    0x03   ///< Typically a tape device
-#define USB_MASS_STORE_UFI    0x04   ///< Typically a floppy disk driver device
-#define USB_MASS_STORE_8070I  0x05   ///< SFF-8070i, typically a floppy disk driver device.
-#define USB_MASS_STORE_SCSI   0x06   ///< SCSI transparent command set
+#define USB_MASS_STORE_RBC      0x01 ///< Reduced Block Commands
+#define USB_MASS_STORE_8020I    0x02 ///< SFF-8020i, typically a CD/DVD device
+#define USB_MASS_STORE_QIC      0x03 ///< Typically a tape device
+#define USB_MASS_STORE_UFI      0x04 ///< Typically a floppy disk driver device
+#define USB_MASS_STORE_8070I    0x05 ///< SFF-8070i, typically a floppy disk driver device.
+#define USB_MASS_STORE_SCSI     0x06 ///< SCSI transparent command set
 
 //
 // Usb mass storage protocol code, specify the transport protocol
 //
-#define USB_MASS_STORE_CBI0  0x00    ///< CBI protocol with command completion interrupt
-#define USB_MASS_STORE_CBI1  0x01    ///< CBI protocol without command completion interrupt
-#define USB_MASS_STORE_BOT   0x50    ///< Bulk-Only Transport
+#define USB_MASS_STORE_CBI0     0x00 ///< CBI protocol with command completion interrupt
+#define USB_MASS_STORE_CBI1     0x01 ///< CBI protocol without command completion interrupt
+#define USB_MASS_STORE_BOT      0x50 ///< Bulk-Only Transport
 
 //
 // Standard device request and request type
 // USB 2.0 spec, Section 9.4
 //
-#define USB_DEV_GET_STATUS             0x00
-#define USB_DEV_GET_STATUS_REQ_TYPE_D  0x80      // Receiver : Device
-#define USB_DEV_GET_STATUS_REQ_TYPE_I  0x81      // Receiver : Interface
-#define USB_DEV_GET_STATUS_REQ_TYPE_E  0x82      // Receiver : Endpoint
+#define USB_DEV_GET_STATUS                  0x00
+#define USB_DEV_GET_STATUS_REQ_TYPE_D       0x80 // Receiver : Device
+#define USB_DEV_GET_STATUS_REQ_TYPE_I       0x81 // Receiver : Interface
+#define USB_DEV_GET_STATUS_REQ_TYPE_E       0x82 // Receiver : Endpoint
 
-#define USB_DEV_CLEAR_FEATURE             0x01
-#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_D  0x00   // Receiver : Device
-#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_I  0x01   // Receiver : Interface
-#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_E  0x02   // Receiver : Endpoint
+#define USB_DEV_CLEAR_FEATURE               0x01
+#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_D    0x00 // Receiver : Device
+#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_I    0x01 // Receiver : Interface
+#define USB_DEV_CLEAR_FEATURE_REQ_TYPE_E    0x02 // Receiver : Endpoint
 
-#define USB_DEV_SET_FEATURE             0x03
-#define USB_DEV_SET_FEATURE_REQ_TYPE_D  0x00     // Receiver : Device
-#define USB_DEV_SET_FEATURE_REQ_TYPE_I  0x01     // Receiver : Interface
-#define USB_DEV_SET_FEATURE_REQ_TYPE_E  0x02     // Receiver : Endpoint
+#define USB_DEV_SET_FEATURE                 0x03
+#define USB_DEV_SET_FEATURE_REQ_TYPE_D      0x00 // Receiver : Device
+#define USB_DEV_SET_FEATURE_REQ_TYPE_I      0x01 // Receiver : Interface
+#define USB_DEV_SET_FEATURE_REQ_TYPE_E      0x02 // Receiver : Endpoint
 
-#define USB_DEV_SET_ADDRESS           0x05
-#define USB_DEV_SET_ADDRESS_REQ_TYPE  0x00
+#define USB_DEV_SET_ADDRESS                 0x05
+#define USB_DEV_SET_ADDRESS_REQ_TYPE        0x00
 
-#define USB_DEV_GET_DESCRIPTOR           0x06
-#define USB_DEV_GET_DESCRIPTOR_REQ_TYPE  0x80
+#define USB_DEV_GET_DESCRIPTOR              0x06
+#define USB_DEV_GET_DESCRIPTOR_REQ_TYPE     0x80
 
-#define USB_DEV_SET_DESCRIPTOR           0x07
-#define USB_DEV_SET_DESCRIPTOR_REQ_TYPE  0x00
+#define USB_DEV_SET_DESCRIPTOR              0x07
+#define USB_DEV_SET_DESCRIPTOR_REQ_TYPE     0x00
 
 #define USB_DEV_GET_CONFIGURATION           0x08
 #define USB_DEV_GET_CONFIGURATION_REQ_TYPE  0x80
@@ -71,14 +77,15 @@ FILE_LICENCE ( BSD2_PATENT );
 #define USB_DEV_SET_CONFIGURATION           0x09
 #define USB_DEV_SET_CONFIGURATION_REQ_TYPE  0x00
 
-#define USB_DEV_GET_INTERFACE           0x0A
-#define USB_DEV_GET_INTERFACE_REQ_TYPE  0x81
+#define USB_DEV_GET_INTERFACE               0x0A
+#define USB_DEV_GET_INTERFACE_REQ_TYPE      0x81
 
-#define USB_DEV_SET_INTERFACE           0x0B
-#define USB_DEV_SET_INTERFACE_REQ_TYPE  0x01
+#define USB_DEV_SET_INTERFACE               0x0B
+#define USB_DEV_SET_INTERFACE_REQ_TYPE      0x01
+
+#define USB_DEV_SYNCH_FRAME                 0x0C
+#define USB_DEV_SYNCH_FRAME_REQ_TYPE        0x82
 
-#define USB_DEV_SYNCH_FRAME           0x0C
-#define USB_DEV_SYNCH_FRAME_REQ_TYPE  0x82
 
 //
 // USB standard descriptors and reqeust
@@ -90,11 +97,11 @@ FILE_LICENCE ( BSD2_PATENT );
 /// USB 2.0 spec, Section 9.3
 ///
 typedef struct {
-  UINT8     RequestType;
-  UINT8     Request;
-  UINT16    Value;
-  UINT16    Index;
-  UINT16    Length;
+  UINT8           RequestType;
+  UINT8           Request;
+  UINT16          Value;
+  UINT16          Index;
+  UINT16          Length;
 } USB_DEVICE_REQUEST;
 
 ///
@@ -102,20 +109,20 @@ typedef struct {
 /// USB 2.0 spec, Section 9.6.1
 ///
 typedef struct {
-  UINT8     Length;
-  UINT8     DescriptorType;
-  UINT16    BcdUSB;
-  UINT8     DeviceClass;
-  UINT8     DeviceSubClass;
-  UINT8     DeviceProtocol;
-  UINT8     MaxPacketSize0;
-  UINT16    IdVendor;
-  UINT16    IdProduct;
-  UINT16    BcdDevice;
-  UINT8     StrManufacturer;
-  UINT8     StrProduct;
-  UINT8     StrSerialNumber;
-  UINT8     NumConfigurations;
+  UINT8           Length;
+  UINT8           DescriptorType;
+  UINT16          BcdUSB;
+  UINT8           DeviceClass;
+  UINT8           DeviceSubClass;
+  UINT8           DeviceProtocol;
+  UINT8           MaxPacketSize0;
+  UINT16          IdVendor;
+  UINT16          IdProduct;
+  UINT16          BcdDevice;
+  UINT8           StrManufacturer;
+  UINT8           StrProduct;
+  UINT8           StrSerialNumber;
+  UINT8           NumConfigurations;
 } USB_DEVICE_DESCRIPTOR;
 
 ///
@@ -123,14 +130,14 @@ typedef struct {
 /// USB 2.0 spec, Section 9.6.3
 ///
 typedef struct {
-  UINT8     Length;
-  UINT8     DescriptorType;
-  UINT16    TotalLength;
-  UINT8     NumInterfaces;
-  UINT8     ConfigurationValue;
-  UINT8     Configuration;
-  UINT8     Attributes;
-  UINT8     MaxPower;
+  UINT8           Length;
+  UINT8           DescriptorType;
+  UINT16          TotalLength;
+  UINT8           NumInterfaces;
+  UINT8           ConfigurationValue;
+  UINT8           Configuration;
+  UINT8           Attributes;
+  UINT8           MaxPower;
 } USB_CONFIG_DESCRIPTOR;
 
 ///
@@ -138,15 +145,15 @@ typedef struct {
 /// USB 2.0 spec, Section 9.6.5
 ///
 typedef struct {
-  UINT8    Length;
-  UINT8    DescriptorType;
-  UINT8    InterfaceNumber;
-  UINT8    AlternateSetting;
-  UINT8    NumEndpoints;
-  UINT8    InterfaceClass;
-  UINT8    InterfaceSubClass;
-  UINT8    InterfaceProtocol;
-  UINT8    Interface;
+  UINT8           Length;
+  UINT8           DescriptorType;
+  UINT8           InterfaceNumber;
+  UINT8           AlternateSetting;
+  UINT8           NumEndpoints;
+  UINT8           InterfaceClass;
+  UINT8           InterfaceSubClass;
+  UINT8           InterfaceProtocol;
+  UINT8           Interface;
 } USB_INTERFACE_DESCRIPTOR;
 
 ///
@@ -154,12 +161,12 @@ typedef struct {
 /// USB 2.0 spec, Section 9.6.6
 ///
 typedef struct {
-  UINT8     Length;
-  UINT8     DescriptorType;
-  UINT8     EndpointAddress;
-  UINT8     Attributes;
-  UINT16    MaxPacketSize;
-  UINT8     Interval;
+  UINT8           Length;
+  UINT8           DescriptorType;
+  UINT8           EndpointAddress;
+  UINT8           Attributes;
+  UINT16          MaxPacketSize;
+  UINT8           Interval;
 } USB_ENDPOINT_DESCRIPTOR;
 
 ///
@@ -167,44 +174,45 @@ typedef struct {
 /// USB 2.0 spec, Section 9.6.7
 ///
 typedef struct {
-  UINT8     Length;
-  UINT8     DescriptorType;
-  CHAR16    String[1];
+  UINT8           Length;
+  UINT8           DescriptorType;
+  CHAR16          String[1];
 } EFI_USB_STRING_DESCRIPTOR;
 
 #pragma pack()
 
+
 typedef enum {
   //
   // USB request type
   //
-  USB_REQ_TYPE_STANDARD = (0x00 << 5),
-  USB_REQ_TYPE_CLASS    = (0x01 << 5),
-  USB_REQ_TYPE_VENDOR   = (0x02 << 5),
+  USB_REQ_TYPE_STANDARD   = (0x00 << 5),
+  USB_REQ_TYPE_CLASS      = (0x01 << 5),
+  USB_REQ_TYPE_VENDOR     = (0x02 << 5),
 
   //
   // Standard control transfer request type, or the value
   // to fill in EFI_USB_DEVICE_REQUEST.Request
   //
-  USB_REQ_GET_STATUS     = 0x00,
-  USB_REQ_CLEAR_FEATURE  = 0x01,
-  USB_REQ_SET_FEATURE    = 0x03,
-  USB_REQ_SET_ADDRESS    = 0x05,
-  USB_REQ_GET_DESCRIPTOR = 0x06,
-  USB_REQ_SET_DESCRIPTOR = 0x07,
-  USB_REQ_GET_CONFIG     = 0x08,
-  USB_REQ_SET_CONFIG     = 0x09,
-  USB_REQ_GET_INTERFACE  = 0x0A,
-  USB_REQ_SET_INTERFACE  = 0x0B,
-  USB_REQ_SYNCH_FRAME    = 0x0C,
+  USB_REQ_GET_STATUS      = 0x00,
+  USB_REQ_CLEAR_FEATURE   = 0x01,
+  USB_REQ_SET_FEATURE     = 0x03,
+  USB_REQ_SET_ADDRESS     = 0x05,
+  USB_REQ_GET_DESCRIPTOR  = 0x06,
+  USB_REQ_SET_DESCRIPTOR  = 0x07,
+  USB_REQ_GET_CONFIG      = 0x08,
+  USB_REQ_SET_CONFIG      = 0x09,
+  USB_REQ_GET_INTERFACE   = 0x0A,
+  USB_REQ_SET_INTERFACE   = 0x0B,
+  USB_REQ_SYNCH_FRAME     = 0x0C,
 
   //
   // Usb control transfer target
   //
-  USB_TARGET_DEVICE    = 0,
-  USB_TARGET_INTERFACE = 0x01,
-  USB_TARGET_ENDPOINT  = 0x02,
-  USB_TARGET_OTHER     = 0x03,
+  USB_TARGET_DEVICE       = 0,
+  USB_TARGET_INTERFACE    = 0x01,
+  USB_TARGET_ENDPOINT     = 0x02,
+  USB_TARGET_OTHER        = 0x03,
 
   //
   // USB Descriptor types
@@ -225,20 +233,21 @@ typedef enum {
   //
   // USB endpoint types: 00: control, 01: isochronous, 10: bulk, 11: interrupt
   //
-  USB_ENDPOINT_CONTROL   = 0x00,
-  USB_ENDPOINT_ISO       = 0x01,
-  USB_ENDPOINT_BULK      = 0x02,
-  USB_ENDPOINT_INTERRUPT = 0x03,
+  USB_ENDPOINT_CONTROL    = 0x00,
+  USB_ENDPOINT_ISO        = 0x01,
+  USB_ENDPOINT_BULK       = 0x02,
+  USB_ENDPOINT_INTERRUPT  = 0x03,
 
-  USB_ENDPOINT_TYPE_MASK = 0x03,
-  USB_ENDPOINT_DIR_IN    = 0x80,
+  USB_ENDPOINT_TYPE_MASK  = 0x03,
+  USB_ENDPOINT_DIR_IN     = 0x80,
 
   //
-  // Use 200 ms to increase the error handling response time
+  //Use 200 ms to increase the error handling response time
   //
   EFI_USB_INTERRUPT_DELAY = 2000000
 } USB_TYPES_DEFINITION;
 
+
 //
 // HID constants definition, see Device Class Definition
 // for Human Interface Devices (HID) rev1.11
@@ -252,19 +261,19 @@ typedef enum {
 //
 // HID specific requests.
 //
-#define USB_HID_CLASS_GET_REQ_TYPE  0xa1
-#define USB_HID_CLASS_SET_REQ_TYPE  0x21
+#define USB_HID_CLASS_GET_REQ_TYPE       0xa1
+#define USB_HID_CLASS_SET_REQ_TYPE       0x21
 
 //
 // HID report item format
 //
-#define HID_ITEM_FORMAT_SHORT  0
-#define HID_ITEM_FORMAT_LONG   1
+#define HID_ITEM_FORMAT_SHORT 0
+#define HID_ITEM_FORMAT_LONG  1
 
 //
 // Special tag indicating long items
 //
-#define HID_ITEM_TAG_LONG  15
+#define HID_ITEM_TAG_LONG 15
 
 //
 // HID report descriptor item type (prefix bit 2,3)
@@ -286,15 +295,15 @@ typedef enum {
 //
 // HID report descriptor main item contents
 //
-#define HID_MAIN_ITEM_CONSTANT       0x001
-#define HID_MAIN_ITEM_VARIABLE       0x002
-#define HID_MAIN_ITEM_RELATIVE       0x004
-#define HID_MAIN_ITEM_WRAP           0x008
-#define HID_MAIN_ITEM_NONLINEAR      0x010
-#define HID_MAIN_ITEM_NO_PREFERRED   0x020
-#define HID_MAIN_ITEM_NULL_STATE     0x040
-#define HID_MAIN_ITEM_VOLATILE       0x080
-#define HID_MAIN_ITEM_BUFFERED_BYTE  0x100
+#define HID_MAIN_ITEM_CONSTANT      0x001
+#define HID_MAIN_ITEM_VARIABLE      0x002
+#define HID_MAIN_ITEM_RELATIVE      0x004
+#define HID_MAIN_ITEM_WRAP          0x008
+#define HID_MAIN_ITEM_NONLINEAR     0x010
+#define HID_MAIN_ITEM_NO_PREFERRED  0x020
+#define HID_MAIN_ITEM_NULL_STATE    0x040
+#define HID_MAIN_ITEM_VOLATILE      0x080
+#define HID_MAIN_ITEM_BUFFERED_BYTE 0x100
 
 //
 // HID report descriptor collection item types
@@ -322,16 +331,16 @@ typedef enum {
 //
 // HID report descriptor local item tags
 //
-#define HID_LOCAL_ITEM_TAG_USAGE               0
-#define HID_LOCAL_ITEM_TAG_USAGE_MINIMUM       1
-#define HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM       2
-#define HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX    3
-#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM  4
-#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM  5
-#define HID_LOCAL_ITEM_TAG_STRING_INDEX        7
-#define HID_LOCAL_ITEM_TAG_STRING_MINIMUM      8
-#define HID_LOCAL_ITEM_TAG_STRING_MAXIMUM      9
-#define HID_LOCAL_ITEM_TAG_DELIMITER           10
+#define HID_LOCAL_ITEM_TAG_USAGE              0
+#define HID_LOCAL_ITEM_TAG_USAGE_MINIMUM      1
+#define HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM      2
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX   3
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM 4
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM 5
+#define HID_LOCAL_ITEM_TAG_STRING_INDEX       7
+#define HID_LOCAL_ITEM_TAG_STRING_MINIMUM     8
+#define HID_LOCAL_ITEM_TAG_STRING_MAXIMUM     9
+#define HID_LOCAL_ITEM_TAG_DELIMITER          10
 
 //
 // HID report types
@@ -356,8 +365,8 @@ typedef enum {
 /// HID 1.1, section 6.2.1
 ///
 typedef struct hid_class_descriptor {
-  UINT8     DescriptorType;
-  UINT16    DescriptorLength;
+  UINT8   DescriptorType;
+  UINT16  DescriptorLength;
 } EFI_USB_HID_CLASS_DESCRIPTOR;
 
 ///
@@ -366,12 +375,12 @@ typedef struct hid_class_descriptor {
 /// HID 1.1, section 6.2.1
 ///
 typedef struct hid_descriptor {
-  UINT8                           Length;
-  UINT8                           DescriptorType;
-  UINT16                          BcdHID;
-  UINT8                           CountryCode;
-  UINT8                           NumDescriptors;
-  EFI_USB_HID_CLASS_DESCRIPTOR    HidClassDesc[1];
+  UINT8                         Length;
+  UINT8                         DescriptorType;
+  UINT16                        BcdHID;
+  UINT8                         CountryCode;
+  UINT8                         NumDescriptors;
+  EFI_USB_HID_CLASS_DESCRIPTOR  HidClassDesc[1];
 } EFI_USB_HID_DESCRIPTOR;
 
 #pragma pack()

src/include/ipxe/efi/LoongArch64/ProcessorBind.h

@@ -1,122 +0,0 @@
-/** @file
-  Processor or Compiler specific defines and types for LoongArch
-
-  Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR>
-
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef PROCESSOR_BIND_H_
-#define PROCESSOR_BIND_H_
-
-FILE_LICENCE ( BSD2_PATENT );
-
-//
-// Define the processor type so other code can make processor based choices
-//
-#define MDE_CPU_LOONGARCH64
-
-#define EFIAPI
-
-//
-// Make sure we are using the correct packing rules per EFI specification
-//
-#ifndef __GNUC__
-  #pragma pack()
-#endif
-
-//
-// Assume standard LoongArch 64-bit alignment.
-// Need to check portability of long long
-//
-typedef unsigned long long  UINT64;
-typedef long long           INT64;
-typedef unsigned int        UINT32;
-typedef int                 INT32;
-typedef unsigned short      UINT16;
-typedef unsigned short      CHAR16;
-typedef short               INT16;
-typedef unsigned char       BOOLEAN;
-typedef unsigned char       UINT8;
-typedef char                CHAR8;
-typedef char                INT8;
-
-//
-// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,
-// 8 bytes on supported 64-bit processor instructions)
-//
-
-typedef UINT64 UINTN;
-
-//
-// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
-// 8 bytes on supported 64-bit processor instructions)
-//
-typedef INT64 INTN;
-
-//
-// Processor specific defines
-//
-
-//
-// A value of native width with the highest bit set.
-//
-#define MAX_BIT  0x8000000000000000ULL
-//
-// A value of native width with the two highest bits set.
-//
-#define MAX_2_BITS  0xC000000000000000ULL
-
-//
-// Maximum legal LoongArch 64-bit address
-//
-#define MAX_ADDRESS  0xFFFFFFFFFFFFFFFFULL
-
-//
-// Maximum usable address at boot time (48 bits using 4KB pages)
-//
-#define MAX_ALLOC_ADDRESS  0xFFFFFFFFFFFFULL
-
-//
-// Maximum legal LoongArch  64-bit INTN and UINTN values.
-//
-#define MAX_INTN   ((INTN)0x7FFFFFFFFFFFFFFFULL)
-#define MAX_UINTN  ((UINTN)0xFFFFFFFFFFFFFFFFULL)
-
-//
-// Page allocation granularity for LoongArch
-//
-#define DEFAULT_PAGE_ALLOCATION_GRANULARITY  (0x1000)
-#define RUNTIME_PAGE_ALLOCATION_GRANULARITY  (0x10000)
-
-#if defined (__GNUC__)
-//
-// For GNU assembly code, .global or .globl can declare global symbols.
-// Define this macro to unify the usage.
-//
-#define ASM_GLOBAL  .globl
-#endif
-
-//
-// The stack alignment required for LoongArch
-//
-#define CPU_STACK_ALIGNMENT  16
-
-/**
-  Return the pointer to the first instruction of a function given a function pointer.
-  On LOONGARCH CPU architectures, these two pointer values are the same,
-  so the implementation of this macro is very simple.
-
-  @param  FunctionPointer   A pointer to a function.
-
-  @return The pointer to the first instruction of a function given a function pointer.
-
-**/
-#define FUNCTION_ENTRY_POINT(FunctionPointer)  (VOID *)(UINTN)(FunctionPointer)
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__
-#endif
-
-#endif

src/include/ipxe/efi/Pi/PiBootMode.h

@@ -2,7 +2,13 @@
   Present the boot mode values in PI.
 
   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   PI Version 1.2.1A
@@ -12,27 +18,27 @@
 #ifndef __PI_BOOT_MODE_H__
 #define __PI_BOOT_MODE_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// EFI boot mode
 ///
-typedef UINT32 EFI_BOOT_MODE;
+typedef UINT32  EFI_BOOT_MODE;
 
 //
 // 0x21 - 0xf..f are reserved.
 //
-#define BOOT_WITH_FULL_CONFIGURATION                   0x00
-#define BOOT_WITH_MINIMAL_CONFIGURATION                0x01
-#define BOOT_ASSUMING_NO_CONFIGURATION_CHANGES         0x02
-#define BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS  0x03
-#define BOOT_WITH_DEFAULT_SETTINGS                     0x04
-#define BOOT_ON_S4_RESUME                              0x05
-#define BOOT_ON_S5_RESUME                              0x06
-#define BOOT_WITH_MFG_MODE_SETTINGS                    0x07
-#define BOOT_ON_S2_RESUME                              0x10
-#define BOOT_ON_S3_RESUME                              0x11
-#define BOOT_ON_FLASH_UPDATE                           0x12
-#define BOOT_IN_RECOVERY_MODE                          0x20
+#define BOOT_WITH_FULL_CONFIGURATION                  0x00
+#define BOOT_WITH_MINIMAL_CONFIGURATION               0x01
+#define BOOT_ASSUMING_NO_CONFIGURATION_CHANGES        0x02
+#define BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS 0x03
+#define BOOT_WITH_DEFAULT_SETTINGS                    0x04
+#define BOOT_ON_S4_RESUME                             0x05
+#define BOOT_ON_S5_RESUME                             0x06
+#define BOOT_WITH_MFG_MODE_SETTINGS                   0x07
+#define BOOT_ON_S2_RESUME                             0x10
+#define BOOT_ON_S3_RESUME                             0x11
+#define BOOT_ON_FLASH_UPDATE                          0x12
+#define BOOT_IN_RECOVERY_MODE                         0x20
 
 #endif

src/include/ipxe/efi/Pi/PiDependency.h

@@ -1,43 +1,49 @@
 /** @file
   Present the dependency expression values in PI.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
   PI Version 1.0
 
 **/
-
 #ifndef __PI_DEPENDENCY_H__
 #define __PI_DEPENDENCY_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// If present, this must be the first and only opcode,
 /// EFI_DEP_BEFORE may be used by DXE and SMM drivers.
 ///
-#define EFI_DEP_BEFORE  0x00
+#define EFI_DEP_BEFORE        0x00
 
 ///
 /// If present, this must be the first and only opcode,
 /// EFI_DEP_AFTER may be used by DXE and SMM drivers.
 ///
-#define EFI_DEP_AFTER  0x01
+#define EFI_DEP_AFTER         0x01
+
+#define EFI_DEP_PUSH          0x02
+#define EFI_DEP_AND           0x03
+#define EFI_DEP_OR            0x04
+#define EFI_DEP_NOT           0x05
+#define EFI_DEP_TRUE          0x06
+#define EFI_DEP_FALSE         0x07
+#define EFI_DEP_END           0x08
 
-#define EFI_DEP_PUSH   0x02
-#define EFI_DEP_AND    0x03
-#define EFI_DEP_OR     0x04
-#define EFI_DEP_NOT    0x05
-#define EFI_DEP_TRUE   0x06
-#define EFI_DEP_FALSE  0x07
-#define EFI_DEP_END    0x08
 
 ///
 /// If present, this must be the first opcode,
 /// EFI_DEP_SOR is only used by DXE driver.
 ///
-#define EFI_DEP_SOR  0x09
+#define EFI_DEP_SOR           0x09
 
 #endif

src/include/ipxe/efi/Pi/PiDxeCis.h

@@ -1,18 +1,24 @@
 /** @file
   Include file matches things in PI.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
-  PI Version 1.7
+  PI Version 1.4
 
 **/
 
 #ifndef __PI_DXECIS_H__
 #define __PI_DXECIS_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #include <ipxe/efi/Uefi/UefiMultiPhase.h>
 #include <ipxe/efi/Pi/PiMultiPhase.h>
@@ -48,25 +54,13 @@ typedef enum {
   /// A memory region that is visible to the boot processor.
   /// This memory supports byte-addressable non-volatility.
   ///
-  EfiGcdMemoryTypePersistent,
-  //
-  // Keep original one for the compatibility.
-  //
-  EfiGcdMemoryTypePersistentMemory = EfiGcdMemoryTypePersistent,
+  EfiGcdMemoryTypePersistentMemory,
   ///
   /// A memory region that provides higher reliability relative to other memory in the
   /// system. If all memory has the same reliability, then this bit is not used.
   ///
   EfiGcdMemoryTypeMoreReliable,
-  // ///
-  // /// A memory region that describes system memory that has not been accepted
-  // /// by a corresponding call to the underlying isolation architecture.
-  // ///
-  // /// Please be noted:
-  // /// EfiGcdMemoryTypeUnaccepted is defined in PrePiDxeCis.h because it has not been
-  // /// defined in PI spec.
-  // EfiGcdMemoryTypeUnaccepted,
-  EfiGcdMemoryTypeMaximum = 7
+  EfiGcdMemoryTypeMaximum
 } EFI_GCD_MEMORY_TYPE;
 
 ///
@@ -132,29 +126,29 @@ typedef struct {
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function
   /// description in the UEFI 2.0 specification.
   ///
-  EFI_PHYSICAL_ADDRESS    BaseAddress;
+  EFI_PHYSICAL_ADDRESS  BaseAddress;
 
   ///
   /// The number of bytes in the memory region.
   ///
-  UINT64                  Length;
+  UINT64                Length;
 
   ///
   /// The bit mask of attributes that the memory region is capable of supporting. The bit
   /// mask of available attributes is defined in the GetMemoryMap() function description
   /// in the UEFI 2.0 specification.
   ///
-  UINT64                  Capabilities;
+  UINT64                Capabilities;
   ///
   /// The bit mask of attributes that the memory region is currently using. The bit mask of
   /// available attributes is defined in GetMemoryMap().
   ///
-  UINT64                  Attributes;
+  UINT64                Attributes;
   ///
   /// Type of the memory region. Type EFI_GCD_MEMORY_TYPE is defined in the
   /// AddMemorySpace() function description.
   ///
-  EFI_GCD_MEMORY_TYPE     GcdMemoryType;
+  EFI_GCD_MEMORY_TYPE   GcdMemoryType;
 
   ///
   /// The image handle of the agent that allocated the memory resource described by
@@ -162,7 +156,7 @@ typedef struct {
   /// resource is not currently allocated. Type EFI_HANDLE is defined in
   /// InstallProtocolInterface() in the UEFI 2.0 specification.
   ///
-  EFI_HANDLE              ImageHandle;
+  EFI_HANDLE            ImageHandle;
 
   ///
   /// The device handle for which the memory resource has been allocated. If
@@ -171,7 +165,7 @@ typedef struct {
   /// described by a device handle. Type EFI_HANDLE is defined in
   /// InstallProtocolInterface() in the UEFI 2.0 specification.
   ///
-  EFI_HANDLE    DeviceHandle;
+  EFI_HANDLE            DeviceHandle;
 } EFI_GCD_MEMORY_SPACE_DESCRIPTOR;
 
 ///
@@ -183,18 +177,18 @@ typedef struct {
   /// EFI_PHYSICAL_ADDRESS is defined in the AllocatePages() function
   /// description in the UEFI 2.0 specification.
   ///
-  EFI_PHYSICAL_ADDRESS    BaseAddress;
+  EFI_PHYSICAL_ADDRESS  BaseAddress;
 
   ///
   /// Number of bytes in the I/O region.
   ///
-  UINT64                  Length;
+  UINT64                Length;
 
   ///
   /// Type of the I/O region. Type EFI_GCD_IO_TYPE is defined in the
   /// AddIoSpace() function description.
   ///
-  EFI_GCD_IO_TYPE         GcdIoType;
+  EFI_GCD_IO_TYPE       GcdIoType;
 
   ///
   /// The image handle of the agent that allocated the I/O resource described by
@@ -202,7 +196,7 @@ typedef struct {
   /// resource is not currently allocated. Type EFI_HANDLE is defined in
   /// InstallProtocolInterface() in the UEFI 2.0 specification.
   ///
-  EFI_HANDLE              ImageHandle;
+  EFI_HANDLE            ImageHandle;
 
   ///
   /// The device handle for which the I/O resource has been allocated. If ImageHandle
@@ -211,9 +205,10 @@ typedef struct {
   /// Type EFI_HANDLE is defined in InstallProtocolInterface() in the UEFI
   /// 2.0 specification.
   ///
-  EFI_HANDLE    DeviceHandle;
+  EFI_HANDLE            DeviceHandle;
 } EFI_GCD_IO_SPACE_DESCRIPTOR;
 
+
 /**
   Adds reserved memory, system memory, or memory-mapped I/O resources to the
   global coherency domain of the processor.
@@ -416,7 +411,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SET_MEMORY_SPACE_CAPABILITIES)(
+(EFIAPI *EFI_SET_MEMORY_SPACE_CAPABILITIES) (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length,
   IN UINT64                Capabilities
@@ -608,6 +603,8 @@ EFI_STATUS
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  **IoSpaceMap
   );
 
+
+
 /**
   Loads and executed DXE drivers from firmware volumes.
 
@@ -697,7 +694,7 @@ EFI_STATUS
 //
 #define DXE_SERVICES_SIGNATURE            0x565245535f455844ULL
 #define DXE_SPECIFICATION_MAJOR_REVISION  1
-#define DXE_SPECIFICATION_MINOR_REVISION  70
+#define DXE_SPECIFICATION_MINOR_REVISION  40
 #define DXE_SERVICES_REVISION             ((DXE_SPECIFICATION_MAJOR_REVISION<<16) | (DXE_SPECIFICATION_MINOR_REVISION))
 
 typedef struct {
@@ -705,39 +702,39 @@ typedef struct {
   /// The table header for the DXE Services Table.
   /// This header contains the DXE_SERVICES_SIGNATURE and DXE_SERVICES_REVISION values.
   ///
-  EFI_TABLE_HEADER                     Hdr;
+  EFI_TABLE_HEADER                Hdr;
 
   //
   // Global Coherency Domain Services
   //
-  EFI_ADD_MEMORY_SPACE                 AddMemorySpace;
-  EFI_ALLOCATE_MEMORY_SPACE            AllocateMemorySpace;
-  EFI_FREE_MEMORY_SPACE                FreeMemorySpace;
-  EFI_REMOVE_MEMORY_SPACE              RemoveMemorySpace;
-  EFI_GET_MEMORY_SPACE_DESCRIPTOR      GetMemorySpaceDescriptor;
-  EFI_SET_MEMORY_SPACE_ATTRIBUTES      SetMemorySpaceAttributes;
-  EFI_GET_MEMORY_SPACE_MAP             GetMemorySpaceMap;
-  EFI_ADD_IO_SPACE                     AddIoSpace;
-  EFI_ALLOCATE_IO_SPACE                AllocateIoSpace;
-  EFI_FREE_IO_SPACE                    FreeIoSpace;
-  EFI_REMOVE_IO_SPACE                  RemoveIoSpace;
-  EFI_GET_IO_SPACE_DESCRIPTOR          GetIoSpaceDescriptor;
-  EFI_GET_IO_SPACE_MAP                 GetIoSpaceMap;
+  EFI_ADD_MEMORY_SPACE            AddMemorySpace;
+  EFI_ALLOCATE_MEMORY_SPACE       AllocateMemorySpace;
+  EFI_FREE_MEMORY_SPACE           FreeMemorySpace;
+  EFI_REMOVE_MEMORY_SPACE         RemoveMemorySpace;
+  EFI_GET_MEMORY_SPACE_DESCRIPTOR GetMemorySpaceDescriptor;
+  EFI_SET_MEMORY_SPACE_ATTRIBUTES SetMemorySpaceAttributes;
+  EFI_GET_MEMORY_SPACE_MAP        GetMemorySpaceMap;
+  EFI_ADD_IO_SPACE                AddIoSpace;
+  EFI_ALLOCATE_IO_SPACE           AllocateIoSpace;
+  EFI_FREE_IO_SPACE               FreeIoSpace;
+  EFI_REMOVE_IO_SPACE             RemoveIoSpace;
+  EFI_GET_IO_SPACE_DESCRIPTOR     GetIoSpaceDescriptor;
+  EFI_GET_IO_SPACE_MAP            GetIoSpaceMap;
 
   //
   // Dispatcher Services
   //
-  EFI_DISPATCH                         Dispatch;
-  EFI_SCHEDULE                         Schedule;
-  EFI_TRUST                            Trust;
+  EFI_DISPATCH                    Dispatch;
+  EFI_SCHEDULE                    Schedule;
+  EFI_TRUST                       Trust;
   //
   // Service to process a single firmware volume found in a capsule
   //
-  EFI_PROCESS_FIRMWARE_VOLUME          ProcessFirmwareVolume;
+  EFI_PROCESS_FIRMWARE_VOLUME     ProcessFirmwareVolume;
   //
   // Extensions to Global Coherency Domain Services
   //
-  EFI_SET_MEMORY_SPACE_CAPABILITIES    SetMemorySpaceCapabilities;
+  EFI_SET_MEMORY_SPACE_CAPABILITIES SetMemorySpaceCapabilities;
 } DXE_SERVICES;
 
 typedef DXE_SERVICES EFI_DXE_SERVICES;

src/include/ipxe/efi/Pi/PiFirmwareFile.h

@@ -1,18 +1,25 @@
 /** @file
   The firmware file related definitions in PI.
 
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
-  PI Version 1.6.
+  PI Version 1.4.
 
 **/
 
+
 #ifndef __PI_FIRMWARE_FILE_H__
 #define __PI_FIRMWARE_FILE_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 #pragma pack(1)
 ///
@@ -25,7 +32,7 @@ typedef union {
     /// header. The State and IntegrityCheck.Checksum.File fields are assumed
     /// to be zero and the checksum is calculated such that the entire header sums to zero.
     ///
-    UINT8    Header;
+    UINT8   Header;
     ///
     /// If the FFS_ATTRIB_CHECKSUM (see definition below) bit of the Attributes
     /// field is set to one, the IntegrityCheck.Checksum.File field is an 8-bit
@@ -35,7 +42,7 @@ typedef union {
     /// 0xAA. The IntegrityCheck.Checksum.File field is valid any time the
     /// EFI_FILE_DATA_VALID bit is set in the State field.
     ///
-    UINT8    File;
+    UINT8   File;
   } Checksum;
   ///
   /// This is the full 16 bits of the IntegrityCheck field.
@@ -49,47 +56,41 @@ typedef union {
 ///
 #define FFS_FIXED_CHECKSUM  0xAA
 
-typedef UINT8  EFI_FV_FILETYPE;
-typedef UINT8  EFI_FFS_FILE_ATTRIBUTES;
-typedef UINT8  EFI_FFS_FILE_STATE;
+typedef UINT8 EFI_FV_FILETYPE;
+typedef UINT8 EFI_FFS_FILE_ATTRIBUTES;
+typedef UINT8 EFI_FFS_FILE_STATE;
 
 ///
 /// File Types Definitions
 ///
-#define EFI_FV_FILETYPE_ALL                    0x00
-#define EFI_FV_FILETYPE_RAW                    0x01
-#define EFI_FV_FILETYPE_FREEFORM               0x02
-#define EFI_FV_FILETYPE_SECURITY_CORE          0x03
-#define EFI_FV_FILETYPE_PEI_CORE               0x04
-#define EFI_FV_FILETYPE_DXE_CORE               0x05
-#define EFI_FV_FILETYPE_PEIM                   0x06
-#define EFI_FV_FILETYPE_DRIVER                 0x07
-#define EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER   0x08
-#define EFI_FV_FILETYPE_APPLICATION            0x09
-#define EFI_FV_FILETYPE_MM                     0x0A
-#define EFI_FV_FILETYPE_SMM                    EFI_FV_FILETYPE_MM
-#define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE  0x0B
-#define EFI_FV_FILETYPE_COMBINED_MM_DXE        0x0C
-#define EFI_FV_FILETYPE_COMBINED_SMM_DXE       EFI_FV_FILETYPE_COMBINED_MM_DXE
-#define EFI_FV_FILETYPE_MM_CORE                0x0D
-#define EFI_FV_FILETYPE_SMM_CORE               EFI_FV_FILETYPE_MM_CORE
-#define EFI_FV_FILETYPE_MM_STANDALONE          0x0E
-#define EFI_FV_FILETYPE_MM_CORE_STANDALONE     0x0F
-#define EFI_FV_FILETYPE_OEM_MIN                0xc0
-#define EFI_FV_FILETYPE_OEM_MAX                0xdf
-#define EFI_FV_FILETYPE_DEBUG_MIN              0xe0
-#define EFI_FV_FILETYPE_DEBUG_MAX              0xef
-#define EFI_FV_FILETYPE_FFS_MIN                0xf0
-#define EFI_FV_FILETYPE_FFS_MAX                0xff
-#define EFI_FV_FILETYPE_FFS_PAD                0xf0
+#define EFI_FV_FILETYPE_ALL                   0x00
+#define EFI_FV_FILETYPE_RAW                   0x01
+#define EFI_FV_FILETYPE_FREEFORM              0x02
+#define EFI_FV_FILETYPE_SECURITY_CORE         0x03
+#define EFI_FV_FILETYPE_PEI_CORE              0x04
+#define EFI_FV_FILETYPE_DXE_CORE              0x05
+#define EFI_FV_FILETYPE_PEIM                  0x06
+#define EFI_FV_FILETYPE_DRIVER                0x07
+#define EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER  0x08
+#define EFI_FV_FILETYPE_APPLICATION           0x09
+#define EFI_FV_FILETYPE_SMM                   0x0A
+#define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE 0x0B
+#define EFI_FV_FILETYPE_COMBINED_SMM_DXE      0x0C
+#define EFI_FV_FILETYPE_SMM_CORE              0x0D
+#define EFI_FV_FILETYPE_OEM_MIN               0xc0
+#define EFI_FV_FILETYPE_OEM_MAX               0xdf
+#define EFI_FV_FILETYPE_DEBUG_MIN             0xe0
+#define EFI_FV_FILETYPE_DEBUG_MAX             0xef
+#define EFI_FV_FILETYPE_FFS_MIN               0xf0
+#define EFI_FV_FILETYPE_FFS_MAX               0xff
+#define EFI_FV_FILETYPE_FFS_PAD               0xf0
 ///
 /// FFS File Attributes.
 ///
-#define FFS_ATTRIB_LARGE_FILE        0x01
-#define FFS_ATTRIB_DATA_ALIGNMENT_2  0x02
-#define FFS_ATTRIB_FIXED             0x04
-#define FFS_ATTRIB_DATA_ALIGNMENT    0x38
-#define FFS_ATTRIB_CHECKSUM          0x40
+#define FFS_ATTRIB_LARGE_FILE         0x01
+#define FFS_ATTRIB_FIXED              0x04
+#define FFS_ATTRIB_DATA_ALIGNMENT     0x38
+#define FFS_ATTRIB_CHECKSUM           0x40
 
 ///
 /// FFS File State Bits.
@@ -101,6 +102,7 @@ typedef UINT8  EFI_FFS_FILE_STATE;
 #define EFI_FILE_DELETED              0x10
 #define EFI_FILE_HEADER_INVALID       0x20
 
+
 ///
 /// Each file begins with the header that describe the
 /// contents and state of the files.
@@ -109,27 +111,27 @@ typedef struct {
   ///
   /// This GUID is the file name. It is used to uniquely identify the file.
   ///
-  EFI_GUID                   Name;
+  EFI_GUID                Name;
   ///
   /// Used to verify the integrity of the file.
   ///
-  EFI_FFS_INTEGRITY_CHECK    IntegrityCheck;
+  EFI_FFS_INTEGRITY_CHECK IntegrityCheck;
   ///
   /// Identifies the type of file.
   ///
-  EFI_FV_FILETYPE            Type;
+  EFI_FV_FILETYPE         Type;
   ///
   /// Declares various file attribute bits.
   ///
-  EFI_FFS_FILE_ATTRIBUTES    Attributes;
+  EFI_FFS_FILE_ATTRIBUTES Attributes;
   ///
   /// The length of the file in bytes, including the FFS header.
   ///
-  UINT8                      Size[3];
+  UINT8                   Size[3];
   ///
   /// Used to track the state of the file throughout the life of the file from creation to deletion.
   ///
-  EFI_FFS_FILE_STATE         State;
+  EFI_FFS_FILE_STATE      State;
 } EFI_FFS_FILE_HEADER;
 
 typedef struct {
@@ -138,22 +140,22 @@ typedef struct {
   /// one instance of a file with the file name GUID of Name in any given firmware
   /// volume, except if the file type is EFI_FV_FILETYPE_FFS_PAD.
   ///
-  EFI_GUID                   Name;
+  EFI_GUID                  Name;
 
   ///
   /// Used to verify the integrity of the file.
   ///
-  EFI_FFS_INTEGRITY_CHECK    IntegrityCheck;
+  EFI_FFS_INTEGRITY_CHECK   IntegrityCheck;
 
   ///
   /// Identifies the type of file.
   ///
-  EFI_FV_FILETYPE            Type;
+  EFI_FV_FILETYPE           Type;
 
   ///
   /// Declares various file attribute bits.
   ///
-  EFI_FFS_FILE_ATTRIBUTES    Attributes;
+  EFI_FFS_FILE_ATTRIBUTES   Attributes;
 
   ///
   /// The length of the file in bytes, including the FFS header.
@@ -162,32 +164,25 @@ typedef struct {
   /// Size is not required to be a multiple of 8 bytes. Given a file F, the next file header is
   /// located at the next 8-byte aligned firmware volume offset following the last byte of the file F.
   ///
-  UINT8                 Size[3];
+  UINT8                     Size[3];
 
   ///
   /// Used to track the state of the file throughout the life of the file from creation to deletion.
   ///
-  EFI_FFS_FILE_STATE    State;
+  EFI_FFS_FILE_STATE        State;
 
   ///
   /// If FFS_ATTRIB_LARGE_FILE is set in Attributes, then ExtendedSize exists and Size must be set to zero.
   /// If FFS_ATTRIB_LARGE_FILE is not set then EFI_FFS_FILE_HEADER is used.
   ///
-  UINT64                ExtendedSize;
+  UINT64                    ExtendedSize;
 } EFI_FFS_FILE_HEADER2;
 
 #define IS_FFS_FILE2(FfsFileHeaderPtr) \
     (((((EFI_FFS_FILE_HEADER *) (UINTN) FfsFileHeaderPtr)->Attributes) & FFS_ATTRIB_LARGE_FILE) == FFS_ATTRIB_LARGE_FILE)
 
-///
-/// The argument passed as the FfsFileHeaderPtr parameter to the
-/// FFS_FILE_SIZE() function-like macro below must not have side effects:
-/// FfsFileHeaderPtr is evaluated multiple times.
-///
-#define FFS_FILE_SIZE(FfsFileHeaderPtr)  ((UINT32) (\
-    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[0]      ) | \
-    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[1] <<  8) | \
-    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[2] << 16)))
+#define FFS_FILE_SIZE(FfsFileHeaderPtr) \
+    ((UINT32) (*((UINT32 *) ((EFI_FFS_FILE_HEADER *) (UINTN) FfsFileHeaderPtr)->Size) & 0x00ffffff))
 
 #define FFS_FILE2_SIZE(FfsFileHeaderPtr) \
     ((UINT32) (((EFI_FFS_FILE_HEADER2 *) (UINTN) FfsFileHeaderPtr)->ExtendedSize))
@@ -198,33 +193,32 @@ typedef UINT8 EFI_SECTION_TYPE;
 /// Pseudo type. It is used as a wild card when retrieving sections.
 ///  The section type EFI_SECTION_ALL matches all section types.
 ///
-#define EFI_SECTION_ALL  0x00
+#define EFI_SECTION_ALL                   0x00
 
 ///
 /// Encapsulation section Type values.
 ///
-#define EFI_SECTION_COMPRESSION  0x01
+#define EFI_SECTION_COMPRESSION           0x01
 
-#define EFI_SECTION_GUID_DEFINED  0x02
+#define EFI_SECTION_GUID_DEFINED          0x02
 
-#define EFI_SECTION_DISPOSABLE  0x03
+#define EFI_SECTION_DISPOSABLE            0x03
 
 ///
 /// Leaf section Type values.
 ///
-#define EFI_SECTION_PE32                   0x10
-#define EFI_SECTION_PIC                    0x11
-#define EFI_SECTION_TE                     0x12
-#define EFI_SECTION_DXE_DEPEX              0x13
-#define EFI_SECTION_VERSION                0x14
-#define EFI_SECTION_USER_INTERFACE         0x15
-#define EFI_SECTION_COMPATIBILITY16        0x16
-#define EFI_SECTION_FIRMWARE_VOLUME_IMAGE  0x17
-#define EFI_SECTION_FREEFORM_SUBTYPE_GUID  0x18
-#define EFI_SECTION_RAW                    0x19
-#define EFI_SECTION_PEI_DEPEX              0x1B
-#define EFI_SECTION_MM_DEPEX               0x1C
-#define EFI_SECTION_SMM_DEPEX              EFI_SECTION_MM_DEPEX
+#define EFI_SECTION_PE32                  0x10
+#define EFI_SECTION_PIC                   0x11
+#define EFI_SECTION_TE                    0x12
+#define EFI_SECTION_DXE_DEPEX             0x13
+#define EFI_SECTION_VERSION               0x14
+#define EFI_SECTION_USER_INTERFACE        0x15
+#define EFI_SECTION_COMPATIBILITY16       0x16
+#define EFI_SECTION_FIRMWARE_VOLUME_IMAGE 0x17
+#define EFI_SECTION_FREEFORM_SUBTYPE_GUID 0x18
+#define EFI_SECTION_RAW                   0x19
+#define EFI_SECTION_PEI_DEPEX             0x1B
+#define EFI_SECTION_SMM_DEPEX             0x1C
 
 ///
 /// Common section header.
@@ -234,8 +228,8 @@ typedef struct {
   /// A 24-bit unsigned integer that contains the total size of the section in bytes,
   /// including the EFI_COMMON_SECTION_HEADER.
   ///
-  UINT8               Size[3];
-  EFI_SECTION_TYPE    Type;
+  UINT8             Size[3];
+  EFI_SECTION_TYPE  Type;
   ///
   /// Declares the section type.
   ///
@@ -246,15 +240,15 @@ typedef struct {
   /// A 24-bit unsigned integer that contains the total size of the section in bytes,
   /// including the EFI_COMMON_SECTION_HEADER.
   ///
-  UINT8               Size[3];
+  UINT8             Size[3];
 
-  EFI_SECTION_TYPE    Type;
+  EFI_SECTION_TYPE  Type;
 
   ///
   /// If Size is 0xFFFFFF, then ExtendedSize contains the size of the section. If
   /// Size is not equal to 0xFFFFFF, then this field does not exist.
   ///
-  UINT32              ExtendedSize;
+  UINT32            ExtendedSize;
 } EFI_COMMON_SECTION_HEADER2;
 
 ///
@@ -277,15 +271,15 @@ typedef struct {
   ///
   /// Usual common section header. CommonHeader.Type = EFI_SECTION_COMPRESSION.
   ///
-  EFI_COMMON_SECTION_HEADER    CommonHeader;
+  EFI_COMMON_SECTION_HEADER   CommonHeader;
   ///
   /// The UINT32 that indicates the size of the section data after decompression.
   ///
-  UINT32                       UncompressedLength;
+  UINT32                      UncompressedLength;
   ///
   /// Indicates which compression algorithm is used.
   ///
-  UINT8                        CompressionType;
+  UINT8                       CompressionType;
 } EFI_COMPRESSION_SECTION;
 
 typedef struct {
@@ -312,20 +306,20 @@ typedef struct {
 /// order to conserve space. The contents of this section are implementation specific, but might contain
 /// debug data or detailed integration instructions.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_DISPOSABLE_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_DISPOSABLE_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_DISPOSABLE_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_DISPOSABLE_SECTION2;
 
 ///
 /// The leaf section which could be used to determine the dispatch order of DXEs.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_DXE_DEPEX_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_DXE_DEPEX_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_DXE_DEPEX_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_DXE_DEPEX_SECTION2;
 
 ///
 /// The leaf section which contains a PI FV.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_FIRMWARE_VOLUME_IMAGE_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_FIRMWARE_VOLUME_IMAGE_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_FIRMWARE_VOLUME_IMAGE_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_FIRMWARE_VOLUME_IMAGE_SECTION2;
 
 ///
 /// The leaf section which contains a single GUID.
@@ -334,11 +328,11 @@ typedef struct {
   ///
   /// Common section header. CommonHeader.Type = EFI_SECTION_FREEFORM_SUBTYPE_GUID.
   ///
-  EFI_COMMON_SECTION_HEADER    CommonHeader;
+  EFI_COMMON_SECTION_HEADER   CommonHeader;
   ///
   /// This GUID is defined by the creator of the file. It is a vendor-defined file type.
   ///
-  EFI_GUID                     SubTypeGuid;
+  EFI_GUID                    SubTypeGuid;
 } EFI_FREEFORM_SUBTYPE_GUID_SECTION;
 
 typedef struct {
@@ -364,19 +358,19 @@ typedef struct {
   ///
   /// The common section header. CommonHeader.Type = EFI_SECTION_GUID_DEFINED.
   ///
-  EFI_COMMON_SECTION_HEADER    CommonHeader;
+  EFI_COMMON_SECTION_HEADER   CommonHeader;
   ///
   /// The GUID that defines the format of the data that follows. It is a vendor-defined section type.
   ///
-  EFI_GUID                     SectionDefinitionGuid;
+  EFI_GUID                    SectionDefinitionGuid;
   ///
   /// Contains the offset in bytes from the beginning of the common header to the first byte of the data.
   ///
-  UINT16                       DataOffset;
+  UINT16                      DataOffset;
   ///
   /// The bit field that declares some specific characteristics of the section contents.
   ///
-  UINT16                       Attributes;
+  UINT16                      Attributes;
 } EFI_GUID_DEFINED_SECTION;
 
 typedef struct {
@@ -401,14 +395,14 @@ typedef struct {
 ///
 /// The leaf section which contains PE32+ image.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_PE32_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_PE32_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_PE32_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_PE32_SECTION2;
 
 ///
 /// The leaf section used to determine the dispatch order of PEIMs.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_PEI_DEPEX_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_PEI_DEPEX_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_PEI_DEPEX_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_PEI_DEPEX_SECTION2;
 
 ///
 /// A leaf section type that contains a position-independent-code (PIC) image.
@@ -419,20 +413,20 @@ typedef EFI_COMMON_SECTION_HEADER2 EFI_PEI_DEPEX_SECTION2;
 /// execute correctly without performing any relocation or other fix-ups. EFI_PIC_SECTION2 must
 /// be used if the section is 16MB or larger.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_PIC_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_PIC_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_PIC_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_PIC_SECTION2;
 
 ///
 /// The leaf section which constains the position-independent-code image.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_TE_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_TE_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_TE_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_TE_SECTION2;
 
 ///
 /// The leaf section which contains an array of zero or more bytes.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_RAW_SECTION;
-typedef EFI_COMMON_SECTION_HEADER2 EFI_RAW_SECTION2;
+typedef EFI_COMMON_SECTION_HEADER   EFI_RAW_SECTION;
+typedef EFI_COMMON_SECTION_HEADER2  EFI_RAW_SECTION2;
 
 ///
 /// The SMM dependency expression section is a leaf section that contains a dependency expression that
@@ -442,7 +436,7 @@ typedef EFI_COMMON_SECTION_HEADER2 EFI_RAW_SECTION2;
 /// The dependency expression may refer to protocols installed in either the UEFI or the SMM protocol
 /// database. EFI_SMM_DEPEX_SECTION2 must be used if the section is 16MB or larger.
 ///
-typedef EFI_COMMON_SECTION_HEADER  EFI_SMM_DEPEX_SECTION;
+typedef EFI_COMMON_SECTION_HEADER EFI_SMM_DEPEX_SECTION;
 typedef EFI_COMMON_SECTION_HEADER2 EFI_SMM_DEPEX_SECTION2;
 
 ///
@@ -450,12 +444,12 @@ typedef EFI_COMMON_SECTION_HEADER2 EFI_SMM_DEPEX_SECTION2;
 /// is human readable file name.
 ///
 typedef struct {
-  EFI_COMMON_SECTION_HEADER    CommonHeader;
+  EFI_COMMON_SECTION_HEADER   CommonHeader;
 
   ///
   /// Array of unicode string.
   ///
-  CHAR16                       FileNameString[1];
+  CHAR16                      FileNameString[1];
 } EFI_USER_INTERFACE_SECTION;
 
 typedef struct {
@@ -468,13 +462,13 @@ typedef struct {
 /// an optional unicode string that represents the file revision.
 ///
 typedef struct {
-  EFI_COMMON_SECTION_HEADER    CommonHeader;
-  UINT16                       BuildNumber;
+  EFI_COMMON_SECTION_HEADER   CommonHeader;
+  UINT16                      BuildNumber;
 
   ///
   /// Array of unicode string.
   ///
-  CHAR16                       VersionString[1];
+  CHAR16                      VersionString[1];
 } EFI_VERSION_SECTION;
 
 typedef struct {
@@ -487,18 +481,11 @@ typedef struct {
   CHAR16                        VersionString[1];
 } EFI_VERSION_SECTION2;
 
-///
-/// The argument passed as the SectionHeaderPtr parameter to the SECTION_SIZE()
-/// and IS_SECTION2() function-like macros below must not have side effects:
-/// SectionHeaderPtr is evaluated multiple times.
-///
-#define SECTION_SIZE(SectionHeaderPtr)  ((UINT32) (\
-    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[0]      ) | \
-    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[1] <<  8) | \
-    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[2] << 16)))
-
 #define IS_SECTION2(SectionHeaderPtr) \
-    (SECTION_SIZE (SectionHeaderPtr) == 0x00ffffff)
+    ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff) == 0x00ffffff)
+
+#define SECTION_SIZE(SectionHeaderPtr) \
+    ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff))
 
 #define SECTION2_SIZE(SectionHeaderPtr) \
     (((EFI_COMMON_SECTION_HEADER2 *) (UINTN) SectionHeaderPtr)->ExtendedSize)
@@ -506,3 +493,4 @@ typedef struct {
 #pragma pack()
 
 #endif
+

src/include/ipxe/efi/Pi/PiFirmwareVolume.h

@@ -1,23 +1,29 @@
 /** @file
   The firmware volume related definitions in PI.
 
-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @par Revision Reference:
-  PI Version 1.6
+  PI Version 1.3
 
 **/
 
 #ifndef __PI_FIRMWAREVOLUME_H__
 #define __PI_FIRMWAREVOLUME_H__
 
-FILE_LICENCE ( BSD2_PATENT );
+FILE_LICENCE ( BSD3 );
 
 ///
 /// EFI_FV_FILE_ATTRIBUTES
 ///
-typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
+typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
 
 //
 // Value of EFI_FV_FILE_ATTRIBUTES.
@@ -29,70 +35,70 @@ typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
 ///
 /// type of EFI FVB attribute
 ///
-typedef UINT32 EFI_FVB_ATTRIBUTES_2;
+typedef UINT32  EFI_FVB_ATTRIBUTES_2;
 
 //
 // Attributes bit definitions
 //
-#define EFI_FVB2_READ_DISABLED_CAP   0x00000001
-#define EFI_FVB2_READ_ENABLED_CAP    0x00000002
-#define EFI_FVB2_READ_STATUS         0x00000004
-#define EFI_FVB2_WRITE_DISABLED_CAP  0x00000008
-#define EFI_FVB2_WRITE_ENABLED_CAP   0x00000010
-#define EFI_FVB2_WRITE_STATUS        0x00000020
-#define EFI_FVB2_LOCK_CAP            0x00000040
-#define EFI_FVB2_LOCK_STATUS         0x00000080
-#define EFI_FVB2_STICKY_WRITE        0x00000200
-#define EFI_FVB2_MEMORY_MAPPED       0x00000400
-#define EFI_FVB2_ERASE_POLARITY      0x00000800
-#define EFI_FVB2_READ_LOCK_CAP       0x00001000
-#define EFI_FVB2_READ_LOCK_STATUS    0x00002000
-#define EFI_FVB2_WRITE_LOCK_CAP      0x00004000
-#define EFI_FVB2_WRITE_LOCK_STATUS   0x00008000
-#define EFI_FVB2_ALIGNMENT           0x001F0000
-#define EFI_FVB2_ALIGNMENT_1         0x00000000
-#define EFI_FVB2_ALIGNMENT_2         0x00010000
-#define EFI_FVB2_ALIGNMENT_4         0x00020000
-#define EFI_FVB2_ALIGNMENT_8         0x00030000
-#define EFI_FVB2_ALIGNMENT_16        0x00040000
-#define EFI_FVB2_ALIGNMENT_32        0x00050000
-#define EFI_FVB2_ALIGNMENT_64        0x00060000
-#define EFI_FVB2_ALIGNMENT_128       0x00070000
-#define EFI_FVB2_ALIGNMENT_256       0x00080000
-#define EFI_FVB2_ALIGNMENT_512       0x00090000
-#define EFI_FVB2_ALIGNMENT_1K        0x000A0000
-#define EFI_FVB2_ALIGNMENT_2K        0x000B0000
-#define EFI_FVB2_ALIGNMENT_4K        0x000C0000
-#define EFI_FVB2_ALIGNMENT_8K        0x000D0000
-#define EFI_FVB2_ALIGNMENT_16K       0x000E0000
-#define EFI_FVB2_ALIGNMENT_32K       0x000F0000
-#define EFI_FVB2_ALIGNMENT_64K       0x00100000
-#define EFI_FVB2_ALIGNMENT_128K      0x00110000
-#define EFI_FVB2_ALIGNMENT_256K      0x00120000
-#define EFI_FVB2_ALIGNMENT_512K      0x00130000
-#define EFI_FVB2_ALIGNMENT_1M        0x00140000
-#define EFI_FVB2_ALIGNMENT_2M        0x00150000
-#define EFI_FVB2_ALIGNMENT_4M        0x00160000
-#define EFI_FVB2_ALIGNMENT_8M        0x00170000
-#define EFI_FVB2_ALIGNMENT_16M       0x00180000
-#define EFI_FVB2_ALIGNMENT_32M       0x00190000
-#define EFI_FVB2_ALIGNMENT_64M       0x001A0000
-#define EFI_FVB2_ALIGNMENT_128M      0x001B0000
-#define EFI_FVB2_ALIGNMENT_256M      0x001C0000
-#define EFI_FVB2_ALIGNMENT_512M      0x001D0000
-#define EFI_FVB2_ALIGNMENT_1G        0x001E0000
-#define EFI_FVB2_ALIGNMENT_2G        0x001F0000
-#define EFI_FVB2_WEAK_ALIGNMENT      0x80000000
+#define EFI_FVB2_READ_DISABLED_CAP  0x00000001
+#define EFI_FVB2_READ_ENABLED_CAP   0x00000002
+#define EFI_FVB2_READ_STATUS        0x00000004
+#define EFI_FVB2_WRITE_DISABLED_CAP 0x00000008
+#define EFI_FVB2_WRITE_ENABLED_CAP  0x00000010
+#define EFI_FVB2_WRITE_STATUS       0x00000020
+#define EFI_FVB2_LOCK_CAP           0x00000040
+#define EFI_FVB2_LOCK_STATUS        0x00000080
+#define EFI_FVB2_STICKY_WRITE       0x00000200
+#define EFI_FVB2_MEMORY_MAPPED      0x00000400
+#define EFI_FVB2_ERASE_POLARITY     0x00000800
+#define EFI_FVB2_READ_LOCK_CAP      0x00001000
+#define EFI_FVB2_READ_LOCK_STATUS   0x00002000
+#define EFI_FVB2_WRITE_LOCK_CAP     0x00004000
+#define EFI_FVB2_WRITE_LOCK_STATUS  0x00008000
+#define EFI_FVB2_ALIGNMENT          0x001F0000
+#define EFI_FVB2_ALIGNMENT_1        0x00000000
+#define EFI_FVB2_ALIGNMENT_2        0x00010000
+#define EFI_FVB2_ALIGNMENT_4        0x00020000
+#define EFI_FVB2_ALIGNMENT_8        0x00030000
+#define EFI_FVB2_ALIGNMENT_16       0x00040000
+#define EFI_FVB2_ALIGNMENT_32       0x00050000
+#define EFI_FVB2_ALIGNMENT_64       0x00060000
+#define EFI_FVB2_ALIGNMENT_128      0x00070000
+#define EFI_FVB2_ALIGNMENT_256      0x00080000
+#define EFI_FVB2_ALIGNMENT_512      0x00090000
+#define EFI_FVB2_ALIGNMENT_1K       0x000A0000
+#define EFI_FVB2_ALIGNMENT_2K       0x000B0000
+#define EFI_FVB2_ALIGNMENT_4K       0x000C0000
+#define EFI_FVB2_ALIGNMENT_8K       0x000D0000
+#define EFI_FVB2_ALIGNMENT_16K      0x000E0000
+#define EFI_FVB2_ALIGNMENT_32K      0x000F0000
+#define EFI_FVB2_ALIGNMENT_64K      0x00100000
+#define EFI_FVB2_ALIGNMENT_128K     0x00110000
+#define EFI_FVB2_ALIGNMENT_256K     0x00120000
+#define EFI_FVB2_ALIGNMENT_512K     0x00130000
+#define EFI_FVB2_ALIGNMENT_1M       0x00140000
+#define EFI_FVB2_ALIGNMENT_2M       0x00150000
+#define EFI_FVB2_ALIGNMENT_4M       0x00160000
+#define EFI_FVB2_ALIGNMENT_8M       0x00170000
+#define EFI_FVB2_ALIGNMENT_16M      0x00180000
+#define EFI_FVB2_ALIGNMENT_32M      0x00190000
+#define EFI_FVB2_ALIGNMENT_64M      0x001A0000
+#define EFI_FVB2_ALIGNMENT_128M     0x001B0000
+#define EFI_FVB2_ALIGNMENT_256M     0x001C0000
+#define EFI_FVB2_ALIGNMENT_512M     0x001D0000
+#define EFI_FVB2_ALIGNMENT_1G       0x001E0000
+#define EFI_FVB2_ALIGNMENT_2G       0x001F0000
+#define EFI_FVB2_WEAK_ALIGNMENT     0x80000000
 
 typedef struct {
   ///
   /// The number of sequential blocks which are of the same size.
   ///
-  UINT32    NumBlocks;
+  UINT32 NumBlocks;
   ///
   /// The size of the blocks.
   ///
-  UINT32    Length;
+  UINT32 Length;
 } EFI_FV_BLOCK_MAP_ENTRY;
 
 ///
@@ -149,7 +155,7 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];
 } EFI_FIRMWARE_VOLUME_HEADER;
 
-#define EFI_FVH_SIGNATURE  SIGNATURE_32 ('_', 'F', 'V', 'H')
+#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')
 
 ///
 /// Firmware Volume Header Revision definition
@@ -163,11 +169,11 @@ typedef struct {
   ///
   /// Firmware volume name.
   ///
-  EFI_GUID    FvName;
+  EFI_GUID  FvName;
   ///
   /// Size of the rest of the extension header, including this structure.
   ///
-  UINT32      ExtHeaderSize;
+  UINT32    ExtHeaderSize;
 } EFI_FIRMWARE_VOLUME_EXT_HEADER;
 
 ///
@@ -192,12 +198,12 @@ typedef struct {
   ///
   /// Standard extension entry, with the type EFI_FV_EXT_TYPE_OEM_TYPE.
   ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY Hdr;
   ///
   /// A bit mask, one bit for each file type between 0xC0 (bit 0) and 0xDF (bit 31). If a bit
   /// is '1', then the GUID entry exists in Types. If a bit is '0' then no GUID entry exists in Types.
   ///
-  UINT32                           TypeMask;
+  UINT32    TypeMask;
   ///
   /// An array of GUIDs, each GUID representing an OEM file type.
   ///
@@ -205,7 +211,7 @@ typedef struct {
   ///
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_OEM_TYPE;
 
-#define EFI_FV_EXT_TYPE_GUID_TYPE  0x0002
+#define EFI_FV_EXT_TYPE_GUID_TYPE 0x0002
 
 ///
 /// This extension header EFI_FIRMWARE_VOLUME_EXT_ENTRY_GUID_TYPE provides a vendor specific
@@ -215,11 +221,11 @@ typedef struct {
   ///
   /// Standard extension entry, with the type EFI_FV_EXT_TYPE_OEM_TYPE.
   ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY     Hdr;
   ///
   /// Vendor-specific GUID.
   ///
-  EFI_GUID                         FormatType;
+  EFI_GUID                          FormatType;
   ///
   /// An arry of bytes of length Length.
   ///
@@ -227,23 +233,4 @@ typedef struct {
   ///
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_GUID_TYPE;
 
-#define EFI_FV_EXT_TYPE_USED_SIZE_TYPE  0x03
-
-///
-/// The EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE can be used to find
-/// out how many EFI_FVB2_ERASE_POLARITY bytes are at the end of the FV.
-///
-typedef struct {
-  ///
-  /// Standard extension entry, with the type EFI_FV_EXT_TYPE_USED_SIZE_TYPE.
-  ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
-  ///
-  /// The number of bytes of the FV that are in uses. The remaining
-  /// EFI_FIRMWARE_VOLUME_HEADER FvLength minus UsedSize bytes in
-  /// the FV must contain the value implied by EFI_FVB2_ERASE_POLARITY.
-  ///
-  UINT32                           UsedSize;
-} EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE;
-
 #endif