Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH

2018-10-24 Thread Vadim Yanitskiy 
Vadim Yanitskiy has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11422 )

Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH
..

sigProcLib: add a CorrType for extended (11-bit) RACH

This is a preparatory change that enables a possibility to choose
the amount of synch. sequences to be used for Access Burst (RACH)
detection. The VTY flag will be introduced in further changes.

There are two correlation types now:

  - RACH (default) - TS0 only;
  - EXT_RACH - all TS0, TS1, and TS2 together.

Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Related: OS#3054
---
M Transceiver52M/sigProcLib.cpp
M Transceiver52M/sigProcLib.h
2 files changed, 12 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp
index 072fb3b..28c4ded 100644
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -1602,18 +1602,22 @@
  *   tail: Search 8 symbols + maximum expected delay
  */
 static int detectRACHBurst(const signalVector , float threshold, int sps,
-   complex , float , unsigned max_toa)
+   complex , float , unsigned max_toa, 
bool ext)
 {
   int rc, target, head, tail;
-  CorrelationSequence *sync;
+  int i, num_seq;

   target = 8 + 40;
   head = 8;
   tail = 8 + max_toa;
-  sync = gRACHSequences[0];
+  num_seq = ext ? 3 : 1;

-  rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
-  target, head, tail, sync);
+  for (i = 0; i < num_seq; i++) {
+rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+target, head, tail, gRACHSequences[i]);
+if (rc > 0)
+  break;
+  }

   return rc;
 }
@@ -1682,9 +1686,10 @@
 rc = analyzeTrafficBurst(burst, tsc, threshold, sps,
  amp, toa, max_toa);
 break;
+  case EXT_RACH:
   case RACH:
 rc = detectRACHBurst(burst, threshold, sps, amp, toa,
- max_toa);
+ max_toa, type == EXT_RACH);
 break;
   default:
 LOG(ERR) << "Invalid correlation type";
diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h
index 9bc7e10..79a5c3f 100644
--- a/Transceiver52M/sigProcLib.h
+++ b/Transceiver52M/sigProcLib.h
@@ -29,6 +29,7 @@
 enum CorrType{
   OFF, ///< timeslot is off
   TSC, ///< timeslot should contain a normal burst
+  EXT_RACH,///< timeslot should contain an extended access burst
   RACH,///< timeslot should contain an access burst
   EDGE,///< timeslot should contain an EDGE burst
   IDLE ///< timeslot is an idle (or dummy) burst

--
To view, visit https://gerrit.osmocom.org/11422
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Gerrit-Change-Number: 11422
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy

Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH

2018-10-22 Thread Vadim Yanitskiy 
Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11422

to look at the new patch set (#2).

Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH
..

sigProcLib: add a CorrType for extended (11-bit) RACH

This is a preparatory change that enables a possibility to choose
the amount of synch. sequences to be used for Access Burst (RACH)
detection. The VTY flag will be introduced in further changes.

There are two correlation types now:

  - RACH (default) - TS0 only;
  - EXT_RACH - all TS0, TS1, and TS2 together.

Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Related: OS#3054
---
M Transceiver52M/sigProcLib.cpp
M Transceiver52M/sigProcLib.h
2 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/11422/2
--
To view, visit https://gerrit.osmocom.org/11422
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Gerrit-Change-Number: 11422
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH

2018-10-22 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11422 )

Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11422
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Gerrit-Change-Number: 11422
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 22 Oct 2018 06:48:21 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH

2018-10-21 Thread Vadim Yanitskiy 
Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/11422


Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH
..

sigProcLib: add a CorrType for extended (11-bit) RACH

This is a preparatory change that enables a possibility to choose
the amount of synch. sequences to be used for Access Burst (RACH)
detection. The VTY flag will be introduced in further changes.

There are two correlation types now:

  - RACH (default) - TS0 only;
  - EXT_RACH - all TS0, TS1, and TS2 together.

Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Related: OS#3054
---
M Transceiver52M/sigProcLib.cpp
M Transceiver52M/sigProcLib.h
2 files changed, 12 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/11422/1

diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp
index 072fb3b..28c4ded 100644
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -1602,18 +1602,22 @@
  *   tail: Search 8 symbols + maximum expected delay
  */
 static int detectRACHBurst(const signalVector , float threshold, int sps,
-   complex , float , unsigned max_toa)
+   complex , float , unsigned max_toa, 
bool ext)
 {
   int rc, target, head, tail;
-  CorrelationSequence *sync;
+  int i, num_seq;

   target = 8 + 40;
   head = 8;
   tail = 8 + max_toa;
-  sync = gRACHSequences[0];
+  num_seq = ext ? 3 : 1;

-  rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
-  target, head, tail, sync);
+  for (i = 0; i < num_seq; i++) {
+rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa,
+target, head, tail, gRACHSequences[i]);
+if (rc > 0)
+  break;
+  }

   return rc;
 }
@@ -1682,9 +1686,10 @@
 rc = analyzeTrafficBurst(burst, tsc, threshold, sps,
  amp, toa, max_toa);
 break;
+  case EXT_RACH:
   case RACH:
 rc = detectRACHBurst(burst, threshold, sps, amp, toa,
- max_toa);
+ max_toa, type == EXT_RACH);
 break;
   default:
 LOG(ERR) << "Invalid correlation type";
diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h
index 9bc7e10..79a5c3f 100644
--- a/Transceiver52M/sigProcLib.h
+++ b/Transceiver52M/sigProcLib.h
@@ -29,6 +29,7 @@
 enum CorrType{
   OFF, ///< timeslot is off
   TSC, ///< timeslot should contain a normal burst
+  EXT_RACH,///< timeslot should contain an extended access burst
   RACH,///< timeslot should contain an access burst
   EDGE,///< timeslot should contain an EDGE burst
   IDLE ///< timeslot is an idle (or dummy) burst

--
To view, visit https://gerrit.osmocom.org/11422
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9
Gerrit-Change-Number: 11422
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy