Commit 03394da3 authored by Michael Cook's avatar Michael Cook

Revert whitespace changes

parent 8204f3ea
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
#include <errno.h> #include <errno.h>
extern int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind); extern int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind);
void configure_nfapi_pnf(char *vnf_ip_addr, void configure_nfapi_pnf(char *vnf_ip_addr,
int vnf_p5_port, int vnf_p5_port,
char *pnf_ip_addr, char *pnf_ip_addr,
int pnf_p7_port, int pnf_p7_port,
int vnf_p7_port); int vnf_p7_port);
UL_IND_t *UL_INFO = NULL; UL_IND_t *UL_INFO = NULL;
nfapi_ul_config_request_t* ul_config_req = NULL; nfapi_ul_config_request_t* ul_config_req = NULL;
...@@ -56,8 +56,8 @@ int current_sfn_sf; ...@@ -56,8 +56,8 @@ int current_sfn_sf;
static int ue_sock_descriptor = -1; static int ue_sock_descriptor = -1;
extern nfapi_tx_request_pdu_t* tx_request_pdu[1023][10][10]; extern nfapi_tx_request_pdu_t* tx_request_pdu[1023][10][10];
extern int timer_subframe; //extern int timer_subframe;
extern int timer_frame; //extern int timer_frame;
extern uint16_t sf_ahead; extern uint16_t sf_ahead;
...@@ -195,7 +195,7 @@ void fill_rach_indication_UE_MAC(int Mod_id, ...@@ -195,7 +195,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
UL_IND_t *UL_INFO, UL_IND_t *UL_INFO,
uint8_t ra_PreambleIndex, uint8_t ra_PreambleIndex,
uint16_t ra_RNTI) { uint16_t ra_RNTI) {
LOG_I(MAC, "fill_rach_indication_UE_MAC 1 \n"); LOG_D(MAC, "fill_rach_indication_UE_MAC 1 \n");
pthread_mutex_lock(&fill_ul_mutex.rach_mutex); pthread_mutex_lock(&fill_ul_mutex.rach_mutex);
...@@ -241,7 +241,7 @@ void fill_rach_indication_UE_MAC(int Mod_id, ...@@ -241,7 +241,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
// This function is currently defined only in the nfapi-RU-RAU-split so we // This function is currently defined only in the nfapi-RU-RAU-split so we
// should call it when we merge with that branch. // should call it when we merge with that branch.
// Andrew - send proxy specific socket instead of oai_nfapi_rach_ind Send the whole UL_INFO struct // TODO Andrew - send proxy specific socket instead of oai_nfapi_rach_ind Send the whole UL_INFO struct
// as soon as numberof preambles // as soon as numberof preambles
if (NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) { if (NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) {
send_standalone_msg(UL_INFO, UL_INFO->rach_ind.header.message_id); send_standalone_msg(UL_INFO, UL_INFO->rach_ind.header.message_id);
......
...@@ -632,7 +632,7 @@ int main( int argc, char **argv ) { ...@@ -632,7 +632,7 @@ int main( int argc, char **argv ) {
NB_INST=1; NB_INST=1;
if(NFAPI_MODE==NFAPI_UE_STUB_PNF || NFAPI_MODE==NFAPI_MODE_STANDALONE_PNF) { // || NFAPI_MODE_STANDALONE_PNF if(NFAPI_MODE==NFAPI_UE_STUB_PNF || NFAPI_MODE==NFAPI_MODE_STANDALONE_PNF) {
PHY_vars_UE_g = malloc(sizeof(PHY_VARS_UE **)*NB_UE_INST); PHY_vars_UE_g = malloc(sizeof(PHY_VARS_UE **)*NB_UE_INST);
for (int i=0; i<NB_UE_INST; i++) { for (int i=0; i<NB_UE_INST; i++) {
......
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