From 6b71250a9c1dba77b73a76412a8d611dfa3e4e53 Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Tue, 28 Jun 2016 18:28:57 +0200
Subject: [PATCH] development of enb processing

---
 matlab/tests/ce                    | Bin 6912 -> 0 bytes
 matlab/tests/d                     | Bin 6912 -> 0 bytes
 matlab/tests/sf_symbols            | Bin 8064 -> 0 bytes
 matlab/tests/z                     | Bin 6912 -> 0 bytes
 srslte/include/srslte/enb/enb_dl.h |  29 ++++++++++++++++++++---------
 srslte/include/srslte/enb/enb_ul.h |  27 ++++++++++++++++++++-------
 srslte/include/srslte/phch/phich.h |   6 ++++++
 srslte/lib/enb/enb_dl.c            |  22 ++++++++++++++++++----
 srslte/lib/enb/enb_ul.c            |  28 ++++++++++++++--------------
 srslte/lib/phch/phich.c            |  10 ++++++++++
 srslte/lib/rf/rf_dev.h             |   8 ++++++--
 srslte/lib/ue/ue_dl.c              |   7 +++----
 12 files changed, 97 insertions(+), 40 deletions(-)
 delete mode 100644 matlab/tests/ce
 delete mode 100644 matlab/tests/d
 delete mode 100644 matlab/tests/sf_symbols
 delete mode 100644 matlab/tests/z

diff --git a/matlab/tests/ce b/matlab/tests/ce
deleted file mode 100644
index cefc6508efb16163af5a44fcd9594b9cb60e5f12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6912
zcmeIyF%19!2m`P=!y3{FxF9JH|FSjd%AGHVO+XLyKo9JI103K02ROh14sd`29N+*4
RIKTl8aDW3G-~b1HJ21W6gueg)

diff --git a/matlab/tests/d b/matlab/tests/d
deleted file mode 100644
index 3ad03af0688ef97e64cf388024f1bbe11e50afc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6912
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

diff --git a/matlab/tests/sf_symbols b/matlab/tests/sf_symbols
deleted file mode 100644
index c18c441e421bd28c2d69529881290fb5cc75af11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8064
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
M;hj5BvHxoRe??m;KL7v#

diff --git a/matlab/tests/z b/matlab/tests/z
deleted file mode 100644
index 3ad03af0688ef97e64cf388024f1bbe11e50afc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6912
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

diff --git a/srslte/include/srslte/enb/enb_dl.h b/srslte/include/srslte/enb/enb_dl.h
index c15cd80b7..7a6e831bd 100644
--- a/srslte/include/srslte/enb/enb_dl.h
+++ b/srslte/include/srslte/enb/enb_dl.h
@@ -55,6 +55,8 @@
 #include "srslte/phch/ra.h"
 #include "srslte/phch/regs.h"
 
+#include "srslte/enb/enb_ul.h"
+
 #include "srslte/utils/vector.h"
 #include "srslte/utils/debug.h"
 
@@ -86,7 +88,6 @@ typedef struct SRSLTE_API {
   float sss_signal5[SRSLTE_SSS_LEN]; 
   uint8_t bch_payload[SRSLTE_BCH_PAYLOAD_LEN];
     
-  srslte_softbuffer_tx_t *softbuffer;
   uint32_t nof_rnti;
   
 } srslte_enb_dl_t;
@@ -97,14 +98,13 @@ typedef struct {
   srslte_dci_location_t   location; 
   srslte_softbuffer_tx_t *softbuffer;
   uint8_t                *data; 
-} srslte_enb_dl_grant_pdsch_t; 
+} srslte_enb_dl_pdsch_t; 
 
 typedef struct {
-  uint32_t                rnti_idx; 
-  srslte_ra_ul_dci_t      grant;
-  srslte_dci_location_t   location; 
-} srslte_enb_dl_grant_pusch_t; 
-
+  uint8_t  ack;
+  uint32_t rnti_idx; 
+  srslte_enb_ul_phich_info_t info; 
+} srslte_enb_dl_phich_t; 
 
 /* This function shall be called just after the initial synchronization */
 SRSLTE_API int srslte_enb_dl_init(srslte_enb_dl_t *q, 
@@ -130,6 +130,17 @@ SRSLTE_API void srslte_enb_dl_put_mib(srslte_enb_dl_t *q,
 SRSLTE_API void srslte_enb_dl_put_pcfich(srslte_enb_dl_t *q, 
                                          uint32_t sf_idx);
 
+SRSLTE_API void srslte_enb_dl_put_phich(srslte_enb_dl_t *q, 
+                                        uint8_t ack, 
+                                        uint32_t n_prb_lowest, 
+                                        uint32_t n_dmrs, 
+                                        uint32_t sf_idx);
+
+SRSLTE_API void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q, 
+                                              srslte_enb_dl_phich_t *acks, 
+                                              uint32_t nof_acks, 
+                                              uint32_t sf_idx); 
+
 SRSLTE_API void srslte_enb_dl_put_base(srslte_enb_dl_t *q, 
                                        uint32_t tti);
 
@@ -165,12 +176,12 @@ SRSLTE_API int srslte_enb_dl_put_pdcch_ul(srslte_enb_dl_t *q,
                                           uint32_t sf_idx); 
 
 SRSLTE_API int srslte_enb_dl_put_grant_pdsch(srslte_enb_dl_t *q, 
-                                             srslte_enb_dl_grant_pdsch_t *grants, 
+                                             srslte_enb_dl_pdsch_t *grants, 
                                              uint32_t nof_grants, 
                                              uint32_t sf_idx); 
 
 SRSLTE_API int srslte_enb_dl_put_grant_pusch(srslte_enb_dl_t *q, 
-                                             srslte_enb_dl_grant_pusch_t *grants, 
+                                             srslte_enb_ul_pusch_t *grants, 
                                              uint32_t nof_grants, 
                                              uint32_t sf_idx); 
 
diff --git a/srslte/include/srslte/enb/enb_ul.h b/srslte/include/srslte/enb/enb_ul.h
index 3104c9f2d..f1a4fab0c 100644
--- a/srslte/include/srslte/enb/enb_ul.h
+++ b/srslte/include/srslte/enb/enb_ul.h
@@ -53,6 +53,11 @@
 
 #include "srslte/config.h"
 
+typedef struct {
+  uint32_t n_prb_lowest;
+  uint32_t n_dmrs;  
+} srslte_enb_ul_phich_info_t; 
+
 typedef struct SRSLTE_API {
   srslte_cell_t cell;
 
@@ -67,16 +72,18 @@ typedef struct SRSLTE_API {
   srslte_prach_t  prach;
   
   srslte_pusch_cfg_t     pusch_cfg; 
-  srslte_softbuffer_rx_t softbuffer;
-      
+  srslte_enb_ul_phich_info_t *phich_info;
+
 } srslte_enb_ul_t;
 
 typedef struct {
-  srslte_ra_ul_dci_t    grant;
-  uint32_t              rnti_idx; 
-  uint32_t              rv_idx; 
-  uint32_t              current_tx_nb; 
-  uint8_t              *data; 
+  uint32_t                rnti_idx; 
+  srslte_ra_ul_dci_t      grant;
+  srslte_dci_location_t   location; 
+  uint32_t                rv_idx; 
+  uint32_t                current_tx_nb; 
+  uint8_t                *data; 
+  srslte_softbuffer_rx_t *softbuffer;
 } srslte_enb_ul_pusch_t; 
 
 /* This function shall be called just after the initial synchronization */
@@ -97,8 +104,13 @@ SRSLTE_API int srslte_enb_ul_rem_rnti(srslte_enb_ul_t *q,
 SRSLTE_API void srslte_enb_ul_fft(srslte_enb_ul_t *q, 
                                   cf_t *signal_buffer); 
 
+SRSLTE_API void srslte_enb_ul_get_phich_info(srslte_enb_ul_t *q, 
+                                             uint32_t rnti_idx, 
+                                             srslte_enb_ul_phich_info_t *phich_info);
+
 SRSLTE_API int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, 
                                        srslte_ra_ul_grant_t *grant, 
+                                       srslte_softbuffer_rx_t *softbuffer,
                                        uint32_t rnti_idx, 
                                        uint32_t rv_idx, 
                                        uint32_t current_tx_nb,
@@ -107,6 +119,7 @@ SRSLTE_API int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q,
 
 SRSLTE_API int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, 
                                              srslte_enb_ul_pusch_t *grants, 
+                                             bool *pusch_crc_res,
                                              uint32_t nof_pusch,
                                              uint32_t sf_idx); 
 
diff --git a/srslte/include/srslte/phch/phich.h b/srslte/include/srslte/phch/phich.h
index 47ff4d651..e4e6f0175 100644
--- a/srslte/include/srslte/phch/phich.h
+++ b/srslte/include/srslte/phch/phich.h
@@ -89,6 +89,12 @@ SRSLTE_API int srslte_phich_init(srslte_phich_t *q,
 
 SRSLTE_API void srslte_phich_free(srslte_phich_t *q);
 
+SRSLTE_API void srslte_phich_calc(srslte_phich_t *q, 
+                                  uint32_t n_prb_lowest, 
+                                  uint32_t n_dmrs, 
+                                  uint32_t *ngroup, 
+                                  uint32_t *nseq); 
+
 SRSLTE_API int srslte_phich_decode(srslte_phich_t *q, 
                                    cf_t *slot_symbols, 
                                    cf_t *ce[SRSLTE_MAX_PORTS],
diff --git a/srslte/lib/enb/enb_dl.c b/srslte/lib/enb/enb_dl.c
index 7481c673a..afeda1e08 100644
--- a/srslte/lib/enb/enb_dl.c
+++ b/srslte/lib/enb/enb_dl.c
@@ -183,8 +183,22 @@ void srslte_enb_dl_put_mib(srslte_enb_dl_t *q, uint32_t tti)
 
 void srslte_enb_dl_put_pcfich(srslte_enb_dl_t *q, uint32_t sf_idx)
 {
-  srslte_pcfich_encode(&q->pcfich, q->cfi, q->sf_symbols, sf_idx);       
-  
+  srslte_pcfich_encode(&q->pcfich, q->cfi, q->sf_symbols, sf_idx);         
+}
+
+void srslte_enb_dl_put_phich(srslte_enb_dl_t *q, uint8_t ack, uint32_t n_prb_lowest, 
+                             uint32_t n_dmrs, uint32_t sf_idx)
+{
+  uint32_t ngroup, nseq; 
+  srslte_phich_calc(&q->phich, n_prb_lowest, n_dmrs, &ngroup, &nseq);
+  srslte_phich_encode(&q->phich, ack, ngroup, nseq, sf_idx, q->sf_symbols);
+}
+
+void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q, srslte_enb_dl_phich_t *acks, uint32_t nof_acks, uint32_t sf_idx)
+{
+  for (int i=0;i<nof_acks;i++) {
+    srslte_phich_encode(&q->phich, acks[i].ack, acks[i].n_prb_lowest, acks[i].n_dmrs, sf_idx, q->sf_symbols);    
+  }
 }
 
 void srslte_enb_dl_put_base(srslte_enb_dl_t *q, uint32_t tti) 
@@ -278,7 +292,7 @@ int srslte_enb_dl_put_pdsch(srslte_enb_dl_t *q, srslte_ra_dl_grant_t *grant, srs
   return SRSLTE_SUCCESS; 
 }
 
-int srslte_enb_dl_put_grant_pusch(srslte_enb_dl_t *q, srslte_enb_dl_grant_pusch_t *grants, uint32_t nof_grants, uint32_t sf_idx)
+int srslte_enb_dl_put_grant_pusch(srslte_enb_dl_t *q, srslte_enb_ul_pusch_t *grants, uint32_t nof_grants, uint32_t sf_idx)
 {
   for (int i=0;i<nof_grants;i++) {
     if (srslte_enb_dl_put_pdcch_ul(q, &grants[i].grant, grants[i].location, grants[i].rnti_idx, sf_idx)) {
@@ -289,7 +303,7 @@ int srslte_enb_dl_put_grant_pusch(srslte_enb_dl_t *q, srslte_enb_dl_grant_pusch_
   return SRSLTE_SUCCESS; 
 }
 
-int srslte_enb_dl_put_grant_pdsch(srslte_enb_dl_t *q, srslte_enb_dl_grant_pdsch_t *grants, 
+int srslte_enb_dl_put_grant_pdsch(srslte_enb_dl_t *q, srslte_enb_dl_pdsch_t *grants, 
                                   uint32_t nof_grants, uint32_t sf_idx)
 {
   for (int i=0;i<nof_grants;i++) {
diff --git a/srslte/lib/enb/enb_ul.c b/srslte/lib/enb/enb_ul.c
index 5b8148835..df759ae9b 100644
--- a/srslte/lib/enb/enb_ul.c
+++ b/srslte/lib/enb/enb_ul.c
@@ -80,11 +80,6 @@ int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
       goto clean_exit; 
     }
    
-    if (srslte_softbuffer_rx_init(&q->softbuffer, q->cell.nof_prb)) {
-      fprintf(stderr, "Error initiating soft buffer\n");
-      goto clean_exit;
-    }
-    
     if (srslte_chest_ul_init(&q->chest, cell)) {
       fprintf(stderr, "Error initiating channel estimator\n");
       goto clean_exit; 
@@ -123,7 +118,6 @@ void srslte_enb_ul_free(srslte_enb_ul_t *q)
     srslte_ofdm_rx_free(&q->fft);
     srslte_pucch_free(&q->pucch);
     srslte_pusch_free(&q->pusch);
-    srslte_softbuffer_rx_free(&q->softbuffer);
     srslte_chest_ul_free(&q->chest);
     if (q->sf_symbols) {
       free(q->sf_symbols);
@@ -151,7 +145,7 @@ void srslte_enb_ul_fft(srslte_enb_ul_t *q, cf_t *signal_buffer)
 }
 
 
-int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant, 
+int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant, srslte_softbuffer_rx_t *softbuffer, 
                             uint32_t rnti_idx, uint32_t rv_idx, uint32_t current_tx_nb,
                             uint8_t *data, uint32_t sf_idx)
 {
@@ -170,29 +164,35 @@ int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant,
   srslte_uci_data_t uci_data; 
   bzero(&uci_data, sizeof(srslte_uci_data_t)); 
   return srslte_pusch_uci_decode_rnti_idx(&q->pusch, &q->pusch_cfg, 
-                                          &q->softbuffer, q->sf_symbols, 
+                                          softbuffer, q->sf_symbols, 
                                           q->ce, noise_power, 
                                           rnti_idx, data, 
                                           &uci_data);
 }
 
 int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, srslte_enb_ul_pusch_t *grants, 
+                                  bool *pusch_crc_res,
                                   uint32_t nof_pusch, uint32_t tti)
 {
   uint32_t n_rb_ho = 0; 
   for (int i=0;i<nof_pusch;i++) {
     srslte_ra_ul_grant_t phy_grant; 
     srslte_ra_ul_dci_to_grant(&grants[i].grant, q->cell.nof_prb, n_rb_ho, &phy_grant, tti%8);
-    if (srslte_enb_ul_get_pusch(q, &phy_grant, grants[i].rnti_idx, grants[i].rv_idx, 
-                                grants[i].current_tx_nb, grants[i].data, tti%10) < 0) 
-    {
-      fprintf(stderr, "Error getting PUSCH\n");
-      return SRSLTE_ERROR; 
-    }
+    pusch_crc_res[i] = srslte_enb_ul_get_pusch(q, &phy_grant, grants[i].softbuffer, 
+                                               grants[i].rnti_idx, grants[i].rv_idx, 
+                                               grants[i].current_tx_nb, 
+                                               grants[i].data, tti%10) == 0; 
+
+    q->phich_info[grants[i].rnti_idx].n_prb_lowest = q->pusch_cfg.grant.n_prb_tilde[0];                                           
+    q->phich_info[grants[i].rnti_idx].n_dmrs       = phy_grant.ncs_dmrs;                                           
   }
   return SRSLTE_SUCCESS; 
 }
 
+void srslte_enb_ul_get_phich_info(srslte_enb_ul_t *q, 
+                                             uint32_t rnti_idx, 
+                                             srslte_enb_ul_phich_info_t *phich_info)
+
 int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q, uint32_t tti, 
                                uint32_t freq_offset, cf_t *signal, 
                                uint32_t *indices, uint32_t *offsets)
diff --git a/srslte/lib/phch/phich.c b/srslte/lib/phch/phich.c
index 5768106be..ae5b6aa67 100644
--- a/srslte/lib/phch/phich.c
+++ b/srslte/lib/phch/phich.c
@@ -110,6 +110,16 @@ void srslte_phich_free(srslte_phich_t *q) {
 
 }
 
+/* Computes n_group and n_seq according to Section 9.1.2 in 36.213 */
+void srslte_phich_calc(srslte_phich_t *q, uint32_t n_prb_lowest, uint32_t n_dmrs, 
+                       uint32_t *ngroup, uint32_t *nseq) 
+{
+  uint32_t Ngroups = srslte_phich_ngroups(q); 
+  *ngroup = (n_prb_lowest+n_dmrs)%Ngroups;
+  *nseq = ((n_prb_lowest/Ngroups)+n_dmrs)%(2*srslte_phich_nsf(q)); 
+}
+
+
 /* Decodes ACK
  *
  */
diff --git a/srslte/lib/rf/rf_dev.h b/srslte/lib/rf/rf_dev.h
index 739c39650..3cc784944 100644
--- a/srslte/lib/rf/rf_dev.h
+++ b/srslte/lib/rf/rf_dev.h
@@ -130,9 +130,13 @@ static rf_dev_t dev_blade = {
 };
 #endif
 
-//#define ENABLE_DUMMY_DEV
+#define ENABLE_DUMMY_DEV
 
 #ifdef ENABLE_DUMMY_DEV
+int dummy_rcv() {
+  usleep(100000);
+  return 1; 
+}
 void dummy_fnc() {
   
 }
@@ -160,7 +164,7 @@ static rf_dev_t dev_dummy = {
   dummy_fnc,
   dummy_fnc,
   dummy_fnc,  
-  dummy_fnc,
+  dummy_rcv,
   dummy_fnc,
   dummy_fnc,
   dummy_fnc
diff --git a/srslte/lib/ue/ue_dl.c b/srslte/lib/ue/ue_dl.c
index 2400c6a81..d421c6796 100644
--- a/srslte/lib/ue/ue_dl.c
+++ b/srslte/lib/ue/ue_dl.c
@@ -425,14 +425,13 @@ int srslte_ue_dl_decode_rnti_rv(srslte_ue_dl_t *q, cf_t *input, uint8_t *data, u
   }
 }
 
-/* Computes n_group and n_seq according to Section 9.1.2 in 36.213 and calls phich processing function */
+
 bool srslte_ue_dl_decode_phich(srslte_ue_dl_t *q, uint32_t sf_idx, uint32_t n_prb_lowest, uint32_t n_dmrs)
 {
   uint8_t ack_bit; 
   float distance;
-  uint32_t Ngroups = srslte_phich_ngroups(&q->phich); 
-  uint32_t ngroup = (n_prb_lowest+n_dmrs)%Ngroups;
-  uint32_t nseq = ((n_prb_lowest/Ngroups)+n_dmrs)%(2*srslte_phich_nsf(&q->phich));
+  uint32_t ngroup, nseq; 
+  srslte_phich_calc(&q->phich, n_prb_lowest, n_dmrs, &ngroup, &nseq);
   DEBUG("Decoding PHICH sf_idx=%d, n_prb_lowest=%d, n_dmrs=%d, n_group=%d, n_seq=%d\n", 
     sf_idx, n_prb_lowest, n_dmrs, ngroup, nseq);
   if (!srslte_phich_decode(&q->phich, q->sf_symbols, q->ce, 0, ngroup, nseq, sf_idx, &ack_bit, &distance)) {