Commit Graph

308 Commits

Author SHA1 Message Date
Francisco Paisana 66a38f53f5 fix req_bytes methods to account for new method to calculate conres scheduling. 2020-04-22 11:34:08 +01:00
Francisco Paisana d716d8bf7e use mini state machine for ConRes CE scheduling instead of relying that there is data in the DL buffer 2020-04-22 11:34:08 +01:00
Francisco Paisana 6ddedd5972 moved pdu to common mac folder 2020-04-22 10:06:08 +01:00
Xavier Arteaga 784bf81a1a Multiple fixes HARQ ACK/NACK feedback and CSI reporting for MIMO and CA 2020-04-10 15:58:25 +02:00
Francisco Paisana 179e959d05 fix msg3 retx issue. Now nof_prb for pucch above 1 are forbidden for prb==6 2020-04-01 15:02:21 +01:00
Francisco Paisana 344eaf49ec use logmap in the whole enb and ue 2020-03-25 15:50:30 +00:00
Andre Puschmann dff00c77c0 srsenb: fix mobility test after adding UE cap enquiry 2020-03-22 18:28:25 +01:00
Francisco Paisana 34bc48d31a fix cfi to cc assignment 2020-03-18 19:55:39 +00:00
Francisco Paisana ede09cb9b2 added dynamic CFI capability to the eNB scheduler 2020-03-17 22:06:37 +00:00
Ismael Gomez 73447972d8
Fix issue with simultaneous CQI and ACK/NACK transmission in CA (#1067)
* Fix memory corruption when phy calling mac scheduler and not yet initiated

* Do not drop CQI if collision with ACK/NACK and PUSCH

* Allocate CQI resources for SCell properly

* Use UE_PCELL_CC_IDX macro

* Protect ul_sched from being called if not yet started
2020-03-16 13:10:21 +01:00
Xavier Arteaga e832769ae6 Updated copyright 2020-03-16 11:26:06 +01:00
Francisco Paisana afd7ea9e83 Fixed the check for msg3 delay to account for retxs 2020-03-13 19:57:48 +00:00
Francisco Paisana 5330249625 created tti_point type and unit test. Added also the tti_point to the scheduler harqs, and rrc procedure 2020-03-13 19:20:40 +00:00
Francisco Paisana fe3195bb27 add default pcell to ue_cfg in RRC 2020-03-13 11:46:12 +00:00
Francisco Paisana ce03971ca0 fix rrc_mobility_test 2020-03-13 11:46:12 +00:00
Andre Puschmann 764c912977 fix a few more displaying issue in the stdout metrics 2020-03-13 11:34:32 +01:00
Francisco Paisana 4217dba7e0 fix msg3 delayed allocation and update test 2020-03-13 08:30:42 +01:00
Ismael Gomez e8b8c9922e
Add RF per-channel frequency band constraints (#1026) 2020-03-12 23:06:09 +01:00
Andre Puschmann 2f8643fb97 add tx/rx pkt ok/nok to enb metrics, also add enb metrics test
This is what it'll look like if running the new test:

------DL--------------------------------UL-------------------------------------
rnti cqi  ri mcs brate   ok  nok  (%)  snr  phr mcs brate   ok  nok  (%)    bsr
  46  16 1.5  28 15.2G 1000 1000 100% 14.2 12.0  20 15.2M   50   10  20%  100.0
ffff 1.2 1.5 6.2 1.00M  100   54  54% 22.2 99.1  28 1.00k   50   10  20%  100.0
2020-03-12 21:43:36 +01:00
Francisco Paisana 7548402632 change scell activation interface to use arrays. Added a method to the scheduler to get the current set of activated carriers 2020-03-11 21:56:33 +01:00
Xavier Arteaga 76408b195e Rename TX_DELAY and FDD_HARQ_DELAY_MS 2020-03-11 21:16:36 +01:00
Xavier Arteaga 442926cf66 Fix enb_phy_test deadlock 2020-03-11 12:08:24 +01:00
Pedro Alvarez 96c82b3fc6 Moved PDCP configs to pdcp_config.h. Added `as_security_cfg_t` structure to hold access stratum keys.
Refactored PDCP, RRC and USIM accordingly.
2020-03-11 09:00:38 +00:00
Francisco Paisana 9ad80ee29f added initial_dl_cqi to the enb rr.cfg parser 2020-03-10 22:06:07 +00:00
Francisco Paisana bcbb08ebae use initial_dl_cqi for first DL tx. 2020-03-10 22:06:07 +00:00
Francisco Paisana ab69c6fe43 account for delays in RAR tx in scheduler CA tester 2020-03-10 22:06:07 +00:00
Andre Puschmann f2e1bfa699 refactor naming for s/p/cell structs and {enb,ue}_cc_idx 2020-03-10 15:01:00 +01:00
Francisco Paisana f3c3c52fcd added ue_cc_idx to dci allocation 2020-03-10 14:17:49 +01:00
Francisco Paisana e62972d38e fix fdd delays in scheduler 2020-03-10 14:17:49 +01:00
Xavier Arteaga 385cc8ecd8 tweaked I_offset_ack in enb_phy_test 2020-03-10 09:19:54 +01:00
Andre Puschmann 120ad76c63 refactor cell param handling and fix SIB transmissions
- move cell specific eNB params to cell list in rr.conf
- make sure DL EARFCN and DL freq can be used to manually overwrite a single cell config
- fix SIB packing and transmission for multi cell configs
- introduce cell list to MAC
- adapt default enb.conf.example and rr.conf.example
2020-03-06 16:20:44 +01:00
Ismael Gomez 4e12405fff
Remove radio_multi class and organize channels, ports and carrier buffers (#1019) 2020-03-06 15:26:48 +01:00
Xavier Arteaga ecb22600ff improved eNb PHY test scheduler 2020-03-06 13:58:49 +01:00
Xavier Arteaga 84dd9911ca eNb PHY test uses only Aggregation level 0 2020-03-06 13:58:49 +01:00
Xavier Arteaga 0d6694d5e6 Improvement in eNb PHY test 2020-03-06 13:58:49 +01:00
Xavier Arteaga da701cd82b SRSENB: Added PUSCH TA and EVM measurement. Some more PHY cleanup. 2020-03-06 13:58:49 +01:00
Pedro Alvarez bd3598f774 Moved srsEPC to the new S1AP library. Deleted liblte_s1ap.cc and liblte_s1ap.h. 2020-03-06 11:57:07 +00:00
Francisco Paisana ec1f1cc677 remove const_casts from scheduler. Fix ODR issue 2020-03-05 20:23:07 +00:00
Francisco Paisana e9a599857a created a header for all common structs and helper functions 2020-03-05 20:23:07 +00:00
Francisco Paisana 02ccb8b32b fix wrong calculation of sched tx and rx delays 2020-03-05 20:23:07 +00:00
Andre Puschmann 33a410bda4 fix parsing of DL/UL earfcn in cell config
using a single earfcn or dl_freq value that gets set by default
in the [rf] section doesn't make sense in a enb config with more
than 1 cell, so we should actually remove the earfcn/freq setting in [rf]
and only configure the radio through the values in the cell list in rr.cfg
2020-03-05 20:46:14 +01:00
Francisco Paisana 43e67b8536 created a harq entity that handles all harq procs. This entity accepts as arg the number of harq procs. 2020-03-05 17:51:33 +00:00
Andre Puschmann dfb1cd1361 temporarily disabling enb_phy_test_1cell until it is fixed 2020-03-05 14:47:07 +01:00
Francisco Paisana d1356568e0 separated sf sched result from sf_sched class. The interface became way simpler. No need for finish_tti() method, sf_sched::new_tti() is called automatically when we access the sf_sched. 2020-03-05 00:04:21 +00:00
Francisco Paisana bb38fa7119 fixed tti resetting after tti end 2020-03-05 00:04:21 +00:00
Francisco Paisana 47b05118ad simplified msg3 allocation. Now we can allocate resources ahead of time (e.g. msg3 is 2 ttis ahead) using the sf_sched interface. It's guaranteed that the given allocations wont be erased when the respective tti starts 2020-03-05 00:04:21 +00:00
Francisco Paisana 8f7890c60a store mask results in separate variables for testing, and reset sf_sched state at the end of the tti 2020-03-05 00:04:21 +00:00
Francisco Paisana b37d9b9930 fixed msg4 setting in sched tester 2020-03-03 21:26:17 +00:00
Francisco Paisana fed06138b9 moved rach_detected to stack thread. Created a more friendly interface to enqueue tasks in stack 2020-03-03 21:03:21 +00:00
Andre Puschmann 37c342af39 give enb_phy_tests individual names 2020-03-03 17:20:17 +01:00
Francisco Paisana ad9e126299 test for different enb_cc_idxs as pcell. Bug fixes 2020-03-02 16:33:31 +00:00
Francisco Paisana 0f3ef11f8b now the scheduler only activates a scell after receiving a valid CQI for the SCell 2020-03-02 16:33:31 +00:00
Francisco Paisana f571b7c16b cleaned up some of the log error messages in the sched tester 2020-03-02 16:33:31 +00:00
Francisco Paisana c595696ec2 no need for a separate class for the CA tester 2020-03-02 16:33:31 +00:00
Francisco Paisana b44754f0ae the CA and random sched testers now use same structs and common interface. 2020-03-02 16:33:31 +00:00
Francisco Paisana 385fa226e0 started to use a type-safe tti counter for comparisons. Uniformized the common_sched_tester api. Next, need to use the same struct to register events. 2020-03-02 16:33:31 +00:00
Francisco Paisana 518f813f13 now the CA testing generation and simulation happen simultaneously. This way we can do more tti/event specific checks 2020-03-02 16:33:31 +00:00
Francisco Paisana b319f8dfcd created first version of CA test. Now we need to create actual asserts 2020-03-02 16:33:31 +00:00
Francisco Paisana 507bc2d2a2 created a test for CA. Currently is quite empty 2020-03-02 16:33:31 +00:00
Xavier Arteaga 2c534c9059 Correction of TX_DELAY and FDD_HARQ_DELAY_MS uses in srsenb PHY 2020-03-02 12:19:09 +01:00
Xavier Arteaga ae6f52bf0b Fix CLang Warnings in PHY eNb Test 2020-03-02 12:19:09 +01:00
Xavier Arteaga 0556dea01a Refactored eNb PHY test to accept arguments and added unit test 2020-03-02 12:19:09 +01:00
Xavier Arteaga 5893f66364 SRSENB: fixes, srsUE attaches srsENB 2020-03-02 12:19:09 +01:00
Xavier Arteaga f35ed14f76 SRSENB: refactored PHY common UE database 2020-03-02 12:19:09 +01:00
Xavier Arteaga 2fc0832f05 Addition of DL HARQ-ACK generation procedure for eNb DL and minor aesthetic changes 2020-03-02 12:19:09 +01:00
Francisco Paisana e859d622c7 added logref class to forbid logmap pointer invalidation. Created a test for the logref, and introduced it in the scheduler, rrc and nas 2020-02-28 11:33:26 +00:00
Francisco Paisana c29f08d8d5 refactored si acquisition procedure to use stack timers. Also created an interface that is going to be used for the task/timer handling 2020-02-20 20:48:36 +01:00
Xavier Arteaga 385102fa2d SRSENB: minor format, renaming and interface changes 2020-02-13 10:29:00 +01:00
Xavier Arteaga bf4ecc8064 Fix srsenb PHY and unit/component tests 2020-02-13 10:29:00 +01:00
Xavier Arteaga 231431f569 SRSENB: enabled CA PUCCH decode in eNb 2020-02-13 10:29:00 +01:00
Xavier Arteaga 73c63b10f2 Fix compilation of dummy classes 2020-02-13 10:29:00 +01:00
Xavier Arteaga db9cd1683a SRSENB: improved phy test 2020-02-13 10:29:00 +01:00
Xavier Arteaga fd29944bf9 [Temporal] Disabled by default enb phy test 2020-02-13 10:29:00 +01:00
Xavier Arteaga 3f5c270fce SRSENB: added initial component PHY test 2020-02-13 10:29:00 +01:00
Francisco Paisana 87038375d5 fixed the building of MAC SDUs in the scheduler. Now, we ensure there is always space for the MAC subheader and RLC header. The MAC subheader is correctly discounted from the remaining bytes in a TB. 2020-02-10 16:55:18 +00:00
Francisco Paisana c8fc0d91b3 changed the supported cc list to a vector of structs 2020-02-07 15:06:46 +00:00
Francisco Paisana 42b15c7bed use common ue_cfg interface to set the ue antenna info 2020-02-07 15:06:46 +00:00
Francisco Paisana 5f557700f2 changed the sched::ue_cfg(...) function to allow diff configurations. The RRC now activates all carriers after rrc reconf complete 2020-02-07 15:06:46 +00:00
Francisco Paisana b66bc3a6b0 create a sched_interface struct for antenna info dedicated. This way we remove the asn1 as a dependency in the scheduler 2020-02-07 15:06:46 +00:00
Francisco Paisana 88a22e7dbf support cc cfg from rrc 2020-02-07 15:06:46 +00:00
Francisco Paisana e86862611c update the scheduler interfaces to accommodate the configuration of multiple carriers 2020-02-07 15:06:46 +00:00
Francisco Paisana 73c528793f add interface changes to dummy classes and scheduler test 2020-02-07 15:06:46 +00:00
Francisco Paisana 2dc31ea440 added interface to configure multiple cells from the RRC 2020-02-07 15:06:46 +00:00
Andre Puschmann 926f256afa fix RLC dummy class that was missing suspend/resume 2020-02-03 16:26:15 +01:00
Francisco Paisana c8cd12ac53 updated the test logging utils 2020-01-29 17:15:35 +00:00
Francisco Paisana daf471be1f moved test of pdsch collisions for separate test file 2020-01-29 17:15:35 +00:00
Francisco Paisana c537d38650 separated sched tests based on output into a separate file. Added scheduler random tester to unit tests 2020-01-29 17:15:35 +00:00
Francisco Paisana af0b80b0a7 fix test for prb==6 and accidental adaptive retx in UL 2020-01-28 17:15:23 +00:00
Francisco Paisana a74dcd947f changed rar/msg3 scheduling to accommodate multiple rars per TTI 2020-01-28 17:15:23 +00:00
Francisco Paisana dc782e514b change the naming from tti --> sf for scheduling operations specific to a subframe 2020-01-28 17:15:23 +00:00
Francisco Paisana 5ae3afd2b8 created cbit_ref for unpacking const buffers 2020-01-23 12:22:19 +00:00
Francisco Paisana 5468189cd9 fix some variables' naming (e.g. x2_ap -> x2ap, e_rab -> erab) 2020-01-21 00:58:19 +00:00
Francisco Paisana ee24b59924 converted s1ap to new s1ap asn1 lib. Cleaned up bitstring packing/unpacking and bitstring types 2020-01-21 00:58:19 +00:00
Francisco Paisana b6c53d786b updated s1ap rrc interface with new asn1 lib types 2020-01-21 00:58:19 +00:00
Andre Puschmann 0bd493b567 call byte_buffer cleanup in two enb tests and fix typo 2019-12-26 22:06:34 +01:00
Andre Puschmann 7e294f7325 move common helper for eNB tests into own header file and split mobility and erab tests 2019-12-18 15:27:42 +01:00
Andre Puschmann 75672324b9 fix RRC connection reconfig for new bearer
this fixes the packing of a RRC connection reconfig after creating
a new ERAB

it also adds a PDCP config factory based on the received request
2019-12-18 15:27:42 +01:00
Andre Puschmann 476f970ee1 replace FIXME with TODO 2019-12-18 11:25:56 +01:00
Pedro Alvarez c5979f59eb Clang format UE, eNB and lib (#850)
* Clang-formated UE, eNB and lib.
* Fixed compiling errors from clang-format.
* Fix linking issues introduced by clang-format
* Fix poor formating in initializing arrays of arrays.
* Fix mistake in conflict resolution on rm_turbo.c
* Re-apply clang format to gtpc_ies.h
2019-12-16 16:04:22 +01:00
Francisco Paisana d59016ae68 use of srslte::log* type for ASN1 logging. Initialization of the asn1 and rrc_asn1 loggers done now in both the ue and enb 2019-12-12 15:45:24 +00:00
Francisco Paisana 0894e6b2f1 updated dummy interfaces 2019-12-11 17:41:49 +00:00
Francisco Paisana 67411ecfa9 updated dummy interfaces 2019-12-11 17:41:49 +00:00
Francisco Paisana 39fcf25e0d added extra tests for handover. Did a some refactoring to move boilerplate out of the test mobility function 2019-12-06 11:49:01 +00:00
Francisco Paisana a18a7e307e moved all the parsing of the libconfig files to separate functions that can be called from individual tests. Created several stack layer dummy classes for testing. Extended the rrc_mobility test to check correctness of RRC HOPreparation struct 2019-12-06 10:21:41 +00:00
Francisco Paisana ab3d7dd413 updated sched interface for multiple carriers 2019-12-03 15:46:22 +00:00
Francisco Paisana eeb47f8fa4 fixed issue regarding repetition of ConRes tx 2019-12-03 10:04:11 +00:00
Francisco Paisana 3159a5b84a added cc_idx to dl_rach_info 2019-12-02 12:36:27 +00:00
Francisco Paisana cab9327b1a updated scheduler interfaces to accommodate multiple carriers 2019-12-02 12:36:27 +00:00
Francisco Paisana 6d4f746a61 moved tti_sched_result out of carrier_sched. Removed interdependencies between the two classes. Simplified ra_sched and bc_sched initialization 2019-11-28 20:22:40 +00:00
Francisco Paisana 0b962f19f4 fix compilation issue 2019-11-28 11:44:54 +00:00
Francisco Paisana 67ccaf1029 created a file with common test utils, including assertions, a logger specialized for tests that counts the number of errors and warnings during the test run and can print diagnostics on exit 2019-11-28 11:44:54 +00:00
Francisco Paisana 011b2168a6 grouped different sched params/args/derived params into a single struct to simplify the ctor api of different sched sub components 2019-11-27 15:20:55 +00:00
Andre Puschmann 6a9c4d94b0 fix printf in scheduler test 2019-11-24 14:59:54 +01:00
Francisco Paisana 57cd40ca31 added an ho required message send from SeNB to MME 2019-11-10 22:06:31 +00:00
Francisco Paisana 35c9f02579 added quant cfg parsing and addition to measCfg 2019-11-01 15:48:47 +00:00
Francisco Paisana b6b1dd1814 extended mobility test 2019-11-01 15:48:47 +00:00
Francisco Paisana 427fdb83fe using std::make_tuple now to support old compilers. Move operator== definitions for meascfg types to rrc_asn1_types 2019-11-01 15:48:47 +00:00
Francisco Paisana 200e18ee3a added diff computation for reportconfig and measid. Tests passing 2019-11-01 15:48:47 +00:00
Francisco Paisana 1524e28c3a finished the function to compute diffs between cells/measObjs of two var_meas_cfg objects. Added tests for this. Now the update of a UE's var_meas_cfg is made via a shared pointer. 2019-11-01 15:48:47 +00:00
Francisco Paisana b7559171b7 added logic to insert cells from conf file into var_meas_cfg and calculate diffs between meas_objs 2019-11-01 15:48:47 +00:00
Francisco Paisana b88b8fde7b moved the carrier scheduler and tti_result_t classes out of the main sched class. Now it is possible to instantiate more than one carrier_sched per sched 2019-10-31 16:01:04 +00:00
Francisco Paisana 2019fec37a moved dl/ul scheduling to the a separate class carrier_sched 2019-10-31 16:01:04 +00:00
Francisco Paisana 00d24872d9 clang-format on all the scheduler files 2019-10-31 16:01:04 +00:00
Francisco Paisana c19e0d9423 moved the RAR/Msg3 scheduling to a separate class 2019-10-23 18:46:26 +01:00
Francisco Paisana d79e49ed4c moved the BC scheduling to a separate class/file 2019-10-23 18:06:32 +01:00
Francisco Paisana 837c16557f started to implement separate SIB scheduler, and its tests. This is particualrly important for CA 2019-10-23 17:48:47 +01:00
Francisco Paisana 84ac16826f modernized the scheduler code, and removed some clang-tidy warnings 2019-10-23 17:48:47 +01:00
Francisco Paisana ad0b3ce6e2 modernize the random sched test 2019-10-23 17:39:45 +01:00
Ismael Gomez 3828e03f33
Refactor in eNodeB, add channel emulator and fixes in OFDM
* Added channel emulator to srsENB. Added support for fixed delay

* Bug in OFDM when using nonguru mode

* A few changes and refactor in eNodeB
2019-10-23 11:09:39 -05:00
Xavier Arteaga 5e49aca835
Merge pull request #570 from softwareradiosystems/feature_256qam_fix
Resource allocation extended tables and PDSCH table 2 for 256QAM
2019-07-12 12:32:47 -04:00
Francisco Paisana 58e2e51044 removed rlc_interfaces. The rlc_cnfg types are now part of the rrc_interface_types. Removed implicit RB initialization in the RLC. 2019-07-05 10:44:15 +02:00
Francisco Paisana b936629221 removed rrc asn1 header from bcd_helpers, from rlc_interface, and rlc tests 2019-07-05 10:44:15 +02:00
Guillem Foreman db4127ca64 Fixes 256QAM, added pdsch table 2, fixed warnings 2019-07-04 15:49:43 +02:00
Francisco Paisana 415d3418b6 reorganized enb to mirror ue director/class structure with a stack class 2019-06-07 15:41:56 +02:00
Francisco Paisana 7be183c223 rework scheduler 2019-05-14 22:34:50 +02:00
Andre Puschmann 4b01a2e4a0 update copyright notice 2019-04-29 09:20:02 +02:00
Andre Puschmann 205db6f229 add missing license headers 2019-04-26 21:20:12 +02:00
Ismael Gomez 7780b1aba5 add tdd/ca support 2019-04-25 20:57:58 +02:00
Francisco Paisana 0204db2e12 new asn1 rrc library 2019-01-17 17:43:13 +01:00
Pedro Alvarez c4a5af11d5 Fixed nibble order in mccmnc_to_plmn and plmn_to_mccmnc. Fixed corresponding PLMN test 2018-09-25 14:55:12 +01:00
Pedro Alvarez 49c44a2bd4 Moved int_helpers to lib so that the EPC can use those functions too. 2018-09-24 14:08:00 +01:00
yagoda 84f4996584 adding upper embms support to the enodeb 2018-05-15 17:13:30 +02:00
David Rupprecht 06d4559294 Change include path absolut to project dir 2018-04-01 18:08:24 +02:00
Andre Puschmann 1daf7b04bc add copyright header 2018-02-11 19:32:07 +01:00
Ismael Gomez be62b8a179 Fixed uninitialized sock 2018-02-02 16:30:43 +01:00
Andre Puschmann e5a04844ec more coverity fixes 2018-02-02 09:43:10 +01:00
Andre Puschmann 36a53b9cfc fix coverity issue 2018-02-01 15:44:42 +01:00
yagoda 42040f7111 fixing conflicts 2018-01-31 12:32:11 +00:00
yagoda ee1c8c292e fixing coverity issues 2018-01-31 12:28:21 +00:00
Andre Puschmann d500bdbc24 fix more coverity issues 2018-01-31 12:35:46 +01:00
Andre Puschmann 02856704c8 more coverity fixes 2018-01-31 10:32:26 +01:00
Andre Puschmann 8dbabb2834 rework bearer/LCID handling
This is a larger patch that reworks the LCID handling throughout the
code.

- It first moves the RB/LCID mapping out of common.h into the RRC object
  because different RATs may have different mappings.
- It adds a interface to RRC that other objects like RLC/PDCP/etc. may
  use to get the bearer name of a specific LCID.
- The patch also introduces a PDCP config class.
2017-07-04 17:48:39 +02:00
Ismael Gomez 6037a2f2bd changed logger classes 2017-06-23 16:29:46 +02:00
Ismael Gomez 5e030dc805 renamed SRSUE_ constants to SRSLTE_ 2017-06-06 20:34:09 +02:00
Ismael Gomez 129b34201d Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next_private 2017-06-06 20:04:56 +02:00
Ismael Gomez d05b03e43a added buffer pool function call name debug feature 2017-06-06 20:04:19 +02:00
Paul Sutton 0b64e8a9ee Minor cleanup of security library handling in cmake 2017-06-02 15:59:03 +01:00
Ismael Gomez e5ae82aef1 added srsENB code 2017-06-01 12:25:57 +02:00