Commit 97cf4dec84d05976727bd52f575358cb6c1a944e

Authored by Nicola Bui
1 parent c1e3a962
Exists in master

small changes

lib/include/srslte/phy/phch/pdsch.h
... ... @@ -48,7 +48,8 @@
48 48 #include "srslte/phy/phch/pdsch_cfg.h"
49 49  
50 50 typedef struct {
51   - srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME];
  51 + srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME];
  52 + bool sequence_generated;
52 53 } srslte_pdsch_user_t;
53 54  
54 55 /* PDSCH object */
... ...
lib/include/srslte/phy/phch/pucch.h
... ... @@ -80,7 +80,8 @@ typedef struct SRSLTE_API {
80 80 } srslte_pucch_cfg_t;
81 81  
82 82 typedef struct {
83   - srslte_sequence_t seq_f2[SRSLTE_NSUBFRAMES_X_FRAME];
  83 + srslte_sequence_t seq_f2[SRSLTE_NSUBFRAMES_X_FRAME];
  84 + bool sequence_generated;
84 85 } srslte_pucch_user_t;
85 86  
86 87 /* PUCCH object */
... ...
lib/include/srslte/phy/phch/pusch.h
... ... @@ -61,7 +61,8 @@ typedef struct {
61 61 } srslte_pusch_hopping_cfg_t;
62 62  
63 63 typedef struct {
64   - srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME];
  64 + srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME];
  65 + bool sequences_generated;
65 66 } srslte_pusch_user_t;
66 67  
67 68 /* PUSCH object */
... ...
srsenb/drb.conf.example
... ... @@ -28,25 +28,22 @@ qci_config = (
28 28 {
29 29 qci=9;
30 30 pdcp_config = {
31   - discard_timer = -1;
32   - status_report_required = false;
  31 + discard_timer = 100;
  32 + pdcp_sn_size = 12;
33 33 }
34 34 rlc_config = {
35   - ul_am = {
36   - t_poll_retx = 200;
37   - poll_pdu = 16;
38   - poll_byte = -1;
39   - max_retx_thresh = 8;
  35 + ul_um = {
  36 + sn_field_length = 10;
40 37 };
41   - dl_am = {
42   - t_reordering = 80;
43   - t_status_prohibit = 35;
  38 + dl_um = {
  39 + sn_field_length = 10;
  40 + t_reordering = 80;
44 41 };
45 42 };
46 43 logical_channel_config = {
47   - priority = 3;
48   - prioritized_bit_rate = 8;
49   - bucket_size_duration = 50;
  44 + priority = 11;
  45 + prioritized_bit_rate = -1;
  46 + bucket_size_duration = 100;
50 47 log_chan_group = 3;
51 48 };
52 49 }
... ...
srsenb/src/CMakeLists.txt
... ... @@ -42,3 +42,5 @@ if (NOT ${BUILDENB_CMD} STREQUAL "")
42 42 else(NOT ${BUILDENB_CMD} STREQUAL "")
43 43 message(STATUS "No post-build-ENB command defined")
44 44 endif (NOT ${BUILDENB_CMD} STREQUAL "")
  45 +
  46 +install(TARGETS srsenb DESTINATION ${RUNTIME_DIR})
... ...
srsenb/src/upper/rrc.cc
... ... @@ -995,6 +995,7 @@ bool rrc::ue::release_erabs()
995 995 void rrc::ue::notify_s1ap_ue_ctxt_setup_complete()
996 996 {
997 997 LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT res;
  998 + res.ext = false;
998 999 res.E_RABSetupListCtxtSURes.len = 0;
999 1000 res.E_RABFailedToSetupListCtxtSURes.len = 0;
1000 1001  
... ...
srsue/src/CMakeLists.txt
... ... @@ -50,3 +50,5 @@ if (NOT ${BUILDUE_CMD} STREQUAL "")
50 50 else(NOT ${BUILDUE_CMD} STREQUAL "")
51 51 message(STATUS "No post-build-UE command defined")
52 52 endif (NOT ${BUILDUE_CMD} STREQUAL "")
  53 +
  54 +install(TARGETS srsue DESTINATION ${RUNTIME_DIR})
... ...
srsue/src/phy/phy.cc
... ... @@ -59,6 +59,7 @@ phy::phy() : workers_pool(MAX_WORKERS),
59 59  
60 60 void phy::set_default_args(phy_args_t *args)
61 61 {
  62 + args->nof_rx_ant = 1;
62 63 args->ul_pwr_ctrl_en = false;
63 64 args->prach_gain = -1;
64 65 args->cqi_max = -1;
... ...
srsue/test/mac/mac_test.cc
... ... @@ -458,7 +458,9 @@ int main(int argc, char *argv[])
458 458 }
459 459  
460 460 // Init Radio and PHY
461   - radio.init();
  461 + if (!radio.init()) {
  462 + exit(1);
  463 + }
462 464 phy.init(&radio, &mac, NULL, &phy_log);
463 465 if (prog_args.rf_rx_gain > 0 && prog_args.rf_tx_gain > 0) {
464 466 radio.set_rx_gain(prog_args.rf_rx_gain);
... ...
srsue/test/phy/ue_itf_test_prach.cc
... ... @@ -199,6 +199,14 @@ srslte_softbuffer_tx_t softbuffer_tx;
199 199  
200 200 uint16_t temp_c_rnti;
201 201  
  202 +
  203 +class rrc_dummy : public srsue::rrc_interface_phy
  204 +{
  205 +public:
  206 + void in_sync() {};
  207 + void out_of_sync() {};
  208 +};
  209 +
202 210 /******** MAC Interface implementation */
203 211 class testmac : public srsue::mac_interface_phy
204 212 {
... ... @@ -326,7 +334,8 @@ private:
326 334  
327 335  
328 336 testmac my_mac;
329   -srslte::radio_multi radio;
  337 +srslte::radio_multi radio;
  338 +rrc_dummy rrc_dummy;
330 339  
331 340 int main(int argc, char *argv[])
332 341 {
... ... @@ -336,7 +345,7 @@ int main(int argc, char *argv[])
336 345  
337 346 // Init Radio and PHY
338 347 radio.init();
339   - my_phy.init(&radio, &my_mac, NULL, &log);
  348 + my_phy.init(&radio, &my_mac, &rrc_dummy, &log);
340 349 if (prog_args.rf_rx_gain > 0 && prog_args.rf_tx_gain > 0) {
341 350 radio.set_rx_gain(prog_args.rf_rx_gain);
342 351 radio.set_tx_gain(prog_args.rf_tx_gain);
... ...
srsue/test/phy/ue_itf_test_sib1.cc
... ... @@ -90,6 +90,13 @@ uint32_t total_oks=0;
90 90 uint8_t payload[1024];
91 91 srslte_softbuffer_rx_t softbuffer;
92 92  
  93 +class rrc_dummy : public srsue::rrc_interface_phy
  94 +{
  95 +public:
  96 + void in_sync() {};
  97 + void out_of_sync() {};
  98 +};
  99 +
93 100 /******** MAC Interface implementation */
94 101 class testmac : public srsue::mac_interface_phy
95 102 {
... ... @@ -147,7 +154,7 @@ public:
147 154  
148 155 testmac my_mac;
149 156 srslte::radio_multi radio;
150   -
  157 +rrc_dummy rrc_dummy;
151 158  
152 159  
153 160  
... ... @@ -159,7 +166,7 @@ int main(int argc, char *argv[])
159 166  
160 167 // Init Radio and PHY
161 168 radio.init();
162   - my_phy.init(&radio, &my_mac, NULL, &log);
  169 + my_phy.init(&radio, &my_mac, &rrc_dummy, &log);
163 170 if (prog_args.rf_gain > 0) {
164 171 radio.set_rx_gain(prog_args.rf_gain);
165 172 } else {
... ...