#endif
-#define DEBUG_BALLOC (1 << 0)
-#define DEBUG_BCACHE (1 << 1)
-#define DEBUG_BITMAP (1 << 2)
-#define DEBUG_BLOCK_GROUP (1 << 3)
-#define DEBUG_BLOCKDEV (1 << 4)
-#define DEBUG_DIR_IDX (1 << 5)
-#define DEBUG_DIR (1 << 6)
-#define DEBUG_EXTENT (1 << 7)
-#define DEBUG_FS (1 << 8)
-#define DEBUG_HASH (1 << 9)
-#define DEBUG_IALLOC (1 << 10)
-#define DEBUG_INODE (1 << 11)
-#define DEBUG_SUPER (1 << 12)
-#define DEBUG_XATTR (1 << 13)
-#define DEBUG_MKFS (1 << 14)
-#define DEBUG_EXT4 (1 << 15)
-#define DEBUG_JBD (1 << 16)
-
+#define DEBUG_BALLOC (1ul << 0)
+#define DEBUG_BCACHE (1ul << 1)
+#define DEBUG_BITMAP (1ul << 2)
+#define DEBUG_BLOCK_GROUP (1ul << 3)
+#define DEBUG_BLOCKDEV (1ul << 4)
+#define DEBUG_DIR_IDX (1ul << 5)
+#define DEBUG_DIR (1ul << 6)
+#define DEBUG_EXTENT (1ul << 7)
+#define DEBUG_FS (1ul << 8)
+#define DEBUG_HASH (1ul << 9)
+#define DEBUG_IALLOC (1ul << 10)
+#define DEBUG_INODE (1ul << 11)
+#define DEBUG_SUPER (1ul << 12)
+#define DEBUG_XATTR (1ul << 13)
+#define DEBUG_MKFS (1ul << 14)
+#define DEBUG_EXT4 (1ul << 15)
+#define DEBUG_JBD (1ul << 16)
+#define DEBUG_MBR (1ul << 17)
+
+#define DEBUG_NOPREFIX (1ul << 31)
#define DEBUG_ALL (0xFFFFFFFF)
static inline const char *ext4_dmask_id2str(uint32_t m)
return "ext4_mkfs: ";
case DEBUG_JBD:
return "ext4_jbd: ";
+ case DEBUG_MBR:
+ return "ext4_mbr: ";
case DEBUG_EXT4:
return "ext4: ";
}
return "";
}
-#define DBG_NONE " "
+#define DBG_NONE ""
#define DBG_INFO "[info] "
#define DBG_WARN "[warn] "
#define DBG_ERROR "[error] "
/**@brief Debug printf.*/
#define ext4_dbg(m, ...) \
do { \
- if (m & ext4_dmask_get()) { \
- if (CONFIG_DEBUG_PREFIX) { \
+ if ((m) & ext4_dmask_get()) { \
+ if (!((m) & DEBUG_NOPREFIX)) { \
printf("%s", ext4_dmask_id2str(m)); \
printf("l: %d ", __LINE__); \
} \
#if CONFIG_DEBUG_ASSERT
/**@brief Debug assertion.*/
- #if CONFIG_HAVE_OWN_ASSERT
- #define ext4_assert(_v) \
- do { \
- if (!(_v)) { \
- printf("assertion failed:\nfile: %s\nline: %d\n", \
- __FILE__, __LINE__); \
- while (1) \
- ; \
- } \
- } while (0)
- #else
- #define ext4_assert(_v) assert(_v)
- #endif
+#if CONFIG_HAVE_OWN_ASSERT
+#define ext4_assert(_v) \
+ do { \
+ if (!(_v)) { \
+ printf("assertion failed:\nfile: %s\nline: %d\n", \
+ __FILE__, __LINE__); \
+ while (1) \
+ ; \
+ } \
+ } while (0)
+#else
+#define ext4_assert(_v) assert(_v)
+#endif
#else
#define ext4_assert(_v)
#endif