[MERGED] osmo-ttcn3-hacks[master]: bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS ...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS 
function)
..


bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS function)

Change-Id: I619264654bfeafe4b76c8702ede5876a82c32f13
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index e68a20d..48ca1fd 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -488,9 +488,7 @@
 
 /* like L1SAP_IS_PACKET_RACH */
 private function ra_is_ps(OCT1 ra) return boolean {
-   if (ra and4b 'F0'O == '70'O) {
-   return true;
-   } else if (ra and4b '0F'O == '0F'O) {
+   if ((ra and4b 'F0'O == '70'O) and (ra and4b '0F'O != '0F'O)) {
return true;
}
return false;
@@ -522,6 +520,7 @@
fn_last := fn;
 
timer T := 5.0;
+   T.start;
alt {
[] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, ?))) {
T.stop;
@@ -558,6 +557,7 @@
}
var integer rsl_chrqd := 0;
timer T := 3.0;
+   T.start;
alt {
[] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?,?))) {
rsl_chrqd := rsl_chrqd + 1;

-- 
To view, visit https://gerrit.osmocom.org/7006
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I619264654bfeafe4b76c8702ede5876a82c32f13
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-ttcn3-hacks[master]: bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS ...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7006
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I619264654bfeafe4b76c8702ede5876a82c32f13
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] osmo-ttcn3-hacks[master]: bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS ...

[Harald Welte]

Review at  https://gerrit.osmocom.org/7006

bts: Fix bugs in RACH Tests (timer not started, wrong CS/PS function)

Change-Id: I619264654bfeafe4b76c8702ede5876a82c32f13
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/06/7006/1

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index e68a20d..48ca1fd 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -488,9 +488,7 @@
 
 /* like L1SAP_IS_PACKET_RACH */
 private function ra_is_ps(OCT1 ra) return boolean {
-   if (ra and4b 'F0'O == '70'O) {
-   return true;
-   } else if (ra and4b '0F'O == '0F'O) {
+   if ((ra and4b 'F0'O == '70'O) and (ra and4b '0F'O != '0F'O)) {
return true;
}
return false;
@@ -522,6 +520,7 @@
fn_last := fn;
 
timer T := 5.0;
+   T.start;
alt {
[] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, ?))) {
T.stop;
@@ -558,6 +557,7 @@
}
var integer rsl_chrqd := 0;
timer T := 3.0;
+   T.start;
alt {
[] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?,?))) {
rsl_chrqd := rsl_chrqd + 1;

-- 
To view, visit https://gerrit.osmocom.org/7006
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I619264654bfeafe4b76c8702ede5876a82c32f13
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte