Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Include/libfdt_env.h

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

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

156854

Message:

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

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• EmbeddedPkg/Include/libfdt_env.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/EmbeddedPkg/Include/libfdt_env.h

@@ -13 +13 @@
 #include <Library/BaseMemoryLib.h>
 
-typedef UINT16 fdt16_t;
-typedef UINT32 fdt32_t;
-typedef UINT64 fdt64_t;
+typedef UINT16  fdt16_t;
+typedef UINT32  fdt32_t;
+typedef UINT64  fdt64_t;
 
-typedef UINT8 uint8_t;
-typedef UINT16 uint16_t;
-typedef UINT32 uint32_t;
-typedef UINT64 uint64_t;
-typedef UINTN uintptr_t;
-typedef UINTN size_t;
+typedef UINT8   uint8_t;
+typedef UINT16  uint16_t;
+typedef UINT32  uint32_t;
+typedef UINT64  uint64_t;
+typedef UINTN   uintptr_t;
+typedef UINTN   size_t;
 
-static inline uint16_t fdt16_to_cpu(fdt16_t x)
+static inline uint16_t
+fdt16_to_cpu (
+  fdt16_t  x
+  )
 {
   return SwapBytes16 (x);
 }
-#define cpu_to_fdt16(x) fdt16_to_cpu(x)
 
-static inline uint32_t fdt32_to_cpu(fdt32_t x)
+#define cpu_to_fdt16(x)  fdt16_to_cpu(x)
+
+static inline uint32_t
+fdt32_to_cpu (
+  fdt32_t  x
+  )
 {
   return SwapBytes32 (x);
 }
-#define cpu_to_fdt32(x) fdt32_to_cpu(x)
 
-static inline uint64_t fdt64_to_cpu(fdt64_t x)
+#define cpu_to_fdt32(x)  fdt32_to_cpu(x)
+
+static inline uint64_t
+fdt64_to_cpu (
+  fdt64_t  x
+  )
 {
   return SwapBytes64 (x);
 }
-#define cpu_to_fdt64(x) fdt64_to_cpu(x)
 
-static inline void* memcpy(void* dest, const void* src, size_t len) {
+#define cpu_to_fdt64(x)  fdt64_to_cpu(x)
+
+static inline void *
+memcpy (
+  void        *dest,
+  const void  *src,
+  size_t      len
+  )
+{
   return CopyMem (dest, src, len);
 }
 
-static inline void *memmove(void *dest, const void *src, size_t n) {
+static inline void *
+memmove (
+  void        *dest,
+  const void  *src,
+  size_t      n
+  )
+{
   return CopyMem (dest, src, n);
 }
 
-static inline void *memset(void *s, int c, size_t n) {
+static inline void *
+memset (
+  void    *s,
+  int     c,
+  size_t  n
+  )
+{
   return SetMem (s, n, c);
 }
 
-static inline int memcmp(const void* dest, const void* src, int len) {
+static inline int
+memcmp (
+  const void  *dest,
+  const void  *src,
+  int         len
+  )
+{
   return CompareMem (dest, src, len);
 }
 
-static inline void *memchr(const void *s, int c, size_t n) {
+static inline void *
+memchr (
+  const void  *s,
+  int         c,
+  size_t      n
+  )
+{
   return ScanMem8 (s, n, c);
 }
 
-static inline size_t strlen (const char* str) {
+static inline size_t
+strlen (
+  const char  *str
+  )
+{
   return AsciiStrLen (str);
 }
 
-static inline char *strchr(const char *s, int c) {
-  char pattern[2];
+static inline char *
+strchr (
+  const char  *s,
+  int         c
+  )
+{
+  char  pattern[2];
+
   pattern[0] = c;
   pattern[1] = 0;
@@ -73 +125 @@
 }
 
-static inline size_t strnlen (const char* str, size_t strsz ) {
+static inline size_t
+strnlen (
+  const char  *str,
+  size_t      strsz
+  )
+{
   return AsciiStrnLenS (str, strsz);
 }
 
-static inline size_t strncmp (const char* str1, const char* str2, size_t strsz ) {
+static inline size_t
+strcmp (
+  const char  *str1,
+  const char  *str2
+  )
+{
+  return AsciiStrCmp (str1, str2);
+}
+
+static inline size_t
+strncmp (
+  const char  *str1,
+  const char  *str2,
+  size_t      strsz
+  )
+{
   return AsciiStrnCmp (str1, str2, strsz);
 }
 
+static inline size_t
+strncpy (
+  char        *dest,
+  const char  *source,
+  size_t      dest_max
+  )
+{
+  return AsciiStrCpyS (dest, dest_max, source);
+}
+
 #endif /* _LIBFDT_ENV_H */