From 1a74c352c6e41612f707291a6bb13ebd4c1ecc47 Mon Sep 17 00:00:00 2001 From: WEI-TAI CHEN Date: Wed, 29 Aug 2018 06:27:31 -0700 Subject: [PATCH] solve the conflict type between crc_byte.c and coding_defs.h --- openair1/PHY/CODING/coding_defs.h | 14 ++++++-------- openair1/PHY/CODING/crc_byte.c | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h index 0960395689..eccac22da3 100644 --- a/openair1/PHY/CODING/coding_defs.h +++ b/openair1/PHY/CODING/coding_defs.h @@ -347,7 +347,7 @@ based on 3GPP UMTS/LTE specifications. @param inPtr Pointer to input byte stream @param bitlen length of inputs in bits */ -uint32_t crc24a (uint8_t * inptr, uint32_t bitlen); +unsigned int crc24a (unsigned char * inptr, int bitlen); /*!\fn uint32_t crc24b(uint8_t *inPtr, int32_t bitlen) \brief This computes a 24-bit crc ('b' variant for transport-block segments) @@ -355,25 +355,25 @@ based on 3GPP UMTS/LTE specifications. @param inPtr Pointer to input byte stream @param bitlen length of inputs in bits */ -uint32_t crc24b (uint8_t * inptr, uint32_t bitlen); +unsigned int crc24b (unsigned char * inptr, int bitlen); /*!\fn uint32_t crc16(uint8_t *inPtr, int32_t bitlen) \brief This computes a 16-bit crc based on 3GPP UMTS specifications. @param inPtr Pointer to input byte stream @param bitlen length of inputs in bits*/ -uint32_t crc16 (uint8_t * inptr, uint32_t bitlen); +unsigned int crc16 (unsigned char * inptr, int bitlen); /*!\fn uint32_t crc12(uint8_t *inPtr, int32_t bitlen) \brief This computes a 12-bit crc based on 3GPP UMTS specifications. @param inPtr Pointer to input byte stream @param bitlen length of inputs in bits*/ -uint32_t crc12 (uint8_t * inptr, uint32_t bitlen); +unsigned int crc12 (unsigned char * inptr, int bitlen); /*!\fn uint32_t crc8(uint8_t *inPtr, int32_t bitlen) \brief This computes a 8-bit crc based on 3GPP UMTS specifications. @param inPtr Pointer to input byte stream @param bitlen length of inputs in bits*/ -uint32_t crc8 (uint8_t * inptr, uint32_t bitlen); +unsigned int crc8 (unsigned char * inptr, int bitlen); /*!\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 @@ -431,9 +431,7 @@ int32_t rate_matching_lte(uint32_t N_coded, -uint32_t crcbit (uint8_t * , - int32_t, - uint32_t); +unsigned int crcbit (unsigned char * inputptr, int octetlen, unsigned int poly); int16_t reverseBits(int32_t ,int32_t); void phy_viterbi_dot11(int8_t *,uint8_t *,uint16_t); diff --git a/openair1/PHY/CODING/crc_byte.c b/openair1/PHY/CODING/crc_byte.c index 7578af8b84..d20b6f8ec6 100644 --- a/openair1/PHY/CODING/crc_byte.c +++ b/openair1/PHY/CODING/crc_byte.c @@ -291,3 +291,4 @@ main() } #endif +