November 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_*

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29957 ) Change subject: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_* ...................................................................... trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_* It's not really necessary to handle signalling and traffic via different events, so let's reduce complexity by merging them. Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 31 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/29957/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 70d804f..0d55ff1 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -17,8 +17,8 @@ int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type); int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type); -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, - const struct trxcon_param_rx_traffic_data_ind *ind); +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, + const struct trxcon_param_rx_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, struct l1ctl_info_dl *data, bool traffic); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 37e3f14..9c641df 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -29,8 +29,6 @@ TRXCON_EV_UPDATE_SACCH_CACHE_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, - TRXCON_EV_TX_TRAFFIC_REQ, - TRXCON_EV_RX_TRAFFIC_IND, TRXCON_EV_TX_DATA_REQ, TRXCON_EV_RX_DATA_IND, TRXCON_EV_CRYPTO_REQ, @@ -84,16 +82,18 @@ }; }; -/* param of TRXCON_EV_TX_{TRAFFIC,DATA}_REQ */ -struct trxcon_param_tx_traffic_data_req { +/* param of TRXCON_EV_TX_DATA_REQ */ +struct trxcon_param_tx_data_req { + bool traffic; uint8_t chan_nr; uint8_t link_id; size_t data_len; const uint8_t *data; }; -/* param of TRXCON_EV_RX_{TRAFFIC,DATA}_IND */ -struct trxcon_param_rx_traffic_data_ind { +/* param of TRXCON_EV_RX_DATA_IND */ +struct trxcon_param_rx_data_ind { + bool traffic; uint8_t chan_nr; uint8_t link_id; uint16_t band_arfcn; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5baac1f..7a35d59 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -232,13 +232,12 @@ /** * Handles both L1CTL_DATA_IND and L1CTL_TRAFFIC_IND. */ -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, - const struct trxcon_param_rx_traffic_data_ind *ind) +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, + const struct trxcon_param_rx_data_ind *ind) { struct msgb *msg; - msg = l1ctl_alloc_msg(traffic ? - L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); + msg = l1ctl_alloc_msg(ind->traffic ? L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); if (msg == NULL) return -ENOMEM; @@ -637,7 +636,8 @@ ul = (struct l1ctl_info_ul *) msg->l1h; msg->l2h = ul->payload; - struct trxcon_param_tx_traffic_data_req req = { + struct trxcon_param_tx_data_req req = { + .traffic = traffic, .chan_nr = ul->chan_nr, .link_id = ul->link_id & 0x40, .data_len = msgb_l2len(msg), @@ -650,10 +650,7 @@ switch (fi->state) { case TRXCON_ST_DEDICATED: - if (traffic) - osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); - else - osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_DATA_REQ, &req); + osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_DATA_REQ, &req); break; default: if (!traffic && req.link_id == 0x40) /* only for SACCH */ diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 0bbb602..039195b 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -197,7 +197,8 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - struct trxcon_param_rx_traffic_data_ind ind = { + struct trxcon_param_rx_data_ind ind = { + /* .traffic is set below */ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .band_arfcn = trxcon->l1p.band_arfcn, @@ -211,10 +212,10 @@ }; switch (dt) { - case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_TRAFFIC_IND, &ind); - break; + case L1SCHED_DT_TRAFFIC: + ind.traffic = true; + /* fall-through */ case L1SCHED_DT_SIGNALING: rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_DATA_IND, &ind); break; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 0e005a3..fb375c4 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -88,7 +88,7 @@ } case TRXCON_EV_UPDATE_SACCH_CACHE_REQ: { - const struct trxcon_param_tx_traffic_data_req *req = data; + const struct trxcon_param_tx_data_req *req = data; if (req->link_id != L1SCHED_CH_LID_SACCH) { LOGPFSML(fi, LOGL_ERROR, "Unexpected link_id=0x%02x\n", req->link_id); @@ -340,12 +340,8 @@ break; } case TRXCON_EV_RX_DATA_IND: - { - const struct trxcon_param_rx_traffic_data_ind *ind = data; - - l1ctl_tx_dt_ind(trxcon->l2if, false, ind); + l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; - } default: OSMO_ASSERT(0); } @@ -433,10 +429,9 @@ } break; } - case TRXCON_EV_TX_TRAFFIC_REQ: case TRXCON_EV_TX_DATA_REQ: { - const struct trxcon_param_tx_traffic_data_req *req = data; + const struct trxcon_param_tx_data_req *req = data; struct l1sched_ts_prim *prim; prim = l1sched_prim_push(trxcon->sched, L1SCHED_PRIM_DATA, @@ -448,14 +443,9 @@ } break; } - case TRXCON_EV_RX_TRAFFIC_IND: case TRXCON_EV_RX_DATA_IND: - { - const struct trxcon_param_rx_traffic_data_ind *ind = data; - - l1ctl_tx_dt_ind(trxcon->l2if, event == TRXCON_EV_RX_TRAFFIC_IND, ind); + l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; - } default: OSMO_ASSERT(0); } @@ -470,12 +460,16 @@ case TRXCON_EV_TX_ACCESS_BURST_REQ: handle_tx_access_burst_req(fi, data); break; - case TRXCON_EV_RX_TRAFFIC_IND: - LOGPFSML(fi, LOGL_NOTICE, "Rx PDTCH/D message\n"); - break; case TRXCON_EV_RX_DATA_IND: - LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); + { + const struct trxcon_param_rx_data_ind *ind = data; + + if (ind->link_id == 0x00) + LOGPFSML(fi, LOGL_NOTICE, "Rx PDTCH/D message\n"); + else + LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); break; + } case TRXCON_EV_DEDICATED_RELEASE_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -554,8 +548,6 @@ .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_SET_TCH_MODE_REQ) - | S(TRXCON_EV_TX_TRAFFIC_REQ) - | S(TRXCON_EV_RX_TRAFFIC_IND) | S(TRXCON_EV_TX_DATA_REQ) | S(TRXCON_EV_RX_DATA_IND) | S(TRXCON_EV_CRYPTO_REQ), @@ -568,7 +560,6 @@ | S(TRXCON_ST_BCCH_CCCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) - | S(TRXCON_EV_RX_TRAFFIC_IND) | S(TRXCON_EV_RX_DATA_IND), .action = &trxcon_st_packet_data_action, }, @@ -590,8 +581,6 @@ OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), - OSMO_VALUE_STRING(TRXCON_EV_TX_TRAFFIC_REQ), - OSMO_VALUE_STRING(TRXCON_EV_RX_TRAFFIC_IND), OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ), OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND), OSMO_VALUE_STRING(TRXCON_EV_CRYPTO_REQ), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0 Gerrit-Change-Number: 29957 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29958 ) Change subject: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF ...................................................................... trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF We already handle DATA.req/TRAFFIC.req via TRXCON_EV_TX_DATA_REQ, so let's handle the respective *.cnf messages via the FSM too. Change-Id: Ica7a25f0bf8c7f89037a776d711ac641c57c9ad5 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 33 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/29958/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 0d55ff1..eb67bee 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -20,6 +20,6 @@ int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, const struct trxcon_param_rx_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, - struct l1ctl_info_dl *data, bool traffic); + const struct trxcon_param_tx_data_cnf *cnf); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, uint32_t fn); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 9c641df..5af2122 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -30,6 +30,7 @@ TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, TRXCON_EV_TX_DATA_REQ, + TRXCON_EV_TX_DATA_CNF, TRXCON_EV_RX_DATA_IND, TRXCON_EV_CRYPTO_REQ, }; @@ -91,6 +92,15 @@ const uint8_t *data; }; +/* param of TRXCON_EV_TX_DATA_CNF */ +struct trxcon_param_tx_data_cnf { + bool traffic; + uint8_t chan_nr; + uint8_t link_id; + uint16_t band_arfcn; + uint32_t frame_nr; +}; + /* param of TRXCON_EV_RX_DATA_IND */ struct trxcon_param_rx_data_ind { bool traffic; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 7a35d59..b9805eb 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -285,8 +285,8 @@ /** * Handles both L1CTL_DATA_CONF and L1CTL_TRAFFIC_CONF. */ -int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, - struct l1ctl_info_dl *data, bool traffic) +int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, bool traffic, + struct trxcon_param_tx_data_cnf *cnf) { struct msgb *msg; @@ -295,8 +295,15 @@ if (msg == NULL) return -ENOMEM; + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = cnf->chan_nr, + .link_id = cnf->link_id, + .frame_nr = htonl(cnf->frame_nr), + .band_arfcn = htons(cnf->band_arfcn), + }; + /* Copy DL frame header from source message */ - put_dl_info_hdr(msg, data); + put_dl_info_hdr(msg, &dl_hdr); return l1ctl_client_send(l1c, msg); } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 039195b..6b5bdb5 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -47,7 +47,6 @@ #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/trxcon/l1ctl_server.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> #define COPYRIGHT \ @@ -248,7 +247,6 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; - struct l1ctl_info_dl dl_hdr; const uint8_t *data; uint8_t ra_buf[2]; size_t data_len; @@ -256,22 +254,21 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - dl_hdr = (struct l1ctl_info_dl) { + struct trxcon_param_tx_data_cnf cnf = { + /* .traffic is set below */ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, - .frame_nr = htonl(fn), - .band_arfcn = htons(trxcon->l1p.band_arfcn), + .band_arfcn = trxcon->l1p.band_arfcn, + .frame_nr = fn, }; switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, true); - data_len = lchan->prim->payload_len; - data = lchan->prim->payload; - break; + cnf.traffic = true; + /* fall-through */ case L1SCHED_DT_SIGNALING: - rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, false); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_CNF, &cnf); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index fb375c4..676c060 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -443,6 +443,9 @@ } break; } + case TRXCON_EV_TX_DATA_CNF: + l1ctl_tx_dt_conf(trxcon->l2if, (const struct trxcon_param_tx_data_cnf *)data); + break; case TRXCON_EV_RX_DATA_IND: l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; @@ -549,6 +552,7 @@ | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_SET_TCH_MODE_REQ) | S(TRXCON_EV_TX_DATA_REQ) + | S(TRXCON_EV_TX_DATA_CNF) | S(TRXCON_EV_RX_DATA_IND) | S(TRXCON_EV_CRYPTO_REQ), .action = &trxcon_st_dedicated_action, @@ -582,6 +586,7 @@ OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ), + OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_CNF), OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND), OSMO_VALUE_STRING(TRXCON_EV_CRYPTO_REQ), { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica7a25f0bf8c7f89037a776d711ac641c57c9ad5 Gerrit-Change-Number: 29958 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1ctl.c: remove unused headers

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29955 ) Change subject: trxcon: l1ctl.c: remove unused headers ...................................................................... trxcon: l1ctl.c: remove unused headers Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/29955/1 diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f1e610..87bfe74 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -26,14 +26,12 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include <assert.h> #include <arpa/inet.h> #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/select.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 Gerrit-Change-Number: 29955 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29956 ) Change subject: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind() ...................................................................... trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind() The trxcon_fsm should not be dealing with the L1CTL protocol, so let's better hand over the trxcon_param_rx_traffic_data_ind to l1ctl_tx_dt_ind() and compose the l1ctl_info_dl there. Change-Id: Ie57d86ffd9ea7c44187aafba0df1f519d1c523fb Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 22 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/29956/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 9518bb9..70d804f 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -17,10 +17,8 @@ int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type); int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type); -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, - const struct l1ctl_info_dl *dl_info, - const uint8_t *l2, size_t l2_len, - bool traffic); +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, + const struct trxcon_param_rx_traffic_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, struct l1ctl_info_dl *data, bool traffic); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 9aa5e55..37e3f14 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -96,6 +96,7 @@ struct trxcon_param_rx_traffic_data_ind { uint8_t chan_nr; uint8_t link_id; + uint16_t band_arfcn; uint32_t frame_nr; int16_t toa256; int8_t rssi; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 87bfe74..5baac1f 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -232,26 +232,32 @@ /** * Handles both L1CTL_DATA_IND and L1CTL_TRAFFIC_IND. */ -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, - const struct l1ctl_info_dl *dl_info, - const uint8_t *l2, size_t l2_len, - bool traffic) +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, + const struct trxcon_param_rx_traffic_data_ind *ind) { struct msgb *msg; - uint8_t *msg_l2; msg = l1ctl_alloc_msg(traffic ? L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); if (msg == NULL) return -ENOMEM; - put_dl_info_hdr(msg, dl_info); + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = ind->chan_nr, + .link_id = ind->link_id, + .frame_nr = htonl(ind->frame_nr), + .band_arfcn = htons(ind->band_arfcn), + .fire_crc = ind->data_len > 0 ? 0 : 2, + .rx_level = dbm2rxlev(ind->rssi), + .num_biterr = ind->n_errors, + /* TODO: set proper .snr */ + }; + + put_dl_info_hdr(msg, &dl_hdr); /* Copy the L2 payload if preset */ - if (l2 && l2_len > 0) { - msg_l2 = (uint8_t *) msgb_put(msg, l2_len); - memcpy(msg_l2, l2, l2_len); - } + if (ind->data && ind->data_len > 0) + memcpy(msgb_put(msg, ind->data_len), ind->data, ind->data_len); /* Put message to upper layers */ return l1ctl_client_send(l1c, msg); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 764f717..0bbb602 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -200,6 +200,7 @@ struct trxcon_param_rx_traffic_data_ind ind = { .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, + .band_arfcn = trxcon->l1p.band_arfcn, .frame_nr = meas->fn, .toa256 = meas->toa256, .rssi = meas->rssi, diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 58a749e..0e005a3 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -23,8 +23,6 @@ #include <string.h> #include <errno.h> -#include <arpa/inet.h> - #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> @@ -34,7 +32,6 @@ #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/trxcon/l1ctl_server.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> @@ -345,18 +342,8 @@ case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_traffic_data_ind *ind = data; - const struct l1ctl_info_dl dl_hdr = { - .chan_nr = ind->chan_nr, - .link_id = ind->link_id, - .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->l1p.band_arfcn), - .fire_crc = ind->data_len > 0 ? 0 : 2, - .rx_level = dbm2rxlev(ind->rssi), - .num_biterr = ind->n_errors, - /* TODO: set proper .snr */ - }; - l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, false); + l1ctl_tx_dt_ind(trxcon->l2if, false, ind); break; } default: @@ -465,20 +452,8 @@ case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_traffic_data_ind *ind = data; - const struct l1ctl_info_dl dl_hdr = { - .chan_nr = ind->chan_nr, - .link_id = ind->link_id, - .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->l1p.band_arfcn), - .fire_crc = ind->data_len > 0 ? 0 : 2, - .rx_level = dbm2rxlev(ind->rssi), - .num_biterr = ind->n_errors, - /* TODO: set proper .snr */ - }; - l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, - ind->data, ind->data_len, - event == TRXCON_EV_RX_TRAFFIC_IND); + l1ctl_tx_dt_ind(trxcon->l2if, event == TRXCON_EV_RX_TRAFFIC_IND, ind); break; } default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie57d86ffd9ea7c44187aafba0df1f519d1c523fb Gerrit-Change-Number: 29956 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: drop sched->clock_cb(), expose l1sched_trigger()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29954 ) Change subject: trxcon: drop sched->clock_cb(), expose l1sched_trigger() ...................................................................... trxcon: drop sched->clock_cb(), expose l1sched_trigger() It does not make sense to call function sched_frame_clck_cb() via a configurable pointer in the l1sched_state. Make this function public (thus rename) and call it directly. Remove the .clock_cb. Having l1sched_trigger() globally available makes it possible to call this function directly, bypassing the internal timer driven clock module. This is needed for the integration with osmo-trx-ms. Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_clck.c M src/host/trxcon/src/sched_trx.c 3 files changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/29954/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 9686562..3eadbbf 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -372,8 +372,6 @@ uint32_t fn_counter_lost; /*! Frame callback timer */ struct osmo_timer_list clock_timer; - /*! Frame callback */ - void (*clock_cb)(struct l1sched_state *sched); /*! List of timeslots maintained by this scheduler */ struct l1sched_ts *ts[TRX_TS_COUNT]; /*! SACCH cache (common for all lchans) */ @@ -490,8 +488,10 @@ void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_meas_set *meas); void l1sched_lchan_meas_avg(struct l1sched_lchan_state *lchan, unsigned int n); +/* Clock and Downlink scheduling trigger */ int l1sched_clck_handle(struct l1sched_state *sched, uint32_t fn); void l1sched_clck_reset(struct l1sched_state *sched); +void l1sched_trigger(struct l1sched_state *sched); /* External L1 API, must be implemented by the API user */ int l1sched_handle_config_req(struct l1sched_state *sched, diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index f08156c..ccafd7b 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -81,9 +81,8 @@ GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } osmo_timer_schedule(&sched->clock_timer, 0, @@ -95,9 +94,8 @@ { sched->fn_counter_proc = fn; - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); /* Schedule first FN clock */ sched->clock = *tv_now; @@ -177,9 +175,8 @@ while (fn != sched->fn_counter_proc) { GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } /* Schedule next FN to be transmitted */ diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index be1f820..c36b7de 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -85,7 +85,7 @@ static void l1sched_a5_burst_enc(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); -static void sched_frame_clck_cb(struct l1sched_state *sched) +void l1sched_trigger(struct l1sched_state *sched) { struct l1sched_burst_req br[TRX_TS_COUNT]; const struct l1sched_tdma_frame *frame; @@ -199,7 +199,6 @@ *sched = (struct l1sched_state) { /* .clock_timer is set up in l1sched_clck_correct() */ - .clock_cb = &sched_frame_clck_cb, .fn_counter_advance = cfg->fn_advance, .priv = priv, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Gerrit-Change-Number: 29954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) This likely means it's not an e1-tracer after all, or it's an old firmware that doesn't yet expose the e1d-compatible USB configuration. Related: OS#5734 Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 --- M src/usb.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Verified tnt: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index dc89bb0..35e1894 100644 --- a/src/usb.c +++ b/src/usb.c @@ -876,8 +876,13 @@ } /* we have prior knowledge that the e1-tracer firmware configuration 2 is the e1d compatible mode. */ - if (is_tracer) - libusb_set_configuration(devh, 2); + if (is_tracer) { + if (libusb_set_configuration(devh, 2) != LIBUSB_SUCCESS) { + LOGP(DE1D, LOGL_ERROR, "Cannot set configuration 2 of e1-tracer device. Maybe too old firmware?\n"); + libusb_close(devh); + return -EIO; + } + } INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:04:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022