diff options
author | Andreas.Eversberg <jolly@eversberg.eu> | 2010-10-30 17:30:59 +0200 |
---|---|---|
committer | Sylvain Munaut <tnt@246tNt.com> | 2010-10-30 17:32:09 +0200 |
commit | a0246e07ff89c88b9927dbb2da68252e169441b3 (patch) | |
tree | d03edf85ff89b517fcd6fe9f44c24bf5cb29905a /src/host/layer23/src/mobile/gsm48_rr.c | |
parent | 072d7dd4bfef5bad171d0561a6ce4f984a26fd88 (diff) |
layer23: Use the new rach_req format in l1ctl and update l23 apps to use it
This removes an old hack
Written-by: Andreas Eversberg <jolly@eversberg.eu>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'src/host/layer23/src/mobile/gsm48_rr.c')
-rw-r--r-- | src/host/layer23/src/mobile/gsm48_rr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 65fc05f3..6c38e8f1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -1508,6 +1508,8 @@ fail: "S(lots) %d ra 0x%02x)\n", s->tx_integer, (s->ccch_conf == 1) ? "yes": "no", slots, chan_req); + slots = (random() % s->tx_integer) + slots; + /* (re)send CHANNEL RQD with new randiom */ nmsg = gsm48_rsl_msgb_alloc(); if (!nmsg) @@ -1518,9 +1520,8 @@ fail: ncch->chan_nr = RSL_CHAN_RACH; ncch->data[0] = RSL_IE_REQ_REFERENCE; ncch->data[1] = chan_req; -#warning HACK: fn51 and fn_off - ncch->data[2] = (s->ccch_conf == 1) ? 27 : 50; - ncch->data[3] = 1 + ((random() % s->tx_integer) + slots) / 51; + ncch->data[2] = (slots >> 8) | ((s->ccch_conf == 1) << 7); + ncch->data[3] = slots; ncch->data[4] = RSL_IE_ACCESS_DELAY; ncch->data[5] = set->alter_delay; /* (-)=earlier (+)=later */ ncch->data[6] = RSL_IE_MS_POWER; |