Changeset 46408 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 6, 2013 1:28:44 PM (11 years ago)

Author:

vboxsync

Message:

Use iprt/formats/hfs.h. Also use IPRT for endian conversion.

File:

• trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h

@@ -23 +23 @@
 
 #include "fsw_core.h"
+#include "iprt/formats/hfs.h"
+#include "iprt/asm.h"           /* endian conversion */
 
 
@@ -31 +33 @@
 #define HFS_SUPERBLOCK_BLOCKNO   2
 
-/* Make world look Applish enough for the system header describing HFS layout  */
-#define __APPLE_API_PRIVATE
-#define __APPLE_API_UNSTABLE
-
-#define u_int8_t  fsw_u8
-#define u_int16_t fsw_u16
-#define u_int32_t fsw_u32
-#define u_int64_t fsw_u64
-#define int8_t    fsw_s8
-#define int16_t   fsw_s16
-#define int32_t   fsw_s32
-#define int64_t   fsw_s64
-
-#include "hfs_format.h"
-
-#undef u_int8_t
-#undef u_int16_t
-#undef u_int32_t
-#undef u_int64_t
-#undef int8_t
-#undef int16_t
-#undef int32_t
-#undef int64_t
-
-#pragma pack(1)
 #ifdef _MSC_VER
 /* vasily: disable warning for non-standard anonymous struct/union
@@ -61 +38 @@
  */
 # pragma warning (disable:4201)
-# define inline __inline
 #endif
 
@@ -68 +44 @@
 };
 
+#pragma pack(1)
 struct fsw_hfs_key
 {
@@ -77 +54 @@
   };
 };
-
 #pragma pack()
 
@@ -92 +68 @@
  * HFS: Dnode structure with HFS-specific data.
  */
-
 struct fsw_hfs_dnode
 {
@@ -131 +106 @@
 };
 
-/* Endianess swappers */
-static inline fsw_u16
-swab16(fsw_u16 x)
+/* Endianess swappers. */
+DECLINLINE(fsw_u16)
+be16_to_cpu(fsw_u16 x)
 {
-    return x<<8 | x>>8;
+    return RT_BE2H_U16(x);
 }
 
-static inline fsw_u32
-swab32(fsw_u32 x)
+DECLINLINE(fsw_u16)
+cpu_to_be16(fsw_u16 x)
 {
-    return x<<24 | x>>24 |
-            (x & (fsw_u32)0x0000ff00UL)<<8 |
-            (x & (fsw_u32)0x00ff0000UL)>>8;
+    return RT_H2BE_U16(x);
 }
 
 
-static inline fsw_u64
-swab64(fsw_u64 x)
+DECLINLINE(fsw_u32)
+cpu_to_be32(fsw_u32 x)
 {
-    return x<<56 | x>>56 |
-            (x & (fsw_u64)0x000000000000ff00ULL)<<40 |
-            (x & (fsw_u64)0x0000000000ff0000ULL)<<24 |
-            (x & (fsw_u64)0x00000000ff000000ULL)<< 8 |
-            (x & (fsw_u64)0x000000ff00000000ULL)>> 8 |
-            (x & (fsw_u64)0x0000ff0000000000ULL)>>24 |
-            (x & (fsw_u64)0x00ff000000000000ULL)>>40;
+    return RT_H2BE_U32(x);
 }
 
-static inline fsw_u16
-be16_to_cpu(fsw_u16 x)
+DECLINLINE(fsw_u32)
+be32_to_cpu(fsw_u32 x)
 {
-    return swab16(x);
+    return RT_BE2H_U32(x);
 }
 
-static inline fsw_u16
-cpu_to_be16(fsw_u16 x)
-{
-    return swab16(x);
-}
-
-
-static inline fsw_u32
-cpu_to_be32(fsw_u32 x)
-{
-    return swab32(x);
-}
-
-static inline fsw_u32
-be32_to_cpu(fsw_u32 x)
-{
-    return swab32(x);
-}
-
-static inline fsw_u64
+DECLINLINE(fsw_u64)
 be64_to_cpu(fsw_u64 x)
 {
-    return swab64(x);
+    return RT_BE2H_U64(x);
 }
 
 #endif
+