fw & layer23: Remove limitation about the SDCCH subchannel 4..8

This is now supported :)

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

diff --git a/src/host/layer23/src/misc/layer3.c b/src/host/layer23/src/misc/layer3.c
index 74d48eb..8716a8a 100644 (file)
--- 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 674f7ea..29b1925 100644 (file)
--- 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 471e509..ca8d26a 100644 (file)
--- 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;