Changeset 85718 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/BrotliCustomDecompressLib

Timestamp:

Aug 12, 2020 4:09:12 PM (5 years ago)

Author:

vboxsync

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

139865

Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf (modified) (2 diffs)
• MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecUefiSupport.c (added)
• MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecUefiSupport.h (added)
• MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h (modified) (3 diffs)
• MdeModulePkg/Library/BrotliCustomDecompressLib/LICENSE (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/README.md (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/ReadMe.txt (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/decode.h (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/port.h (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/common (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/dec (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/docs (deleted)
• MdeModulePkg/Library/BrotliCustomDecompressLib/stddef.h (added)
• MdeModulePkg/Library/BrotliCustomDecompressLib/stdint.h (added)
• MdeModulePkg/Library/BrotliCustomDecompressLib/stdlib.h (added)
• MdeModulePkg/Library/BrotliCustomDecompressLib/string.h (added)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf

@@ -5 +5 @@
 #  Brotli was released on the website https://github.com/google/brotli.
 #
-#  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -30 +30 @@
 [Sources]
   GuidedSectionExtraction.c
+  BrotliDecUefiSupport.c
+  BrotliDecUefiSupport.h
   BrotliDecompress.c
   BrotliDecompressLibInternal.h
-  common/dictionary.c
-  common/transform.c
-  dec/bit_reader.c
-  dec/decode.c
-  dec/huffman.c
-  dec/state.c
-  brotli/decode.h
-  brotli/port.h
-  brotli/types.h
-  common/constants.h
-  common/context.h
-  common/dictionary.h
-  common/platform.h
-  common/transform.h
-  common/version.h
-  dec/bit_reader.h
-  dec/huffman.h
-  dec/state.h
-  dec/prefix.h
+  # Wrapper header files start #
+  stddef.h
+  stdint.h
+  stdlib.h
+  string.h
+  # Wrapper header files end #
+  brotli/c/common/dictionary.c
+  brotli/c/common/transform.c
+  brotli/c/dec/bit_reader.c
+  brotli/c/dec/decode.c
+  brotli/c/dec/huffman.c
+  brotli/c/dec/state.c
+  brotli/c/include/brotli/decode.h
+  brotli/c/include/brotli/port.h
+  brotli/c/include/brotli/types.h
+  brotli/c/common/constants.h
+  brotli/c/common/context.h
+  brotli/c/common/dictionary.h
+  brotli/c/common/platform.h
+  brotli/c/common/transform.h
+  brotli/c/common/version.h
+  brotli/c/dec/bit_reader.h
+  brotli/c/dec/huffman.h
+  brotli/c/dec/state.h
+  brotli/c/dec/prefix.h
 
 [Packages]

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h

@@ -4 +4 @@
   Allows BROTLI code to build under UEFI (edk2) build environment
 
-  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -13 +13 @@
 
 #include <PiPei.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
 #include <Library/ExtractGuidedSectionLib.h>
-#include <brotli/types.h>
-#include <brotli/decode.h>
+#include <brotli/c/include/brotli/types.h>
+#include <brotli/c/include/brotli/decode.h>
 
 typedef struct
@@ -30 +27 @@
 #define BROTLI_DECODE_MAX    8
 #define BROTLI_SCRATCH_MAX   16
-
-#define memcpy                      CopyMem
-#define memmove                     CopyMem
-#define memset(dest,ch,count)       SetMem(dest,(UINTN)(count),(UINT8)(ch))
-
-VOID *
-BrDummyMalloc (
-  IN size_t   Size
-  );
-
-VOID
-BrDummyFree (
-  IN VOID *   Ptr
-  );
 
 EFI_STATUS