Merge remote-tracking branch 'internal/usrp-cherry-pick' into develop_integration_w34

targets/ARCH/COMMON/common_lib.h

@@ -140,7 +140,9 @@ typedef enum {
   //! This tells the underlying hardware to use the internal reference
   internal=0,
   //! This tells the underlying hardware to use the external reference
-  external=1
+  external=1,
+  //! This tells the underlying hardware to use the gpsdo reference
+  gpsdo=2
 } clock_source_t;
 
 /*! \brief RF frontend parameters set by application */

targets/RT/USER/lte-enb.c

@@ -945,7 +945,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
       int siglen=fp->samples_per_tti,flags=1;
 
       if (SF_type == SF_S) {
-	siglen = fp->dl_symbols_in_S_subframe*(fp->ofdm_symbol_size+fp->nb_prefix_samples0);
+	siglen = (fp->dl_symbols_in_S_subframe+1)*(fp->ofdm_symbol_size+fp->nb_prefix_samples0);
 	flags=3; // end of burst
       }
       if ((fp->frame_type == TDD) &&

targets/RT/USER/lte-softmodem.c

@@ -608,9 +608,6 @@ static void get_options (int argc, char **argv) {
     //  char                          line[1000];
     //  int                           l;
     int k,i;//,j,k;
-#if defined(OAI_USRP) || defined(CPRIGW)
-    int clock_src;
-#endif
     int CC_id;
 
 
@@ -639,6 +636,7 @@ static void get_options (int argc, char **argv) {
         LONG_OPTION_USIMTEST,
         LONG_OPTION_MMAPPED_DMA,
         LONG_OPTION_EXTERNAL_CLOCK,
+        LONG_OPTION_GPSDO_CLOCK,
         LONG_OPTION_WAIT_FOR_SYNC,
         LONG_OPTION_SINGLE_THREAD_DISABLE,
         LONG_OPTION_THREADIQ,
@@ -681,6 +679,7 @@ static void get_options (int argc, char **argv) {
         {"usim-test", no_argument, NULL, LONG_OPTION_USIMTEST},
         {"mmapped-dma", no_argument, NULL, LONG_OPTION_MMAPPED_DMA},
         {"external-clock", no_argument, NULL, LONG_OPTION_EXTERNAL_CLOCK},
+        {"gpsdo-clock", no_argument, NULL, LONG_OPTION_GPSDO_CLOCK},
         {"wait-for-sync", no_argument, NULL, LONG_OPTION_WAIT_FOR_SYNC},
         {"single-thread-disable", no_argument, NULL, LONG_OPTION_SINGLE_THREAD_DISABLE},
         {"threadIQ",  required_argument, NULL, LONG_OPTION_THREADIQ},
@@ -810,6 +809,10 @@ static void get_options (int argc, char **argv) {
       clock_source = external;
       break;
 
+    case LONG_OPTION_GPSDO_CLOCK:
+      clock_source = gpsdo;
+      break;
+
     case LONG_OPTION_WAIT_FOR_SYNC:
       wait_for_sync = 1;
       break;
@@ -1002,24 +1005,6 @@ static void get_options (int argc, char **argv) {
 
             break;
 
-        case 's':
-#if defined(OAI_USRP) || defined(CPRIGW)
-
-            clock_src = atoi(optarg);
-
-            if (clock_src == 0) {
-                //  char ref[128] = "internal";
-                //strncpy(uhd_ref, ref, strlen(ref)+1);
-            } else if (clock_src == 1) {
-                //char ref[128] = "external";
-                //strncpy(uhd_ref, ref, strlen(ref)+1);
-            }
-
-#else
-            printf("Note: -s not defined for ExpressMIMO2\n");
-#endif
-            break;
-
         case 'S':
             exit_missed_slots=0;
             printf("Skip exit for missed slots\n");