Add `common.j2` template

[deliverable/barectf.git] / barectf / templates / bitfield.h.j2

diff --git a/barectf/templates/bitfield.h.j2 b/barectf/templates/bitfield.h.j2
index d19951d46454379c58134257f984212cd3417197..51ea797a6e04e62a82e7a0439b54558179f1a8bc 100644 (file)
--- a/barectf/templates/bitfield.h.j2
+++ b/barectf/templates/bitfield.h.j2
@@ -1,5 +1,6 @@
-{% set prefix = cfg.options.code_generation_options.identifier_prefix %}
-{% set ucprefix = prefix | upper %}
+{% import 'common.j2' as common %}
+{% set prefix = common.prefix %}
+{% set ucprefix = common.ucprefix %}
 #ifndef _{{ ucprefix }}BITFIELD_H
 #define _{{ ucprefix }}BITFIELD_H
 
@@ -34,10 +35,10 @@
 #include <limits.h>
 
 #ifdef __cplusplus
-# define CAST_PTR(_type, _value) \
+# define {{ ucprefix }}CAST_PTR(_type, _value) \
        static_cast<_type>(static_cast<void *>(_value))
 #else
-# define CAST_PTR(_type, _value)       ((void *) (_value))
+# define {{ ucprefix }}CAST_PTR(_type, _value) ((void *) (_value))
 #endif
 
 {% set def_bo = cfg.trace.type.default_byte_order %}
@@ -78,7 +79,7 @@ do {                                                                  \
 #define _{{ prefix }}bt_bitfield_write_le(_ptr, type, _start, _length, _vtype, _v) \
 do {                                                                   \
        _vtype __v = (_v);                                              \
-       type *__ptr = CAST_PTR(type *, _ptr);                           \
+       type *__ptr = {{ ucprefix }}CAST_PTR(type *, _ptr);                     \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \
@@ -137,7 +138,7 @@ do {                                                                        \
 #define _{{ prefix }}bt_bitfield_write_be(_ptr, type, _start, _length, _vtype, _v) \
 do {                                                                   \
        _vtype __v = (_v);                                              \
-       type *__ptr = CAST_PTR(type *, _ptr);                           \
+       type *__ptr = {{ ucprefix }}CAST_PTR(type *, _ptr);                     \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \