• Cedric Roux's avatar
    Fix NFAPI integration · 922b5b59
    Cedric Roux authored
    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.
    922b5b59
pnf_phy_2_A.xml 2.7 KB
<?xml version="1.0" encoding="UTF-8"?>
<pnf>
	<sync_mode>0</sync_mode>
	<location_mode>0</location_mode>
	<location_coordinates></location_coordinates>

	<dl_config_timing>500</dl_config_timing>
	<ul_config_timing>500</ul_config_timing>
	<tx_timing>500</tx_timing>
	<hi_dci0_timing>500</hi_dci0_timing>

	<max_phys>1</max_phys>
	<max_total_bandwidth>30</max_total_bandwidth>
	<max_total_num_dl_layers>1</max_total_num_dl_layers>
	<max_total_num_ul_layers>1</max_total_num_ul_layers>

	<shared_bands>0</shared_bands>
	<shared_pas>0</shared_pas>

	<maximum_total_power>0</maximum_total_power>

	<oui>ALPHA</oui>
	
	<phys>
		<phy>
			<index>88</index>
			<port>2500</port>
			<address>127.0.0.1</address>

			<duplex_mode>1</duplex_mode>
			<downlink_channel_bandwidth_support>22</downlink_channel_bandwidth_support>
			<uplink_channel_bandwidth_support>22</uplink_channel_bandwidth_support>
			<number_of_dl_layers>1</number_of_dl_layers>
			<number_of_ul_layers>1</number_of_ul_layers>
			<3gpp_release_supported>31</3gpp_release_supported>
			<nmm_modes_supported>0</nmm_modes_supported>
			<dl_ues_per_subframe>8</dl_ues_per_subframe>
			<ul_ues_per_subframe>8</ul_ues_per_subframe>

			<rfs>
				<index>0</index>
			</rfs>
			<excluded_rfs/>
		</phy>
		<phy>
			<index>44</index>
			<port>2600</port>
			<address>127.0.0.1</address>

			<duplex_mode>1</duplex_mode>
			<downlink_channel_bandwidth_support>22</downlink_channel_bandwidth_support>
			<uplink_channel_bandwidth_support>22</uplink_channel_bandwidth_support>
			<number_of_dl_layers>1</number_of_dl_layers>
			<number_of_ul_layers>1</number_of_ul_layers>
			<3gpp_release_supported>31</3gpp_release_supported>
			<nmm_modes_supported>0</nmm_modes_supported>
			<dl_ues_per_subframe>8</dl_ues_per_subframe>
			<ul_ues_per_subframe>8</ul_ues_per_subframe>

			<rfs>
				<index>1</index>
			</rfs>
			<excluded_rfs/>
		</phy>
	</phys>
	<rfs>
		<rf>
			<index>0</index>
			<band>2</band>
			<max_transmit_power>-30</max_transmit_power>
			<min_transmit_power>-230</min_transmit_power>
			<num_antennas_supported>2</num_antennas_supported>
			<min_downlink_frequency>1890</min_downlink_frequency>
			<max_downlink_frequency>1890</max_downlink_frequency>
			<max_uplink_frequency>1890</max_uplink_frequency>
			<min_uplink_frequency>1890</min_uplink_frequency>
		</rf>
		<rf>
			<index>1</index>
			<band>4</band>
			<max_transmit_power>-30</max_transmit_power>
			<min_transmit_power>-230</min_transmit_power>
			<num_antennas_supported>2</num_antennas_supported>
			<min_downlink_frequency>1890</min_downlink_frequency>
			<max_downlink_frequency>1890</max_downlink_frequency>
			<max_uplink_frequency>1890</max_uplink_frequency>
			<min_uplink_frequency>1890</min_uplink_frequency>
		</rf>
	</rfs>
</pnf>