Skip to content

O
OpenXG-RAN
Commit b7c37c10 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

Merge branch 'enhancement-10-harmony' of... 

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
parents 1654af9a d51d5dee
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 135 deletions
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @ b7c37c10
...@@ -45,153 +45,132 @@ ...@@ -45,153 +45,132 @@
#include "PHY/LTE_TRANSPORT/if4_tools.h" #include "PHY/LTE_TRANSPORT/if4_tools.h"
#endif #endif
// Define how data blocks are stored and transferred void send_IF4(PHY_VARS_eNB *eNB, eNB_rxtx_proc_t *proc) {
int frame = proc->frame_tx;
//void send_IF4(PHY_VARS_eNB *eNB, int subframe){ int subframe = proc->subframe_tx;
//eNB_proc_t *proc = &eNB->proc; LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
//int frame=proc->frame_tx;
//int subframe=proc->subframe_tx;
//LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
//uint32_t i,j;
//float *data_block = malloc(length*sizeof(long));
// Generate IF4 packet (for now DL) with frame status information
//dl_packet = gen_IF4_dl_packet( /* ADD INFO and data_block pointer */ );
//for(i=0; i<fp->symbols_per_tti; i++) { uint16_t i;
// Do compression of the two parts and generate data blocks float_t data_block_length = 1200*(fp->ofdm_symbol_size/2048);
uint16_t *data_block = (uint16_t*)malloc(data_block_length*sizeof(uint16_t));
//symbol = eNB->common_vars.txdataF[0][0 /*antenna number*/][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)]
//data_block[j] = Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j -1])<<16 + Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j]); // Caller: RCC - DL *** handle RRU case - UL and PRACH ***
//data_block[j+NrOfNonZeroValues] = Atan(subframe[i][j+1])<<16 + Atan(subframe[i][j+2]); if (eNB->node_function == NGFI_RCC_IF4) {
IF4_dl_packet_t *dl_packet = (IF4_dl_packet_t*)malloc(sizeof_IF4_dl_packet_t);
// Set data blocks and update subframe no./other information to generated packet gen_IF4_dl_packet(dl_packet, proc);
dl_packet->data_block = data_block;
// Write the packet(s) to the fronthaul
for(i=0; i<fp->symbols_per_tti; i++) {
//}
//Do compression of the two parts and generate data blocks
//symbol = eNB->common_vars.txdataF[0][0 /*antenna number*/][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)]
//data_block[j] = Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j -1])<<16 + Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j]);
//data_block[j+NrOfNonZeroValues] = Atan(subframe[i][j+1])<<16 + Atan(subframe[i][j+2]);
// Update information in generated packet
dl_packet->frame_status.sym_num = i;
// Write the packet(s) to the fronthaul
}
}else {
IF4_ul_packet_t *ul_packet = (IF4_ul_packet_t*)malloc(sizeof_IF4_ul_packet_t);
gen_IF4_ul_packet(ul_packet, proc);
ul_packet->data_block = data_block;
for(i=0; i<fp->symbols_per_tti; i++) {
//Do compression of the two parts and generate data blocks
//symbol = eNB->common_vars.txdataF[0][0 /*antenna number*/][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)]
//data_block[j] = Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j -1])<<16 + Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j]);
//data_block[j+NrOfNonZeroValues] = Atan(subframe[i][j+1])<<16 + Atan(subframe[i][j+2]);
// Update information in generated packet
ul_packet->frame_status.sym_num = i;
// Write the packet(s) to the fronthaul
}
}
//} }
void recv_IF4( /* ADD INFO and data_block pointer */ ) { void recv_IF4(PHY_VARS_eNB *eNB, eNB_rxtx_proc_t *proc) {
// Read packet(s) from the fronthaul // Read packet(s) from the fronthaul
// Apply reverse processing - decompression // Apply reverse processing - decompression
// Generate and return the OFDM symbols (txdataF) // Generate and return the OFDM symbols (txdataF)
// Caller: RRU - DL *** handle RCC case - UL and PRACH ***
} }
struct IF4_dl_packet gen_IF4_dl_packet( /* ADD INFO and data_block pointer */ ) { void gen_IF4_dl_packet(IF4_dl_packet_t *dl_packet, eNB_rxtx_proc_t *proc) {
struct IF4_dl_packet dl_packet;
// Set destination and source address
// Set Type and Sub-Type // Set Type and Sub-Type
dl_packet.type = 0x080A; dl_packet->type = 0x080A;
dl_packet.sub_type = 0x0020; dl_packet->sub_type = 0x0020;
// Leave reserved as it is // Leave reserved as it is
//dl_packet.rsvd = ; dl_packet->rsvd = 0;
// Set frame status // Set frame status
dl_packet.frame_status.ant_num = 0; dl_packet->frame_status.ant_num = 0;
dl_packet.frame_status.ant_start = 0; dl_packet->frame_status.ant_start = 0;
dl_packet.frame_status.rf_num = 0; dl_packet->frame_status.rf_num = proc->frame_tx;
dl_packet.frame_status.sf_num = 0; dl_packet->frame_status.sf_num = proc->subframe_tx;
dl_packet.frame_status.sym_num = 0; dl_packet->frame_status.sym_num = 0;
//dl_packet.frame_status.rsvd = ; dl_packet->frame_status.rsvd = 0;
// Set data blocks if sent
//if (data_block != NULL) {
//
//} else {
//
//}
// Set frame check sequence // Set frame check sequence
dl_packet.fcs = 0; dl_packet->fcs = 0;
return dl_packet;
} }
struct IF4_ul_packet gen_IF4_ul_packet( /* ADD INFO and data_block pointer */ ) { void gen_IF4_ul_packet(IF4_ul_packet_t *ul_packet, eNB_rxtx_proc_t *proc) {
struct IF4_ul_packet ul_packet;
// Set destination and source address
// Set Type and Sub-Type // Set Type and Sub-Type
ul_packet.type = 0x080A; ul_packet->type = 0x080A;
ul_packet.sub_type = 0x0019; ul_packet->sub_type = 0x0019;
// Leave reserved as it is // Leave reserved as it is
//ul_packet.rsvd = ; ul_packet->rsvd = 0;
// Set frame status // Set frame status
ul_packet.frame_status.ant_num = 0; ul_packet->frame_status.ant_num = 0;
ul_packet.frame_status.ant_start = 0; ul_packet->frame_status.ant_start = 0;
ul_packet.frame_status.rf_num = 0; ul_packet->frame_status.rf_num = proc->frame_rx;
ul_packet.frame_status.sf_num = 0; ul_packet->frame_status.sf_num = proc->subframe_rx;
ul_packet.frame_status.sym_num = 0; ul_packet->frame_status.sym_num = 0;
//ul_packet.frame_status.rsvd = ; ul_packet->frame_status.rsvd = 0;
// Set antenna specific gain *** set other antenna gain ***
ul_packet->gain0.exponent = 0;
ul_packet->gain0.rsvd = 0;
// Set antenna specific gain
ul_packet.gain0.exponent = 0;
//ul_packet.gain0.rsvd = ;
// Set data blocks if sent
//if (data_block != NULL) {
//
//} else {
//
//}
// Set frame check sequence // Set frame check sequence
ul_packet.fcs = 0; ul_packet->fcs = 0;
return ul_packet;
} }
struct IF4_prach_packet gen_IF4_prach_packet( /* ADD INFO and data_block pointer */ ) { void gen_IF4_prach_packet(IF4_prach_packet_t *prach_packet, eNB_rxtx_proc_t *proc) {
struct IF4_prach_packet prach_packet;
// Set destination and source address
// Set Type and Sub-Type // Set Type and Sub-Type
prach_packet.type = 0x080A; prach_packet->type = 0x080A;
prach_packet.sub_type = 0x0021; prach_packet->sub_type = 0x0021;
// Leave reserved as it is // Leave reserved as it is
//prach_packet.rsvd = ; prach_packet->rsvd = 0;
// Set LTE Prach configuration // Set LTE Prach configuration
//prach_packet.prach_conf.rsvd = ; prach_packet->prach_conf.rsvd = 0;
prach_packet.prach_conf.ant = 0; prach_packet->prach_conf.ant = 0;
prach_packet.prach_conf.rf_num = 0; prach_packet->prach_conf.rf_num = proc->frame_rx;
prach_packet.prach_conf.sf_num = 0; prach_packet->prach_conf.sf_num = proc->subframe_rx;
prach_packet.prach_conf.exponent = 0; prach_packet->prach_conf.exponent = 0;
// Set data blocks if sent
//if (data_block != NULL) {
//
//} else {
//
//}
// Set frame check sequence // Set frame check sequence
prach_packet.fcs = 0; prach_packet->fcs = 0;
return prach_packet;
} }
int main(){
uint32_t i=0;
return 0;
}
openair1/PHY/LTE_TRANSPORT/if4_tools.h
View file @ b7c37c10
...@@ -54,6 +54,9 @@ struct IF4_frame_status { ...@@ -54,6 +54,9 @@ struct IF4_frame_status {
uint32_t rsvd:2; uint32_t rsvd:2;
}; };
typedef struct IF4_frame_status IF4_frame_status_t;
#define sizeof_IF4_frame_status_t 4
/// IF4 Antenna Gain (16 bits) /// IF4 Antenna Gain (16 bits)
struct IF4_gain { struct IF4_gain {
/// Reserved /// Reserved
...@@ -62,6 +65,9 @@ struct IF4_gain { ...@@ -62,6 +65,9 @@ struct IF4_gain {
uint16_t exponent:6; uint16_t exponent:6;
}; };
typedef struct IF4_gain IF4_gain_t;
#define sizeof_IF_gain_t 2
/// IF4 LTE PRACH Configuration (32 bits) /// IF4 LTE PRACH Configuration (32 bits)
struct IF4_lte_prach_conf { struct IF4_lte_prach_conf {
/// Reserved /// Reserved
...@@ -76,6 +82,9 @@ struct IF4_lte_prach_conf { ...@@ -76,6 +82,9 @@ struct IF4_lte_prach_conf {
uint32_t exponent:6; uint32_t exponent:6;
}; };
typedef struct IF4_lte_prach_conf IF4_lte_prach_conf_t;
#define sizeof_IF4_lte_prach_conf_t 4
struct IF4_dl_packet { struct IF4_dl_packet {
/// Destination Address /// Destination Address
...@@ -88,13 +97,15 @@ struct IF4_dl_packet { ...@@ -88,13 +97,15 @@ struct IF4_dl_packet {
/// Reserved /// Reserved
uint32_t rsvd; uint32_t rsvd;
/// Frame Status /// Frame Status
struct IF4_frame_status frame_status; IF4_frame_status_t frame_status;
/// Data Blocks /// Data Blocks
uint16_t *data_block;
/// Frame Check Sequence /// Frame Check Sequence
uint32_t fcs; uint32_t fcs;
}; };
typedef struct IF4_dl_packet IF4_dl_packet_t;
#define sizeof_IF4_dl_packet_t 18
struct IF4_ul_packet { struct IF4_ul_packet {
/// Destination Address /// Destination Address
...@@ -108,29 +119,32 @@ struct IF4_ul_packet { ...@@ -108,29 +119,32 @@ struct IF4_ul_packet {
/// Reserved /// Reserved
uint32_t rsvd; uint32_t rsvd;
/// Frame Status /// Frame Status
struct IF4_frame_status frame_status; IF4_frame_status_t frame_status;
/// Gain 0 /// Gain 0
struct IF4_gain gain0; IF4_gain_t gain0;
/// Gain 1 /// Gain 1
struct IF4_gain gain1; IF4_gain_t gain1;
/// Gain 2 /// Gain 2
struct IF4_gain gain2; IF4_gain_t gain2;
/// Gain 3 /// Gain 3
struct IF4_gain gain3; IF4_gain_t gain3;
/// Gain 4 /// Gain 4
struct IF4_gain gain4; IF4_gain_t gain4;
/// Gain 5 /// Gain 5
struct IF4_gain gain5; IF4_gain_t gain5;
/// Gain 6 /// Gain 6
struct IF4_gain gain6; IF4_gain_t gain6;
/// Gain 7 /// Gain 7
struct IF4_gain gain7; IF4_gain_t gain7;
/// Data Blocks /// Data Blocks
uint16_t *data_block;
/// Frame Check Sequence /// Frame Check Sequence
uint32_t fcs; uint32_t fcs;
}; };
typedef struct IF4_ul_packet IF4_ul_packet_t;
#define sizeof_IF4_ul_packet_t 34
struct IF4_prach_packet { struct IF4_prach_packet {
/// Destination Address /// Destination Address
...@@ -143,21 +157,22 @@ struct IF4_prach_packet { ...@@ -143,21 +157,22 @@ struct IF4_prach_packet {
/// Reserved /// Reserved
uint32_t rsvd; uint32_t rsvd;
/// LTE Prach Configuration /// LTE Prach Configuration
struct IF4_lte_prach_conf prach_conf; IF4_lte_prach_conf_t prach_conf;
/// Prach Data Block (one antenna) /// Prach Data Block (one antenna)
uint16_t *data_block;
/// Frame Check Sequence /// Frame Check Sequence
uint32_t fcs; uint32_t fcs;
}; };
// Needs to be checked typedef struct IF4_prach_packet IF4_prach_packet_t;
#define sizeof_IF4_prach_packet_t 18
struct IF4_dl_packet gen_IF4_dl_packet(); void gen_IF4_dl_packet(IF4_dl_packet_t*, eNB_rxtx_proc_t*);
struct IF4_ul_packet gen_IF4_ul_packet(); void gen_IF4_ul_packet(IF4_ul_packet_t*, eNB_rxtx_proc_t*);
struct IF4_prach_packet gen_IF4_prach_packet(); void gen_IF4_prach_packet(IF4_prach_packet_t*, eNB_rxtx_proc_t*);
void send_IF4( /* ADD INFO */ ); void send_IF4(PHY_VARS_eNB*, eNB_rxtx_proc_t*);
void recv_IF4( /* ADD INFO */ ); void recv_IF4(PHY_VARS_eNB*, eNB_rxtx_proc_t*);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment