diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2010-09-14 21:19:38 +0200 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2010-09-17 20:52:41 +0200 |
| commit | 54b77bc07ea86ecc4b86e604d3798b441c13b463 (patch) | |
| tree | a01fb9c8e5258a324a115b469b2fc8c19aa16154 | |
| parent | f0873b81fedbc0aed27886c9e158ef2a30f9935d (diff) | |
fw & layer23: Remove limitation about the SDCCH subchannel 4..8
This is now supported :)
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
| -rw-r--r-- | src/host/layer23/src/misc/layer3.c | 4 | ||||
| -rw-r--r-- | src/host/layer23/src/mobile/gsm48_rr.c | 2 | ||||
| -rw-r--r-- | src/target/firmware/layer1/l23_api.c | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/host/layer23/src/misc/layer3.c b/src/host/layer23/src/misc/layer3.c index 74d48eb3..8716a8a8 100644 --- a/src/host/layer23/src/misc/layer3.c +++ b/src/host/layer23/src/misc/layer3.c @@ -207,7 +207,7 @@ static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms) ia->chan_desc.chan_nr, arfcn, ch_ts, ch_subch, ia->chan_desc.h0.tsc); - if (ch_ts >= 4 || ch_subch >= 4) { + if (ch_ts >= 4) { DEBUGPC(DRR, "UNSUPPORTED!\n"); return 0; } @@ -242,7 +242,7 @@ static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms) } } - if (ch_ts >= 4 || ch_subch >= 4) { + if (ch_ts >= 4) { DEBUGPC(DRR, "UNSUPPORTED!\n"); return 0; } diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 674f7ea1..29b19251 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -2928,7 +2928,7 @@ static int gsm48_rr_activate_channel(struct osmocom_ms *ms, rsl_dec_chan_nr(cd->chan_nr, &ch_type, &ch_subch, &ch_ts); if ((ch_type != RSL_CHAN_SDCCH8_ACCH && ch_type != RSL_CHAN_SDCCH4_ACCH - && ch_type != RSL_CHAN_Bm_ACCHs) /*|| ch_ts > 4*/ || ch_subch >= 4) { + && ch_type != RSL_CHAN_Bm_ACCHs) || ch_ts >= 4) { printf("Channel type %d, subch %d, ts %d not supported, " "exitting.\n", ch_type, ch_subch, ch_ts); exit(-ENOTSUP); diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 471e509f..ca8d26ab 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -173,13 +173,6 @@ static void l1ctl_rx_dm_est_req(struct msgb *msg) return; } - if ((chan_nr2mf_task(ul->chan_nr) >= MF_TASK_SDCCH8_4) && - (chan_nr2mf_task(ul->chan_nr) <= MF_TASK_SDCCH8_7)) { - /* FIXME: TX while RX prevents SDCCH8 [4..7] */ - puts("We don't support SDCCH8 [4..7] yet\n"); - return; - } - /* configure dedicated channel state */ l1s.dedicated.type = chan_nr2dchan_type(ul->chan_nr); l1s.dedicated.tsc = est_req->tsc; |