src: use new libosmogsm and include/osmocom/[gsm|core] path to headers

[osmocom-bb.git] / src / host / layer23 / src / common / lapdm.c

diff --git a/src/host/layer23/src/common/lapdm.c b/src/host/layer23/src/common/lapdm.c
index b1c0d40..61e2287 100644 (file)
--- a/src/host/layer23/src/common/lapdm.c
+++ b/src/host/layer23/src/common/lapdm.c
@@ -56,14 +56,14 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
-#include <osmocore/logging.h>
-#include <osmocore/timer.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/utils.h>
-#include <osmocore/rsl.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_08_58.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/rsl.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
 
 #include <osmocom/bb/common/osmocom_data.h>
 #include <osmocom/bb/common/l1ctl.h>
@@ -573,20 +573,21 @@ static void lapdm_t200_cb(void *data)
                dl->retrans_ctr++;
                if (dl->retrans_ctr < N200) {
                        /* retransmit I frame (V_s-1) with P=1, if any */
-                       if (dl->tx_length[dl->V_send - 1]) {
+                       if (dl->tx_length[sub_mod8(dl->V_send, 1)]) {
                                struct msgb *msg;
                                int length;
 
                                LOGP(DLAPDM, LOGL_INFO, "retransmit last frame "
-                                       "V(S)=%d\n", dl->V_send - 1);
+                                       "V(S)=%d\n", sub_mod8(dl->V_send, 1));
                                /* Create I frame (segment) from tx_hist */
-                               length = dl->tx_length[dl->V_send - 1];
+                               length = dl->tx_length[sub_mod8(dl->V_send, 1)];
                                msg = msgb_alloc_headroom(23+10, 10, "LAPDm I");
                                msg->l2h = msgb_put(msg, length);
-                               memcpy(msg->l2h, dl->tx_hist[dl->V_send - 1],
+                               memcpy(msg->l2h,
+                                       dl->tx_hist[sub_mod8(dl->V_send, 1)],
                                        length);
                                msg->l2h[1] = LAPDm_CTRL_I(dl->V_recv,
-                                               dl->V_send - 1, 1); /* P=1 */
+                                       sub_mod8(dl->V_send, 1), 1); /* P=1 */
                                tx_ph_data_enqueue(dl, msg, dl->mctx.chan_nr,
                                        dl->mctx.link_id, dl->mctx.n201);
                        } else {
@@ -1078,9 +1079,11 @@ static int lapdm_rx_s(struct msgb *msg, struct lapdm_msg_ctx *mctx)
                rsl_rll_error(RLL_CAUSE_SFRM_INC_PARAM, mctx);
                return -EIO;
        }
-       /* 5.4.2.2: Inidcate error on supervisory reponse F=1 */
+
        if (LAPDm_ADDR_CR(mctx->addr) == CR_BS2MS_RESP
-        && LAPDm_CTRL_PF_BIT(mctx->ctrl)) {
+        && LAPDm_CTRL_PF_BIT(mctx->ctrl)
+        && dl->state != LAPDm_STATE_TIMER_RECOV) {
+               /* 5.4.2.2: Inidcate error on supervisory reponse F=1 */
                LOGP(DLAPDM, LOGL_NOTICE, "S frame response with F=1 error\n");
                rsl_rll_error(RLL_CAUSE_UNSOL_SPRV_RESP, mctx);
        }
@@ -1123,6 +1126,18 @@ static int lapdm_rx_s(struct msgb *msg, struct lapdm_msg_ctx *mctx)
                                        "so we reply with RR frame\n");
                                lapdm_send_rnr(mctx, 1);
                        }
+               } else if (LAPDm_ADDR_CR(mctx->addr) == CR_BS2MS_RESP
+                       && LAPDm_CTRL_PF_BIT(mctx->ctrl)
+                       && dl->state == LAPDm_STATE_TIMER_RECOV) {
+                       LOGP(DLAPDM, LOGL_INFO, "RR response with F==1, "
+                               "and we are in timer recovery state, so "
+                               "we leave that state\n");
+                       /* V(S) to the N(R) in the RR frame */
+                       dl->V_send = LAPDm_CTRL_Nr(mctx->ctrl);
+                       /* reset Timer T200 */
+                       bsc_del_timer(&dl->t200);
+                       /* 5.5.7 Clear timer recovery condition */
+                       lapdm_dl_newstate(dl, LAPDm_STATE_MF_EST);
                }
                /* Send message, if possible due to acknowledged data */
                rslms_send_i(mctx, __LINE__);
@@ -1158,7 +1173,7 @@ static int lapdm_rx_s(struct msgb *msg, struct lapdm_msg_ctx *mctx)
                                LOGP(DLAPDM, LOGL_INFO, "RNR poll response "
                                        "and we in timer recovery state, so "
                                        "we leave that state\n");
-                               /* Clear timer recovery condition */
+                               /* 5.5.7 Clear timer recovery condition */
                                lapdm_dl_newstate(dl, LAPDm_STATE_MF_EST);
                                /* V(S) to the N(R) in the RNR frame */
                                dl->V_send = LAPDm_CTRL_Nr(mctx->ctrl);
@@ -1226,7 +1241,7 @@ static int lapdm_rx_s(struct msgb *msg, struct lapdm_msg_ctx *mctx)
                                "recovery state received\n");
                        /* Clear an existing peer receiver busy condition */
                        dl->peer_busy = 0;
-                       /* Clear timer recovery condition */
+                       /* 5.5.7 Clear timer recovery condition */
                        lapdm_dl_newstate(dl, LAPDm_STATE_MF_EST);
                        /* V(S) and V(A) to the N(R) in the REJ frame */
                        dl->V_send = dl->V_ack = LAPDm_CTRL_Nr(mctx->ctrl);
@@ -1742,7 +1757,7 @@ static int rslms_send_i(struct lapdm_msg_ctx *mctx, int line)
        int k = k_sapi[sapi];
        struct msgb *msg;
        int length, left;
-       int rc = -1; /* we sent nothing */
+       int rc = - 1; /* we sent nothing */
 
        LOGP(DLAPDM, LOGL_INFO, "%s() called from line %d\n", __func__, line);
 
@@ -2037,7 +2052,8 @@ static int rslms_rx_chan_rqd(struct osmocom_ms *ms, struct msgb *msg)
        /* TA = 0 - delay */
        rc = l1ctl_tx_param_req(ms, 0 - cch->data[5], cch->data[7]);
 
-       rc = l1ctl_tx_rach_req(ms, cch->data[1], cch->data[2], cch->data[3]);
+       rc = l1ctl_tx_rach_req(ms, cch->data[1],
+               ((cch->data[2] & 0x7f) << 8) | cch->data[3], cch->data[2] >> 7);
 
        msgb_free(msg);
 
@@ -2063,7 +2079,7 @@ int l2_ph_chan_conf(struct msgb *msg, struct osmocom_ms *ms,
        ref = (struct gsm48_req_ref *) (ch->data + 1);
        ref->t1 = tm.t1;
        ref->t2 = tm.t2;
-       ref->t3_low = tm.t3 & 0x3;
+       ref->t3_low = tm.t3 & 0x7;
        ref->t3_high = tm.t3 >> 3;
        
        return rslms_sendmsg(msg, ms);