Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/volume_id/volume_id_internal.h

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/volume_id/volume_id_internal.h (modified) (3 diffs)

branches/3.3/mindi-busybox/util-linux/volume_id/volume_id_internal.h

@@ -97 +97 @@
 #define SEEK_BUFFER_SIZE            0x10000
 
-#define bswap16(x) (uint16_t)   ( \
-                (((uint16_t)(x) & 0x00ffu) << 8) | \
-                (((uint16_t)(x) & 0xff00u) >> 8))
-
-#define bswap32(x) (uint32_t)   ( \
-                (((uint32_t)(x) & 0xff000000u) >> 24) | \
-                (((uint32_t)(x) & 0x00ff0000u) >>  8) | \
-                (((uint32_t)(x) & 0x0000ff00u) <<  8) | \
-                (((uint32_t)(x) & 0x000000ffu) << 24))
-
-#define bswap64(x) (uint64_t)   ( \
-                (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \
-                (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \
-                (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \
-                (((uint64_t)(x) & 0x000000ff00000000ull) >>  8) | \
-                (((uint64_t)(x) & 0x00000000ff000000ull) <<  8) | \
-                (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \
-                (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \
-                (((uint64_t)(x) & 0x00000000000000ffull) << 56))
-
 #if BB_LITTLE_ENDIAN
-#define le16_to_cpu(x) (x)
-#define le32_to_cpu(x) (x)
-#define le64_to_cpu(x) (x)
-#define be16_to_cpu(x) bswap16(x)
-#define be32_to_cpu(x) bswap32(x)
-#define cpu_to_le16(x) (x)
-#define cpu_to_le32(x) (x)
-#define cpu_to_be32(x) bswap32(x)
+# define le16_to_cpu(x) (uint16_t)(x)
+# define le32_to_cpu(x) (uint32_t)(x)
+# define le64_to_cpu(x) (uint64_t)(x)
+# define be16_to_cpu(x) (uint16_t)(bswap_16(x))
+# define be32_to_cpu(x) (uint32_t)(bswap_32(x))
+# define cpu_to_le16(x) (uint16_t)(x)
+# define cpu_to_le32(x) (uint32_t)(x)
+# define cpu_to_be32(x) (uint32_t)(bswap_32(x))
 #else
-#define le16_to_cpu(x) bswap16(x)
-#define le32_to_cpu(x) bswap32(x)
-#define le64_to_cpu(x) bswap64(x)
-#define be16_to_cpu(x) (x)
-#define be32_to_cpu(x) (x)
-#define cpu_to_le16(x) bswap16(x)
-#define cpu_to_le32(x) bswap32(x)
-#define cpu_to_be32(x) (x)
+# define le16_to_cpu(x) (uint16_t)(bswap_16(x))
+# define le32_to_cpu(x) (uint32_t)(bswap_32(x))
+# define le64_to_cpu(x) (uint64_t)(bb_bswap_64(x))
+# define be16_to_cpu(x) (uint16_t)(x)
+# define be32_to_cpu(x) (uint32_t)(x)
+# define cpu_to_le16(x) (uint16_t)(bswap_16(x))
+# define cpu_to_le32(x) (uint32_t)(bswap_32(x))
+# define cpu_to_be32(x) (uint32_t)(x)
 #endif
 
@@ -190 +170 @@
 /* FS */
 
+int FAST_FUNC volume_id_probe_bcache(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/);
 
@@ -216 +198 @@
 //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_f2fs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/);