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.
72 lines
1.5 KiB
C
72 lines
1.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 _VENDOR_EXT_H_
|
|
#define _VENDOR_EXT_H_
|
|
|
|
#include "nfapi_interface.h"
|
|
|
|
typedef enum
|
|
{
|
|
P5_VENDOR_EXT_REQ = NFAPI_VENDOR_EXT_MSG_MIN,
|
|
P5_VENDOR_EXT_RSP,
|
|
|
|
P7_VENDOR_EXT_REQ,
|
|
P7_VENDOR_EXT_IND
|
|
|
|
} vendor_ext_message_id_e;
|
|
|
|
typedef struct {
|
|
nfapi_p4_p5_message_header_t header;
|
|
uint16_t dummy1;
|
|
uint16_t dummy2;
|
|
} vendor_ext_p5_req;
|
|
|
|
typedef struct {
|
|
nfapi_p4_p5_message_header_t header;
|
|
uint16_t error_code;
|
|
} vendor_ext_p5_rsp;
|
|
|
|
typedef struct {
|
|
nfapi_p7_message_header_t header;
|
|
uint16_t dummy1;
|
|
uint16_t dummy2;
|
|
} vendor_ext_p7_req;
|
|
|
|
typedef struct {
|
|
nfapi_p7_message_header_t header;
|
|
uint16_t error_code;
|
|
} vendor_ext_p7_ind;
|
|
|
|
typedef struct {
|
|
nfapi_tl_t tl;
|
|
uint32_t dummy;
|
|
} vendor_ext_tlv_1;
|
|
|
|
#define VENDOR_EXT_TLV_1_TAG 0xF001
|
|
|
|
typedef struct {
|
|
nfapi_tl_t tl;
|
|
uint32_t dummy;
|
|
} vendor_ext_tlv_2;
|
|
|
|
#define VENDOR_EXT_TLV_2_TAG 0xF002
|
|
|
|
|
|
|
|
|
|
#endif // _VENDOR_EXT_
|