X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=894dda24bdd479882d4546777c5b45bfb533675f;hp=276152dbc67ffd358fbb8fba208fad5a76729947;hb=fc93b2bdc2ced1d46fefb91fe79391afded8e504;hpb=a3dbc7949a29a2abe9c7e75f2d893f99d36d6256

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 276152db..894dda24 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -40,30 +40,28 @@ int64_t ctf_int_read(const unsigned char *ptr, int byte_order, size_t len);
 size_t ctf_uint_write(unsigned char *ptr, int byte_order, size_t len, uint64_t v);
 size_t ctf_int_write(unsigned char *ptr, int byte_order, size_t len, int64_t v);
 
-/*
- * ctf-types-bitfield.h declares:
- *
- * ctf_bitfield_unsigned_read
- * ctf_bitfield_signed_read
- * ctf_bitfield_unsigned_write
- * ctf_bitfield_signed_write
- */
-#include <ctf/ctf-types-bitfield.h>
+uint64_t ctf_bitfield_unsigned_read(const unsigned char *ptr,
+				    unsigned long start, unsigned long len,
+				    int byte_order);
+int64_t ctf_bitfield_signed_read(const unsigned char *ptr,
+				 unsigned long start, unsigned long len,
+				 int byte_order);
+size_t ctf_bitfield_unsigned_write(unsigned char *ptr,
+				   unsigned long start, unsigned long len,
+				   int byte_order, uint64_t v);
+size_t ctf_bitfield_signed_write(unsigned char *ptr,
+				 unsigned long start, unsigned long len,
+				 int byte_order, int64_t v);
 
-double ctf_double_read(const unsigned char *ptr, const struct ctf_float *src)
-size_t ctf_double_write(unsigned char *ptr, const struct ctf_float *dest,
+double ctf_double_read(const unsigned char *ptr, const struct type_class_float *src)
+size_t ctf_double_write(unsigned char *ptr, const struct type_class_float *dest,
 		        double v);
 long double ctf_ldouble_read(const unsigned char *ptr,
-			     const struct ctf_float *src)
-size_t ctf_ldouble_write(unsigned char *ptr, const struct ctf_float *dest,
+			     const struct type_class_float *src)
+size_t ctf_ldouble_write(unsigned char *ptr, const struct type_class_float *dest,
 		         long double v);
-struct ctf_float {
-	size_t exp_len;
-	size_t mantissa_len;	/* Including sign bit */
-	int byte_order;
-};
-void ctf_float_copy(unsigned char *destp, const struct ctf_float *dest,
-		    const unsigned char *srcp, const struct ctf_float *src);
+void ctf_float_copy(unsigned char *destp, const struct type_class_float *dest,
+		    const unsigned char *srcp, const struct type_class_float *src);
 
 size_t ctf_string_copy(unsigned char *dest, const unsigned char *src);