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.
61 lines
1.9 KiB
C
61 lines
1.9 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 _MAC_H_
|
|
#define _MAC_H_
|
|
|
|
#include "nfapi_interface.h"
|
|
|
|
#if defined(__cplusplus)
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct mac mac_t;
|
|
|
|
typedef struct mac
|
|
{
|
|
void* user_data;
|
|
|
|
void (*dl_config_req)(mac_t* mac, nfapi_dl_config_request_t* req);
|
|
void (*ul_config_req)(mac_t* mac, nfapi_ul_config_request_t* req);
|
|
void (*hi_dci0_req)(mac_t* mac, nfapi_hi_dci0_request_t* req);
|
|
void (*tx_req)(mac_t* mac, nfapi_tx_request_t* req);
|
|
} mac_t;
|
|
|
|
mac_t* mac_create(uint8_t wireshark_test_mode);
|
|
void mac_destroy(mac_t* mac);
|
|
|
|
void mac_start_data(mac_t* mac, unsigned rx_port, const char* tx_addres, unsigned tx_port);
|
|
|
|
void mac_subframe_ind(mac_t* mac, uint16_t phy_id, uint16_t sfn_sf);
|
|
void mac_harq_ind(mac_t* mac, nfapi_harq_indication_t* ind);
|
|
void mac_crc_ind(mac_t* mac, nfapi_crc_indication_t* ind);
|
|
void mac_rx_ind(mac_t* mac, nfapi_rx_indication_t* ind);
|
|
void mac_rach_ind(mac_t* mac, nfapi_rach_indication_t* ind);
|
|
void mac_srs_ind(mac_t* mac, nfapi_srs_indication_t* ind);
|
|
void mac_sr_ind(mac_t* mac, nfapi_sr_indication_t* ind);
|
|
void mac_cqi_ind(mac_t* mac, nfapi_cqi_indication_t* ind);
|
|
void mac_lbt_dl_ind(mac_t* mac, nfapi_lbt_dl_indication_t* ind);
|
|
void mac_nb_harq_ind(mac_t* mac, nfapi_nb_harq_indication_t* ind);
|
|
void mac_nrach_ind(mac_t* mac, nfapi_nrach_indication_t* ind);
|
|
|
|
|
|
#if defined(__cplusplus)
|
|
}
|
|
#endif
|
|
|
|
#endif
|