Merge remote-tracking branch 'remotes/mpi/master' into wip-mc

Conflicts:
	src/ft2csv.c
	src/ftdump.c

1 files changed, 3 insertions, 1 deletions

diff --git a/include/timestamp.h b/include/timestamp.h
index 64a0f23..81d7a79 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -17,7 +17,9 @@ struct timestamp {
         uint32_t                seq_no;
         uint8_t                 cpu;
         uint8_t                 event;
-        uint8_t                 task_type;
+        uint8_t                 task_type:3;
+        uint8_t                 irq_flag:1;
+        uint8_t                 irq_count:4;
 };
 
 typedef uint32_t cmd_t;