Melissa Elkadi
9b16c1d860
At this point we are successfully able to build. Additionally, we can run the scenario, however, it does not pass. It seems that the gNB is not connecting to the proxy correctly. Just wanted to push the progress so far. FYI, the items that had to be changed to correct the linking issues were the following: - mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue - rrc_data_req vs. nr_rrc_data_req - mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue - rrc_data_req_ue vs. rrc_data_req_nr_ue - rrc_data_req vs. nr_rrc_data_req The listed functions should be declard in the LTE/NR UE directory depending on the functionality. Several were mixed. i.e.: LTE functions being called in NR UE. Also, removing siWindowLength, siWindowLength_int, SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC. These variable were not used in the NR UE and are defined for LTE only. Lastly, in the NR_IF_Module.c of the NR UE, the global variable def_dci_pdu_rel15 is not accessible. Need to revisit this. For not it is commented out.
268 lines
8.2 KiB
C
Executable File
268 lines
8.2 KiB
C
Executable File
/*
|
|
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The OpenAirInterface Software Alliance licenses this file to You under
|
|
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.openairinterface.org/?page_id=698
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*-------------------------------------------------------------------------------
|
|
* For more information about the OpenAirInterface (OAI) Software Alliance:
|
|
* contact@openairinterface.org
|
|
*/
|
|
|
|
/* \file NR_IF_Module.h
|
|
* \brief data structures for L1/L2 interface modules
|
|
* \author R. Knopp, K.H. HSU
|
|
* \date 2018
|
|
* \version 0.1
|
|
* \company Eurecom / NTUST
|
|
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
|
|
* \note
|
|
* \warning
|
|
*/
|
|
|
|
#ifndef __NR_IF_MODULE_H__
|
|
#define __NR_IF_MODULE_H__
|
|
|
|
#include "platform_types.h"
|
|
#include <openair1/PHY/thread_NR_UE.h>
|
|
#include <semaphore.h>
|
|
#include "fapi_nr_ue_interface.h"
|
|
#include "openair2/PHY_INTERFACE/queue.h"
|
|
#include "nfapi_nr_interface_scf.h"
|
|
#include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
|
|
|
|
typedef struct NR_UL_TIME_ALIGNMENT NR_UL_TIME_ALIGNMENT_t;
|
|
|
|
typedef struct nr_phy_channel_params_t
|
|
{
|
|
uint16_t sfn_slot;
|
|
float sinr;
|
|
// Incomplete, need all channel parameters
|
|
} nr_phy_channel_params_t;
|
|
|
|
typedef struct {
|
|
/// module id
|
|
module_id_t module_id;
|
|
/// gNB index
|
|
uint32_t gNB_index;
|
|
/// component carrier id
|
|
int cc_id;
|
|
/// frame
|
|
frame_t frame;
|
|
/// slot
|
|
int slot;
|
|
|
|
fapi_nr_dl_config_request_t dl_config_req;
|
|
fapi_nr_ul_config_request_t ul_config_req;
|
|
} nr_dcireq_t;
|
|
|
|
typedef struct {
|
|
/// module id
|
|
module_id_t module_id;
|
|
/// gNB index
|
|
uint32_t gNB_index;
|
|
/// component carrier id
|
|
int cc_id;
|
|
/// frame
|
|
frame_t frame;
|
|
/// slot
|
|
int slot;
|
|
/// index of the current UE RX/TX thread
|
|
int thread_id;
|
|
|
|
/// NR UE FAPI-like P7 message, direction: L1 to L2
|
|
/// data reception indication structure
|
|
fapi_nr_rx_indication_t *rx_ind;
|
|
/// ssb_index, if ssb is not present in current TTI, value set to -1
|
|
int ssb_index;
|
|
/// dci reception indication structure
|
|
fapi_nr_dci_indication_t *dci_ind;
|
|
|
|
} nr_downlink_indication_t;
|
|
|
|
|
|
typedef struct {
|
|
/// module id
|
|
module_id_t module_id;
|
|
/// gNB index
|
|
uint32_t gNB_index;
|
|
/// component carrier id
|
|
int cc_id;
|
|
/// frame
|
|
frame_t frame_rx;
|
|
/// slot rx
|
|
uint32_t slot_rx;
|
|
/// frame tx
|
|
frame_t frame_tx;
|
|
/// slot tx
|
|
uint32_t slot_tx;
|
|
/// index of the current UE RX/TX thread
|
|
int thread_id;
|
|
|
|
/// dci reception indication structure
|
|
fapi_nr_dci_indication_t *dci_ind;
|
|
} nr_uplink_indication_t;
|
|
|
|
// Downlink subframe P7
|
|
|
|
|
|
typedef struct {
|
|
/// module id
|
|
module_id_t module_id;
|
|
/// component carrier id
|
|
int CC_id;
|
|
/// frame
|
|
frame_t frame;
|
|
/// slot
|
|
int slot;
|
|
/// index of the current UE RX/TX thread
|
|
int thread_id;
|
|
|
|
/// NR UE FAPI-like P7 message, direction: L2 to L1
|
|
/// downlink transmission configuration request structure
|
|
fapi_nr_dl_config_request_t *dl_config;
|
|
|
|
/// uplink transmission configuration request structure
|
|
fapi_nr_ul_config_request_t *ul_config;
|
|
|
|
/// data transmission request structure
|
|
fapi_nr_tx_request_t *tx_request;
|
|
|
|
} nr_scheduled_response_t;
|
|
|
|
typedef struct {
|
|
/// module id
|
|
uint8_t Mod_id;
|
|
/// component carrier id
|
|
uint8_t CC_id;
|
|
|
|
/// NR UE FAPI-like P5 message
|
|
/// physical layer configuration request structure
|
|
fapi_nr_config_request_t config_req;
|
|
|
|
} nr_phy_config_t;
|
|
|
|
|
|
/*
|
|
* Generic type of an application-defined callback to return various
|
|
* types of data to the application.
|
|
* EXPECTED RETURN VALUES:
|
|
* -1: Failed to consume bytes. Abort the mission.
|
|
* Non-negative return values indicate success, and ignored.
|
|
*/
|
|
typedef int8_t (nr_ue_scheduled_response_f)(nr_scheduled_response_t *scheduled_response);
|
|
|
|
|
|
/*
|
|
* Generic type of an application-defined callback to return various
|
|
* types of data to the application.
|
|
* EXPECTED RETURN VALUES:
|
|
* -1: Failed to consume bytes. Abort the mission.
|
|
* Non-negative return values indicate success, and ignored.
|
|
*/
|
|
typedef int8_t (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config);
|
|
|
|
|
|
/*
|
|
* Generic type of an application-defined callback to return various
|
|
* types of data to the application.
|
|
* EXPECTED RETURN VALUES:
|
|
* -1: Failed to consume bytes. Abort the mission.
|
|
* Non-negative return values indicate success, and ignored.
|
|
*/
|
|
typedef int (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
|
|
|
|
/*
|
|
* Generic type of an application-defined callback to return various
|
|
* types of data to the application.
|
|
* EXPECTED RETURN VALUES:
|
|
* -1: Failed to consume bytes. Abort the mission.
|
|
* Non-negative return values indicate success, and ignored.
|
|
*/
|
|
typedef int (nr_ue_ul_indication_f)(nr_uplink_indication_t *ul_info);
|
|
|
|
typedef int (nr_ue_dcireq_f)(nr_dcireq_t *ul_info);
|
|
|
|
// TODO check this stuff can be reuse of need modification
|
|
typedef struct nr_ue_if_module_s {
|
|
nr_ue_scheduled_response_f *scheduled_response;
|
|
nr_ue_phy_config_request_f *phy_config_request;
|
|
nr_ue_dl_indication_f *dl_indication;
|
|
nr_ue_ul_indication_f *ul_indication;
|
|
//nr_ue_dcireq_f *dcireq;
|
|
uint32_t cc_mask;
|
|
uint32_t current_frame;
|
|
uint32_t current_slot;
|
|
//pthread_mutex_t nr_if_mutex;
|
|
} nr_ue_if_module_t;
|
|
|
|
|
|
/**\brief reserved one of the interface(if) module instantce from pointer pool and done memory allocation by module_id.
|
|
\param module_id module id*/
|
|
nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id);
|
|
|
|
void nrue_init_standalone_socket(const char *addr, int tx_port, int rx_port);
|
|
|
|
void *nrue_standalone_pnf_task(void *context);
|
|
extern int current_sfn_slot;
|
|
extern sem_t sfn_slot_semaphore;
|
|
|
|
typedef struct nfapi_dl_tti_config_req_tx_data_req_t
|
|
{
|
|
nfapi_nr_dl_tti_request_pdu_t *dl_itti_config_req;
|
|
nfapi_nr_tx_data_request_t *tx_data_req_pdu_list;
|
|
} nfapi_dl_tti_config_req_tx_data_req_t;
|
|
|
|
void send_nsa_standalone_msg(NR_UL_IND_t *UL_INFO, uint16_t msg_id);
|
|
|
|
/**\brief done free of memory allocation by module_id and release to pointer pool.
|
|
\param module_id module id*/
|
|
int nr_ue_if_module_kill(uint32_t module_id);
|
|
|
|
|
|
/**\brief interface between L1/L2, indicating the downlink related information, like dci_ind and rx_req
|
|
\param dl_info including dci_ind and rx_request messages*/
|
|
int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
|
|
|
|
int nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
|
|
|
|
int nr_ue_dcireq(nr_dcireq_t *dcireq);
|
|
|
|
// TODO check
|
|
/**\brief handle BCCH-BCH message from dl_indication
|
|
\param pduP pointer to bch pdu
|
|
\param additional_bits corresponding to 38.212 ch.7
|
|
\param ssb_index SSB index within 0 - (L_ssb-1) corresponding to 38.331 ch.13 parameter i
|
|
\param ssb_length corresponding to L1 parameter L_ssb
|
|
\param cell_id cell id */
|
|
int handle_bcch_bch(module_id_t module_id,
|
|
int cc_id,
|
|
unsigned int gNB_index,
|
|
uint8_t *pduP,
|
|
unsigned int additional_bits,
|
|
uint32_t ssb_index,
|
|
uint32_t ssb_length,
|
|
uint16_t ssb_start_subcarrier,
|
|
uint16_t cell_id);
|
|
|
|
// TODO check
|
|
/**\brief handle BCCH-DL-SCH message from dl_indication
|
|
\param pdu_len length(bytes) of pdu
|
|
\param pduP pointer to pdu*/
|
|
int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len);
|
|
|
|
int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci);
|
|
|
|
#endif
|
|
|