Cedric Roux
922b5b595a
This commit fixes issues introduced by the previous commit.
Summary of work:
- cleanup:
- fix LOG_XX to be less verbose
- fix cmake_targets/CMakeLists.txt
- fix oaienv
- remove dead code
- bug fixes:
- in openair1/SCHED/fapi_l1.c we had:
eNB->pdcch_vars[subframe&1].num_dci = number_dci;
should be:
eNB->pdcch_vars[subframe&1].num_dci = 0;
This bug let the PHY send more DCIs than what should have been
sent because num_dci is incremented later on in the code.
This fix may be a problem for fapi mode, to be checked.
- add new T VCD traces
- revert openair1/PHY/TOOLS/file_output.c to 'develop' version
- remove thread_id in logRecord/logRecord_mt
- revert (and adapt) configuration files
- be careful when doing frame++, we need to % 1024
- revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- NFAPI:
- the open-nFAPI code has been included in the repository. See nfapi/README.
Maybe we should "git clone" the Cisco repository instead. We have to be
careful of availability though.
What has been tested:
- monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink
Anything else may fail to work, especially the FAPI mode, which has not
been tested at all.
127 lines
3.5 KiB
C
127 lines
3.5 KiB
C
/*
|
|
* Copyright 2017 Cisco Systems, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _PNF_P7_H_
|
|
#define _PNF_P7_H_
|
|
|
|
#define TIMEHR_SEC(_time_hr) ((uint32_t)(_time_hr) >> 20)
|
|
#define TIMEHR_USEC(_time_hr) ((uint32_t)(_time_hr) & 0xFFFFF)
|
|
#define TIME2TIMEHR(_time) (((uint32_t)(_time.tv_sec) & 0xFFF) << 20 | ((uint32_t)(_time.tv_usec) & 0xFFFFF))
|
|
|
|
#include "nfapi_pnf_interface.h"
|
|
|
|
#define NFAPI_MAX_PACKED_MESSAGE_SIZE 8192
|
|
|
|
typedef struct {
|
|
uint16_t dl_conf_ontime;
|
|
uint16_t dl_conf_late;
|
|
uint16_t ul_conf_ontime;
|
|
uint16_t ul_conf_late;
|
|
uint16_t hi_dci0_ontime;
|
|
uint16_t hi_dci0_late;
|
|
uint16_t tx_ontime;
|
|
uint16_t tx_late;
|
|
} pnf_p7_stats_t;
|
|
|
|
typedef struct {
|
|
uint8_t* buffer;
|
|
uint16_t length;
|
|
} pnf_p7_rx_message_segment_t;
|
|
|
|
typedef struct pnf_p7_rx_message pnf_p7_rx_message_t;
|
|
|
|
typedef struct pnf_p7_rx_message {
|
|
uint8_t sequence_number;
|
|
uint8_t num_segments_received;
|
|
uint8_t num_segments_expected;
|
|
|
|
// the spec allows of upto 128 segments, this does seem excessive
|
|
pnf_p7_rx_message_segment_t segments[128];
|
|
|
|
uint32_t rx_hr_time;
|
|
|
|
pnf_p7_rx_message_t* next;
|
|
} pnf_p7_rx_message_t;
|
|
|
|
typedef struct {
|
|
|
|
pnf_p7_rx_message_t* msg_queue;
|
|
|
|
} pnf_p7_rx_reassembly_queue_t;
|
|
|
|
|
|
typedef struct {
|
|
|
|
nfapi_pnf_p7_config_t _public;
|
|
|
|
//private data
|
|
int p7_sock;
|
|
|
|
uint8_t terminate;
|
|
|
|
uint8_t tx_message_buffer[NFAPI_MAX_PACKED_MESSAGE_SIZE];
|
|
uint8_t* rx_message_buffer;
|
|
uint16_t rx_message_buffer_size;
|
|
|
|
pthread_mutex_t mutex; // should we allow the client to specifiy
|
|
pthread_mutex_t pack_mutex; // should we allow the client to specifiy
|
|
|
|
nfapi_pnf_p7_subframe_buffer_t subframe_buffer[30/*NFAPI_MAX_TIMING_WINDOW_SIZE*/];
|
|
|
|
uint32_t sequence_number;
|
|
uint16_t max_num_segments;
|
|
|
|
pnf_p7_rx_reassembly_queue_t reassembly_queue;
|
|
|
|
uint8_t* reassemby_buffer;
|
|
uint32_t reassemby_buffer_size;
|
|
|
|
uint16_t sfn_sf;
|
|
uint32_t sf_start_time_hr;
|
|
int32_t sfn_sf_shift;
|
|
|
|
uint8_t timing_info_period_counter;
|
|
uint8_t timing_info_aperiodic_send; // 0:false 1:true
|
|
|
|
uint32_t timing_info_ms_counter; // number of ms since last timing info
|
|
|
|
uint32_t dl_config_jitter;
|
|
uint32_t ul_config_jitter;
|
|
uint32_t hi_dci0_jitter;
|
|
uint32_t tx_jitter;
|
|
|
|
uint32_t tick;
|
|
pnf_p7_stats_t stats;
|
|
|
|
} pnf_p7_t;
|
|
|
|
int pnf_p7_message_pump(pnf_p7_t* pnf_p7);
|
|
|
|
int pnf_p7_pack_and_send_p7_message(pnf_p7_t* pnf_p7, nfapi_p7_message_header_t* msg, uint32_t msg_len);
|
|
int pnf_p7_send_message(pnf_p7_t* pnf_p7, uint8_t* msg, uint32_t msg_len);
|
|
|
|
|
|
int pnf_p7_subframe_ind(pnf_p7_t* config, uint16_t phy_id, uint16_t sfn_sf);
|
|
|
|
pnf_p7_rx_message_t* pnf_p7_rx_reassembly_queue_add_segment(pnf_p7_t* pnf_p7, pnf_p7_rx_reassembly_queue_t* queue, uint32_t rx_hr_time, uint16_t sequence_number, uint16_t segment_number, uint8_t m, uint8_t* data, uint16_t data_len);
|
|
void pnf_p7_rx_reassembly_queue_remove_msg(pnf_p7_t* pnf_p7, pnf_p7_rx_reassembly_queue_t* queue, pnf_p7_rx_message_t* msg);
|
|
void pnf_p7_rx_reassembly_queue_remove_old_msgs(pnf_p7_t* pnf_p7, pnf_p7_rx_reassembly_queue_t* queue, uint32_t rx_hr_time, uint32_t delta);
|
|
|
|
#endif /* _PNF_P7_H_ */
|
|
|