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/misc | |
| 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/misc')
| -rw-r--r-- | src/host/layer23/src/misc/cell_log.c | 5 | ||||
| -rw-r--r-- | src/host/layer23/src/misc/layer3.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index c5d7c194..e6c5771b 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -287,9 +287,8 @@ static void start_rach(void) ncch->chan_nr = RSL_CHAN_RACH; ncch->data[0] = RSL_IE_REQ_REFERENCE; ncch->data[1] = rach_ref.cr; -#warning HACK: fn51 and fn_off - ncch->data[2] = (s->ccch_conf == 1) ? 27 : 50; - ncch->data[3] = 1; /* next frame */ + ncch->data[2] = (s->ccch_conf == 1) << 7; + ncch->data[3] = 0; ncch->data[4] = RSL_IE_ACCESS_DELAY; ncch->data[5] = 0; /* no delay */ ncch->data[6] = RSL_IE_MS_POWER; diff --git a/src/host/layer23/src/misc/layer3.c b/src/host/layer23/src/misc/layer3.c index 6a6cbeca..936623f3 100644 --- a/src/host/layer23/src/misc/layer3.c +++ b/src/host/layer23/src/misc/layer3.c @@ -287,8 +287,8 @@ int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) /* Req channel logic */ if (app_state.ccch_enabled && (app_state.rach_count < 2)) { - l1ctl_tx_rach_req(ms, app_state.rach_count, - app_state.ccch_mode == CCCH_MODE_COMBINED ? 27 : 51, 0); + l1ctl_tx_rach_req(ms, app_state.rach_count, 0, + app_state.ccch_mode == CCCH_MODE_COMBINED); app_state.rach_count++; } |