Commit 21fd147c authored by Raphael Defosseux's avatar Raphael Defosseux

Merge branch '312-minor-modifications-to-crc-code' into 'develop'

Resolve "Minor modifications to CRC code"

See merge request !319
parents edec2f6c 9f856219
...@@ -2620,8 +2620,6 @@ int test_logmap8() ...@@ -2620,8 +2620,6 @@ int test_logmap8()
test[3] = 0x92; test[3] = 0x92;
test[4] = 0xfe; test[4] = 0xfe;
crcTableInit();
crc = crc24a(test, crc = crc24a(test,
40)>>8; 40)>>8;
......
...@@ -52,8 +52,6 @@ void lte_param_init(unsigned char N_tx, unsigned char N_rx) ...@@ -52,8 +52,6 @@ void lte_param_init(unsigned char N_tx, unsigned char N_rx)
randominit(0); randominit(0);
set_taus_seed(0); set_taus_seed(0);
crcTableInit();
lte_frame_parms = &(PHY_config->lte_frame_parms); //openair1/PHY/impl_defs_lte.h lte_frame_parms = &(PHY_config->lte_frame_parms); //openair1/PHY/impl_defs_lte.h
lte_ue_common_vars = &(PHY_vars->lte_ue_common_vars); lte_ue_common_vars = &(PHY_vars->lte_ue_common_vars);
lte_ue_dlsch_vars = &(PHY_vars->lte_ue_dlsch_vars); lte_ue_dlsch_vars = &(PHY_vars->lte_ue_dlsch_vars);
...@@ -249,7 +247,6 @@ int main(int argc, char *argv[]) ...@@ -249,7 +247,6 @@ int main(int argc, char *argv[])
randominit(0); randominit(0);
set_taus_seed(0); set_taus_seed(0);
crcTableInit();
ccodelte_init(); ccodelte_init();
ccodelte_init_inv(); ccodelte_init_inv();
......
...@@ -218,8 +218,6 @@ int main(int argc, char *argv[]) ...@@ -218,8 +218,6 @@ int main(int argc, char *argv[])
randominit(); randominit();
set_taus_seed(); set_taus_seed();
crcTableInit();
printf("EbN0, sigma, BER, FER\n"); printf("EbN0, sigma, BER, FER\n");
for (SNR=0; SNR<10; SNR++) { for (SNR=0; SNR<10; SNR++) {
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <stdint.h> #include <stdint.h>
#include "PHY/defs_common.h"
#define CRC24_A 0 #define CRC24_A 0
#define CRC24_B 1 #define CRC24_B 1
#define CRC16 2 #define CRC16 2
...@@ -321,7 +319,7 @@ void ccodedab_init_inv(void); ...@@ -321,7 +319,7 @@ void ccodedab_init_inv(void);
/*!\fn void crcTableInit(void) /*!\fn void crcTableInit(void)
\brief This function initializes the different crc tables.*/ \brief This function initializes the different crc tables.*/
void crcTableInit (void); //void crcTableInit (void);
...@@ -331,7 +329,7 @@ based on 3GPP UMTS/LTE specifications. ...@@ -331,7 +329,7 @@ based on 3GPP UMTS/LTE specifications.
@param inPtr Pointer to input byte stream @param inPtr Pointer to input byte stream
@param bitlen length of inputs in bits @param bitlen length of inputs in bits
*/ */
uint32_t crc24a (uint8_t *inPtr, int32_t bitlen); uint32_t crc24a (uint8_t * inptr, uint32_t bitlen);
/*!\fn uint32_t crc24b(uint8_t *inPtr, int32_t bitlen) /*!\fn uint32_t crc24b(uint8_t *inPtr, int32_t bitlen)
\brief This computes a 24-bit crc ('b' variant for transport-block segments) \brief This computes a 24-bit crc ('b' variant for transport-block segments)
...@@ -339,26 +337,26 @@ based on 3GPP UMTS/LTE specifications. ...@@ -339,26 +337,26 @@ based on 3GPP UMTS/LTE specifications.
@param inPtr Pointer to input byte stream @param inPtr Pointer to input byte stream
@param bitlen length of inputs in bits @param bitlen length of inputs in bits
*/ */
uint32_t crc24b (uint8_t *inPtr, int32_t bitlen); uint32_t crc24b (uint8_t * inptr, uint32_t bitlen);
/*!\fn uint32_t crc16(uint8_t *inPtr, int32_t bitlen) /*!\fn uint32_t crc16(uint8_t *inPtr, int32_t bitlen)
\brief This computes a 16-bit crc based on 3GPP UMTS specifications. \brief This computes a 16-bit crc based on 3GPP UMTS specifications.
@param inPtr Pointer to input byte stream @param inPtr Pointer to input byte stream
@param bitlen length of inputs in bits*/ @param bitlen length of inputs in bits*/
uint32_t crc16 (uint8_t *inPtr, int32_t bitlen); uint32_t crc16 (uint8_t * inptr, uint32_t bitlen);
/*!\fn uint32_t crc12(uint8_t *inPtr, int32_t bitlen) /*!\fn uint32_t crc12(uint8_t *inPtr, int32_t bitlen)
\brief This computes a 12-bit crc based on 3GPP UMTS specifications. \brief This computes a 12-bit crc based on 3GPP UMTS specifications.
@param inPtr Pointer to input byte stream @param inPtr Pointer to input byte stream
@param bitlen length of inputs in bits*/ @param bitlen length of inputs in bits*/
uint32_t crc12 (uint8_t *inPtr, int32_t bitlen); uint32_t crc12 (uint8_t * inptr, uint32_t bitlen);
/*!\fn uint32_t crc8(uint8_t *inPtr, int32_t bitlen) /*!\fn uint32_t crc8(uint8_t *inPtr, int32_t bitlen)
\brief This computes a 8-bit crc based on 3GPP UMTS specifications. \brief This computes a 8-bit crc based on 3GPP UMTS specifications.
@param inPtr Pointer to input byte stream @param inPtr Pointer to input byte stream
@param bitlen length of inputs in bits*/ @param bitlen length of inputs in bits*/
uint32_t crc8 (uint8_t *inPtr, int32_t bitlen); uint32_t crc8 (uint8_t * inptr, uint32_t bitlen);
/*!\fn void phy_viterbi_dot11_sse2(int8_t *y, uint8_t *decoded_bytes, uint16_t n,int offset,int traceback) /*!\fn void phy_viterbi_dot11_sse2(int8_t *y, uint8_t *decoded_bytes, uint16_t n,int offset,int traceback)
\brief This routine performs a SIMD optmized Viterbi decoder for the 802.11 64-state convolutional code. It can be \brief This routine performs a SIMD optmized Viterbi decoder for the 802.11 64-state convolutional code. It can be
run in segments with final trace back after last segment. run in segments with final trace back after last segment.
......
This diff is collapsed.
...@@ -67,8 +67,6 @@ void generate_qpsk_table(void) ...@@ -67,8 +67,6 @@ void generate_qpsk_table(void)
void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms) void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms)
{ {
crcTableInit();
ccodedot11_init(); ccodedot11_init();
ccodedot11_init_inv(); ccodedot11_init_inv();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment