fix more trivial cppcheck errors and warnings
This commit is contained in:
frtabu
@@ -164,9 +164,10 @@ int processoption(paramdef_t *cfgoptions, char *value) {
|
|||||||
*/
|
*/
|
||||||
int config_check_unknown_cmdlineopt(char *prefix) {
|
int config_check_unknown_cmdlineopt(char *prefix) {
|
||||||
int unknowndetected=0;
|
int unknowndetected=0;
|
||||||
char testprefix[CONFIG_MAXOPTLENGTH]="";
|
char testprefix[CONFIG_MAXOPTLENGTH];
|
||||||
int finalcheck = 0;
|
int finalcheck = 0;
|
||||||
|
|
||||||
|
memset(testpref,0,sizeof(testprefix));
|
||||||
if (prefix != NULL) {
|
if (prefix != NULL) {
|
||||||
if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0)
|
if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0)
|
||||||
finalcheck = 1;
|
finalcheck = 1;
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ int pnf_param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_re
|
|||||||
for(int i = 0; i < resp->pnf_phy.number_of_phys; ++i)
|
for(int i = 0; i < resp->pnf_phy.number_of_phys; ++i)
|
||||||
{
|
{
|
||||||
phy_info phy;
|
phy_info phy;
|
||||||
|
memset(phy,0,sizeof(phy));
|
||||||
phy.index = resp->pnf_phy.phy[i].phy_config_index;
|
phy.index = resp->pnf_phy.phy[i].phy_config_index;
|
||||||
|
|
||||||
printf("[VNF] (PHY:%d) phy_config_idx:%d\n", i, resp->pnf_phy.phy[i].phy_config_index);
|
printf("[VNF] (PHY:%d) phy_config_idx:%d\n", i, resp->pnf_phy.phy[i].phy_config_index);
|
||||||
@@ -287,6 +288,7 @@ int pnf_param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_re
|
|||||||
|
|
||||||
for(int i = 0; i < resp->pnf_rf.number_of_rfs; ++i) {
|
for(int i = 0; i < resp->pnf_rf.number_of_rfs; ++i) {
|
||||||
rf_info rf;
|
rf_info rf;
|
||||||
|
memset(rf,0,sizeof(rf));
|
||||||
rf.index = resp->pnf_rf.rf[i].rf_config_index;
|
rf.index = resp->pnf_rf.rf[i].rf_config_index;
|
||||||
|
|
||||||
printf("[VNF] (RF:%d) rf_config_idx:%d\n", i, resp->pnf_rf.rf[i].rf_config_index);
|
printf("[VNF] (RF:%d) rf_config_idx:%d\n", i, resp->pnf_rf.rf[i].rf_config_index);
|
||||||
@@ -897,7 +899,7 @@ int param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_response_t
|
|||||||
|
|
||||||
// for now just 1
|
// for now just 1
|
||||||
|
|
||||||
printf("[VNF] %d.%d pnf p7 %s:%d timing %d %d %d %d\n", p5_idx, phy->id, phy->remote_addr, phy->remote_port, p7_vnf->timing_window, p7_vnf->periodic_timing_period, p7_vnf->aperiodic_timing_enabled, p7_vnf->periodic_timing_period);
|
printf("[VNF] %d.%d pnf p7 %s:%d timing %u %u %u %u\n", p5_idx, phy->id, phy->remote_addr, phy->remote_port, p7_vnf->timing_window, p7_vnf->periodic_timing_period, p7_vnf->aperiodic_timing_enabled, p7_vnf->periodic_timing_period);
|
||||||
|
|
||||||
req->header.message_id = NFAPI_CONFIG_REQUEST;
|
req->header.message_id = NFAPI_CONFIG_REQUEST;
|
||||||
req->header.phy_id = phy->id;
|
req->header.phy_id = phy->id;
|
||||||
@@ -919,7 +921,7 @@ int param_resp_cb(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_response_t
|
|||||||
|
|
||||||
req->nfapi_config.timing_window.tl.tag = NFAPI_NFAPI_TIMING_WINDOW_TAG;
|
req->nfapi_config.timing_window.tl.tag = NFAPI_NFAPI_TIMING_WINDOW_TAG;
|
||||||
req->nfapi_config.timing_window.value = p7_vnf->timing_window;
|
req->nfapi_config.timing_window.value = p7_vnf->timing_window;
|
||||||
printf("[VNF] Timing window:%d\n", p7_vnf->timing_window);
|
printf("[VNF] Timing window:%u\n", p7_vnf->timing_window);
|
||||||
req->num_tlv++;
|
req->num_tlv++;
|
||||||
|
|
||||||
if(p7_vnf->periodic_timing_enabled || p7_vnf->aperiodic_timing_enabled) {
|
if(p7_vnf->periodic_timing_enabled || p7_vnf->aperiodic_timing_enabled) {
|
||||||
|
|||||||
+108
-170
@@ -26,9 +26,9 @@
|
|||||||
date: 09.2012
|
date: 09.2012
|
||||||
*/
|
*/
|
||||||
#ifndef TC_MAIN
|
#ifndef TC_MAIN
|
||||||
#include "coding_defs.h"
|
#include "coding_defs.h"
|
||||||
#else
|
#else
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -66,11 +66,11 @@ struct treillis {
|
|||||||
union {
|
union {
|
||||||
uint8x8_t systematic_andp1_64[3];
|
uint8x8_t systematic_andp1_64[3];
|
||||||
char systematic_andp1_8[24];
|
char systematic_andp1_8[24];
|
||||||
}__attribute__((aligned(64)));
|
} __attribute__((aligned(64)));
|
||||||
union {
|
union {
|
||||||
uint8x8_t parity2_64[3];
|
uint8x8_t parity2_64[3];
|
||||||
char parity2_8[24];
|
char parity2_8[24];
|
||||||
}__attribute__((aligned(64)));
|
} __attribute__((aligned(64)));
|
||||||
int exit_state;
|
int exit_state;
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
@@ -79,23 +79,20 @@ struct treillis all_treillis[8][256];
|
|||||||
|
|
||||||
int all_treillis_initialized=0;
|
int all_treillis_initialized=0;
|
||||||
|
|
||||||
static inline unsigned char threegpplte_rsc(unsigned char input,unsigned char *state)
|
static inline unsigned char threegpplte_rsc(unsigned char input,unsigned char *state) {
|
||||||
{
|
|
||||||
unsigned char output;
|
unsigned char output;
|
||||||
output = (input ^ (*state>>2) ^ (*state>>1))&1;
|
output = (input ^ (*state>>2) ^ (*state>>1))&1;
|
||||||
*state = (((input<<2)^(*state>>1))^((*state>>1)<<2)^((*state)<<2))&7;
|
*state = (((input<<2)^(*state>>1))^((*state>>1)<<2)^((*state)<<2))&7;
|
||||||
return(output);
|
return(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void threegpplte_rsc_termination(unsigned char *x,unsigned char *z,unsigned char *state)
|
static inline void threegpplte_rsc_termination(unsigned char *x,unsigned char *z,unsigned char *state) {
|
||||||
{
|
|
||||||
*z = ((*state>>2) ^ (*state)) &1;
|
*z = ((*state>>2) ^ (*state)) &1;
|
||||||
*x = ((*state) ^ (*state>>1)) &1;
|
*x = ((*state) ^ (*state>>1)) &1;
|
||||||
*state = (*state)>>1;
|
*state = (*state)>>1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void treillis_table_init(void)
|
static void treillis_table_init(void) {
|
||||||
{
|
|
||||||
//struct treillis t[][]=all_treillis;
|
//struct treillis t[][]=all_treillis;
|
||||||
//t=memalign(16,sizeof(struct treillis)*8*256);
|
//t=memalign(16,sizeof(struct treillis)*8*256);
|
||||||
int i, j,b;
|
int i, j,b;
|
||||||
@@ -114,8 +111,8 @@ static void treillis_table_init(void)
|
|||||||
all_treillis[i][j].systematic_andp1_8[b*3]= (j&(1<<(7-b)))>>(7-b);
|
all_treillis[i][j].systematic_andp1_8[b*3]= (j&(1<<(7-b)))>>(7-b);
|
||||||
v=threegpplte_rsc( all_treillis[i][j].systematic_andp1_8[b*3] ,
|
v=threegpplte_rsc( all_treillis[i][j].systematic_andp1_8[b*3] ,
|
||||||
¤t_state);
|
¤t_state);
|
||||||
all_treillis[i][j].systematic_andp1_8[b*3+1]=v; // for the yparity1
|
all_treillis[i][j].systematic_andp1_8[b*3+1]=v; // for the yparity1
|
||||||
// all_treillis[i][j].parity1_8[b*3+1]=v; // for the yparity1
|
// all_treillis[i][j].parity1_8[b*3+1]=v; // for the yparity1
|
||||||
all_treillis[i][j].parity2_8[b*3+2]=v; // for the yparity2
|
all_treillis[i][j].parity2_8[b*3+2]=v; // for the yparity2
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,14 +125,12 @@ static void treillis_table_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
char interleave_compact_byte(short * base_interleaver,unsigned char * input, unsigned char * output, int n)
|
char interleave_compact_byte(short *base_interleaver,unsigned char *input, unsigned char *output, int n) {
|
||||||
{
|
|
||||||
|
|
||||||
char expandInput[768*8] __attribute__((aligned(32)));
|
char expandInput[768*8] __attribute__((aligned(32)));
|
||||||
int i,loop=n>>4;
|
int i,loop=n>>4;
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
#ifndef __AVX2__
|
#ifndef __AVX2__
|
||||||
__m128i *i_128=(__m128i *)input, *o_128=(__m128i*)expandInput;
|
__m128i *i_128=(__m128i *)input, *o_128=(__m128i *)expandInput;
|
||||||
__m128i tmp1, tmp2, tmp3, tmp4;
|
__m128i tmp1, tmp2, tmp3, tmp4;
|
||||||
__m128i BIT_MASK = _mm_set_epi8( 0b00000001,
|
__m128i BIT_MASK = _mm_set_epi8( 0b00000001,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
@@ -153,42 +148,41 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
0b00100000,
|
0b00100000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b10000000);
|
0b10000000);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
__m256i *i_256=(__m256i *)input, *o_256=(__m256i*)expandInput;
|
__m256i *i_256=(__m256i *)input, *o_256=(__m256i *)expandInput;
|
||||||
__m256i tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
|
__m256i tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
|
||||||
__m256i BIT_MASK = _mm256_set_epi8( 0b00000001,
|
__m256i BIT_MASK = _mm256_set_epi8( 0b00000001,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b10000000,
|
0b10000000,
|
||||||
0b00000001,
|
0b00000001,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b10000000,
|
0b10000000,
|
||||||
0b00000001,
|
0b00000001,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b10000000,
|
0b10000000,
|
||||||
0b00000001,
|
0b00000001,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b10000000);
|
0b10000000);
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
uint8x16_t *i_128=(uint8x16_t *)input, *o_128=(uint8x16_t *)expandInput;
|
uint8x16_t *i_128=(uint8x16_t *)input, *o_128=(uint8x16_t *)expandInput;
|
||||||
@@ -196,40 +190,41 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
uint16x8_t tmp3;
|
uint16x8_t tmp3;
|
||||||
uint32x4_t tmp4;
|
uint32x4_t tmp4;
|
||||||
uint8x16_t and_tmp;
|
uint8x16_t and_tmp;
|
||||||
uint8x16_t BIT_MASK = { 0b10000000,
|
uint8x16_t BIT_MASK = { 0b10000000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000001,
|
0b00000001,
|
||||||
0b10000000,
|
0b10000000,
|
||||||
0b01000000,
|
0b01000000,
|
||||||
0b00100000,
|
0b00100000,
|
||||||
0b00010000,
|
0b00010000,
|
||||||
0b00001000,
|
0b00001000,
|
||||||
0b00000100,
|
0b00000100,
|
||||||
0b00000010,
|
0b00000010,
|
||||||
0b00000001};
|
0b00000001
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifndef __AVX2__
|
#ifndef __AVX2__
|
||||||
|
|
||||||
if ((n&15) > 0)
|
if ((n&15) > 0)
|
||||||
loop++;
|
loop++;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
loop=n>>5;
|
loop=n>>5;
|
||||||
|
|
||||||
if ((n&31) > 0)
|
if ((n&31) > 0)
|
||||||
loop++;
|
loop++;
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
for (i=0; i<loop ; i++ ) {
|
for (i=0; i<loop ; i++ ) {
|
||||||
// int cur_byte=i<<3;
|
// int cur_byte=i<<3;
|
||||||
// for (b=0;b<8;b++)
|
// for (b=0;b<8;b++)
|
||||||
// expandInput[cur_byte+b] = (input[i]&(1<<(7-b)))>>(7-b);
|
// expandInput[cur_byte+b] = (input[i]&(1<<(7-b)))>>(7-b);
|
||||||
|
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
#ifndef __AVX2__
|
#ifndef __AVX2__
|
||||||
tmp1=_mm_load_si128(i_128++); // tmp1 = B0,B1,...,B15
|
tmp1=_mm_load_si128(i_128++); // tmp1 = B0,B1,...,B15
|
||||||
@@ -237,29 +232,22 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B0,B0,B0,B0,B1,B1,B1,B1,B2,B2,B2,B2,B3,B3,B3,B3
|
tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B0,B0,B0,B0,B1,B1,B1,B1,B2,B2,B2,B2,B3,B3,B3,B3
|
||||||
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B0,B0,B0,B0,B0,B0,B0,B0,B1,B1,B1,B1,B1,B1,B1,B1
|
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B0,B0,B0,B0,B0,B0,B0,B0,B1,B1,B1,B1,B1,B1,B1,B1
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);
|
||||||
|
|
||||||
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B2,B2,B2,B2,B2,B2,B2,B2,B3,B3,B3,B3,B3,B3,B3,B3
|
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B2,B2,B2,B2,B2,B2,B2,B2,B3,B3,B3,B3,B3,B3,B3,B3
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7
|
tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7
|
||||||
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5
|
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7
|
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp2=_mm_unpackhi_epi8(tmp1,tmp1); // tmp2 = B8,B8,B9,B9,...,B15,B15
|
tmp2=_mm_unpackhi_epi8(tmp1,tmp1); // tmp2 = B8,B8,B9,B9,...,B15,B15
|
||||||
tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B8,B8,B8,B9,B9,B9,B9,B10,B10,B10,B10,B11,B11,B11,B11
|
tmp3=_mm_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B8,B8,B8,B9,B9,B9,B9,B10,B10,B10,B10,B11,B11,B11,B11
|
||||||
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B8,B8,B8,B8,B8,B8,B8,B8,B9,B9,B9,B9,B9,B9,B9,B9
|
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B8,B8,B8,B8,B8,B8,B8,B8,B9,B9,B9,B9,B9,B9,B9,B9
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B10,B10,B10,B10,B10,B10,B10,B10,B11,B11,B11,B11,B11,B11,B11,B11
|
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B10,B10,B10,B10,B10,B10,B10,B10,B11,B11,B11,B11,B11,B11,B11,B11
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12,B12,B12,B12,B13,B13,B13,B13,B14,B14,B14,B14,B15,B15,B15,B15
|
tmp3=_mm_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12,B12,B12,B12,B13,B13,B13,B13,B14,B14,B14,B14,B15,B15,B15,B15
|
||||||
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12,B12,B12,B12,B12,B12,B12,B12,B13,B13,B13,B13,B13,B13,B13,B13
|
tmp4=_mm_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12,B12,B12,B12,B12,B12,B12,B12,B13,B13,B13,B13,B13,B13,B13,B13
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
|
|
||||||
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B14,B14,B14,B14,B14,B14,B14,B14,B15,B15,B15,B15,B15,B15,B15,B15
|
tmp4=_mm_unpackhi_epi32(tmp3,tmp3); // tmp4 = B14,B14,B14,B14,B14,B14,B14,B14,B15,B15,B15,B15,B15,B15,B15,B15
|
||||||
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
*o_128++=_mm_cmpeq_epi8(_mm_and_si128(tmp4,BIT_MASK),BIT_MASK);;
|
||||||
#else
|
#else
|
||||||
@@ -281,7 +269,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
//print_bytes2("out",(uint8_t*)o_256);
|
//print_bytes2("out",(uint8_t*)o_256);
|
||||||
o_256[4]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
o_256[4]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
||||||
//print_bytes2("out",(uint8_t*)(o_256+4));
|
//print_bytes2("out",(uint8_t*)(o_256+4));
|
||||||
|
|
||||||
tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7,B20,B20,B20,B20,...,B23,B23,B23,B23
|
tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B4,B4,B4,B4,B5,B5,B5,B5,B6,B6,B6,B6,B7,B7,B7,B7,B20,B20,B20,B20,...,B23,B23,B23,B23
|
||||||
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5,B20,B20...,B21..,B21
|
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B4,B4,B4,B4,B4,B4,B4,B4,B5,B5,B5,B5,B5,B5,B5,B5,B20,B20...,B21..,B21
|
||||||
tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7,B22...,B22,B23,...,B23
|
tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 - B6,B6,B6,B6,B6,B6,B6,B6,B7,B7,B7,B7,B7,B7,B7,B7,B22...,B22,B23,...,B23
|
||||||
@@ -297,7 +284,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
//print_bytes2("out",(uint8_t*)(o_256+1));
|
//print_bytes2("out",(uint8_t*)(o_256+1));
|
||||||
o_256[5]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
o_256[5]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
||||||
//print_bytes2("out",(uint8_t*)(o_256+4));
|
//print_bytes2("out",(uint8_t*)(o_256+4));
|
||||||
|
|
||||||
tmp2=_mm256_unpackhi_epi8(tmp1,tmp1); // tmp2 = B8 B9 B10 B11 B12 B13 B14 B15 B25 B26 B27 B28 B29 B30 B31
|
tmp2=_mm256_unpackhi_epi8(tmp1,tmp1); // tmp2 = B8 B9 B10 B11 B12 B13 B14 B15 B25 B26 B27 B28 B29 B30 B31
|
||||||
tmp3=_mm256_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B9,B10,B11,B26,B27,B28,B29
|
tmp3=_mm256_unpacklo_epi16(tmp2,tmp2); // tmp3 = B8,B9,B10,B11,B26,B27,B28,B29
|
||||||
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B8,B9,B26,B27
|
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 - B8,B9,B26,B27
|
||||||
@@ -314,7 +300,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
//print_bytes2("out",(uint8_t*)(o_256+2));
|
//print_bytes2("out",(uint8_t*)(o_256+2));
|
||||||
o_256[6]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
o_256[6]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
||||||
//print_bytes2("out",(uint8_t*)(o_256+4));
|
//print_bytes2("out",(uint8_t*)(o_256+4));
|
||||||
|
|
||||||
tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12 B13 B14 B15 B28 B29 B30 B31
|
tmp3=_mm256_unpackhi_epi16(tmp2,tmp2); // tmp3 = B12 B13 B14 B15 B28 B29 B30 B31
|
||||||
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12 B13 B28 B29
|
tmp4=_mm256_unpacklo_epi32(tmp3,tmp3); // tmp4 = B12 B13 B28 B29
|
||||||
tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 = B14 B15 B30 B31
|
tmp5=_mm256_unpackhi_epi32(tmp3,tmp3); // tmp5 = B14 B15 B30 B31
|
||||||
@@ -330,48 +315,35 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
//print_bytes2("out",(uint8_t*)(o_256+3));
|
//print_bytes2("out",(uint8_t*)(o_256+3));
|
||||||
o_256[7]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
o_256[7]=_mm256_cmpeq_epi8(_mm256_and_si256(tmp7,BIT_MASK),BIT_MASK);;
|
||||||
//print_bytes2("out",(uint8_t*)(o_256+7));
|
//print_bytes2("out",(uint8_t*)(o_256+7));
|
||||||
|
|
||||||
o_256+=8;
|
o_256+=8;
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
tmp1=vld1q_u8((uint8_t*)i_128);
|
tmp1=vld1q_u8((uint8_t *)i_128);
|
||||||
//print_bytes("tmp1:",(uint8_t*)&tmp1);
|
//print_bytes("tmp1:",(uint8_t*)&tmp1);
|
||||||
|
|
||||||
uint8x16x2_t temp1 = vzipq_u8(tmp1,tmp1);
|
uint8x16x2_t temp1 = vzipq_u8(tmp1,tmp1);
|
||||||
tmp2 = temp1.val[0];
|
tmp2 = temp1.val[0];
|
||||||
|
|
||||||
uint16x8x2_t temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
uint16x8x2_t temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
||||||
tmp3 = temp2.val[0];
|
tmp3 = temp2.val[0];
|
||||||
|
|
||||||
uint32x4x2_t temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
uint32x4x2_t temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
||||||
tmp4 = temp3.val[0];
|
tmp4 = temp3.val[0];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //1
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //1
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
tmp4 = temp3.val[1];
|
tmp4 = temp3.val[1];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //2
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //2
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
tmp3 = temp2.val[1];
|
tmp3 = temp2.val[1];
|
||||||
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
||||||
tmp4 = temp3.val[0];
|
tmp4 = temp3.val[0];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //3
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //3
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
tmp4 = temp3.val[1];
|
tmp4 = temp3.val[1];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //4
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //4
|
||||||
//and_tmp = vandq_u8((uint8x16_t)tmp4,BIT_MASK); print_bytes("and:",and_tmp);
|
//and_tmp = vandq_u8((uint8x16_t)tmp4,BIT_MASK); print_bytes("and:",and_tmp);
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
|
|
||||||
temp1 = vzipq_u8(tmp1,tmp1);
|
temp1 = vzipq_u8(tmp1,tmp1);
|
||||||
tmp2 = temp1.val[1];
|
tmp2 = temp1.val[1];
|
||||||
temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
||||||
@@ -379,52 +351,41 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
||||||
tmp4 = temp3.val[0];
|
tmp4 = temp3.val[0];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //5
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //5
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
tmp4 = temp3.val[1];
|
tmp4 = temp3.val[1];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //6
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //6
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
|
|
||||||
temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
temp2 = vzipq_u16((uint16x8_t)tmp2,(uint16x8_t)tmp2);
|
||||||
tmp3 = temp2.val[1];
|
tmp3 = temp2.val[1];
|
||||||
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
temp3 = vzipq_u32((uint32x4_t)tmp3,(uint32x4_t)tmp3);
|
||||||
tmp4 = temp3.val[0];
|
tmp4 = temp3.val[0];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //7
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //7
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
tmp4 = temp3.val[1];
|
tmp4 = temp3.val[1];
|
||||||
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
//print_bytes("tmp4:",(uint8_t*)&tmp4);
|
||||||
|
|
||||||
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //7
|
*o_128++=vceqq_u8(vandq_u8((uint8x16_t)tmp4,BIT_MASK),BIT_MASK); //7
|
||||||
//print_bytes("o:",(uint8_t*)(o_128-1));
|
//print_bytes("o:",(uint8_t*)(o_128-1));
|
||||||
|
|
||||||
i_128++;
|
i_128++;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
short *ptr_intl=base_interleaver;
|
||||||
short * ptr_intl=base_interleaver;
|
|
||||||
#if defined(__x86_64) || defined(__i386__)
|
#if defined(__x86_64) || defined(__i386__)
|
||||||
#ifndef __AVX2__
|
#ifndef __AVX2__
|
||||||
__m128i tmp;
|
__m128i tmp;
|
||||||
uint16_t *systematic2_ptr=(uint16_t *) output;
|
uint16_t *systematic2_ptr=(uint16_t *) output;
|
||||||
#else
|
#else
|
||||||
__m256i tmp;
|
__m256i tmp;
|
||||||
uint32_t *systematic2_ptr=(uint32_t *) output;
|
uint32_t *systematic2_ptr=(uint32_t *) output;
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
uint8x16_t tmp;
|
uint8x16_t tmp;
|
||||||
const uint8_t __attribute__ ((aligned (16))) _Powers[16]=
|
const uint8_t __attribute__ ((aligned (16))) _Powers[16]=
|
||||||
{ 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128 };
|
{ 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128 };
|
||||||
|
// Set the powers of 2 (do it once for all, if applicable)
|
||||||
// Set the powers of 2 (do it once for all, if applicable)
|
|
||||||
uint8x16_t Powers= vld1q_u8(_Powers);
|
uint8x16_t Powers= vld1q_u8(_Powers);
|
||||||
uint8_t *systematic2_ptr=(uint8_t *) output;
|
uint8_t *systematic2_ptr=(uint8_t *) output;
|
||||||
#endif
|
#endif
|
||||||
@@ -435,8 +396,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
for ( i=0; i< input_length_words ; i ++ ) {
|
for ( i=0; i< input_length_words ; i ++ ) {
|
||||||
|
|
||||||
|
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
#ifndef __AVX2__
|
#ifndef __AVX2__
|
||||||
tmp=_mm_insert_epi8(tmp,expandInput[*ptr_intl++],7);
|
tmp=_mm_insert_epi8(tmp,expandInput[*ptr_intl++],7);
|
||||||
@@ -465,7 +424,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],2);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],2);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],1);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],1);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],0);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],0);
|
||||||
|
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+7);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+7);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+6);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+6);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+5);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+5);
|
||||||
@@ -474,7 +432,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+2);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+2);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+1);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+1);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+0);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],8+0);
|
||||||
|
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+7);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+7);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+6);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+6);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+5);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+5);
|
||||||
@@ -483,7 +440,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+2);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+2);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+1);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+1);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+0);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],16+0);
|
||||||
|
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+7);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+7);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+6);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+6);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+5);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+5);
|
||||||
@@ -492,7 +448,6 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+2);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+2);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+1);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+1);
|
||||||
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+0);
|
tmp=_mm256_insert_epi8(tmp,expandInput[*ptr_intl++],24+0);
|
||||||
|
|
||||||
*systematic2_ptr++=(unsigned int)_mm256_movemask_epi8(tmp);
|
*systematic2_ptr++=(unsigned int)_mm256_movemask_epi8(tmp);
|
||||||
#endif
|
#endif
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
@@ -512,11 +467,10 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+2);
|
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+2);
|
||||||
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+1);
|
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+1);
|
||||||
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+0);
|
tmp=vsetq_lane_u8(expandInput[*ptr_intl++],tmp,8+0);
|
||||||
// Compute the mask from the input
|
// Compute the mask from the input
|
||||||
uint64x2_t Mask= vpaddlq_u32(vpaddlq_u16(vpaddlq_u8(vandq_u8(tmp, Powers))));
|
uint64x2_t Mask= vpaddlq_u32(vpaddlq_u16(vpaddlq_u8(vandq_u8(tmp, Powers))));
|
||||||
vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 0);
|
vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 0);
|
||||||
vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 8);
|
vst1q_lane_u8(systematic2_ptr++, (uint8x16_t)Mask, 8);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -537,14 +491,12 @@ char interleave_compact_byte(short * base_interleaver,unsigned char * input, uns
|
|||||||
void threegpplte_turbo_encoder_sse(unsigned char *input,
|
void threegpplte_turbo_encoder_sse(unsigned char *input,
|
||||||
unsigned short input_length_bytes,
|
unsigned short input_length_bytes,
|
||||||
unsigned char *output,
|
unsigned char *output,
|
||||||
unsigned char F)
|
unsigned char F) {
|
||||||
{
|
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
unsigned char *x;
|
unsigned char *x;
|
||||||
unsigned char state0=0,state1=0;
|
unsigned char state0=0,state1=0;
|
||||||
unsigned short input_length_bits = input_length_bytes<<3;
|
unsigned short input_length_bits = input_length_bytes<<3;
|
||||||
short * base_interleaver;
|
short *base_interleaver;
|
||||||
|
|
||||||
if ( all_treillis_initialized == 0 ) {
|
if ( all_treillis_initialized == 0 ) {
|
||||||
treillis_table_init();
|
treillis_table_init();
|
||||||
@@ -560,15 +512,12 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
|
|||||||
base_interleaver=il_tb+f1f2mat[i].beg_index;
|
base_interleaver=il_tb+f1f2mat[i].beg_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unsigned char systematic2[768] __attribute__((aligned(32)));
|
unsigned char systematic2[768] __attribute__((aligned(32)));
|
||||||
|
|
||||||
interleave_compact_byte(base_interleaver,input,systematic2,input_length_bytes);
|
interleave_compact_byte(base_interleaver,input,systematic2,input_length_bytes);
|
||||||
|
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
__m64 *ptr_output=(__m64*) output;
|
__m64 *ptr_output=(__m64 *) output;
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
uint8x8_t *ptr_output=(uint8x8_t*)output;
|
uint8x8_t *ptr_output=(uint8x8_t *)output;
|
||||||
#endif
|
#endif
|
||||||
unsigned char cur_s1, cur_s2;
|
unsigned char cur_s1, cur_s2;
|
||||||
int code_rate;
|
int code_rate;
|
||||||
@@ -582,54 +531,45 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
|
|||||||
/*
|
/*
|
||||||
*ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_64[code_rate],
|
*ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_64[code_rate],
|
||||||
_mm_add_pi8(all_treillis[state0][cur_s1].parity1_64[code_rate],
|
_mm_add_pi8(all_treillis[state0][cur_s1].parity1_64[code_rate],
|
||||||
all_treillis[state1][cur_s2].parity2_64[code_rate]));
|
all_treillis[state1][cur_s2].parity2_64[code_rate]));
|
||||||
*/
|
*/
|
||||||
|
|
||||||
*ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
|
*ptr_output++ = _mm_add_pi8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
|
||||||
all_treillis[state1][cur_s2].parity2_64[code_rate]);
|
all_treillis[state1][cur_s2].parity2_64[code_rate]);
|
||||||
|
|
||||||
|
|
||||||
#elif defined(__arm__)
|
#elif defined(__arm__)
|
||||||
*ptr_output++ = vadd_u8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
|
*ptr_output++ = vadd_u8(all_treillis[state0][cur_s1].systematic_andp1_64[code_rate],
|
||||||
all_treillis[state0][cur_s1].parity2_64[code_rate]);
|
all_treillis[state0][cur_s1].parity2_64[code_rate]);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
state0=all_treillis[state0][cur_s1].exit_state;
|
state0=all_treillis[state0][cur_s1].exit_state;
|
||||||
state1=all_treillis[state1][cur_s2].exit_state;
|
state1=all_treillis[state1][cur_s2].exit_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
x=output+(input_length_bits*3);
|
x=output+(input_length_bits*3);
|
||||||
|
|
||||||
// Trellis termination
|
// Trellis termination
|
||||||
threegpplte_rsc_termination(&x[0],&x[1],&state0);
|
threegpplte_rsc_termination(&x[0],&x[1],&state0);
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state0 %d\n",x[0],x[1],state0);
|
printf("term: x0 %u, x1 %u, state0 %d\n",x[0],x[1],state0);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
|
|
||||||
threegpplte_rsc_termination(&x[2],&x[3],&state0);
|
threegpplte_rsc_termination(&x[2],&x[3],&state0);
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state0 %d\n",x[2],x[3],state0);
|
printf("term: x0 %u, x1 %u, state0 %d\n",x[2],x[3],state0);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
|
|
||||||
threegpplte_rsc_termination(&x[4],&x[5],&state0);
|
threegpplte_rsc_termination(&x[4],&x[5],&state0);
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state0 %d\n",x[4],x[5],state0);
|
printf("term: x0 %u, x1 %u, state0 %d\n",x[4],x[5],state0);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
|
|
||||||
threegpplte_rsc_termination(&x[6],&x[7],&state1);
|
threegpplte_rsc_termination(&x[6],&x[7],&state1);
|
||||||
|
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state1 %d\n",x[6],x[7],state1);
|
printf("term: x0 %u, x1 %u, state1 %d\n",x[6],x[7],state1);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
threegpplte_rsc_termination(&x[8],&x[9],&state1);
|
threegpplte_rsc_termination(&x[8],&x[9],&state1);
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state1 %d\n",x[8],x[9],state1);
|
printf("term: x0 %u, x1 %u, state1 %d\n",x[8],x[9],state1);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
threegpplte_rsc_termination(&x[10],&x[11],&state1);
|
threegpplte_rsc_termination(&x[10],&x[11],&state1);
|
||||||
|
|
||||||
#ifdef DEBUG_TURBO_ENCODER
|
#ifdef DEBUG_TURBO_ENCODER
|
||||||
printf("term: x0 %d, x1 %d, state1 %d\n",x[10],x[11],state1);
|
printf("term: x0 %u, x1 %u, state1 %d\n",x[10],x[11],state1);
|
||||||
#endif //DEBUG_TURBO_ENCODER
|
#endif //DEBUG_TURBO_ENCODER
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
_mm_empty();
|
_mm_empty();
|
||||||
@@ -638,22 +578,23 @@ void threegpplte_turbo_encoder_sse(unsigned char *input,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void init_encoder_sse (void) {
|
void init_encoder_sse (void) {
|
||||||
treillis_table_init();
|
treillis_table_init();
|
||||||
}
|
}
|
||||||
/* function which will be called by the shared lib loader, to check shared lib version
|
/* function which will be called by the shared lib loader, to check shared lib version
|
||||||
against main exec version. version mismatch no considered as fatal (interfaces not supposed to change)
|
against main exec version. version mismatch no considered as fatal (interfaces not supposed to change)
|
||||||
*/
|
*/
|
||||||
int coding_checkbuildver(char * mainexec_buildversion, char ** shlib_buildversion)
|
int coding_checkbuildver(char *mainexec_buildversion, char **shlib_buildversion) {
|
||||||
{
|
|
||||||
#ifndef PACKAGE_VERSION
|
#ifndef PACKAGE_VERSION
|
||||||
#define PACKAGE_VERSION "standalone built: " __DATE__ __TIME__
|
#define PACKAGE_VERSION "standalone built: " __DATE__ __TIME__
|
||||||
#endif
|
#endif
|
||||||
*shlib_buildversion = PACKAGE_VERSION;
|
*shlib_buildversion = PACKAGE_VERSION;
|
||||||
if (strcmp(mainexec_buildversion, *shlib_buildversion) != 0) {
|
|
||||||
fprintf(stderr,"[CODING] shared lib version %s, doesn't match main version %s, compatibility should be checked\n",
|
if (strcmp(mainexec_buildversion, *shlib_buildversion) != 0) {
|
||||||
mainexec_buildversion,*shlib_buildversion);
|
fprintf(stderr,"[CODING] shared lib version %s, doesn't match main version %s, compatibility should be checked\n",
|
||||||
}
|
mainexec_buildversion,*shlib_buildversion);
|
||||||
return 0;
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TC_MAIN
|
#ifdef TC_MAIN
|
||||||
@@ -661,9 +602,7 @@ int coding_checkbuildver(char * mainexec_buildversion, char ** shlib_buildversi
|
|||||||
#define F1 21
|
#define F1 21
|
||||||
#define F2 120
|
#define F2 120
|
||||||
|
|
||||||
int main(int argc,char **argv)
|
int main(int argc,char **argv) {
|
||||||
{
|
|
||||||
|
|
||||||
unsigned char input[INPUT_LENGTH+32],state,state2;
|
unsigned char input[INPUT_LENGTH+32],state,state2;
|
||||||
unsigned char output[12+(3*(INPUT_LENGTH<<3))],x,z;
|
unsigned char output[12+(3*(INPUT_LENGTH<<3))],x,z;
|
||||||
int i;
|
int i;
|
||||||
@@ -680,28 +619,27 @@ int main(int argc,char **argv)
|
|||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
for (state=0; state<8; state++) {
|
for (state=0; state<8; state++) {
|
||||||
|
|
||||||
state2=state;
|
state2=state;
|
||||||
threegpplte_rsc_termination(&x,&z,&state2);
|
threegpplte_rsc_termination(&x,&z,&state2);
|
||||||
printf("Termination: (%d->%d) : (%d,%d)\n",state,state2,x,z);
|
printf("Termination: (%d->%d) : (%d,%d)\n",state,state2,x,z);
|
||||||
}
|
}
|
||||||
|
|
||||||
memset((void*)input,0,INPUT_LENGTH+16);
|
memset((void *)input,0,INPUT_LENGTH+16);
|
||||||
|
|
||||||
for (i=0; i<INPUT_LENGTH; i++) {
|
for (i=0; i<INPUT_LENGTH; i++) {
|
||||||
input[i] = i*219;
|
input[i] = i*219;
|
||||||
printf("Input %d : %d\n",i,input[i]);
|
printf("Input %d : %u\n",i,input[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
threegpplte_turbo_encoder_sse(&input[0],
|
threegpplte_turbo_encoder_sse(&input[0],
|
||||||
INPUT_LENGTH,
|
INPUT_LENGTH,
|
||||||
&output[0],
|
&output[0],
|
||||||
0);
|
0);
|
||||||
|
|
||||||
|
for (i=0; i<12+(INPUT_LENGTH*24); i++)
|
||||||
|
printf("%u",output[i]);
|
||||||
|
|
||||||
for (i=0;i<12+(INPUT_LENGTH*24);i++)
|
|
||||||
printf("%d",output[i]);
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -47,27 +47,20 @@ void
|
|||||||
ccodedot11_encode (unsigned int numbytes,
|
ccodedot11_encode (unsigned int numbytes,
|
||||||
unsigned char *inPtr,
|
unsigned char *inPtr,
|
||||||
unsigned char *outPtr,
|
unsigned char *outPtr,
|
||||||
unsigned char puncturing)
|
unsigned char puncturing) {
|
||||||
{
|
|
||||||
unsigned int state;
|
unsigned int state;
|
||||||
|
|
||||||
unsigned char c, out, shiftbit =0;
|
unsigned char c, out, shiftbit =0;
|
||||||
|
|
||||||
// printf("In ccodedot11_encode (%d,%p,%p,%d)\n",numbytes,inPtr,outPtr,puncturing);
|
// printf("In ccodedot11_encode (%d,%p,%p,%d)\n",numbytes,inPtr,outPtr,puncturing);
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
unsigned int dummy;
|
unsigned int dummy;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
int bit_index;
|
int bit_index;
|
||||||
|
|
||||||
/* The input bit is shifted in position 8 of the state.
|
/* The input bit is shifted in position 8 of the state.
|
||||||
Shiftbit will take values between 1 and 8 */
|
Shiftbit will take values between 1 and 8 */
|
||||||
state = 0;
|
state = 0;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
dummy = 0;
|
dummy = 0;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
/* Do not increment inPtr until we read the next octet */
|
/* Do not increment inPtr until we read the next octet */
|
||||||
bit_index=0;
|
bit_index=0;
|
||||||
|
|
||||||
@@ -78,85 +71,75 @@ ccodedot11_encode (unsigned int numbytes,
|
|||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
switch (puncturing) {
|
switch (puncturing) {
|
||||||
case 0: //rate 1/2
|
case 0: //rate 1/2
|
||||||
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
||||||
|
state >>= 1;
|
||||||
|
|
||||||
state >>= 1;
|
if ((c&(1<<shiftbit)) != 0) {
|
||||||
|
state |= 64;
|
||||||
|
}
|
||||||
|
|
||||||
if ((c&(1<<shiftbit)) != 0) {
|
out = ccodedot11_table[state];
|
||||||
state |= 64;
|
*outPtr++ = out & 1;
|
||||||
|
*outPtr++ = (out>>1)&1;
|
||||||
|
#ifdef DEBUG_CCODE
|
||||||
|
printf("%u: %u -> %d (%u)\n",dummy,state,out,ccodedot11_table[state]);
|
||||||
|
dummy+=2;
|
||||||
|
#endif //DEBUG_CCODE
|
||||||
}
|
}
|
||||||
|
|
||||||
out = ccodedot11_table[state];
|
break;
|
||||||
|
|
||||||
*outPtr++ = out & 1;
|
case 1: // rate 3/4
|
||||||
*outPtr++ = (out>>1)&1;
|
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
||||||
|
state >>= 1;
|
||||||
|
|
||||||
|
if ((c&(1<<shiftbit)) != 0) {
|
||||||
|
state |= 64;
|
||||||
|
}
|
||||||
|
|
||||||
|
out = ccodedot11_table[state];
|
||||||
|
|
||||||
|
if (bit_index<2)
|
||||||
|
*outPtr++ = out & 1;
|
||||||
|
|
||||||
|
if (bit_index!=1)
|
||||||
|
*outPtr++ = (out>>1)&1;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("%d: %d -> %d (%d)\n",dummy,state,out,ccodedot11_table[state]);
|
printf("%u: %u -> %d (%u)\n",dummy,state,out,ccodedot11_table[state]);
|
||||||
dummy+=2;
|
dummy+=2;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
bit_index=(bit_index==2)?0:(bit_index+1);
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1: // rate 3/4
|
|
||||||
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
|
||||||
|
|
||||||
state >>= 1;
|
|
||||||
|
|
||||||
if ((c&(1<<shiftbit)) != 0) {
|
|
||||||
state |= 64;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
out = ccodedot11_table[state];
|
break;
|
||||||
|
|
||||||
if (bit_index<2)
|
case 2: // rate 2/3
|
||||||
|
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
||||||
|
state >>= 1;
|
||||||
|
|
||||||
|
if ((c&(1<<shiftbit)) != 0) {
|
||||||
|
state |= 64;
|
||||||
|
}
|
||||||
|
|
||||||
|
out = ccodedot11_table[state];
|
||||||
*outPtr++ = out & 1;
|
*outPtr++ = out & 1;
|
||||||
|
|
||||||
if (bit_index!=1)
|
if (bit_index==0)
|
||||||
*outPtr++ = (out>>1)&1;
|
*outPtr++ = (out>>1)&1;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("%d: %d -> %d (%d)\n",dummy,state,out,ccodedot11_table[state]);
|
printf("%d: %u -> %d (%u)\n",dummy,state,out,ccodedot11_table[state]);
|
||||||
dummy+=2;
|
dummy+=2;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
bit_index=(bit_index==0)?1:0;
|
||||||
bit_index=(bit_index==2)?0:(bit_index+1);
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2: // rate 2/3
|
|
||||||
for (shiftbit = 0; shiftbit<8; shiftbit++) {
|
|
||||||
|
|
||||||
state >>= 1;
|
|
||||||
|
|
||||||
if ((c&(1<<shiftbit)) != 0) {
|
|
||||||
state |= 64;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
out = ccodedot11_table[state];
|
break;
|
||||||
|
|
||||||
*outPtr++ = out & 1;
|
default:
|
||||||
|
break;
|
||||||
if (bit_index==0)
|
|
||||||
*outPtr++ = (out>>1)&1;
|
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
|
||||||
printf("%d: %d -> %d (%d)\n",dummy,state,out,ccodedot11_table[state]);
|
|
||||||
dummy+=2;
|
|
||||||
#endif //DEBUG_CCODE
|
|
||||||
|
|
||||||
bit_index=(bit_index==0)?1:0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,8 +164,6 @@ ccodedot11_encode (unsigned int numbytes,
|
|||||||
}
|
}
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -197,8 +178,7 @@ ccodedot11_encode (unsigned int numbytes,
|
|||||||
/* Basic code table initialization for constraint length 7 */
|
/* Basic code table initialization for constraint length 7 */
|
||||||
/* Input in MSB, followed by state in 6 LSBs */
|
/* Input in MSB, followed by state in 6 LSBs */
|
||||||
|
|
||||||
void ccodedot11_init(void)
|
void ccodedot11_init(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -219,8 +199,7 @@ void ccodedot11_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Input in LSB, followed by state in 6 MSBs */
|
/* Input in LSB, followed by state in 6 MSBs */
|
||||||
void ccodedot11_init_inv(void)
|
void ccodedot11_init_inv(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -251,21 +230,15 @@ void ccodedot11_init_inv(void)
|
|||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
main()
|
main() {
|
||||||
{
|
|
||||||
unsigned char test[] = "0Thebigredfox";
|
unsigned char test[] = "0Thebigredfox";
|
||||||
unsigned char output[512], *inPtr, *outPtr;
|
unsigned char output[512], *inPtr, *outPtr;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
test[0] = 128;
|
test[0] = 128;
|
||||||
test[1] = 0;
|
test[1] = 0;
|
||||||
|
|
||||||
|
|
||||||
ccodedot11_init();
|
ccodedot11_init();
|
||||||
|
|
||||||
inPtr = test;
|
inPtr = test;
|
||||||
outPtr = output;
|
outPtr = output;
|
||||||
|
|
||||||
ccodedot11_encode(16, inPtr, outPtr,0);
|
ccodedot11_encode(16, inPtr, outPtr,0);
|
||||||
|
|
||||||
for (i = 0; i < 32; i++) printf("%x ", output[i]);
|
for (i = 0; i < 32; i++) printf("%x ", output[i]);
|
||||||
|
|||||||
@@ -52,20 +52,16 @@ ccodelte_encode (int32_t numbits,
|
|||||||
uint8_t add_crc,
|
uint8_t add_crc,
|
||||||
uint8_t *inPtr,
|
uint8_t *inPtr,
|
||||||
uint8_t *outPtr,
|
uint8_t *outPtr,
|
||||||
uint16_t rnti)
|
uint16_t rnti) {
|
||||||
{
|
|
||||||
uint32_t state;
|
uint32_t state;
|
||||||
|
|
||||||
uint8_t c, out, first_bit;
|
uint8_t c, out, first_bit;
|
||||||
int8_t shiftbit=0;
|
int8_t shiftbit=0;
|
||||||
uint16_t c16;
|
uint16_t c16;
|
||||||
uint16_t next_last_byte=0;
|
uint16_t next_last_byte=0;
|
||||||
uint32_t crc=0;
|
uint32_t crc=0;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
uint32_t dummy=0;
|
uint32_t dummy=0;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
/* The input bit is shifted in position 8 of the state.
|
/* The input bit is shifted in position 8 of the state.
|
||||||
Shiftbit will take values between 1 and 8 */
|
Shiftbit will take values between 1 and 8 */
|
||||||
state = 0;
|
state = 0;
|
||||||
@@ -137,17 +133,12 @@ ccodelte_encode (int32_t numbits,
|
|||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
/* Do not increment inPtr until we read the next octet */
|
/* Do not increment inPtr until we read the next octet */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
while (numbits > 0) {
|
while (numbits > 0) {
|
||||||
|
|
||||||
c = *inPtr++;
|
c = *inPtr++;
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("** %x **\n",c);
|
printf("** %x **\n",c);
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
|
|
||||||
// for (shiftbit = 0; (shiftbit<8) && (numbits>0);shiftbit++,numbits--) {
|
// for (shiftbit = 0; (shiftbit<8) && (numbits>0);shiftbit++,numbits--) {
|
||||||
for (shiftbit = 7; (shiftbit>=0) && (numbits>0); shiftbit--,numbits--) {
|
for (shiftbit = 7; (shiftbit>=0) && (numbits>0); shiftbit--,numbits--) {
|
||||||
state >>= 1;
|
state >>= 1;
|
||||||
@@ -157,23 +148,18 @@ ccodelte_encode (int32_t numbits,
|
|||||||
}
|
}
|
||||||
|
|
||||||
out = ccodelte_table[state];
|
out = ccodelte_table[state];
|
||||||
|
|
||||||
*outPtr++ = out & 1;
|
*outPtr++ = out & 1;
|
||||||
*outPtr++ = (out>>1)&1;
|
*outPtr++ = (out>>1)&1;
|
||||||
*outPtr++ = (out>>2)&1;
|
*outPtr++ = (out>>2)&1;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("numbits %d, input %d, outbit %d: %d -> %d (%d%d%d)\n",numbits,state>>6,dummy,state,out,out&1,(out>>1)&1,(out>>2)&1);
|
printf("numbits %d, input %d, outbit %d: %d -> %d (%d%d%d)\n",numbits,state>>6,dummy,state,out,out&1,(out>>1)&1,(out>>2)&1);
|
||||||
dummy+=3;
|
dummy+=3;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// now code 8-bit CRC for UCI
|
// now code 8-bit CRC for UCI
|
||||||
if (add_crc == 1) {
|
if (add_crc == 1) {
|
||||||
|
|
||||||
c = (uint8_t)(crc>>24);
|
c = (uint8_t)(crc>>24);
|
||||||
|
|
||||||
// for (shiftbit = 0; (shiftbit<8);shiftbit++) {
|
// for (shiftbit = 0; (shiftbit<8);shiftbit++) {
|
||||||
@@ -185,22 +171,18 @@ ccodelte_encode (int32_t numbits,
|
|||||||
}
|
}
|
||||||
|
|
||||||
out = ccodelte_table[state];
|
out = ccodelte_table[state];
|
||||||
|
|
||||||
*outPtr++ = out & 1;
|
*outPtr++ = out & 1;
|
||||||
*outPtr++ = (out>>1)&1;
|
*outPtr++ = (out>>1)&1;
|
||||||
*outPtr++ = (out>>2)&1;
|
*outPtr++ = (out>>2)&1;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("crc bit %d input %d, outbit %d: %d -> %d (%d)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]);
|
printf("crc bit %d input %d, outbit %d: %d -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]);
|
||||||
dummy+=3;
|
dummy+=3;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// now code 16-bit CRC for DCI
|
// now code 16-bit CRC for DCI
|
||||||
if (add_crc == 2) {
|
if (add_crc == 2) {
|
||||||
|
|
||||||
c16 = (uint16_t)(crc>>16);
|
c16 = (uint16_t)(crc>>16);
|
||||||
|
|
||||||
// for (shiftbit = 0; (shiftbit<16);shiftbit++) {
|
// for (shiftbit = 0; (shiftbit<16);shiftbit++) {
|
||||||
@@ -212,16 +194,13 @@ ccodelte_encode (int32_t numbits,
|
|||||||
}
|
}
|
||||||
|
|
||||||
out = ccodelte_table[state];
|
out = ccodelte_table[state];
|
||||||
|
|
||||||
*outPtr++ = out & 1;
|
*outPtr++ = out & 1;
|
||||||
*outPtr++ = (out>>1)&1;
|
*outPtr++ = (out>>1)&1;
|
||||||
*outPtr++ = (out>>2)&1;
|
*outPtr++ = (out>>2)&1;
|
||||||
|
|
||||||
#ifdef DEBUG_CCODE
|
#ifdef DEBUG_CCODE
|
||||||
printf("crc bit %d input %d, outbit %d: %d -> %d (%d)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]);
|
printf("crc bit %d input %d, outbit %d: %d -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]);
|
||||||
dummy+=3;
|
dummy+=3;
|
||||||
#endif //DEBUG_CCODE
|
#endif //DEBUG_CCODE
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -238,8 +217,7 @@ ccodelte_encode (int32_t numbits,
|
|||||||
/* Basic code table initialization for constraint length 7 */
|
/* Basic code table initialization for constraint length 7 */
|
||||||
/* Input in MSB, followed by state in 6 LSBs */
|
/* Input in MSB, followed by state in 6 LSBs */
|
||||||
|
|
||||||
void ccodelte_init(void)
|
void ccodelte_init(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -260,8 +238,7 @@ void ccodelte_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Input in LSB, followed by state in 6 MSBs */
|
/* Input in LSB, followed by state in 6 MSBs */
|
||||||
void ccodelte_init_inv(void)
|
void ccodelte_init_inv(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -281,8 +258,7 @@ void ccodelte_init_inv(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ccodedab_init(void)
|
void ccodedab_init(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -303,8 +279,7 @@ void ccodedab_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Input in LSB, followed by state in 6 MSBs */
|
/* Input in LSB, followed by state in 6 MSBs */
|
||||||
void ccodedab_init_inv(void)
|
void ccodedab_init_inv(void) {
|
||||||
{
|
|
||||||
unsigned int i, j, k, sum;
|
unsigned int i, j, k, sum;
|
||||||
|
|
||||||
for (i = 0; i < 128; i++) {
|
for (i = 0; i < 128; i++) {
|
||||||
@@ -334,21 +309,15 @@ void ccodedab_init_inv(void)
|
|||||||
#ifdef CCODE_MAIN
|
#ifdef CCODE_MAIN
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
main()
|
main() {
|
||||||
{
|
|
||||||
unsigned char test[] = "Thebigredfox";
|
unsigned char test[] = "Thebigredfox";
|
||||||
unsigned char output[512], *inPtr, *outPtr;
|
unsigned char output[512], *inPtr, *outPtr;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
test[0] = 128;
|
test[0] = 128;
|
||||||
test[1] = 0;
|
test[1] = 0;
|
||||||
|
|
||||||
|
|
||||||
ccodelte_init();
|
ccodelte_init();
|
||||||
|
|
||||||
inPtr = test;
|
inPtr = test;
|
||||||
outPtr = output;
|
outPtr = output;
|
||||||
|
|
||||||
ccodelte_encode(21, inPtr, outPtr);
|
ccodelte_encode(21, inPtr, outPtr);
|
||||||
|
|
||||||
for (i = 0; i < 21*3; i++) printf("%x ", output[i]);
|
for (i = 0; i < 21*3; i++) printf("%x ", output[i]);
|
||||||
|
|||||||
@@ -25,8 +25,8 @@
|
|||||||
date: 21.10.2009
|
date: 21.10.2009
|
||||||
*/
|
*/
|
||||||
#ifdef MAIN
|
#ifdef MAIN
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
#include "PHY/defs_eNB.h"
|
#include "PHY/defs_eNB.h"
|
||||||
#include "PHY/LTE_TRANSPORT/transport_common.h"
|
#include "PHY/LTE_TRANSPORT/transport_common.h"
|
||||||
@@ -42,9 +42,7 @@ static uint32_t bitrev_cc[32] = {1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31,0,16
|
|||||||
//#define RM_DEBUG2 1
|
//#define RM_DEBUG2 1
|
||||||
//#define RM_DEBUG_CC 1
|
//#define RM_DEBUG_CC 1
|
||||||
|
|
||||||
uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
|
uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w) {
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t RTC = (D>>5), ND, ND3;
|
uint32_t RTC = (D>>5), ND, ND3;
|
||||||
uint32_t row,col,Kpi;
|
uint32_t row,col,Kpi;
|
||||||
uint32_t index3,k,k2;
|
uint32_t index3,k,k2;
|
||||||
@@ -64,7 +62,6 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND);
|
printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND);
|
||||||
#endif
|
#endif
|
||||||
ND3 = ND*3;
|
ND3 = ND*3;
|
||||||
|
|
||||||
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
||||||
d[(3*D)+2] = d[2];
|
d[(3*D)+2] = d[2];
|
||||||
k=0;
|
k=0;
|
||||||
@@ -80,12 +77,9 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
index3 = bitrev_x3[col];//3*index;
|
index3 = bitrev_x3[col];//3*index;
|
||||||
|
|
||||||
for (row=0; row<RTC; row++) {
|
for (row=0; row<RTC; row++) {
|
||||||
|
|
||||||
w[k] = d1[index3];//d[index3-ND3];
|
w[k] = d1[index3];//d[index3-ND3];
|
||||||
w[Kpi+k2] = d2[index3];//d[index3-ND3+1];
|
w[Kpi+k2] = d2[index3];//d[index3-ND3+1];
|
||||||
w[Kpi+1+k2] = d3[index3];//d[index3-ND3+5];
|
w[Kpi+1+k2] = d3[index3];//d[index3-ND3+5];
|
||||||
|
|
||||||
|
|
||||||
#ifdef RM_DEBUG
|
#ifdef RM_DEBUG
|
||||||
printf("row %d, index %d, index-Nd %d index-Nd+1 %d (k,Kpi+2k,Kpi+2k+1) (%d,%d,%d) w(%d,%d,%d)\n",row,index,index-ND,((index+1)%Kpi)-ND,k,Kpi+(k<<1),Kpi+(k<<1)+1,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)]);
|
printf("row %d, index %d, index-Nd %d index-Nd+1 %d (k,Kpi+2k,Kpi+2k+1) (%d,%d,%d) w(%d,%d,%d)\n",row,index,index-ND,((index+1)%Kpi)-ND,k,Kpi+(k<<1),Kpi+(k<<1)+1,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)]);
|
||||||
|
|
||||||
@@ -100,7 +94,8 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
index3+=96;
|
index3+=96;
|
||||||
k++;k2+=2;
|
k++;
|
||||||
|
k2+=2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,9 +115,7 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w)
|
uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w) {
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t RCC = (D>>5), ND, ND3;
|
uint32_t RCC = (D>>5), ND, ND3;
|
||||||
uint32_t row,col,Kpi,index;
|
uint32_t row,col,Kpi,index;
|
||||||
uint32_t index3,k;
|
uint32_t index3,k;
|
||||||
@@ -141,7 +134,6 @@ uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
printf("RCC = %d, Kpi=%d, ND=%d\n",RCC,Kpi,ND);
|
printf("RCC = %d, Kpi=%d, ND=%d\n",RCC,Kpi,ND);
|
||||||
#endif
|
#endif
|
||||||
ND3 = ND*3;
|
ND3 = ND*3;
|
||||||
|
|
||||||
k=0;
|
k=0;
|
||||||
|
|
||||||
for (col=0; col<32; col++) {
|
for (col=0; col<32; col++) {
|
||||||
@@ -180,9 +172,7 @@ uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w)
|
|||||||
return(RCC);
|
return(RCC);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w)
|
void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w) {
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t RTC = (D>>5), ND, ND3;
|
uint32_t RTC = (D>>5), ND, ND3;
|
||||||
uint32_t row,col,Kpi,index;
|
uint32_t row,col,Kpi,index;
|
||||||
uint32_t index3,k,k2;
|
uint32_t index3,k,k2;
|
||||||
@@ -199,7 +189,6 @@ void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w)
|
|||||||
printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND);
|
printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND);
|
||||||
#endif
|
#endif
|
||||||
ND3 = ND*3;
|
ND3 = ND*3;
|
||||||
|
|
||||||
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
||||||
k=0;
|
k=0;
|
||||||
k2=0;
|
k2=0;
|
||||||
@@ -215,7 +204,6 @@ void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w)
|
|||||||
index3 = bitrev_x3[col];//3*index;
|
index3 = bitrev_x3[col];//3*index;
|
||||||
|
|
||||||
for (row=0; row<RTC; row++) {
|
for (row=0; row<RTC; row++) {
|
||||||
|
|
||||||
d1[index3] = w[k];
|
d1[index3] = w[k];
|
||||||
d2[index3] = w[Kpi+k2];
|
d2[index3] = w[Kpi+k2];
|
||||||
d3[index3] = w[Kpi+1+k2];
|
d3[index3] = w[Kpi+1+k2];
|
||||||
@@ -229,12 +217,9 @@ void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w)
|
|||||||
|
|
||||||
// if (ND>0)
|
// if (ND>0)
|
||||||
// d[2] = LTE_NULL;//d[(3*D)+2];
|
// d[2] = LTE_NULL;//d[(3*D)+2];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w)
|
void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w) {
|
||||||
{
|
|
||||||
|
|
||||||
//WANG_Hao uint32_t RCC = (D>>5), ND, ND3;
|
//WANG_Hao uint32_t RCC = (D>>5), ND, ND3;
|
||||||
uint32_t RCC = (D>>5);
|
uint32_t RCC = (D>>5);
|
||||||
ptrdiff_t ND, ND3;
|
ptrdiff_t ND, ND3;
|
||||||
@@ -251,10 +236,9 @@ void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w)
|
|||||||
ND = Kpi - D;
|
ND = Kpi - D;
|
||||||
#ifdef RM_DEBUG2
|
#ifdef RM_DEBUG2
|
||||||
printf("sub_block_interleaving_cc : D = %d (%d), d %p, w %p\n",D,D*3,d,w);
|
printf("sub_block_interleaving_cc : D = %d (%d), d %p, w %p\n",D,D*3,d,w);
|
||||||
printf("RCC = %d, Kpi=%d, ND=%d\n",RCC,Kpi,ND);
|
printf("RCC = %d, Kpi=%d, ND=%ld\n",RCC,Kpi,ND);
|
||||||
#endif
|
#endif
|
||||||
ND3 = ND*3;
|
ND3 = ND*3;
|
||||||
|
|
||||||
k=0;
|
k=0;
|
||||||
|
|
||||||
for (col=0; col<32; col++) {
|
for (col=0; col<32; col++) {
|
||||||
@@ -265,24 +249,20 @@ void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w)
|
|||||||
index3 = 3*index;
|
index3 = 3*index;
|
||||||
|
|
||||||
for (row=0; row<RCC; row++) {
|
for (row=0; row<RCC; row++) {
|
||||||
|
|
||||||
d[index3-ND3] = w[k];
|
d[index3-ND3] = w[k];
|
||||||
d[index3-ND3+1] = w[Kpi+k];
|
d[index3-ND3+1] = w[Kpi+k];
|
||||||
d[index3-ND3+2] = w[(Kpi<<1)+k];
|
d[index3-ND3+2] = w[(Kpi<<1)+k];
|
||||||
#ifdef RM_DEBUG2
|
#ifdef RM_DEBUG2
|
||||||
printf("row %d, index %d k %d index3-ND3 %d w(%d,%d,%d)\n",row,index,k,index3-ND3,w[k],w[Kpi+k],w[(Kpi<<1)+k]);
|
printf("row %d, index %d k %d index3-ND3 %ld w(%d,%d,%d)\n",row,index,k,index3-ND3,w[k],w[Kpi+k],w[(Kpi<<1)+k]);
|
||||||
#endif
|
#endif
|
||||||
index3+=96;
|
index3+=96;
|
||||||
index+=32;
|
index+=32;
|
||||||
k++;
|
k++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F)
|
uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F) {
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t RTC = (D>>5), ND;
|
uint32_t RTC = (D>>5), ND;
|
||||||
uint32_t col,Kpi,index;
|
uint32_t col,Kpi,index;
|
||||||
int32_t k,k2;
|
int32_t k,k2;
|
||||||
@@ -301,8 +281,6 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F)
|
|||||||
printf("dummy sub_block_interleaving_turbo : D = %d (%d)\n",D,D*3);
|
printf("dummy sub_block_interleaving_turbo : D = %d (%d)\n",D,D*3);
|
||||||
printf("RTC = %d, Kpi=%d, ND=%d, F=%d (Nulled %d)\n",RTC,Kpi,ND,F,(2*F + 3*ND));
|
printf("RTC = %d, Kpi=%d, ND=%d, F=%d (Nulled %d)\n",RTC,Kpi,ND,F,(2*F + 3*ND));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
k=0;
|
k=0;
|
||||||
k2=0;
|
k2=0;
|
||||||
wKpi = &w[Kpi];
|
wKpi = &w[Kpi];
|
||||||
@@ -371,9 +349,7 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F)
|
|||||||
return(RTC);
|
return(RTC);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w)
|
uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w) {
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t RCC = (D>>5), ND;
|
uint32_t RCC = (D>>5), ND;
|
||||||
uint32_t col,Kpi,index;
|
uint32_t col,Kpi,index;
|
||||||
int32_t k;
|
int32_t k;
|
||||||
@@ -392,7 +368,6 @@ uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w)
|
|||||||
printf("RCC = %d, Kpi=%d, ND=%d, (Nulled %d)\n",RCC,Kpi,ND,3*ND);
|
printf("RCC = %d, Kpi=%d, ND=%d, (Nulled %d)\n",RCC,Kpi,ND,3*ND);
|
||||||
#endif
|
#endif
|
||||||
// ND3 = ND*3;
|
// ND3 = ND*3;
|
||||||
|
|
||||||
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
// copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212
|
||||||
k=0;
|
k=0;
|
||||||
|
|
||||||
@@ -466,8 +441,6 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC,
|
|||||||
uint8_t nb_rb)
|
uint8_t nb_rb)
|
||||||
// uint8_t m)
|
// uint8_t m)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
uint32_t Nir,Ncb,Gp,GpmodC,E,Ncbmod,ind,k;
|
uint32_t Nir,Ncb,Gp,GpmodC,E,Ncbmod,ind,k;
|
||||||
// int cnt=0;
|
// int cnt=0;
|
||||||
uint8_t *e2;
|
uint8_t *e2;
|
||||||
@@ -487,11 +460,11 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC,
|
|||||||
if (Mdlharq>0) { // Downlink
|
if (Mdlharq>0) { // Downlink
|
||||||
Nir = Nsoft/Kmimo/cmin(8,Mdlharq);
|
Nir = Nsoft/Kmimo/cmin(8,Mdlharq);
|
||||||
Ncb = cmin(Nir/C,3*(RTC<<5));
|
Ncb = cmin(Nir/C,3*(RTC<<5));
|
||||||
}
|
} else { // Uplink
|
||||||
else { // Uplink
|
|
||||||
Nir=0;
|
Nir=0;
|
||||||
Ncb = 3*(RTC<<5); // Kw
|
Ncb = 3*(RTC<<5); // Kw
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef RM_DEBUG_TX
|
#ifdef RM_DEBUG_TX
|
||||||
|
|
||||||
if (rvidx==0 && r==0) {
|
if (rvidx==0 && r==0) {
|
||||||
@@ -518,7 +491,6 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC,
|
|||||||
AssertFatal(Qm>0,"Qm is 0\n");
|
AssertFatal(Qm>0,"Qm is 0\n");
|
||||||
Gp = G/Nl/Qm;
|
Gp = G/Nl/Qm;
|
||||||
GpmodC = Gp%C;
|
GpmodC = Gp%C;
|
||||||
|
|
||||||
#ifdef RM_DEBUG
|
#ifdef RM_DEBUG
|
||||||
printf("lte_rate_matching_turbo: Ncb %d, Kw %d, Nir/C %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",Ncb,3*(RTC<<5),Nir/C,rvidx, G, Qm,Nl,r);
|
printf("lte_rate_matching_turbo: Ncb %d, Kw %d, Nir/C %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",Ncb,3*(RTC<<5),Nir/C,rvidx, G, Qm,Nl,r);
|
||||||
#endif
|
#endif
|
||||||
@@ -529,16 +501,12 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC,
|
|||||||
E = Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
|
E = Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
|
||||||
|
|
||||||
Ncbmod = Ncb%(RTC<<3);
|
Ncbmod = Ncb%(RTC<<3);
|
||||||
|
|
||||||
ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2));
|
ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2));
|
||||||
|
|
||||||
#ifdef RM_DEBUG_TX
|
#ifdef RM_DEBUG_TX
|
||||||
printf("lte_rate_matching_turbo: E %d, k0 %d, Ncbmod %d, Ncb/(RTC<<3) %d\n",E,ind,Ncbmod,Ncb/(RTC<<3));
|
printf("lte_rate_matching_turbo: E %d, k0 %d, Ncbmod %d, Ncb/(RTC<<3) %d\n",E,ind,Ncbmod,Ncb/(RTC<<3));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//e2=e+(r*E);
|
//e2=e+(r*E);
|
||||||
e2 = e;
|
e2 = e;
|
||||||
|
|
||||||
k=0;
|
k=0;
|
||||||
|
|
||||||
for (; (ind<Ncb)&&(k<E); ind++) {
|
for (; (ind<Ncb)&&(k<E); ind++) {
|
||||||
@@ -633,25 +601,16 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC,
|
|||||||
uint32_t lte_rate_matching_cc(uint32_t RCC,
|
uint32_t lte_rate_matching_cc(uint32_t RCC,
|
||||||
uint16_t E,
|
uint16_t E,
|
||||||
uint8_t *w,
|
uint8_t *w,
|
||||||
uint8_t *e)
|
uint8_t *e) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
uint32_t ind=0,k;
|
uint32_t ind=0,k;
|
||||||
|
|
||||||
uint16_t Kw = 3*(RCC<<5);
|
uint16_t Kw = 3*(RCC<<5);
|
||||||
|
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
uint32_t nulled=0;
|
uint32_t nulled=0;
|
||||||
|
|
||||||
printf("lte_rate_matching_cc: Kw %d, E %d\n",Kw, E);
|
printf("lte_rate_matching_cc: Kw %d, E %d\n",Kw, E);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (k=0; k<E; k++) {
|
for (k=0; k<E; k++) {
|
||||||
|
|
||||||
|
|
||||||
while(w[ind] == LTE_NULL) {
|
while(w[ind] == LTE_NULL) {
|
||||||
|
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
nulled++;
|
nulled++;
|
||||||
printf("RM_TX_CC : ind %d, NULL\n",ind);
|
printf("RM_TX_CC : ind %d, NULL\n",ind);
|
||||||
@@ -662,7 +621,6 @@ uint32_t lte_rate_matching_cc(uint32_t RCC,
|
|||||||
ind=0;
|
ind=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
e[k] = w[ind];
|
e[k] = w[ind];
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
// printf("k %d ind %d, w %c(%d)\n",k,ind,w[ind],w[ind]);
|
// printf("k %d ind %d, w %c(%d)\n",k,ind,w[ind],w[ind]);
|
||||||
@@ -695,10 +653,7 @@ int lte_rate_matching_turbo_rx(uint32_t RTC,
|
|||||||
uint8_t Qm,
|
uint8_t Qm,
|
||||||
uint8_t Nl,
|
uint8_t Nl,
|
||||||
uint8_t r,
|
uint8_t r,
|
||||||
uint32_t *E_out)
|
uint32_t *E_out) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
uint32_t Nir,Ncb,Gp,GpmodC,E,Ncbmod,ind,k;
|
uint32_t Nir,Ncb,Gp,GpmodC,E,Ncbmod,ind,k;
|
||||||
int16_t *soft_input2;
|
int16_t *soft_input2;
|
||||||
// int32_t w_tmp;
|
// int32_t w_tmp;
|
||||||
@@ -708,15 +663,14 @@ int lte_rate_matching_turbo_rx(uint32_t RTC,
|
|||||||
|
|
||||||
if (Kmimo==0 || C==0 || Qm==0 || Nl==0) {
|
if (Kmimo==0 || C==0 || Qm==0 || Nl==0) {
|
||||||
printf("lte_rate_matching.c: invalid parameters (Kmimo %d, Mdlharq %d, C %d, Qm %d, Nl %d\n",
|
printf("lte_rate_matching.c: invalid parameters (Kmimo %d, Mdlharq %d, C %d, Qm %d, Nl %d\n",
|
||||||
Kmimo,Mdlharq,C,Qm,Nl);
|
Kmimo,Mdlharq,C,Qm,Nl);
|
||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Mdlharq>0) { // Downlink
|
if (Mdlharq>0) { // Downlink
|
||||||
Nir = Nsoft/Kmimo/cmin(8,Mdlharq);
|
Nir = Nsoft/Kmimo/cmin(8,Mdlharq);
|
||||||
Ncb = cmin(Nir/C,3*(RTC<<5));
|
Ncb = cmin(Nir/C,3*(RTC<<5));
|
||||||
}
|
} else { // Uplink
|
||||||
else { // Uplink
|
|
||||||
Nir=0;
|
Nir=0;
|
||||||
Ncb = 3*(RTC<<5);
|
Ncb = 3*(RTC<<5);
|
||||||
}
|
}
|
||||||
@@ -726,17 +680,13 @@ int lte_rate_matching_turbo_rx(uint32_t RTC,
|
|||||||
Gp = G/Nl/Qm;
|
Gp = G/Nl/Qm;
|
||||||
GpmodC = Gp%C;
|
GpmodC = Gp%C;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (r < (C-(GpmodC)))
|
if (r < (C-(GpmodC)))
|
||||||
E = Nl*Qm * (Gp/C);
|
E = Nl*Qm * (Gp/C);
|
||||||
else
|
else
|
||||||
E = Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
|
E = Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
|
||||||
|
|
||||||
Ncbmod = Ncb%(RTC<<3);
|
Ncbmod = Ncb%(RTC<<3);
|
||||||
|
|
||||||
ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2));
|
ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2));
|
||||||
|
|
||||||
#ifdef RM_DEBUG
|
#ifdef RM_DEBUG
|
||||||
printf("lte_rate_matching_turbo_rx: Clear %d, E %d, Ncb %d, Kw %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",clear,E,Ncb,3*(RTC<<5),rvidx, G, Qm,Nl,r);
|
printf("lte_rate_matching_turbo_rx: Clear %d, E %d, Ncb %d, Kw %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",clear,E,Ncb,3*(RTC<<5),rvidx, G, Qm,Nl,r);
|
||||||
#endif
|
#endif
|
||||||
@@ -751,8 +701,8 @@ int lte_rate_matching_turbo_rx(uint32_t RTC,
|
|||||||
if (dummy_w[ind] != LTE_NULL) {
|
if (dummy_w[ind] != LTE_NULL) {
|
||||||
/*
|
/*
|
||||||
if ((w[ind]>0 && soft_input2[k]<0) ||
|
if ((w[ind]>0 && soft_input2[k]<0) ||
|
||||||
(w[ind]<0 && soft_input2[k]>0))
|
(w[ind]<0 && soft_input2[k]>0))
|
||||||
printf("ind %d: w %d => soft_in %d\n",ind,w[ind],soft_input2[k]);*/
|
printf("ind %d: w %d => soft_in %d\n",ind,w[ind],soft_input2[k]);*/
|
||||||
w[ind] += soft_input2[k++];
|
w[ind] += soft_input2[k++];
|
||||||
#ifdef RM_DEBUG
|
#ifdef RM_DEBUG
|
||||||
printf("RM_RX k%d Ind: %d (%d)\n",k-1,ind,w[ind]);
|
printf("RM_RX k%d Ind: %d (%d)\n",k-1,ind,w[ind]);
|
||||||
@@ -831,10 +781,8 @@ int lte_rate_matching_turbo_rx(uint32_t RTC,
|
|||||||
ind=0;
|
ind=0;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
*E_out = E;
|
*E_out = E;
|
||||||
return(0);
|
return(0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -842,28 +790,19 @@ void lte_rate_matching_cc_rx(uint32_t RCC,
|
|||||||
uint16_t E,
|
uint16_t E,
|
||||||
int8_t *w,
|
int8_t *w,
|
||||||
uint8_t *dummy_w,
|
uint8_t *dummy_w,
|
||||||
int8_t *soft_input)
|
int8_t *soft_input) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
uint32_t ind=0,k;
|
uint32_t ind=0,k;
|
||||||
uint16_t Kw = 3*(RCC<<5);
|
uint16_t Kw = 3*(RCC<<5);
|
||||||
uint32_t acc=1;
|
uint32_t acc=1;
|
||||||
int16_t w16[Kw];
|
int16_t w16[Kw];
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
uint32_t nulled=0;
|
uint32_t nulled=0;
|
||||||
|
|
||||||
printf("lte_rate_matching_cc_rx: Kw %d, E %d, w %p, soft_input %p\n",3*(RCC<<5),E,w,soft_input);
|
printf("lte_rate_matching_cc_rx: Kw %d, E %d, w %p, soft_input %p\n",3*(RCC<<5),E,w,soft_input);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
memset(w,0,Kw);
|
memset(w,0,Kw);
|
||||||
memset(w16,0,Kw*sizeof(int16_t));
|
memset(w16,0,Kw*sizeof(int16_t));
|
||||||
|
|
||||||
for (k=0; k<E; k++) {
|
for (k=0; k<E; k++) {
|
||||||
|
|
||||||
|
|
||||||
while(dummy_w[ind] == LTE_NULL) {
|
while(dummy_w[ind] == LTE_NULL) {
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
nulled++;
|
nulled++;
|
||||||
@@ -883,10 +822,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC,
|
|||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
printf("RM_RX_CC k %d (%d) ind: %d (%d)\n",k,soft_input[k],ind,w16[ind]);
|
printf("RM_RX_CC k %d (%d) ind: %d (%d)\n",k,soft_input[k],ind,w16[ind]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
w16[ind] += soft_input[k];
|
w16[ind] += soft_input[k];
|
||||||
|
|
||||||
ind++;
|
ind++;
|
||||||
|
|
||||||
if (ind==Kw) {
|
if (ind==Kw) {
|
||||||
@@ -907,7 +843,6 @@ void lte_rate_matching_cc_rx(uint32_t RCC,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef RM_DEBUG_CC
|
#ifdef RM_DEBUG_CC
|
||||||
|
|
||||||
printf("Nulled %d\n",nulled);
|
printf("Nulled %d\n",nulled);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -915,8 +850,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC,
|
|||||||
|
|
||||||
#ifdef MAIN
|
#ifdef MAIN
|
||||||
|
|
||||||
void main()
|
void main() {
|
||||||
{
|
|
||||||
uint8_t d[96+3+(3*6144)];
|
uint8_t d[96+3+(3*6144)];
|
||||||
uint8_t w[3*6144],e[12*6144];
|
uint8_t w[3*6144],e[12*6144];
|
||||||
uint32_t RTC,G,rvidx;
|
uint32_t RTC,G,rvidx;
|
||||||
@@ -924,7 +858,6 @@ void main()
|
|||||||
uint32_t mod_order = 4;
|
uint32_t mod_order = 4;
|
||||||
uint32_t first_dlsch_symbol = 2;
|
uint32_t first_dlsch_symbol = 2;
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
|
|
||||||
G = ( nb_rb * (12 * mod_order) * (12-first_dlsch_symbol-3)) ;//( nb_rb * (12 * mod_order) * (14-first_dlsch_symbol-3)) :
|
G = ( nb_rb * (12 * mod_order) * (12-first_dlsch_symbol-3)) ;//( nb_rb * (12 * mod_order) * (14-first_dlsch_symbol-3)) :
|
||||||
|
|
||||||
// initialize 96 first positions to "LTE_NULL"
|
// initialize 96 first positions to "LTE_NULL"
|
||||||
|
|||||||
@@ -38,9 +38,7 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
unsigned int *Cminus,
|
unsigned int *Cminus,
|
||||||
unsigned int *Kplus,
|
unsigned int *Kplus,
|
||||||
unsigned int *Kminus,
|
unsigned int *Kminus,
|
||||||
unsigned int *F)
|
unsigned int *F) {
|
||||||
{
|
|
||||||
|
|
||||||
unsigned int L,Bprime,Bprime_by_C,r,Kr,k,s,crc;
|
unsigned int L,Bprime,Bprime_by_C,r,Kr,k,s,crc;
|
||||||
|
|
||||||
if (B<=6144) {
|
if (B<=6144) {
|
||||||
@@ -56,19 +54,19 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
|
|
||||||
Bprime = B+((*C)*L);
|
Bprime = B+((*C)*L);
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("Bprime %d\n",Bprime);
|
printf("Bprime %u\n",Bprime);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((*C)>MAX_NUM_DLSCH_SEGMENTS) {
|
if ((*C)>MAX_NUM_DLSCH_SEGMENTS) {
|
||||||
LOG_E(PHY,"lte_segmentation.c: too many segments %d, B %d, L %d, Bprime %d\n",*C,B,L,Bprime);
|
LOG_E(PHY,"lte_segmentation.c: too many segments %d, B %d, L %d, Bprime %d\n",*C,B,L,Bprime);
|
||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find K+
|
// Find K+
|
||||||
Bprime_by_C = Bprime/(*C);
|
Bprime_by_C = Bprime/(*C);
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("Bprime_by_C %d\n",Bprime_by_C);
|
printf("Bprime_by_C %u\n",Bprime_by_C);
|
||||||
#endif
|
#endif
|
||||||
// Bprime = Bprime_by_C>>3;
|
// Bprime = Bprime_by_C>>3;
|
||||||
|
|
||||||
@@ -93,17 +91,16 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
|
|
||||||
*Kminus = (*Kplus - 32);
|
*Kminus = (*Kplus - 32);
|
||||||
} else if (Bprime_by_C <=6144 ) { // increase by 8 bytes til here
|
} else if (Bprime_by_C <=6144 ) { // increase by 8 bytes til here
|
||||||
|
|
||||||
*Kplus = (Bprime_by_C>>6)<<6;
|
*Kplus = (Bprime_by_C>>6)<<6;
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("Bprime_by_C_by_C %d , Kplus %d\n",Bprime_by_C,*Kplus);
|
printf("Bprime_by_C_by_C %u , Kplus %u\n",Bprime_by_C,*Kplus);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (*Kplus < Bprime_by_C)
|
if (*Kplus < Bprime_by_C)
|
||||||
*Kplus = *Kplus + 64;
|
*Kplus = *Kplus + 64;
|
||||||
|
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("Bprime_by_C_by_C %d , Kplus2 %d\n",Bprime_by_C,*Kplus);
|
printf("Bprime_by_C_by_C %u , Kplus2 %u\n",Bprime_by_C,*Kplus);
|
||||||
#endif
|
#endif
|
||||||
*Kminus = (*Kplus - 64);
|
*Kminus = (*Kplus - 64);
|
||||||
} else {
|
} else {
|
||||||
@@ -116,25 +113,21 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
*Kminus = 0;
|
*Kminus = 0;
|
||||||
*Cminus = 0;
|
*Cminus = 0;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// printf("More than one segment (%d), exiting \n",*C);
|
// printf("More than one segment (%d), exiting \n",*C);
|
||||||
// exit(-1);
|
// exit(-1);
|
||||||
*Cminus = ((*C)*(*Kplus) - (Bprime))/((*Kplus) - (*Kminus));
|
*Cminus = ((*C)*(*Kplus) - (Bprime))/((*Kplus) - (*Kminus));
|
||||||
*Cplus = (*C) - (*Cminus);
|
*Cplus = (*C) - (*Cminus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
AssertFatal(Bprime <= (*Cplus)*(*Kplus) + (*Cminus)*(*Kminus),
|
AssertFatal(Bprime <= (*Cplus)*(*Kplus) + (*Cminus)*(*Kminus),
|
||||||
"Bprime %d < (*Cplus %d)*(*Kplus %d) + (*Cminus %d)*(*Kminus %d)\n",
|
"Bprime %d < (*Cplus %d)*(*Kplus %d) + (*Cminus %d)*(*Kminus %d)\n",
|
||||||
Bprime,*Cplus,*Kplus,*Cminus,*Kminus);
|
Bprime,*Cplus,*Kplus,*Cminus,*Kminus);
|
||||||
|
|
||||||
*F = ((*Cplus)*(*Kplus) + (*Cminus)*(*Kminus) - (Bprime));
|
*F = ((*Cplus)*(*Kplus) + (*Cminus)*(*Kminus) - (Bprime));
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("C %d, Cplus %d, Cminus %d, Kplus %d, Kminus %d, Bprime_bytes %d, Bprime %d, F %d\n",*C,*Cplus,*Cminus,*Kplus,*Kminus,Bprime>>3,Bprime,*F);
|
printf("C %u, Cplus %u, Cminus %u, Kplus %u, Kminus %u, Bprime_bytes %u, Bprime %u, F %u\n",*C,*Cplus,*Cminus,*Kplus,*Kminus,Bprime>>3,Bprime,*F);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((input_buffer) && (output_buffers)) {
|
if ((input_buffer) && (output_buffers)) {
|
||||||
|
|
||||||
for (k=0; k<*F>>3; k++) {
|
for (k=0; k<*F>>3; k++) {
|
||||||
output_buffers[0][k] = 0;
|
output_buffers[0][k] = 0;
|
||||||
}
|
}
|
||||||
@@ -142,7 +135,6 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
s=0;
|
s=0;
|
||||||
|
|
||||||
for (r=0; r<*C; r++) {
|
for (r=0; r<*C; r++) {
|
||||||
|
|
||||||
if (r<*Cminus)
|
if (r<*Cminus)
|
||||||
Kr = *Kminus;
|
Kr = *Kminus;
|
||||||
else
|
else
|
||||||
@@ -150,18 +142,18 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
|
|
||||||
while (k<((Kr - L)>>3)) {
|
while (k<((Kr - L)>>3)) {
|
||||||
output_buffers[r][k] = input_buffer[s];
|
output_buffers[r][k] = input_buffer[s];
|
||||||
// printf("encoding segment %d : byte %d (%d) => %d\n",r,k,Kr>>3,input_buffer[s]);
|
// printf("encoding segment %d : byte %d (%d) => %d\n",r,k,Kr>>3,input_buffer[s]);
|
||||||
k++;
|
k++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (*C > 1) { // add CRC
|
if (*C > 1) { // add CRC
|
||||||
crc = crc24b(output_buffers[r],Kr-24)>>8;
|
crc = crc24b(output_buffers[r],Kr-24)>>8;
|
||||||
output_buffers[r][(Kr-24)>>3] = ((uint8_t*)&crc)[2];
|
output_buffers[r][(Kr-24)>>3] = ((uint8_t *)&crc)[2];
|
||||||
output_buffers[r][1+((Kr-24)>>3)] = ((uint8_t*)&crc)[1];
|
output_buffers[r][1+((Kr-24)>>3)] = ((uint8_t *)&crc)[1];
|
||||||
output_buffers[r][2+((Kr-24)>>3)] = ((uint8_t*)&crc)[0];
|
output_buffers[r][2+((Kr-24)>>3)] = ((uint8_t *)&crc)[0];
|
||||||
#ifdef DEBUG_SEGMENTATION
|
#ifdef DEBUG_SEGMENTATION
|
||||||
printf("Segment %d : CRC %x\n",r,crc);
|
printf("Segment %u : CRC %x\n",r,crc);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,9 +167,7 @@ int lte_segmentation(unsigned char *input_buffer,
|
|||||||
|
|
||||||
|
|
||||||
#ifdef MAIN
|
#ifdef MAIN
|
||||||
main()
|
main() {
|
||||||
{
|
|
||||||
|
|
||||||
unsigned int Kplus,Kminus,C,Cplus,Cminus,F,Bbytes;
|
unsigned int Kplus,Kminus,C,Cplus,Cminus,F,Bbytes;
|
||||||
|
|
||||||
for (Bbytes=5; Bbytes<2*768; Bbytes++) {
|
for (Bbytes=5; Bbytes<2*768; Bbytes++) {
|
||||||
|
|||||||
@@ -34,8 +34,7 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
unsigned char Ns,
|
unsigned char Ns,
|
||||||
unsigned char p,
|
unsigned char p,
|
||||||
unsigned char l,
|
unsigned char l,
|
||||||
unsigned char symbol)
|
unsigned char symbol) {
|
||||||
{
|
|
||||||
int pilot[2][200] __attribute__((aligned(16)));
|
int pilot[2][200] __attribute__((aligned(16)));
|
||||||
unsigned char nu,aarx;
|
unsigned char nu,aarx;
|
||||||
unsigned short k;
|
unsigned short k;
|
||||||
@@ -45,16 +44,14 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
// unsigned int n;
|
// unsigned int n;
|
||||||
// int i;
|
// int i;
|
||||||
static int interpolateS11S12 = 1;
|
static int interpolateS11S12 = 1;
|
||||||
|
|
||||||
uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
|
uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
|
||||||
|
|
||||||
uint8_t nushift,pilot0,pilot1,pilot2,pilot3;
|
uint8_t nushift,pilot0,pilot1,pilot2,pilot3;
|
||||||
uint8_t previous_thread_id = ue->current_thread_id[Ns>>1]==0 ? (RX_NB_TH-1):(ue->current_thread_id[Ns>>1]-1);
|
uint8_t previous_thread_id = ue->current_thread_id[Ns>>1]==0 ? (RX_NB_TH-1):(ue->current_thread_id[Ns>>1]-1);
|
||||||
int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
|
int **dl_ch_estimates =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
|
||||||
int **dl_ch_estimates_previous=ue->common_vars.common_vars_rx_data_per_thread[previous_thread_id].dl_ch_estimates[eNB_offset];
|
int **dl_ch_estimates_previous=ue->common_vars.common_vars_rx_data_per_thread[previous_thread_id].dl_ch_estimates[eNB_offset];
|
||||||
int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF;
|
int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF;
|
||||||
|
|
||||||
pilot0 = 0;
|
pilot0 = 0;
|
||||||
|
|
||||||
if (ue->frame_parms.Ncp == 0) { // normal prefix
|
if (ue->frame_parms.Ncp == 0) { // normal prefix
|
||||||
pilot1 = 4;
|
pilot1 = 4;
|
||||||
pilot2 = 7;
|
pilot2 = 7;
|
||||||
@@ -81,7 +78,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//ch_offset = (l*(ue->frame_parms.ofdm_symbol_size));
|
//ch_offset = (l*(ue->frame_parms.ofdm_symbol_size));
|
||||||
if (ue->high_speed_flag == 0) // use second channel estimate position for temporary storage
|
if (ue->high_speed_flag == 0) // use second channel estimate position for temporary storage
|
||||||
ch_offset = ue->frame_parms.ofdm_symbol_size ;
|
ch_offset = ue->frame_parms.ofdm_symbol_size ;
|
||||||
@@ -89,93 +85,88 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
ch_offset = ue->frame_parms.ofdm_symbol_size*symbol;
|
ch_offset = ue->frame_parms.ofdm_symbol_size*symbol;
|
||||||
|
|
||||||
symbol_offset = ue->frame_parms.ofdm_symbol_size*symbol;
|
symbol_offset = ue->frame_parms.ofdm_symbol_size*symbol;
|
||||||
|
|
||||||
k = (nu + nushift)%6;
|
k = (nu + nushift)%6;
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("Channel Estimation : ThreadId %d, eNB_offset %d cell_id %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d\n",ue->current_thread_id[Ns>>1], eNB_offset,Nid_cell,ch_offset,ue->frame_parms.ofdm_symbol_size,
|
printf("Channel Estimation : ThreadId %d, eNB_offset %d cell_id %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d\n",ue->current_thread_id[Ns>>1], eNB_offset,Nid_cell,ch_offset,
|
||||||
|
ue->frame_parms.ofdm_symbol_size,
|
||||||
ue->frame_parms.Ncp,l,Ns,k);
|
ue->frame_parms.Ncp,l,Ns,k);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch (k) {
|
switch (k) {
|
||||||
case 0 :
|
case 0 :
|
||||||
f=filt24_0; //for first pilot of RB, first half
|
f=filt24_0; //for first pilot of RB, first half
|
||||||
f2=filt24_2; //for second pilot of RB, first half
|
f2=filt24_2; //for second pilot of RB, first half
|
||||||
fl=filt24_0; //for first pilot of leftmost RB
|
fl=filt24_0; //for first pilot of leftmost RB
|
||||||
f2l2=filt24_2;
|
f2l2=filt24_2;
|
||||||
// fr=filt24_2r; //for first pilot of rightmost RB
|
// fr=filt24_2r; //for first pilot of rightmost RB
|
||||||
fr=filt24_0r2; //for first pilot of rightmost RB
|
fr=filt24_0r2; //for first pilot of rightmost RB
|
||||||
// f2r2=filt24_0r2;
|
// f2r2=filt24_0r2;
|
||||||
f2r2=filt24_2r;
|
f2r2=filt24_2r;
|
||||||
|
f_dc=filt24_0_dcr;
|
||||||
|
f2_dc=filt24_2_dcl;
|
||||||
|
break;
|
||||||
|
|
||||||
f_dc=filt24_0_dcr;
|
case 1 :
|
||||||
f2_dc=filt24_2_dcl;
|
f=filt24_1;
|
||||||
|
f2=filt24_3;
|
||||||
|
fl=filt24_1l;
|
||||||
|
f2l2=filt24_3l2;
|
||||||
|
fr=filt24_1r2;
|
||||||
|
f2r2=filt24_3r;
|
||||||
|
f_dc=filt24_1_dcr; //for first pilot of RB, first half
|
||||||
|
f2_dc=filt24_3_dcl; //for first pilot of RB, first half
|
||||||
|
break;
|
||||||
|
|
||||||
break;
|
case 2 :
|
||||||
|
f=filt24_2;
|
||||||
|
f2=filt24_4;
|
||||||
|
fl=filt24_2l;
|
||||||
|
f2l2=filt24_4l2;
|
||||||
|
fr=filt24_2r2;
|
||||||
|
f2r2=filt24_4r;
|
||||||
|
f_dc=filt24_2_dcr; //for first pilot of RB, first half
|
||||||
|
f2_dc=filt24_4_dcl; //for first pilot of RB, first half
|
||||||
|
break;
|
||||||
|
|
||||||
case 1 :
|
case 3 :
|
||||||
f=filt24_1;
|
f=filt24_3;
|
||||||
f2=filt24_3;
|
f2=filt24_5;
|
||||||
fl=filt24_1l;
|
fl=filt24_3l;
|
||||||
f2l2=filt24_3l2;
|
f2l2=filt24_5l2;
|
||||||
fr=filt24_1r2;
|
fr=filt24_3r2;
|
||||||
f2r2=filt24_3r;
|
f2r2=filt24_5r;
|
||||||
f_dc=filt24_1_dcr; //for first pilot of RB, first half
|
f_dc=filt24_3_dcr; //for first pilot of RB, first half
|
||||||
f2_dc=filt24_3_dcl; //for first pilot of RB, first half
|
f2_dc=filt24_5_dcl; //for first pilot of RB, first half
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2 :
|
case 4 :
|
||||||
f=filt24_2;
|
f=filt24_4;
|
||||||
f2=filt24_4;
|
f2=filt24_6;
|
||||||
fl=filt24_2l;
|
fl=filt24_4l;
|
||||||
f2l2=filt24_4l2;
|
f2l2=filt24_6l2;
|
||||||
fr=filt24_2r2;
|
fr=filt24_4r2;
|
||||||
f2r2=filt24_4r;
|
f2r2=filt24_6r;
|
||||||
f_dc=filt24_2_dcr; //for first pilot of RB, first half
|
f_dc=filt24_4_dcr; //for first pilot of RB, first half
|
||||||
f2_dc=filt24_4_dcl; //for first pilot of RB, first half
|
f2_dc=filt24_6_dcl; //for first pilot of RB, first half
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3 :
|
case 5 :
|
||||||
f=filt24_3;
|
f=filt24_5;
|
||||||
f2=filt24_5;
|
f2=filt24_7;
|
||||||
fl=filt24_3l;
|
fl=filt24_5l;
|
||||||
f2l2=filt24_5l2;
|
f2l2=filt24_7l2;
|
||||||
fr=filt24_3r2;
|
fr=filt24_5r2;
|
||||||
f2r2=filt24_5r;
|
f2r2=filt24_7r;
|
||||||
f_dc=filt24_3_dcr; //for first pilot of RB, first half
|
f_dc=filt24_5_dcr; //for first pilot of RB, first half
|
||||||
f2_dc=filt24_5_dcl; //for first pilot of RB, first half
|
f2_dc=filt24_7_dcl; //for first pilot of RB, first half
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4 :
|
default:
|
||||||
f=filt24_4;
|
LOG_E(PHY,"lte_dl_channel_estimation: k=%d -> ERROR\n",k);
|
||||||
f2=filt24_6;
|
return(-1);
|
||||||
fl=filt24_4l;
|
break;
|
||||||
f2l2=filt24_6l2;
|
|
||||||
fr=filt24_4r2;
|
|
||||||
f2r2=filt24_6r;
|
|
||||||
f_dc=filt24_4_dcr; //for first pilot of RB, first half
|
|
||||||
f2_dc=filt24_6_dcl; //for first pilot of RB, first half
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 5 :
|
|
||||||
f=filt24_5;
|
|
||||||
f2=filt24_7;
|
|
||||||
fl=filt24_5l;
|
|
||||||
f2l2=filt24_7l2;
|
|
||||||
fr=filt24_5r2;
|
|
||||||
f2r2=filt24_7r;
|
|
||||||
f_dc=filt24_5_dcr; //for first pilot of RB, first half
|
|
||||||
f2_dc=filt24_7_dcl; //for first pilot of RB, first half
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
LOG_E(PHY,"lte_dl_channel_estimation: k=%d -> ERROR\n",k);
|
|
||||||
return(-1);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// generate pilot
|
// generate pilot
|
||||||
lte_dl_cell_spec_rx(ue,
|
lte_dl_cell_spec_rx(ue,
|
||||||
eNB_offset,
|
eNB_offset,
|
||||||
@@ -184,27 +175,25 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
(l==0)?0:1,
|
(l==0)?0:1,
|
||||||
p);
|
p);
|
||||||
|
|
||||||
|
|
||||||
for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
|
for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
|
||||||
|
|
||||||
pil = (int16_t *)&pilot[p][0];
|
pil = (int16_t *)&pilot[p][0];
|
||||||
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+k+ue->frame_parms.first_carrier_offset))];
|
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+k+ue->frame_parms.first_carrier_offset))];
|
||||||
dl_ch = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][ch_offset];
|
dl_ch = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][ch_offset];
|
||||||
|
|
||||||
|
|
||||||
// if (eNb_id==0)
|
// if (eNb_id==0)
|
||||||
memset(dl_ch,0,4*(ue->frame_parms.ofdm_symbol_size));
|
memset(dl_ch,0,4*(ue->frame_parms.ofdm_symbol_size));
|
||||||
|
|
||||||
if (ue->high_speed_flag==0) // multiply previous channel estimate by ch_est_alpha
|
if (ue->high_speed_flag==0) // multiply previous channel estimate by ch_est_alpha
|
||||||
multadd_complex_vector_real_scalar(dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
|
multadd_complex_vector_real_scalar(dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
|
||||||
ue->ch_est_alpha,dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
|
ue->ch_est_alpha,dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
|
||||||
1,ue->frame_parms.ofdm_symbol_size);
|
1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("k %d, first_carrier %d\n",k,ue->frame_parms.first_carrier_offset);
|
printf("k %d, first_carrier %d\n",k,ue->frame_parms.first_carrier_offset);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((ue->frame_parms.N_RB_DL==6) ||
|
if ((ue->frame_parms.N_RB_DL==6) ||
|
||||||
(ue->frame_parms.N_RB_DL==50) ||
|
(ue->frame_parms.N_RB_DL==50) ||
|
||||||
(ue->frame_parms.N_RB_DL==100)) {
|
(ue->frame_parms.N_RB_DL==100)) {
|
||||||
|
|
||||||
//First half of pilots
|
//First half of pilots
|
||||||
// Treat first 2 pilots specially (left edge)
|
// Treat first 2 pilots specially (left edge)
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
@@ -219,7 +208,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
@@ -234,28 +222,22 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
for (pilot_cnt=2; pilot_cnt<((ue->frame_parms.N_RB_DL)-1); pilot_cnt+=2) {
|
for (pilot_cnt=2; pilot_cnt<((ue->frame_parms.N_RB_DL)-1); pilot_cnt+=2) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15); //Re
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15); //Re
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15); //Im
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15); //Im
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(f,
|
multadd_real_vector_complex_scalar(f,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
24);
|
24);
|
||||||
|
|
||||||
|
|
||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(f2,
|
multadd_real_vector_complex_scalar(f2,
|
||||||
ch,
|
ch,
|
||||||
@@ -264,29 +246,25 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// printf("Second half\n");
|
// printf("Second half\n");
|
||||||
// Second half of RBs
|
// Second half of RBs
|
||||||
|
|
||||||
k = (nu + nushift)%6;
|
k = (nu + nushift)%6;
|
||||||
|
|
||||||
if (k > 6)
|
if (k > 6)
|
||||||
k -=6;
|
k -=6;
|
||||||
|
|
||||||
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+k))];
|
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+k))];
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("second half k %d\n",k);
|
printf("second half k %d\n",k);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (pilot_cnt=0; pilot_cnt<((ue->frame_parms.N_RB_DL)-3); pilot_cnt+=2) {
|
for (pilot_cnt=0; pilot_cnt<((ue->frame_parms.N_RB_DL)-3); pilot_cnt+=2) {
|
||||||
|
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(f,
|
multadd_real_vector_complex_scalar(f,
|
||||||
ch,
|
ch,
|
||||||
@@ -295,11 +273,10 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(f2,
|
multadd_real_vector_complex_scalar(f2,
|
||||||
ch,
|
ch,
|
||||||
@@ -308,13 +285,12 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(fr,
|
multadd_real_vector_complex_scalar(fr,
|
||||||
ch,
|
ch,
|
||||||
@@ -323,34 +299,25 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
#endif
|
#endif
|
||||||
multadd_real_vector_complex_scalar(f2r2,
|
multadd_real_vector_complex_scalar(f2r2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
24);
|
24);
|
||||||
|
} else if (ue->frame_parms.N_RB_DL==25) {
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (ue->frame_parms.N_RB_DL==25) {
|
|
||||||
//printf("Channel estimation\n");
|
//printf("Channel estimation\n");
|
||||||
|
|
||||||
// Treat first 2 pilots specially (left edge)
|
// Treat first 2 pilots specially (left edge)
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot 0 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 0 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(fl,
|
multadd_real_vector_complex_scalar(fl,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -358,17 +325,13 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot 1 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 1 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2l2,
|
multadd_real_vector_complex_scalar(f2l2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -378,21 +341,15 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
for (pilot_cnt=2; pilot_cnt<24; pilot_cnt+=2) {
|
for (pilot_cnt=2; pilot_cnt<24; pilot_cnt+=2) {
|
||||||
|
|
||||||
// printf("pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
// printf("pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
||||||
// printf("rx[%d][%d] -> (%d,%d)\n",p,ue->frame_parms.first_carrier_offset + ue->frame_parms.nushift + 6*rb+(3*p),rxF[0],rxF[1]);
|
// printf("rx[%d][%d] -> (%d,%d)\n",p,ue->frame_parms.first_carrier_offset + ue->frame_parms.nushift + 6*rb+(3*p),rxF[0],rxF[1]);
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f,
|
multadd_real_vector_complex_scalar(f,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -400,13 +357,10 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
@@ -417,39 +371,31 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot 24: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 24: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f_dc,
|
multadd_real_vector_complex_scalar(f_dc,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
24);
|
24);
|
||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
// printf("Second half\n");
|
// printf("Second half\n");
|
||||||
// Second half of RBs
|
// Second half of RBs
|
||||||
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+k))];
|
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+k))];
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot 25: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 25: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2_dc,
|
multadd_real_vector_complex_scalar(f2_dc,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -459,19 +405,15 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
for (pilot_cnt=0; pilot_cnt<22; pilot_cnt+=2) {
|
for (pilot_cnt=0; pilot_cnt<22; pilot_cnt+=2) {
|
||||||
|
|
||||||
// printf("* pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
// printf("* pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
||||||
// printf("rx[%d][%d] -> (%d,%d)\n",p,ue->frame_parms.first_carrier_offset + ue->frame_parms.nushift + 6*rb+(3*p),rxF[0],rxF[1]);
|
// printf("rx[%d][%d] -> (%d,%d)\n",p,ue->frame_parms.first_carrier_offset + ue->frame_parms.nushift + 6*rb+(3*p),rxF[0],rxF[1]);
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",26+pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",26+pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f,
|
multadd_real_vector_complex_scalar(f,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -479,16 +421,13 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot %d : rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",27+pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot %u : rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",27+pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2,
|
multadd_real_vector_complex_scalar(f2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -496,20 +435,15 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
printf("pilot 49: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 49: rxF -> (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(fr,
|
multadd_real_vector_complex_scalar(fr,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -517,28 +451,20 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
#ifdef DEBUG_CH
|
#ifdef DEBUG_CH
|
||||||
|
|
||||||
printf("pilot 50: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
printf("pilot 50: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
|
||||||
|
|
||||||
// ch[0] = 1024;
|
// ch[0] = 1024;
|
||||||
// ch[1] = -128;
|
// ch[1] = -128;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2r2,
|
multadd_real_vector_complex_scalar(f2r2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
24);
|
24);
|
||||||
|
|
||||||
} else if (ue->frame_parms.N_RB_DL==15) {
|
} else if (ue->frame_parms.N_RB_DL==15) {
|
||||||
|
|
||||||
//printf("First Half\n");
|
//printf("First Half\n");
|
||||||
for (rb=0; rb<28; rb+=4) {
|
for (rb=0; rb<28; rb+=4) {
|
||||||
|
|
||||||
//printf("aarx=%d\n",aarx);
|
//printf("aarx=%d\n",aarx);
|
||||||
//printf("pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
//printf("pilot[%d][%d] (%d,%d)\n",p,rb,pil[0],pil[1]);
|
||||||
//printf("rx[%d][%d] -> (%d,%d)\n",p,
|
//printf("rx[%d][%d] -> (%d,%d)\n",p,
|
||||||
@@ -555,7 +481,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
//printf("ch -> (%d,%d)\n",ch[0],ch[1]);
|
//printf("ch -> (%d,%d)\n",ch[0],ch[1]);
|
||||||
@@ -566,7 +491,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
@@ -578,13 +502,11 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
24);
|
24);
|
||||||
pil+=2; // Re Im
|
pil+=2; // Re Im
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
//printf("Second half\n");
|
//printf("Second half\n");
|
||||||
//Second half of RBs
|
//Second half of RBs
|
||||||
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+nushift + (3*p)))];
|
rxF = (int16_t *)&rxdataF[aarx][((symbol_offset+1+nushift + (3*p)))];
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2,
|
multadd_real_vector_complex_scalar(f2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -602,7 +524,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
// rxF[1]);
|
// rxF[1]);
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f,
|
multadd_real_vector_complex_scalar(f,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -610,10 +531,8 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=8;
|
dl_ch+=8;
|
||||||
|
|
||||||
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
|
||||||
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
|
||||||
|
|
||||||
multadd_real_vector_complex_scalar(f2,
|
multadd_real_vector_complex_scalar(f2,
|
||||||
ch,
|
ch,
|
||||||
dl_ch,
|
dl_ch,
|
||||||
@@ -621,17 +540,14 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
pil+=2;
|
pil+=2;
|
||||||
rxF+=12;
|
rxF+=12;
|
||||||
dl_ch+=16;
|
dl_ch+=16;
|
||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LOG_E(PHY,"channel estimation not implemented for ue->frame_parms.N_RB_DL = %d\n",ue->frame_parms.N_RB_DL);
|
LOG_E(PHY,"channel estimation not implemented for ue->frame_parms.N_RB_DL = %d\n",ue->frame_parms.N_RB_DL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (ue->perfect_ce == 0) {
|
if (ue->perfect_ce == 0) {
|
||||||
// Temporal Interpolation
|
// Temporal Interpolation
|
||||||
// printf("ch_offset %d\n",ch_offset);
|
// printf("ch_offset %d\n",ch_offset);
|
||||||
|
|
||||||
dl_ch = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][ch_offset];
|
dl_ch = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][ch_offset];
|
||||||
|
|
||||||
if (ue->high_speed_flag == 0) {
|
if (ue->high_speed_flag == 0) {
|
||||||
@@ -639,182 +555,155 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
|
|||||||
32767-ue->ch_est_alpha,
|
32767-ue->ch_est_alpha,
|
||||||
dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),0,ue->frame_parms.ofdm_symbol_size);
|
dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
} else { // high_speed_flag == 1
|
} else { // high_speed_flag == 1
|
||||||
if ((symbol == 0)) {
|
if ((symbol == 0)) {
|
||||||
// printf("Interpolating %d->0\n",4-ue->frame_parms.Ncp);
|
// printf("Interpolating %d->0\n",4-ue->frame_parms.Ncp);
|
||||||
// dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][(4-ue->frame_parms.Ncp)*(ue->frame_parms.ofdm_symbol_size)];
|
// dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][(4-ue->frame_parms.Ncp)*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
if(((Ns>>1)!=0) || ( ((Ns>>1)==0) && interpolateS11S12))
|
if(((Ns>>1)!=0) || ( ((Ns>>1)==0) && interpolateS11S12)) {
|
||||||
{
|
//LOG_I(PHY,"Interpolate s11-->s0 to get s12 and s13 Ns %d \n", Ns);
|
||||||
//LOG_I(PHY,"Interpolate s11-->s0 to get s12 and s13 Ns %d \n", Ns);
|
dl_ch_prev = (int16_t *)&dl_ch_estimates_previous[(p<<1)+aarx][pilot3*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
dl_ch_prev = (int16_t *)&dl_ch_estimates_previous[(p<<1)+aarx][pilot3*(ue->frame_parms.ofdm_symbol_size)];
|
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
}
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
interpolateS11S12 = 1;
|
||||||
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
} // this is 1/3,2/3 combination for pilots spaced by 3 symbols
|
||||||
|
else if (symbol == pilot1) {
|
||||||
|
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][0];
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
//LOG_I(PHY,"Interpolate s0-->s4 to get s1 s2 and s3 Ns %d \n", Ns);
|
||||||
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
if (ue->frame_parms.Ncp==0) {// pilot spacing 4 symbols (1/4,1/2,3/4 combination)
|
||||||
}
|
uint8_t previous_subframe;
|
||||||
|
|
||||||
interpolateS11S12 = 1;
|
if(Ns>>1 == 0)
|
||||||
} // this is 1/3,2/3 combination for pilots spaced by 3 symbols
|
previous_subframe = 9;
|
||||||
else if (symbol == pilot1) {
|
else
|
||||||
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][0];
|
previous_subframe = ((Ns>>1) - 1 )%9;
|
||||||
|
|
||||||
//LOG_I(PHY,"Interpolate s0-->s4 to get s1 s2 and s3 Ns %d \n", Ns);
|
|
||||||
if (ue->frame_parms.Ncp==0) {// pilot spacing 4 symbols (1/4,1/2,3/4 combination)
|
|
||||||
|
|
||||||
uint8_t previous_subframe;
|
|
||||||
if(Ns>>1 == 0)
|
|
||||||
previous_subframe = 9;
|
|
||||||
else
|
|
||||||
previous_subframe = ((Ns>>1) - 1 )%9;
|
|
||||||
|
|
||||||
if((subframe_select(&ue->frame_parms,previous_subframe) == SF_UL))
|
|
||||||
{
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,24576,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,8192,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,24576,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)<<1),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
} // pilot spacing 3 symbols (1/3,2/3 combination)
|
|
||||||
} else if (symbol == pilot2) {
|
|
||||||
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot1*(ue->frame_parms.ofdm_symbol_size)];
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
} else { // symbol == pilot3
|
|
||||||
// printf("Interpolating 0->%d\n",4-ue->frame_parms.Ncp);
|
|
||||||
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot2*(ue->frame_parms.ofdm_symbol_size)];
|
|
||||||
|
|
||||||
if (ue->frame_parms.Ncp==0) {// pilot spacing 4 symbols (1/4,1/2,3/4 combination)
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,24576,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,8192,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,24576,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
} else {
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)<<1),1,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
|
||||||
} // pilot spacing 3 symbols (1/3,2/3 combination)
|
|
||||||
|
|
||||||
if((ue->rx_offset_diff !=0) && ((Ns>>1) == 9))
|
|
||||||
{
|
|
||||||
//LOG_I(PHY,"Extrapolate s7-->s11 to get s12 and s13 Ns %d\n", Ns);
|
|
||||||
interpolateS11S12 = 0;
|
|
||||||
//LOG_E(PHY,"Interpolate s7--s11 s12 s13 pilot 3 Ns %d l %d symbol %d \n", Ns, l, symbol);
|
|
||||||
int16_t *dlChEst_ofdm11 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot3*(ue->frame_parms.ofdm_symbol_size)];
|
|
||||||
int16_t *dlChEst_ofdm7 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot2*(ue->frame_parms.ofdm_symbol_size)];
|
|
||||||
|
|
||||||
// interpolate ofdm s12: 5/4*ofdms11 + -1/4*ofdms7 5/4 q1.15 40960 -1/4 q1.15 8192
|
|
||||||
int16_t *dlChEst_ofdm12 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][12*ue->frame_parms.ofdm_symbol_size];
|
|
||||||
for(int i=0; i<(2*ue->frame_parms.ofdm_symbol_size); i++)
|
|
||||||
{
|
|
||||||
int64_t tmp_mult = 0;
|
|
||||||
tmp_mult = ((int64_t)dlChEst_ofdm11[i] * 40960 - (int64_t)dlChEst_ofdm7[i] * 8192);
|
|
||||||
|
|
||||||
tmp_mult = tmp_mult >> 15;
|
|
||||||
dlChEst_ofdm12[i] = tmp_mult;
|
|
||||||
}
|
|
||||||
|
|
||||||
// interpolate ofdm s13: 3/2*ofdms11 + -1/2*ofdms7 3/2 q1.15 49152 1/2 q1.15 16384
|
|
||||||
int16_t *dlChEst_ofdm13 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][13*ue->frame_parms.ofdm_symbol_size];
|
|
||||||
for(int i=0; i<(2*ue->frame_parms.ofdm_symbol_size); i++)
|
|
||||||
{
|
|
||||||
int64_t tmp_mult = 0;
|
|
||||||
tmp_mult = ((int64_t)dlChEst_ofdm11[i] * 49152 - (int64_t)dlChEst_ofdm7[i] * 16384);
|
|
||||||
|
|
||||||
tmp_mult = tmp_mult >> 15;
|
|
||||||
dlChEst_ofdm13[i] = tmp_mult;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if((subframe_select(&ue->frame_parms,previous_subframe) == SF_UL)) {
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,32440,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
} else {
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,24576,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,8192,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,24576,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,328,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)<<1),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
} // pilot spacing 3 symbols (1/3,2/3 combination)
|
||||||
|
} else if (symbol == pilot2) {
|
||||||
|
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot1*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
} else { // symbol == pilot3
|
||||||
|
// printf("Interpolating 0->%d\n",4-ue->frame_parms.Ncp);
|
||||||
|
dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot2*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
|
|
||||||
|
if (ue->frame_parms.Ncp==0) {// pilot spacing 4 symbols (1/4,1/2,3/4 combination)
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,24576,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,8192,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,16384,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,8192,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,24576,dl_ch_prev+(3*2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
} else {
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,10923,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch_prev,21845,dl_ch_prev+(2*(ue->frame_parms.ofdm_symbol_size)<<1),1,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
multadd_complex_vector_real_scalar(dl_ch,10923,dl_ch_prev+(2*((ue->frame_parms.ofdm_symbol_size)<<1)),0,ue->frame_parms.ofdm_symbol_size);
|
||||||
|
} // pilot spacing 3 symbols (1/3,2/3 combination)
|
||||||
|
|
||||||
|
if((ue->rx_offset_diff !=0) && ((Ns>>1) == 9)) {
|
||||||
|
//LOG_I(PHY,"Extrapolate s7-->s11 to get s12 and s13 Ns %d\n", Ns);
|
||||||
|
interpolateS11S12 = 0;
|
||||||
|
//LOG_E(PHY,"Interpolate s7--s11 s12 s13 pilot 3 Ns %d l %d symbol %d \n", Ns, l, symbol);
|
||||||
|
int16_t *dlChEst_ofdm11 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot3*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
|
int16_t *dlChEst_ofdm7 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][pilot2*(ue->frame_parms.ofdm_symbol_size)];
|
||||||
|
// interpolate ofdm s12: 5/4*ofdms11 + -1/4*ofdms7 5/4 q1.15 40960 -1/4 q1.15 8192
|
||||||
|
int16_t *dlChEst_ofdm12 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][12*ue->frame_parms.ofdm_symbol_size];
|
||||||
|
|
||||||
|
for(int i=0; i<(2*ue->frame_parms.ofdm_symbol_size); i++) {
|
||||||
|
int64_t tmp_mult = 0;
|
||||||
|
tmp_mult = ((int64_t)dlChEst_ofdm11[i] * 40960 - (int64_t)dlChEst_ofdm7[i] * 8192);
|
||||||
|
tmp_mult = tmp_mult >> 15;
|
||||||
|
dlChEst_ofdm12[i] = tmp_mult;
|
||||||
|
}
|
||||||
|
|
||||||
|
// interpolate ofdm s13: 3/2*ofdms11 + -1/2*ofdms7 3/2 q1.15 49152 1/2 q1.15 16384
|
||||||
|
int16_t *dlChEst_ofdm13 = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][13*ue->frame_parms.ofdm_symbol_size];
|
||||||
|
|
||||||
|
for(int i=0; i<(2*ue->frame_parms.ofdm_symbol_size); i++) {
|
||||||
|
int64_t tmp_mult = 0;
|
||||||
|
tmp_mult = ((int64_t)dlChEst_ofdm11[i] * 49152 - (int64_t)dlChEst_ofdm7[i] * 16384);
|
||||||
|
tmp_mult = tmp_mult >> 15;
|
||||||
|
dlChEst_ofdm13[i] = tmp_mult;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void (*idft)(int16_t *,int16_t *, int);
|
void (*idft)(int16_t *,int16_t *, int);
|
||||||
|
|
||||||
switch (ue->frame_parms.ofdm_symbol_size) {
|
switch (ue->frame_parms.ofdm_symbol_size) {
|
||||||
case 128:
|
case 128:
|
||||||
idft = idft128;
|
idft = idft128;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 256:
|
case 256:
|
||||||
idft = idft256;
|
idft = idft256;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 512:
|
case 512:
|
||||||
idft = idft512;
|
idft = idft512;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1024:
|
case 1024:
|
||||||
idft = idft1024;
|
idft = idft1024;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1536:
|
case 1536:
|
||||||
idft = idft1536;
|
idft = idft1536;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2048:
|
case 2048:
|
||||||
idft = idft2048;
|
idft = idft2048;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
idft = idft512;
|
idft = idft512;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( ((Ns%2) == 0) && (l == pilot0))
|
if( ((Ns%2) == 0) && (l == pilot0)) {
|
||||||
{
|
// do ifft of channel estimate
|
||||||
// do ifft of channel estimate
|
for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++)
|
||||||
for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++)
|
for (p=0; p<ue->frame_parms.nb_antenna_ports_eNB; p++) {
|
||||||
for (p=0; p<ue->frame_parms.nb_antenna_ports_eNB; p++) {
|
if (ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx]) {
|
||||||
if (ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx])
|
//LOG_I(PHY,"Channel Impulse Computation Slot %d ThreadId %d Symbol %d \n", Ns, ue->current_thread_id[Ns>>1], l);
|
||||||
{
|
idft((int16_t *) &ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx][8],
|
||||||
//LOG_I(PHY,"Channel Impulse Computation Slot %d ThreadId %d Symbol %d \n", Ns, ue->current_thread_id[Ns>>1], l);
|
(int16_t *) ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates_time[eNB_offset][(p<<1)+aarx],1);
|
||||||
idft((int16_t*) &ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset][(p<<1)+aarx][8],
|
}
|
||||||
(int16_t*) ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates_time[eNB_offset][(p<<1)+aarx],1);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
T(T_UE_PHY_DL_CHANNEL_ESTIMATE, T_INT(eNB_id),
|
T(T_UE_PHY_DL_CHANNEL_ESTIMATE, T_INT(eNB_id),
|
||||||
T_INT(ue->proc.proc_rxtx[ue->current_thread_id[Ns>>1]].frame_rx%1024), T_INT(ue->proc.proc_rxtx[ue->current_thread_id[Ns>>1]].subframe_rx),
|
T_INT(ue->proc.proc_rxtx[ue->current_thread_id[Ns>>1]].frame_rx%1024), T_INT(ue->proc.proc_rxtx[ue->current_thread_id[Ns>>1]].subframe_rx),
|
||||||
T_INT(0), T_BUFFER(&ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates_time[eNB_offset][0][0], 512 * 4));
|
T_INT(0), T_BUFFER(&ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates_time[eNB_offset][0][0], 512 * 4));
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+341
-339
@@ -39,25 +39,22 @@
|
|||||||
#include "prach_extern.h"
|
#include "prach_extern.h"
|
||||||
|
|
||||||
#if (LTE_RRC_VERSION < MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION < MAKE_VERSION(14, 0, 0))
|
||||||
#define rx_prach0 rx_prach
|
#define rx_prach0 rx_prach
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void rx_prach0(PHY_VARS_eNB *eNB,
|
void rx_prach0(PHY_VARS_eNB *eNB,
|
||||||
RU_t *ru,
|
RU_t *ru,
|
||||||
uint16_t *max_preamble,
|
uint16_t *max_preamble,
|
||||||
uint16_t *max_preamble_energy,
|
uint16_t *max_preamble_energy,
|
||||||
uint16_t *max_preamble_delay,
|
uint16_t *max_preamble_delay,
|
||||||
uint16_t Nf,
|
uint16_t Nf,
|
||||||
uint8_t tdd_mapindex
|
uint8_t tdd_mapindex
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
,uint8_t br_flag,
|
,uint8_t br_flag,
|
||||||
uint8_t ce_level
|
uint8_t ce_level
|
||||||
#endif
|
#endif
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
LTE_DL_FRAME_PARMS *fp;
|
LTE_DL_FRAME_PARMS *fp;
|
||||||
lte_frame_type_t frame_type;
|
lte_frame_type_t frame_type;
|
||||||
uint16_t rootSequenceIndex;
|
uint16_t rootSequenceIndex;
|
||||||
@@ -69,7 +66,6 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
int16_t *prachF=NULL;
|
int16_t *prachF=NULL;
|
||||||
int16_t **rxsigF=NULL;
|
int16_t **rxsigF=NULL;
|
||||||
int nb_rx;
|
int nb_rx;
|
||||||
|
|
||||||
int16_t *prach2;
|
int16_t *prach2;
|
||||||
uint8_t preamble_index;
|
uint8_t preamble_index;
|
||||||
uint16_t NCS,NCS2;
|
uint16_t NCS,NCS2;
|
||||||
@@ -93,54 +89,50 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
int16_t levdB;
|
int16_t levdB;
|
||||||
int fft_size,log2_ifft_size;
|
int fft_size,log2_ifft_size;
|
||||||
int16_t prach_ifft_tmp[2048*2] __attribute__((aligned(32)));
|
int16_t prach_ifft_tmp[2048*2] __attribute__((aligned(32)));
|
||||||
int32_t *prach_ifft=(int32_t*)NULL;
|
int32_t *prach_ifft=(int32_t *)NULL;
|
||||||
int32_t **prach_ifftp=(int32_t **)NULL;
|
int32_t **prach_ifftp=(int32_t **)NULL;
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
int prach_ifft_cnt=0;
|
int prach_ifft_cnt=0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if (ru) {
|
if (ru) {
|
||||||
fp = &ru->frame_parms;
|
fp = &ru->frame_parms;
|
||||||
nb_rx = ru->nb_rx;
|
nb_rx = ru->nb_rx;
|
||||||
}
|
} else if (eNB) {
|
||||||
else if (eNB) {
|
|
||||||
fp = &eNB->frame_parms;
|
fp = &eNB->frame_parms;
|
||||||
nb_rx = fp->nb_antennas_rx;
|
nb_rx = fp->nb_antennas_rx;
|
||||||
}
|
} else AssertFatal(1==0,"rx_prach called without valid RU or eNB descriptor\n");
|
||||||
else AssertFatal(1==0,"rx_prach called without valid RU or eNB descriptor\n");
|
|
||||||
|
|
||||||
frame_type = fp->frame_type;
|
frame_type = fp->frame_type;
|
||||||
|
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
if (br_flag == 1) {
|
if (br_flag == 1) {
|
||||||
AssertFatal(fp->prach_emtc_config_common.prach_Config_enabled==1,
|
AssertFatal(fp->prach_emtc_config_common.prach_Config_enabled==1,
|
||||||
"emtc prach_Config is not enabled\n");
|
"emtc prach_Config is not enabled\n");
|
||||||
AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1,
|
AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1,
|
||||||
"ce_level %d is not active\n",ce_level);
|
"ce_level %d is not active\n",ce_level);
|
||||||
rootSequenceIndex = fp->prach_emtc_config_common.rootSequenceIndex;
|
rootSequenceIndex = fp->prach_emtc_config_common.rootSequenceIndex;
|
||||||
prach_ConfigIndex = fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[ce_level];
|
prach_ConfigIndex = fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[ce_level];
|
||||||
Ncs_config = fp->prach_emtc_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
|
Ncs_config = fp->prach_emtc_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
|
||||||
restricted_set = fp->prach_emtc_config_common.prach_ConfigInfo.highSpeedFlag;
|
restricted_set = fp->prach_emtc_config_common.prach_ConfigInfo.highSpeedFlag;
|
||||||
n_ra_prb = get_prach_prb_offset(fp,prach_ConfigIndex,
|
n_ra_prb = get_prach_prb_offset(fp,prach_ConfigIndex,
|
||||||
fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
|
fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
|
||||||
tdd_mapindex,Nf);
|
tdd_mapindex,Nf);
|
||||||
// update pointers to results for ce_level
|
// update pointers to results for ce_level
|
||||||
max_preamble += ce_level;
|
max_preamble += ce_level;
|
||||||
max_preamble_energy += ce_level;
|
max_preamble_energy += ce_level;
|
||||||
max_preamble_delay += ce_level;
|
max_preamble_delay += ce_level;
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
rootSequenceIndex = fp->prach_config_common.rootSequenceIndex;
|
rootSequenceIndex = fp->prach_config_common.rootSequenceIndex;
|
||||||
prach_ConfigIndex = fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
|
prach_ConfigIndex = fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
|
||||||
Ncs_config = fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
|
Ncs_config = fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
|
||||||
restricted_set = fp->prach_config_common.prach_ConfigInfo.highSpeedFlag;
|
restricted_set = fp->prach_config_common.prach_ConfigInfo.highSpeedFlag;
|
||||||
n_ra_prb = get_prach_prb_offset(fp,prach_ConfigIndex,
|
n_ra_prb = get_prach_prb_offset(fp,prach_ConfigIndex,
|
||||||
fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,
|
fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,
|
||||||
tdd_mapindex,Nf);
|
tdd_mapindex,Nf);
|
||||||
}
|
}
|
||||||
|
|
||||||
int16_t *prach[nb_rx];
|
int16_t *prach[nb_rx];
|
||||||
uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
|
uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
|
||||||
@@ -148,51 +140,57 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
|
|
||||||
if (eNB) {
|
if (eNB) {
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
if (br_flag == 1) {
|
if (br_flag == 1) {
|
||||||
prach_ifftp = eNB->prach_vars_br.prach_ifft[ce_level];
|
prach_ifftp = eNB->prach_vars_br.prach_ifft[ce_level];
|
||||||
subframe = eNB->proc.subframe_prach_br;
|
subframe = eNB->proc.subframe_prach_br;
|
||||||
prachF = eNB->prach_vars_br.prachF;
|
prachF = eNB->prach_vars_br.prachF;
|
||||||
rxsigF = eNB->prach_vars_br.rxsigF[ce_level];
|
rxsigF = eNB->prach_vars_br.rxsigF[ce_level];
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
|
||||||
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d, rootSequenceIndex %d, repetition number %d,numRepetitionsPrePreambleAttempt %d\n",
|
|
||||||
br_flag,ce_level,ru->proc.frame_prach,subframe,
|
|
||||||
fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
|
|
||||||
prach_ConfigIndex,rootSequenceIndex,
|
|
||||||
eNB->prach_vars_br.repetition_number[ce_level],
|
|
||||||
fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level]);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
prach_ifftp = eNB->prach_vars.prach_ifft[0];
|
|
||||||
subframe = eNB->proc.subframe_prach;
|
|
||||||
prachF = eNB->prach_vars.prachF;
|
|
||||||
rxsigF = eNB->prach_vars.rxsigF[0];
|
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
|
||||||
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d , rootSequenceIndex %d\n", subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex,rootSequenceIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
|
||||||
if (br_flag == 1) {
|
|
||||||
subframe = ru->proc.subframe_prach_br;
|
|
||||||
rxsigF = ru->prach_rxsigF_br[ce_level];
|
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
|
||||||
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
|
|
||||||
br_flag,ce_level,ru->proc.frame_prach,subframe,fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],prach_ConfigIndex);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
subframe = ru->proc.subframe_prach;
|
|
||||||
rxsigF = ru->prach_rxsigF;
|
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
|
||||||
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
|
|
||||||
subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,
|
||||||
|
"PRACH (eNB) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d, rootSequenceIndex %d, repetition number %d,numRepetitionsPrePreambleAttempt %d\n",
|
||||||
|
br_flag,ce_level,ru->proc.frame_prach,subframe,
|
||||||
|
fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
|
||||||
|
prach_ConfigIndex,rootSequenceIndex,
|
||||||
|
eNB->prach_vars_br.repetition_number[ce_level],
|
||||||
|
fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level]);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
prach_ifftp = eNB->prach_vars.prach_ifft[0];
|
||||||
|
subframe = eNB->proc.subframe_prach;
|
||||||
|
prachF = eNB->prach_vars.prachF;
|
||||||
|
rxsigF = eNB->prach_vars.rxsigF[0];
|
||||||
|
|
||||||
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d , rootSequenceIndex %d\n", subframe,
|
||||||
|
fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex,rootSequenceIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
|
if (br_flag == 1) {
|
||||||
|
subframe = ru->proc.subframe_prach_br;
|
||||||
|
rxsigF = ru->prach_rxsigF_br[ce_level];
|
||||||
|
|
||||||
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
|
||||||
|
br_flag,ce_level,ru->proc.frame_prach,subframe,fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],prach_ConfigIndex);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
subframe = ru->proc.subframe_prach;
|
||||||
|
rxsigF = ru->prach_rxsigF;
|
||||||
|
|
||||||
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
|
||||||
|
subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
AssertFatal(ru!=NULL,"ru is null\n");
|
AssertFatal(ru!=NULL,"ru is null\n");
|
||||||
@@ -200,25 +198,29 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
for (aa=0; aa<nb_rx; aa++) {
|
for (aa=0; aa<nb_rx; aa++) {
|
||||||
if (ru->if_south == LOCAL_RF) { // set the time-domain signal if we have to use it in this node
|
if (ru->if_south == LOCAL_RF) { // set the time-domain signal if we have to use it in this node
|
||||||
// DJP - indexing below in subframe zero takes us off the beginning of the array???
|
// DJP - indexing below in subframe zero takes us off the beginning of the array???
|
||||||
prach[aa] = (int16_t*)&ru->common.rxdata[aa][(subframe*fp->samples_per_tti)-ru->N_TA_offset];
|
prach[aa] = (int16_t *)&ru->common.rxdata[aa][(subframe*fp->samples_per_tti)-ru->N_TA_offset];
|
||||||
|
|
||||||
|
if (LOG_DUMPFLAG(PRACH)) {
|
||||||
|
int32_t en0=signal_energy((int32_t *)prach[aa],fp->samples_per_tti);
|
||||||
|
int8_t dbEn0 = dB_fixed(en0);
|
||||||
|
int8_t rach_dBm = dbEn0 - ru->rx_total_gain_dB;
|
||||||
|
char buffer[80];
|
||||||
|
|
||||||
|
if (dbEn0>32 && prach[0]!= NULL) {
|
||||||
|
static int counter=0;
|
||||||
|
sprintf(buffer, "%s%d", "/tmp/prach_rx",counter);
|
||||||
|
LOG_M(buffer,"prach_rx",prach[0],fp->samples_per_tti,1,13);
|
||||||
|
}
|
||||||
|
|
||||||
if (LOG_DUMPFLAG(PRACH)){
|
|
||||||
int32_t en0=signal_energy((int32_t*)prach[aa],fp->samples_per_tti);
|
|
||||||
int8_t dbEn0 = dB_fixed(en0);
|
|
||||||
int8_t rach_dBm = dbEn0 - ru->rx_total_gain_dB;
|
|
||||||
char buffer[80];
|
|
||||||
if (dbEn0>32 && prach[0]!= NULL) {
|
|
||||||
static int counter=0;
|
|
||||||
sprintf(buffer, "%s%d", "/tmp/prach_rx",counter);
|
|
||||||
LOG_M(buffer,"prach_rx",prach[0],fp->samples_per_tti,1,13);
|
|
||||||
}
|
|
||||||
if (dB_fixed(en0)>32) {
|
if (dB_fixed(en0)>32) {
|
||||||
sprintf(buffer, "rach_dBm:%d",rach_dBm);
|
sprintf(buffer, "rach_dBm:%d",rach_dBm);
|
||||||
|
|
||||||
if (prach[0]!= NULL) LOG_M("prach_rx","prach_rx",prach[0],fp->samples_per_tti,1,1);
|
if (prach[0]!= NULL) LOG_M("prach_rx","prach_rx",prach[0],fp->samples_per_tti,1,1);
|
||||||
LOG_I(PHY,"RU %d, br_flag %d ce_level %d frame %d subframe %d per_tti:%d prach:%p (energy %d) TA:%d %s rxdata:%p index:%d\n",
|
|
||||||
ru->idx,br_flag,ce_level,ru->proc.frame_prach,subframe,fp->samples_per_tti,
|
LOG_I(PHY,"RU %d, br_flag %d ce_level %d frame %d subframe %d per_tti:%d prach:%p (energy %d) TA:%d %s rxdata:%p index:%d\n",
|
||||||
prach[aa],dbEn0,ru->N_TA_offset,buffer,ru->common.rxdata[aa],
|
ru->idx,br_flag,ce_level,ru->proc.frame_prach,subframe,fp->samples_per_tti,
|
||||||
(subframe*fp->samples_per_tti)-ru->N_TA_offset);
|
prach[aa],dbEn0,ru->N_TA_offset,buffer,ru->common.rxdata[aa],
|
||||||
|
(subframe*fp->samples_per_tti)-ru->N_TA_offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -227,19 +229,17 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
// First compute physical root sequence
|
// First compute physical root sequence
|
||||||
if (restricted_set == 0) {
|
if (restricted_set == 0) {
|
||||||
AssertFatal(Ncs_config<=15,
|
AssertFatal(Ncs_config<=15,
|
||||||
"Illegal Ncs_config for unrestricted format %d\n",Ncs_config);
|
"Illegal Ncs_config for unrestricted format %d\n",Ncs_config);
|
||||||
NCS = NCS_unrestricted[Ncs_config];
|
NCS = NCS_unrestricted[Ncs_config];
|
||||||
} else {
|
} else {
|
||||||
AssertFatal(Ncs_config<=14,
|
AssertFatal(Ncs_config<=14,
|
||||||
"FATAL, Illegal Ncs_config for restricted format %d\n",Ncs_config);
|
"FATAL, Illegal Ncs_config for restricted format %d\n",Ncs_config);
|
||||||
NCS = NCS_restricted[Ncs_config];
|
NCS = NCS_restricted[Ncs_config];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eNB) start_meas(&eNB->rx_prach);
|
if (eNB) start_meas(&eNB->rx_prach);
|
||||||
|
|
||||||
|
|
||||||
prach_root_sequence_map = (prach_fmt < 4) ? prach_root_sequence_map0_3 : prach_root_sequence_map4;
|
prach_root_sequence_map = (prach_fmt < 4) ? prach_root_sequence_map0_3 : prach_root_sequence_map4;
|
||||||
|
|
||||||
// PDP is oversampled, e.g. 1024 sample instead of 839
|
// PDP is oversampled, e.g. 1024 sample instead of 839
|
||||||
// Adapt the NCS (zero-correlation zones) with oversampling factor e.g. 1024/839
|
// Adapt the NCS (zero-correlation zones) with oversampling factor e.g. 1024/839
|
||||||
NCS2 = (N_ZC==839) ? ((NCS<<10)/839) : ((NCS<<8)/139);
|
NCS2 = (N_ZC==839) ? ((NCS<<10)/839) : ((NCS<<8)/139);
|
||||||
@@ -248,56 +248,56 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
NCS2 = N_ZC;
|
NCS2 = N_ZC;
|
||||||
|
|
||||||
switch (prach_fmt) {
|
switch (prach_fmt) {
|
||||||
case 0:
|
case 0:
|
||||||
Ncp = 3168;
|
Ncp = 3168;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
case 3:
|
case 3:
|
||||||
Ncp = 21024;
|
Ncp = 21024;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
Ncp = 6240;
|
Ncp = 6240;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
Ncp = 448;
|
Ncp = 448;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Ncp = 3168;
|
Ncp = 3168;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjust CP length based on UL bandwidth
|
// Adjust CP length based on UL bandwidth
|
||||||
switch (fp->N_RB_UL) {
|
switch (fp->N_RB_UL) {
|
||||||
case 6:
|
case 6:
|
||||||
Ncp>>=4;
|
Ncp>>=4;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 15:
|
case 15:
|
||||||
Ncp>>=3;
|
Ncp>>=3;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 25:
|
case 25:
|
||||||
Ncp>>=2;
|
Ncp>>=2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 50:
|
case 50:
|
||||||
Ncp>>=1;
|
Ncp>>=1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 75:
|
case 75:
|
||||||
Ncp=(Ncp*3)>>2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 100:
|
|
||||||
if (fp->threequarter_fs == 1)
|
|
||||||
Ncp=(Ncp*3)>>2;
|
Ncp=(Ncp*3)>>2;
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
|
case 100:
|
||||||
|
if (fp->threequarter_fs == 1)
|
||||||
|
Ncp=(Ncp*3)>>2;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (((eNB!=NULL) && (ru->function != NGFI_RAU_IF4p5))||
|
if (((eNB!=NULL) && (ru->function != NGFI_RAU_IF4p5))||
|
||||||
((eNB==NULL) && (ru->function == NGFI_RRU_IF4p5))) { // compute the DFTs of the PRACH temporal resources
|
((eNB==NULL) && (ru->function == NGFI_RRU_IF4p5))) { // compute the DFTs of the PRACH temporal resources
|
||||||
@@ -305,104 +305,105 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
if (LOG_DEBUGFLAG(PRACH)) {
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
LOG_D(PHY,"rx_prach: Doing FFT for N_RB_UL %d nb_rx:%d Ncp:%d\n",fp->N_RB_UL, nb_rx, Ncp);
|
LOG_D(PHY,"rx_prach: Doing FFT for N_RB_UL %d nb_rx:%d Ncp:%d\n",fp->N_RB_UL, nb_rx, Ncp);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (aa=0; aa<nb_rx; aa++) {
|
for (aa=0; aa<nb_rx; aa++) {
|
||||||
AssertFatal(prach[aa]!=NULL,"prach[%d] is null\n",aa);
|
AssertFatal(prach[aa]!=NULL,"prach[%d] is null\n",aa);
|
||||||
prach2 = prach[aa] + (Ncp<<1);
|
prach2 = prach[aa] + (Ncp<<1);
|
||||||
|
|
||||||
// do DFT
|
// do DFT
|
||||||
switch (fp->N_RB_UL) {
|
switch (fp->N_RB_UL) {
|
||||||
case 6:
|
case 6:
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft256(prach2,rxsigF[aa],1);
|
dft256(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft1536(prach2,rxsigF[aa],1);
|
dft1536(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft1536(prach2+3072,rxsigF[aa]+3072,1);
|
dft1536(prach2+3072,rxsigF[aa]+3072,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 15:
|
case 15:
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft256(prach2,rxsigF[aa],1);
|
dft256(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft3072(prach2,rxsigF[aa],1);
|
dft3072(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft3072(prach2+6144,rxsigF[aa]+6144,1);
|
dft3072(prach2+6144,rxsigF[aa]+6144,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 25:
|
case 25:
|
||||||
default:
|
default:
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft1024(prach2,rxsigF[aa],1);
|
dft1024(prach2,rxsigF[aa],1);
|
||||||
fft_size = 1024;
|
fft_size = 1024;
|
||||||
} else {
|
} else {
|
||||||
dft6144(prach2,rxsigF[aa],1);
|
dft6144(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft6144(prach2+12288,rxsigF[aa]+12288,1);
|
dft6144(prach2+12288,rxsigF[aa]+12288,1);
|
||||||
|
|
||||||
fft_size = 6144;
|
fft_size = 6144;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 50:
|
case 50:
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft2048(prach2,rxsigF[aa],1);
|
dft2048(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft12288(prach2,rxsigF[aa],1);
|
dft12288(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft12288(prach2+24576,rxsigF[aa]+24576,1);
|
dft12288(prach2+24576,rxsigF[aa]+24576,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 75:
|
case 75:
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft3072(prach2,rxsigF[aa],1);
|
dft3072(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft18432(prach2,rxsigF[aa],1);
|
dft18432(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft18432(prach2+36864,rxsigF[aa]+36864,1);
|
dft18432(prach2+36864,rxsigF[aa]+36864,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 100:
|
case 100:
|
||||||
if (fp->threequarter_fs==0) {
|
if (fp->threequarter_fs==0) {
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft4096(prach2,rxsigF[aa],1);
|
dft4096(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft24576(prach2,rxsigF[aa],1);
|
dft24576(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft24576(prach2+49152,rxsigF[aa]+49152,1);
|
dft24576(prach2+49152,rxsigF[aa]+49152,1);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (prach_fmt == 4) {
|
if (prach_fmt == 4) {
|
||||||
dft3072(prach2,rxsigF[aa],1);
|
dft3072(prach2,rxsigF[aa],1);
|
||||||
} else {
|
} else {
|
||||||
dft18432(prach2,rxsigF[aa],1);
|
dft18432(prach2,rxsigF[aa],1);
|
||||||
|
|
||||||
if (prach_fmt>1)
|
if (prach_fmt>1)
|
||||||
dft18432(prach2+36864,rxsigF[aa]+36864,1);
|
dft18432(prach2+36864,rxsigF[aa]+36864,1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
k = (12*n_ra_prb) - 6*fp->N_RB_UL;
|
k = (12*n_ra_prb) - 6*fp->N_RB_UL;
|
||||||
|
|
||||||
if (k<0) {
|
if (k<0) {
|
||||||
k+=(fp->ofdm_symbol_size);
|
k+=(fp->ofdm_symbol_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
k*=12;
|
k*=12;
|
||||||
@@ -412,71 +413,68 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
//LOG_D(PHY,"Shifting prach_rxF from %d to 0\n",k);
|
//LOG_D(PHY,"Shifting prach_rxF from %d to 0\n",k);
|
||||||
|
|
||||||
if ((k+(839*2)) > dftsize_x2) { // PRACH signal is split around DC
|
if ((k+(839*2)) > dftsize_x2) { // PRACH signal is split around DC
|
||||||
memmove((void*)&rxsigF[aa][dftsize_x2-k],(void*)&rxsigF[aa][0],(k+(839*2)-dftsize_x2)*2);
|
memmove((void *)&rxsigF[aa][dftsize_x2-k],(void *)&rxsigF[aa][0],(k+(839*2)-dftsize_x2)*2);
|
||||||
memmove((void*)&rxsigF[aa][0],(void*)(&rxsigF[aa][k]),(dftsize_x2-k)*2);
|
memmove((void *)&rxsigF[aa][0],(void *)(&rxsigF[aa][k]),(dftsize_x2-k)*2);
|
||||||
}
|
} else // PRACH signal is not split around DC
|
||||||
else // PRACH signal is not split around DC
|
memmove((void *)&rxsigF[aa][0],(void *)(&rxsigF[aa][k]),839*4);
|
||||||
memmove((void*)&rxsigF[aa][0],(void*)(&rxsigF[aa][k]),839*4);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((eNB==NULL) && (ru!=NULL) && ru->function == NGFI_RRU_IF4p5) {
|
if ((eNB==NULL) && ru->function == NGFI_RRU_IF4p5) {
|
||||||
|
|
||||||
/// **** send_IF4 of rxsigF to RAU **** ///
|
/// **** send_IF4 of rxsigF to RAU **** ///
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
if (br_flag == 1) send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH+1+ce_level);
|
if (br_flag == 1) send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH+1+ce_level);
|
||||||
|
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH);
|
send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else if (eNB!=NULL) {
|
} else if (eNB!=NULL) {
|
||||||
|
|
||||||
if ( LOG_DEBUGFLAG(PRACH)) {
|
if ( LOG_DEBUGFLAG(PRACH)) {
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
|
|
||||||
if ((en > 60)&&(br_flag==1)) LOG_I(PHY,"PRACH (br_flag %d,ce_level %d, n_ra_prb %d, k %d): Frame %d, Subframe %d => %d dB\n",br_flag,ce_level,n_ra_prb,k,eNB->proc.frame_rx,eNB->proc.subframe_rx,en);
|
if ((en > 60)&&(br_flag==1)) LOG_I(PHY,"PRACH (br_flag %d,ce_level %d, n_ra_prb %d, k %d): Frame %d, Subframe %d => %d dB\n",br_flag,ce_level,n_ra_prb,k,eNB->proc.frame_rx,eNB->proc.subframe_rx,en);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// in case of RAU and prach received rx_thread wakes up prach
|
// in case of RAU and prach received rx_thread wakes up prach
|
||||||
|
|
||||||
// here onwards is for eNodeB_3GPP or NGFI_RAU_IF4p5
|
// here onwards is for eNodeB_3GPP or NGFI_RAU_IF4p5
|
||||||
|
|
||||||
preamble_offset_old = 99;
|
preamble_offset_old = 99;
|
||||||
|
|
||||||
uint8_t update_TA = 4;
|
uint8_t update_TA = 4;
|
||||||
uint8_t update_TA2 = 1;
|
uint8_t update_TA2 = 1;
|
||||||
|
|
||||||
switch (eNB->frame_parms.N_RB_DL) {
|
switch (eNB->frame_parms.N_RB_DL) {
|
||||||
case 6:
|
case 6:
|
||||||
update_TA = 16;
|
update_TA = 16;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 25:
|
case 25:
|
||||||
update_TA = 4;
|
update_TA = 4;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 50:
|
case 50:
|
||||||
update_TA = 2;
|
update_TA = 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 75:
|
case 75:
|
||||||
update_TA = 3;
|
update_TA = 3;
|
||||||
update_TA2 = 2;
|
update_TA2 = 2;
|
||||||
case 100:
|
break;
|
||||||
update_TA = 1;
|
|
||||||
break;
|
case 100:
|
||||||
|
update_TA = 1;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
*max_preamble_energy=0;
|
*max_preamble_energy=0;
|
||||||
for (preamble_index=0 ; preamble_index<64 ; preamble_index++) {
|
|
||||||
|
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
for (preamble_index=0 ; preamble_index<64 ; preamble_index++) {
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
|
|
||||||
if (en>60) LOG_I(PHY,"frame %d, subframe %d : Trying preamble %d (br_flag %d)\n",ru->proc.frame_prach,subframe,preamble_index,br_flag);
|
if (en>60) LOG_I(PHY,"frame %d, subframe %d : Trying preamble %d (br_flag %d)\n",ru->proc.frame_prach,subframe,preamble_index,br_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (restricted_set == 0) {
|
if (restricted_set == 0) {
|
||||||
// This is the relative offset in the root sequence table (5.7.2-4 from 36.211) for the given preamble index
|
// This is the relative offset in the root sequence table (5.7.2-4 from 36.211) for the given preamble index
|
||||||
preamble_offset = ((NCS==0)? preamble_index : (preamble_index/(N_ZC/NCS)));
|
preamble_offset = ((NCS==0)? preamble_index : (preamble_index/(N_ZC/NCS)));
|
||||||
@@ -486,9 +484,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
new_dft = 1;
|
new_dft = 1;
|
||||||
// This is the \nu corresponding to the preamble index
|
// This is the \nu corresponding to the preamble index
|
||||||
preamble_shift = 0;
|
preamble_shift = 0;
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else {
|
|
||||||
preamble_shift -= NCS;
|
preamble_shift -= NCS;
|
||||||
|
|
||||||
if (preamble_shift < 0)
|
if (preamble_shift < 0)
|
||||||
@@ -519,7 +515,6 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
}
|
}
|
||||||
|
|
||||||
u = prach_root_sequence_map[index];
|
u = prach_root_sequence_map[index];
|
||||||
|
|
||||||
uint16_t n_group_ra = 0;
|
uint16_t n_group_ra = 0;
|
||||||
|
|
||||||
if ( (du[u]<(N_ZC/3)) && (du[u]>=NCS) ) {
|
if ( (du[u]<(N_ZC/3)) && (du[u]>=NCS) ) {
|
||||||
@@ -560,67 +555,75 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
|
|
||||||
// Compute DFT of RX signal (conjugate input, results in conjugate output) for each new rootSequenceIndex
|
// Compute DFT of RX signal (conjugate input, results in conjugate output) for each new rootSequenceIndex
|
||||||
if (LOG_DEBUGFLAG(PRACH)) {
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
|
|
||||||
if (en>60) LOG_I(PHY,"frame %d, subframe %d : preamble index %d: offset %d, preamble shift %d (br_flag %d, en %d)\n",
|
if (en>60) LOG_I(PHY,"frame %d, subframe %d : preamble index %d: offset %d, preamble shift %d (br_flag %d, en %d)\n",
|
||||||
ru->proc.frame_prach,subframe,preamble_index,preamble_offset,preamble_shift,br_flag,en);
|
ru->proc.frame_prach,subframe,preamble_index,preamble_offset,preamble_shift,br_flag,en);
|
||||||
}
|
}
|
||||||
|
|
||||||
log2_ifft_size = 10;
|
log2_ifft_size = 10;
|
||||||
fft_size = 6144;
|
fft_size = 6144;
|
||||||
|
|
||||||
if (new_dft == 1) {
|
if (new_dft == 1) {
|
||||||
new_dft = 0;
|
new_dft = 0;
|
||||||
|
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
if (br_flag == 1) {
|
if (br_flag == 1) {
|
||||||
Xu=(int16_t*)eNB->X_u_br[ce_level][preamble_offset-first_nonzero_root_idx];
|
Xu=(int16_t *)eNB->X_u_br[ce_level][preamble_offset-first_nonzero_root_idx];
|
||||||
prach_ifft = prach_ifftp[prach_ifft_cnt++];
|
prach_ifft = prach_ifftp[prach_ifft_cnt++];
|
||||||
if (eNB->prach_vars_br.repetition_number[ce_level]==1) memset(prach_ifft,0,((N_ZC==839)?2048:256)*sizeof(int32_t));
|
|
||||||
}
|
if (eNB->prach_vars_br.repetition_number[ce_level]==1) memset(prach_ifft,0,((N_ZC==839)?2048:256)*sizeof(int32_t));
|
||||||
else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
Xu=(int16_t*)eNB->X_u[preamble_offset-first_nonzero_root_idx];
|
Xu=(int16_t *)eNB->X_u[preamble_offset-first_nonzero_root_idx];
|
||||||
prach_ifft = prach_ifftp[0];
|
prach_ifft = prach_ifftp[0];
|
||||||
memset(prach_ifft,0,((N_ZC==839) ? 2048 : 256)*sizeof(int32_t));
|
memset(prach_ifft,0,((N_ZC==839) ? 2048 : 256)*sizeof(int32_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(prachF, 0, sizeof(int16_t)*2*1024 );
|
memset(prachF, 0, sizeof(int16_t)*2*1024 );
|
||||||
|
|
||||||
if (LOG_DUMPFLAG(PRACH)) {
|
if (LOG_DUMPFLAG(PRACH)) {
|
||||||
if (prach[0]!= NULL) LOG_M("prach_rx0.m","prach_rx0",prach[0],6144+792,1,1);
|
if (prach[0]!= NULL) LOG_M("prach_rx0.m","prach_rx0",prach[0],6144+792,1,1);
|
||||||
LOG_M("prach_rx1.m","prach_rx1",prach[1],6144+792,1,1);
|
|
||||||
LOG_M("prach_rxF0.m","prach_rxF0",rxsigF[0],24576,1,1);
|
LOG_M("prach_rx1.m","prach_rx1",prach[1],6144+792,1,1);
|
||||||
LOG_M("prach_rxF1.m","prach_rxF1",rxsigF[1],6144,1,1);
|
LOG_M("prach_rxF0.m","prach_rxF0",rxsigF[0],24576,1,1);
|
||||||
|
LOG_M("prach_rxF1.m","prach_rxF1",rxsigF[1],6144,1,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (aa=0;aa<nb_rx; aa++) {
|
for (aa=0; aa<nb_rx; aa++) {
|
||||||
// Do componentwise product with Xu* on each antenna
|
// Do componentwise product with Xu* on each antenna
|
||||||
|
k=0;
|
||||||
|
|
||||||
k=0;
|
for (offset=0; offset<(N_ZC<<1); offset+=2) {
|
||||||
for (offset=0; offset<(N_ZC<<1); offset+=2) {
|
prachF[offset] = (int16_t)(((int32_t)Xu[offset]*rxsigF[aa][k] + (int32_t)Xu[offset+1]*rxsigF[aa][k+1])>>15);
|
||||||
prachF[offset] = (int16_t)(((int32_t)Xu[offset]*rxsigF[aa][k] + (int32_t)Xu[offset+1]*rxsigF[aa][k+1])>>15);
|
prachF[offset+1] = (int16_t)(((int32_t)Xu[offset]*rxsigF[aa][k+1] - (int32_t)Xu[offset+1]*rxsigF[aa][k])>>15);
|
||||||
prachF[offset+1] = (int16_t)(((int32_t)Xu[offset]*rxsigF[aa][k+1] - (int32_t)Xu[offset+1]*rxsigF[aa][k])>>15);
|
k+=2;
|
||||||
k+=2;
|
|
||||||
if (k==(12*2*fp->ofdm_symbol_size))
|
|
||||||
k=0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now do IFFT of size 1024 (N_ZC=839) or 256 (N_ZC=139)
|
if (k==(12*2*fp->ofdm_symbol_size))
|
||||||
if (N_ZC == 839) {
|
k=0;
|
||||||
log2_ifft_size = 10;
|
}
|
||||||
idft1024(prachF,prach_ifft_tmp,1);
|
|
||||||
// compute energy and accumulate over receive antennas and repetitions for BR
|
// Now do IFFT of size 1024 (N_ZC=839) or 256 (N_ZC=139)
|
||||||
for (i=0;i<2048;i++)
|
if (N_ZC == 839) {
|
||||||
prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[i<<1] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>10;
|
log2_ifft_size = 10;
|
||||||
} else {
|
idft1024(prachF,prach_ifft_tmp,1);
|
||||||
idft256(prachF,prach_ifft_tmp,1);
|
|
||||||
log2_ifft_size = 8;
|
// compute energy and accumulate over receive antennas and repetitions for BR
|
||||||
// compute energy and accumulate over receive antennas and repetitions for BR
|
for (i=0; i<2048; i++)
|
||||||
for (i=0;i<256;i++)
|
prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[i<<1] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>10;
|
||||||
prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[(i<<1)] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>10;
|
} else {
|
||||||
}
|
idft256(prachF,prach_ifft_tmp,1);
|
||||||
|
log2_ifft_size = 8;
|
||||||
|
|
||||||
|
// compute energy and accumulate over receive antennas and repetitions for BR
|
||||||
|
for (i=0; i<256; i++)
|
||||||
|
prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[(i<<1)] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>10;
|
||||||
|
}
|
||||||
|
|
||||||
if (LOG_DUMPFLAG(PRACH)) {
|
if (LOG_DUMPFLAG(PRACH)) {
|
||||||
if (aa==0) LOG_M("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
|
if (aa==0) LOG_M("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
|
||||||
|
|
||||||
if (aa==1) LOG_M("prach_rxF_comp1.m","prach_rxF_comp1",prachF,1024,1,1);
|
if (aa==1) LOG_M("prach_rxF_comp1.m","prach_rxF_comp1",prachF,1024,1,1);
|
||||||
}
|
}
|
||||||
}// antennas_rx
|
}// antennas_rx
|
||||||
@@ -628,42 +631,46 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
|
|
||||||
// check energy in nth time shift, for
|
// check energy in nth time shift, for
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
if ((br_flag==0) ||
|
if ((br_flag==0) ||
|
||||||
(eNB->prach_vars_br.repetition_number[ce_level]==
|
(eNB->prach_vars_br.repetition_number[ce_level]==
|
||||||
eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level]))
|
eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level]))
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
if (en>60) LOG_I(PHY,"frame %d, subframe %d: Checking for peak in time-domain (br_flag %d, en %d)\n",ru->proc.frame_prach,subframe,br_flag,en);
|
|
||||||
|
if (en>60) LOG_I(PHY,"frame %d, subframe %d: Checking for peak in time-domain (br_flag %d, en %d)\n",ru->proc.frame_prach,subframe,br_flag,en);
|
||||||
}
|
}
|
||||||
preamble_shift2 = ((preamble_shift==0) ? 0 : ((preamble_shift<<log2_ifft_size)/N_ZC));
|
|
||||||
|
|
||||||
|
preamble_shift2 = ((preamble_shift==0) ? 0 : ((preamble_shift<<log2_ifft_size)/N_ZC));
|
||||||
|
|
||||||
for (i=0; i<NCS2; i++) {
|
for (i=0; i<NCS2; i++) {
|
||||||
lev = (int32_t)prach_ifft[(preamble_shift2+i)];
|
lev = (int32_t)prach_ifft[(preamble_shift2+i)];
|
||||||
levdB = dB_fixed_times10(lev);
|
levdB = dB_fixed_times10(lev);
|
||||||
|
|
||||||
if (levdB>*max_preamble_energy) {
|
if (levdB>*max_preamble_energy) {
|
||||||
*max_preamble_energy = levdB;
|
*max_preamble_energy = levdB;
|
||||||
*max_preamble_delay = ((i*fft_size)>>log2_ifft_size)*update_TA/update_TA2;
|
*max_preamble_delay = ((i*fft_size)>>log2_ifft_size)*update_TA/update_TA2;
|
||||||
*max_preamble = preamble_index;
|
*max_preamble = preamble_index;
|
||||||
if (LOG_DEBUGFLAG(PRACH)){
|
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
|
||||||
if ((en>60) && (br_flag==1))
|
|
||||||
LOG_D(PHY,"frame %d, subframe %d : max_preamble_energy %d, max_preamble_delay %d, max_preamble %d (br_flag %d,ce_level %d, levdB %d, lev %d)\n",
|
|
||||||
ru->proc.frame_prach,subframe,
|
|
||||||
*max_preamble_energy,*max_preamble_delay,
|
|
||||||
*max_preamble,br_flag,ce_level,levdB,lev);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (LOG_DEBUGFLAG(PRACH)) {
|
||||||
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
|
|
||||||
|
if ((en>60) && (br_flag==1))
|
||||||
|
LOG_D(PHY,"frame %d, subframe %d : max_preamble_energy %d, max_preamble_delay %d, max_preamble %d (br_flag %d,ce_level %d, levdB %d, lev %d)\n",
|
||||||
|
ru->proc.frame_prach,subframe,
|
||||||
|
*max_preamble_energy,*max_preamble_delay,
|
||||||
|
*max_preamble,br_flag,ce_level,levdB,lev);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}// preamble_index
|
}// preamble_index
|
||||||
|
|
||||||
if (LOG_DUMPFLAG(PRACH)) {
|
if (LOG_DUMPFLAG(PRACH)) {
|
||||||
int en = dB_fixed(signal_energy((int32_t*)&rxsigF[0][0],840));
|
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
|
||||||
|
|
||||||
if (en>60) {
|
if (en>60) {
|
||||||
k = (12*n_ra_prb) - 6*fp->N_RB_UL;
|
k = (12*n_ra_prb) - 6*fp->N_RB_UL;
|
||||||
|
|
||||||
@@ -674,63 +681,58 @@ void rx_prach0(PHY_VARS_eNB *eNB,
|
|||||||
k*=2;
|
k*=2;
|
||||||
|
|
||||||
if (br_flag == 0) {
|
if (br_flag == 0) {
|
||||||
LOG_M("rxsigF.m","prach_rxF",&rxsigF[0][0],12288,1,1);
|
LOG_M("rxsigF.m","prach_rxF",&rxsigF[0][0],12288,1,1);
|
||||||
LOG_M("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
|
LOG_M("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
|
||||||
LOG_M("Xu.m","xu",Xu,N_ZC,1,1);
|
LOG_M("Xu.m","xu",Xu,N_ZC,1,1);
|
||||||
LOG_M("prach_ifft0.m","prach_t0",prach_ifft,1024,1,1);
|
LOG_M("prach_ifft0.m","prach_t0",prach_ifft,1024,1,1);
|
||||||
|
} else {
|
||||||
|
LOG_E(PHY,"Dumping prach (br_flag %d), k = %d (n_ra_prb %d)\n",br_flag,k,n_ra_prb);
|
||||||
|
LOG_M("rxsigF_br.m","prach_rxF_br",&rxsigF[0][0],12288,1,1);
|
||||||
|
LOG_M("prach_rxF_comp0_br.m","prach_rxF_comp0_br",prachF,1024,1,1);
|
||||||
|
LOG_M("Xu_br.m","xu_br",Xu,N_ZC,1,1);
|
||||||
|
LOG_M("prach_ifft0_br.m","prach_t0_br",prach_ifft,1024,1,1);
|
||||||
|
exit(-1);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
LOG_E(PHY,"Dumping prach (br_flag %d), k = %d (n_ra_prb %d)\n",br_flag,k,n_ra_prb);
|
|
||||||
LOG_M("rxsigF_br.m","prach_rxF_br",&rxsigF[0][0],12288,1,1);
|
|
||||||
LOG_M("prach_rxF_comp0_br.m","prach_rxF_comp0_br",prachF,1024,1,1);
|
|
||||||
LOG_M("Xu_br.m","xu_br",Xu,N_ZC,1,1);
|
|
||||||
LOG_M("prach_ifft0_br.m","prach_t0_br",prach_ifft,1024,1,1);
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
} /* LOG_DUMPFLAG(PRACH) */
|
} /* LOG_DUMPFLAG(PRACH) */
|
||||||
if (eNB) stop_meas(&eNB->rx_prach);
|
|
||||||
|
|
||||||
|
if (eNB) stop_meas(&eNB->rx_prach);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
|
||||||
|
|
||||||
void rx_prach(PHY_VARS_eNB *eNB,
|
void rx_prach(PHY_VARS_eNB *eNB,
|
||||||
RU_t *ru,
|
RU_t *ru,
|
||||||
uint16_t *max_preamble,
|
uint16_t *max_preamble,
|
||||||
uint16_t *max_preamble_energy,
|
uint16_t *max_preamble_energy,
|
||||||
uint16_t *max_preamble_delay,
|
uint16_t *max_preamble_delay,
|
||||||
uint16_t Nf,
|
uint16_t Nf,
|
||||||
uint8_t tdd_mapindex,
|
uint8_t tdd_mapindex,
|
||||||
uint8_t br_flag) {
|
uint8_t br_flag) {
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
int prach_mask=0;
|
int prach_mask=0;
|
||||||
|
|
||||||
if (br_flag == 0) {
|
if (br_flag == 0) {
|
||||||
rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,0,0);
|
rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,0,0);
|
||||||
}
|
} else { // This is procedure for eMTC, basically handling the repetitions
|
||||||
else { // This is procedure for eMTC, basically handling the repetitions
|
|
||||||
prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
|
prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
|
||||||
for (i=0;i<4;i++) {
|
|
||||||
|
for (i=0; i<4; i++) {
|
||||||
if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i]==1) &&
|
if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i]==1) &&
|
||||||
((prach_mask&(1<<(i+1))) > 0)) { // check that prach CE level is active now
|
((prach_mask&(1<<(i+1))) > 0)) { // check that prach CE level is active now
|
||||||
|
|
||||||
// if first reception in group of repetitions store frame for later (in RA-RNTI for Msg2)
|
// if first reception in group of repetitions store frame for later (in RA-RNTI for Msg2)
|
||||||
if (eNB->prach_vars_br.repetition_number[i]==0) eNB->prach_vars_br.first_frame[i]=eNB->proc.frame_prach_br;
|
if (eNB->prach_vars_br.repetition_number[i]==0) eNB->prach_vars_br.first_frame[i]=eNB->proc.frame_prach_br;
|
||||||
|
|
||||||
// increment repetition number
|
// increment repetition number
|
||||||
eNB->prach_vars_br.repetition_number[i]++;
|
eNB->prach_vars_br.repetition_number[i]++;
|
||||||
|
// do basic PRACH reception
|
||||||
|
rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,1,i);
|
||||||
|
|
||||||
// do basic PRACH reception
|
// if last repetition, clear counter
|
||||||
rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,1,i);
|
if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
|
||||||
|
eNB->prach_vars_br.repetition_number[i]=0;
|
||||||
// if last repetition, clear counter
|
}
|
||||||
if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
|
|
||||||
eNB->prach_vars_br.repetition_number[i]=0;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user