Commit Graph
6306 Commits
Author SHA1 Message Date
hbilel 667bfb0173 TDD config 4,5 harq,bundling,multiplexing,ack,nack
config 4 tested with Amarisoft
2017-05-19 15:37:57 +02:00
Cedric Roux 430a8c4e11 Merge branch 'develop_integration_w19' into 'develop'
develop_integration_w19 into develop

Summary of changes:
- bug fixes:
  * RLC AM fixes
  * UE TDD fixes
  * Fujitsu bug fixes (TDD also)
  * mobipass fixes (bad management of carriers, softmodem was failing with more than one CC)
  * compilation warnings removal
- PUCCH format 3 preliminary support (work from Fujitsu)
- build fixes: do not include shared library in main executable (work from Nokia)
  express MIMO2 needs some more work here

See merge request !184
2017-05-15 22:45:56 +02:00
Cedric Roux 099b7f2ac6 integration fix: fix rrh_gw compilation 2017-05-15 16:13:32 +02:00
Cedric Roux 0023d448f7 integration fix: expressMIMO should be aligned with the rest now
No need for this special case. Plus, it fails with the work
from Nokia on compilation cleanup.
2017-05-15 16:12:33 +02:00
Cedric Roux ce08fa8e9e integration fix: remove various warnings 2017-05-15 15:57:26 +02:00
Cedric Roux 15bb39704a integration fix: remove warnings introduced by PUCCH format 3 handling 2017-05-15 15:56:49 +02:00
Cedric Roux f12350ce62 integration fix: remove warnings in dlsim 2017-05-15 15:42:27 +02:00
Cedric Roux 9cd3e2e887 integration fix: remove warnings in ulsim 2017-05-15 15:42:01 +02:00
Cedric Roux 11006597c9 integration fix: let dlsim and ulsim work again
There is now the function copy_harq_proc_struct and some
procedures for the UE have changed, which makes necessary
to have UE->dlsch valid for both subframes (odd and even).

We increase memory usage, maybe it's not the correct solution.
To be kept in mind if something goes wrong at some point.
2017-05-15 11:13:56 +02:00
Cedric Roux 0f42d5a344 Merge remote-tracking branch 'origin/bugfix_multiple_carriers_mobipass' into develop_integration_w19 2017-05-15 11:13:45 +02:00
Cedric Roux 9eaee53bb6 rewrite phy_stats_exist
We have to test that all active CCs of a given UE exist in the PHY layer.
Maybe not the end of the story...
2017-05-13 12:45:17 +02:00
Cedric Roux 0bb229451a Merge remote-tracking branch 'origin/bugfix_Fujitsu_reviewed' into develop 2017-05-12 15:57:33 +02:00
Cedric Roux 2d97b777b6 Merge remote-tracking branch 'origin/enhancement-124-hw_library_new' into develop 2017-05-12 15:57:10 +02:00
Cedric Roux 06f2889b2d Merge remote-tracking branch 'origin/UE_TDD_Fix' into develop 2017-05-12 15:56:52 +02:00
Cedric Roux 9107d2831b Merge remote-tracking branch 'origin/bugfix-238-rlc-am' into develop 2017-05-12 15:53:25 +02:00
Cedric Roux d0b5d6539b Merge remote-tracking branch 'origin/issue-232-pucch3' into develop 2017-05-12 15:32:38 +02:00
Tien-Thinh Nguyen 3d4ba1a3b0 fix the errors related to multiple carriers (for a given UE considering only the CCs which this UE belongs to) 2017-05-12 15:23:07 +02:00
gabrielC ad6d0ac59e bug fixes from Fujitsu (bug 37)
----------------------------------------------------------
bug 37

Ttile:
Sending side is as follows.
rar[3] = (((mcs&0x7)<<5)) | ((TPC&7)<<2) | ((ULdelay&1)<<1) | (cqireq&1);
So, 2 bit shift looks correct.

Bug Location:
ulsch->harq_processes[harq_pid]->TPC = (rar[3]>>3)&7;//rar->TPC;
----------------------------------------------------------
2017-05-12 13:54:49 +02:00
gabrielC 893f36e81e bug fixes from Fujitsu (bug 29)
----------------------------------------------------------
bug 29

Ttile:
FDD should be TDD.

Bug Location:
  switch (oai_emulation.info.frame_type[0]) {
  case FDD:
    frame_type = "FDD";
    break;

  case TDD:
    frame_type = "FDD";
    break;
  }
----------------------------------------------------------
2017-05-12 11:56:57 +02:00
gabrielC 899d150621 bug fixes from Fujitsu (bug 26)
----------------------------------------------------------
bug 26

Ttile:
g_buffer has only 32 index, but he/she tries to zero clear
1024 index.

Bug Location:
static uint8_t g_buffer[32];
:
memset (g_buffer, 0, 1024);

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:55:07 +02:00
Cedric Roux adb3b25c67 bug fixes from Fujitsu (bug 24)
----------------------------------------------------------
bug 24

Ttile:
The last line "multicast_group = multicast_group" is hard
to understand. The local variable should be different name
than the global variable.

Bug Location:
const char *multicast_group_list[MULTICAST_LINK_NUM_GROUPS] = {
  "239.0.0.161",
  "239.0.0.162",
  "239.0.0.163",
  "239.0.0.164"
};
:
:
void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
                          unsigned char multicast_group, char *multicast_ifname)
{
  rx_handler = rx_handlerP;
  multicast_group = multicast_group;

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:52:52 +02:00
gabrielC 34c6805f7a bug fixes from Fujitsu (bug 22)
Note: not sure that the code is correct,
to be checked (Cédric Roux).

----------------------------------------------------------
bug 22

Ttile:
(subframe!=2)||(subframe!=7) is always TRUE. This coding
is really intended? Operator || should be && instead?

Bug Location:
((frame_parms->frame_type==TDD)&&(frame_parms->tdd_config==1)&&((subframe!=2)||(subframe!=7)))) {

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:47:58 +02:00
gabrielC 98a7a16ead bug fixes from Fujitsu (bug 21)
Note: this fix does not solve the issue with how
this buffer is used in this function, but I'm not
sure this code is used at all (Cédric Roux).

----------------------------------------------------------
bug 21

Ttile:
PAYLOAD_MAX=1500, so this coding results in index overflow.
Additionally, operator "!=" just compairs something, this
coding is meaningless.

Bug Location:
buffer[PAYLOAD_MAX] != '\0';

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:16:14 +02:00
gabrielC bdaef7956d bug fixes from Fujitsu (bugs 18, 19, 20)
----------------------------------------------------------
bug 18

Ttile:
Probably he/she wants to copy the contents of arrays, but
this coding doesn't copy anything, moreover index overflow
occurs.

Bug Location:
u2e_t[UE_id][eNB_id]->tx_data[3]=tx[eNB_id][3];
u2e_t[UE_id][eNB_id]->rx_data[3]=rx[NB_eNB_INST+UE_id][3];

Note:
Detected by CppCheck
----------------------------------------------------------
bug 19

Title:
Probably he/she wants to copy the contents of arrays, but
this coding doesn't copy anything, moreover index overflow
occurs.

Bug Location:
e2u_t[eNB_id][UE_id]->tx_data[3]=tx[NB_eNB_INST+UE_id][3];
e2u_t[eNB_id][UE_id]->rx_data[3]=rx[eNB_id][3];

Note:
Detected by CppCheck
----------------------------------------------------------
bug 20

Title:
Probably he/she wants to copy the contents of arrays, but
this coding doesn't copy anything, moreover index overflow
occurs.

Bug Location:
tx_data[3]=cthread->tx_data[3];
rx_data[3]=cthread->rx_data[3];

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:06:10 +02:00
Francois TABURET 261353680c Fix shared lib build problem, where shared lib sources were also included in main exec's
Discovered and fix problems in shared lib build for usrp,bladerf and lime
2017-05-12 09:44:43 +02:00
hbilel 5904734d99 [OAI_UE] Compute O_ACK with ack status only for FDD 2017-05-03 16:59:27 +02:00
gabrielC f2f79a1647 Remove subframe_DL function npot anymore needed 2017-05-03 15:42:32 +02:00
gabrielC 966291029d Clean and remove a problematic memcpy 2017-05-03 15:26:39 +02:00
fnabet 8d787768c4 Issue 238 fix: RLC AM 2017-05-03 14:43:45 +02:00
gabrielC 3fcdec1ad7 fix for FDD 2017-05-03 11:11:06 +02:00
hbilel ceb13b8aa4 [OAI-UE] Additional TDD fix 2017-05-03 09:57:03 +02:00
hbilel 3c6e206e97 TDD fix for several issues 2017-05-02 18:01:47 +02:00
hbilel cd7e479fc7 sss pss calculation 2017-04-26 17:05:29 +02:00
gabrielC 780c7b03ba - fix for TDD config 3 2017-04-25 11:33:40 +02:00
Yoshi bdcc8ecf66 Adjust parameters 2017-04-25 17:54:42 +09:00
Yoshi 655859b865 add comment 2017-04-25 12:31:21 +09:00
gabrielC 5e149161b7 add logging trace 2017-04-24 15:51:59 +02:00
HARADA Masayuki 7854030b90 Add pucch format3 test to pucchsim 2017-04-24 13:24:39 +09:00
Yoshi 46da64063b add comment 2017-04-21 14:04:56 +09:00
Yoshi b7b057a162 Merge remote-tracking branch 'origin/develop' into issue-232-pucch3 2017-04-21 13:51:47 +09:00
gabrielC 8163d78ce3 Remove some logs 2017-04-18 14:28:15 +02:00
gabrielC 59e9e2e85f Merge tag '2017.w15' into ue_dlsch_dual_buffer_fix 2017-04-18 13:26:03 +02:00
Cedric Roux c124e32ab5 Merge branch 'develop_integration_w15' into 'develop'
develop_integration_w15 into develop

Summary of changes:
- DCI1 20MHz phy-test bug fix
- RLC UM/AM max header size fix
- UE autotests improvements

See merge request !177
2017-04-18 10:03:46 +02:00
Cedric Roux fc4d03d419 fix tm1 generic configuration file
- RBs set to 25
- disable SRS
2017-04-18 09:55:37 +02:00
Cedric Roux 20a2bfd109 hotfix: fix TDD 20MHz DCI0 structure
In 20MHz the UE didn't do any uplink granted by DCI0.
It was replying to RAR, so uplink decoding was okay.

Turns out the DCI0 structure for TDD was wrong.
2017-04-14 18:17:13 +02:00
Cedric Roux 2e86a60982 Merge remote-tracking branch 'origin/UE_autotest_For_20Mhz' into develop_integration_w15 2017-04-14 16:18:19 +02:00
Cedric Roux 89292a763d Merge remote-tracking branch 'origin/eNB_phy-test_fix_20MHz' into develop_integration_w15 2017-04-14 16:18:05 +02:00
Cedric Roux ab907918b0 Merge remote-tracking branch 'origin/bugfix-234-rlc-um-max-header-size' into develop_integration_w15 2017-04-14 16:17:51 +02:00
tctalcatel 58aa9f1f52 change eNB and UE name 2017-04-14 09:07:13 +02:00
tctalcatel 5498741f0b Add 20 MHz test for the default XML file 2017-04-14 09:03:12 +02:00