Change in libosmo-abis[master]: trau_frame: use 'ubit_t' for unpacked bits

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/18178 )


Change subject: trau_frame: use 'ubit_t' for unpacked bits
......................................................................

trau_frame: use 'ubit_t' for unpacked bits

Change-Id: I497dbb7e9e199c6276e585b977bd941a2b442b3b
---
M include/osmocom/abis/trau_frame.h
M src/trau_frame.c
2 files changed, 12 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/78/18178/1

diff --git a/include/osmocom/abis/trau_frame.h b/include/osmocom/abis/trau_frame.h
index f2a7015..40995bc 100644
--- a/include/osmocom/abis/trau_frame.h
+++ b/include/osmocom/abis/trau_frame.h
@@ -21,6 +21,7 @@
  */
 
 #include <stdint.h>
+#include <osmocom/core/bits.h>
 
 /*! \defgroup trau_frame TRAU frame handling
  *  @{
@@ -43,11 +44,11 @@
 
 /*! \brief a decoded TRAU frame, extracted C/D/T/S/M bits */
 struct decoded_trau_frame {
-	uint8_t c_bits[MAX_C_BITS];
-	uint8_t d_bits[MAX_D_BITS];
-	uint8_t t_bits[MAX_T_BITS];
-	uint8_t s_bits[MAX_S_BITS];
-	uint8_t m_bits[MAX_M_BITS];
+	ubit_t c_bits[MAX_C_BITS];
+	ubit_t d_bits[MAX_D_BITS];
+	ubit_t t_bits[MAX_T_BITS];
+	ubit_t s_bits[MAX_S_BITS];
+	ubit_t m_bits[MAX_M_BITS];
 };
 
 #define TRAU_FT_FR_UP		0x02	/* 0 0 0 1 0 - 3.5.1.1.1 */
@@ -64,8 +65,8 @@
 #define TRAU_FT_IDLE_DOWN	0x0e	/* 0 1 1 1 0 - 3.5.5 */
 
 
-int decode_trau_frame(struct decoded_trau_frame *fr, const uint8_t *trau_bits);
-int encode_trau_frame(uint8_t *trau_bits, const struct decoded_trau_frame *fr);
+int decode_trau_frame(struct decoded_trau_frame *fr, const ubit_t *trau_bits);
+int encode_trau_frame(ubit_t *trau_bits, const struct decoded_trau_frame *fr);
 int trau_frame_up2down(struct decoded_trau_frame *fr);
 
 uint8_t *trau_idle_frame(void);
diff --git a/src/trau_frame.c b/src/trau_frame.c
index eaced3d..0ea264d 100644
--- a/src/trau_frame.c
+++ b/src/trau_frame.c
@@ -51,7 +51,7 @@
 }
 
 /* Decode according to 3.1.1 */
-static void decode_fr(struct decoded_trau_frame *fr, const uint8_t *trau_bits)
+static void decode_fr(struct decoded_trau_frame *fr, const ubit_t *trau_bits)
 {
 	int i;
 	int d_idx = 0;
@@ -72,7 +72,7 @@
 }
 
 /* Decode according to 3.1.2 */
-static void decode_amr(struct decoded_trau_frame *fr, const uint8_t *trau_bits)
+static void decode_amr(struct decoded_trau_frame *fr, const ubit_t *trau_bits)
 {
 	int i;
 	int d_idx = 0;
@@ -94,7 +94,7 @@
 	memcpy(fr->d_bits + d_idx, trau_bits + 305, 11);
 }
 
-static void decode_data(struct decoded_trau_frame *fr, const uint8_t *trau_bits)
+static void decode_data(struct decoded_trau_frame *fr, const ubit_t *trau_bits)
 {
 	/* C1 .. C15 */
 	memcpy(fr->c_bits+0, trau_bits+17, 15);
@@ -102,7 +102,7 @@
 	memcpy(fr->d_bits, trau_bits+32, 288);
 }
 
-int decode_trau_frame(struct decoded_trau_frame *fr, const uint8_t *trau_bits)
+int decode_trau_frame(struct decoded_trau_frame *fr, const ubit_t *trau_bits)
 {
 	uint8_t cbits5 = get_bits(trau_bits, 17, 5);
 

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18178
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I497dbb7e9e199c6276e585b977bd941a2b442b3b
Gerrit-Change-Number: 18178
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200510/bbadf734/attachment.htm>