aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2015-04-03 20:02:01 +0200
committerSylvain Munaut <tnt@246tNt.com>2015-04-04 13:54:30 +0200
commit5334182d5a1029a302f55273ae2a214cf3f6c38a (patch)
treef705e42643aa3f15efc613d392c95597d3d5eb12
parentd4aba57dc3206cb0221f38ac5b9eb1b94c7fd4d0 (diff)
l1/rach: Fix the gmr1_rach_encode function
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--src/l1/rach.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/l1/rach.c b/src/l1/rach.c
index 2515282..ec04705 100644
--- a/src/l1/rach.c
+++ b/src/l1/rach.c
@@ -93,7 +93,7 @@ gmr1_rach_encode(ubit_t *bits_e, const uint8_t *rach, uint8_t sb_mask)
/* d -> u : CRC addition */
osmo_crc8gen_set_bits (&gmr1_crc8, bits_u1, 16, bits_u1+16);
- osmo_crc16gen_set_bits(&gmr1_crc16, bits_u2, 123, bits_u2+123);
+ osmo_crc16gen_set_bits(&gmr1_crc12, bits_u2, 123, bits_u2+123);
/* u -> u' : masking */
for (i=0; i<8; i++)
@@ -103,8 +103,8 @@ gmr1_rach_encode(ubit_t *bits_e, const uint8_t *rach, uint8_t sb_mask)
osmo_conv_encode(&gmr1_conv_rach, bits_u, bits_c);
/* c -> e' : interleaving */
- gmr1_deinterleave_intra(bits_e1p, bits_c+270, 14);
- gmr1_deinterleave_intra(bits_e2p, bits_c, 33);
+ gmr1_interleave_intra(bits_e1p, bits_c+270, 14);
+ gmr1_interleave_intra(bits_e2p, bits_c, 33);
memcpy(bits_e2p+264, bits_c+264, 6);