February 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/480729a8_eb12055e PS1, Line 173: rlcmac_prim_l1ctl_alloc > > ... which alone takes almost the entire line on my screen […] I see no real need to expose it, you can simply use the existing API and still fill it afterwards as you please. Some of those alloc APIs doesn't really even let you set all the params, just a few most relevant ones. Passing multiple arguments: use multiple lines. rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind({1,2,3,...}); rlcmac_prim->l1ctl = .... -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:47:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst

by dexter

Attention is currently required from: pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst ...................................................................... Patch Set 2: (1 comment) File src/pcu_l1_if_phy.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31558/comment/839c0ed5_7f6728b7 PS2, Line 4: #include <osmocom/core/gsmtap_util.h> > I find it more correct to add the header here since this declaration is provided by some external de […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:44:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to disconnect PDCH

by pespin

Attention is currently required from: pespin, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31573 ) Change subject: pcu_l1_if_phy: add new PHY API function to disconnect PDCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ied88f3289bda87c48f5f9255c4591470633cc805 Gerrit-Change-Number: 31573 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:43:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:34:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/pcu_l1_if_phy.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31558/comment/aec2dbea_a9ee014c PS2, Line 4: #include <osmocom/core/gsmtap_util.h> > It would be enough to add a forward declaration. I find it more correct to add the header here since this declaration is provided by some external dependency. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:31:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 ) Change subject: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description ...................................................................... rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description Change-Id: I740fac72cb418d4b61499990b13208fcd4bb922f --- M include/osmocom/gprs/rlcmac/llc_queue.h M src/rlcmac/llc_queue.c M src/rlcmac/rlcmac_enc.c 3 files changed, 37 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/75/31575/1 diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index a0a91e4..80016e0 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -29,6 +29,7 @@ }; struct gprs_llc_prio_queue { + uint8_t radio_prio; /* Radio prio of this queue, range (1..4) */ struct gprs_codel codel_state; struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; @@ -51,6 +52,7 @@ int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q); +uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); static inline size_t gprs_rlcmac_llc_queue_size(const struct gprs_rlcmac_llc_queue *q) { diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c index 2c1aeea..47cb1e9 100644 --- a/src/rlcmac/llc_queue.c +++ b/src/rlcmac/llc_queue.c @@ -46,6 +46,7 @@ q->avg_queue_delay = 0; for (i = 0; i < ARRAY_SIZE(q->pq); i++) { for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + q->pq[i][j].radio_prio = i + 1; /* range (1..4) */ INIT_LLIST_HEAD(&q->pq[i][j].queue); gprs_codel_init(&q->pq[i][j].codel_state); } @@ -141,25 +142,31 @@ #define ALPHA 0.5f +static struct gprs_llc_prio_queue *gprs_rlcmac_llc_queue_find_msg(struct gprs_rlcmac_llc_queue *q) +{ + unsigned int i, j; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + if (!llist_empty(&q->pq[i][j].queue)) + return &q->pq[i][j]; + } + } + return NULL; +} + static struct msgb *gprs_rlcmac_llc_queue_pick_msg(struct gprs_rlcmac_llc_queue *q, struct gprs_llc_prio_queue **prioq) { struct msgb *msg; struct timespec tv_now, tv_result; uint32_t lifetime; - unsigned int i, j; const struct llc_queue_entry_hdr *ehdr; - for (i = 0; i < ARRAY_SIZE(q->pq); i++) { - for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { - if ((msg = msgb_dequeue(&q->pq[i][j].queue))) { - *prioq = &q->pq[i][j]; - goto found; - } - } - } - return NULL; + *prioq = gprs_rlcmac_llc_queue_find_msg(q); + if (!(*prioq)) + return NULL; -found: + msg = msgb_dequeue(&(*prioq)->queue); ehdr = msgb_l1(msg); q->queue_size -= 1; @@ -213,3 +220,10 @@ msgb_pull_to_l2(msg); return msg; } + +uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q) +{ + struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q); + OSMO_ASSERT(prioq); + return prioq->radio_prio; +} diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c index 4b8c469..6bceb8d 100644 --- a/src/rlcmac/rlcmac_enc.c +++ b/src/rlcmac/rlcmac_enc.c @@ -400,7 +400,7 @@ Channel_Request_Description_t *chan_req = &ack->Channel_Request_Description; ack->Exist_Channel_Request_Description = 1; chan_req->PEAK_THROUGHPUT_CLASS = 0; /* TODO */ - chan_req->RADIO_PRIORITY = 0; /* TODO */ + chan_req->RADIO_PRIORITY = gprs_rlcmac_llc_queue_highest_radio_prio_pending(dl_tbf->tbf.gre->llc_queue); chan_req->RLC_MODE = GPRS_RLCMAC_RLC_MODE_ACKNOWLEDGED; chan_req->LLC_PDU_TYPE = GPRS_RLCMAC_LLC_PDU_TYPE_ACKNOWLEDGED; chan_req->RLC_OCTET_COUNT = 0; /* TODO */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I740fac72cb418d4b61499990b13208fcd4bb922f Gerrit-Change-Number: 31575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/68b97d29_f24f8d3f PS1, Line 173: rlcmac_prim_l1ctl_alloc > ... which alone takes almost the entire line on my screen Ok, this is not entirely true. It's more like 1/3 of the line (I use big font). But still, passing multiple arguments to it looks like a mess. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:11:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac

by fixeria

Attention is currently required from: pespin, fixeria. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/b9cae462_25034a49 PS1, Line 173: rlcmac_prim_l1ctl_alloc @pespin: I would like to be able to allocate RLCMAC_L1CTL primitives like this, instead of using functions like osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind(). One problem is that it's quite a long symbol name, which alone takes almost the entire line on my screen, so passing it several arguments would make it completely unreadable. The benefits of letting the user fill-in the prim structure are: * readability, as I already said above; * extensibility: once we add more fields, there would be no need to add `osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind{1,2,3,...}()`; * consistency with other osmo-API, like the L1SAP code. Would it be possible to expose `[osmo_gprs_]rlcmac_prim_l1ctl_alloc()`? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 16:08:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to initialize PHY

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31574 ) Change subject: pcu_l1_if_phy: add new PHY API function to initialize PHY ...................................................................... pcu_l1_if_phy: add new PHY API function to initialize PHY The PHY implementations we currently have do not require any initialization that has to run directly on startup. This will change when we introduce support for the E1 based Ericsson RBS CCU. Then we will have to perform at least one elarly initialization (VTY config file). So lets add an API function for PHY initialization now. Related: OS#5198 Change-Id: Ibf2a3a058c826f6ee5b740eee72d5be94d460517 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if_phy.h M src/pcu_main.cpp 5 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/31574/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index 580cdf0..043a3ba 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -404,3 +404,8 @@ talloc_free(fl1h); return 0; } + +int l1if_init(void) +{ + return 0; +} diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index 48005a2..c827d72 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -409,3 +409,8 @@ talloc_free(fl1h); return 0; } + +int l1if_init(void) +{ + return 0; +} diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index 18378b6..348497f 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -386,3 +386,8 @@ talloc_free(fl1h); return 0; } + +int l1if_init(void) +{ + return 0; +} diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index 318d0aa..297883b 100644 --- a/src/pcu_l1_if_phy.h +++ b/src/pcu_l1_if_phy.h @@ -3,6 +3,7 @@ #include <stdint.h> #include <osmocom/core/gsmtap_util.h> +int l1if_init(void); void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap); int l1if_connect_pdch(void *obj, uint8_t ts); int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t arfcn, uint8_t block_nr, uint8_t *data, diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 901ee6c..ec7bddd 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -33,6 +33,7 @@ extern "C" { #include "pcu_vty.h" #include "coding_scheme.h" +#include "pcu_l1_if_phy.h" #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/gprs/gprs_ns2.h> #include <osmocom/vty/telnet_interface.h> @@ -250,6 +251,12 @@ osmo_cpu_sched_vty_init(tall_pcu_ctx); logging_vty_add_deprecated_subsys(tall_pcu_ctx, "bssgp"); +#ifdef ENABLE_DIRECT_PHY + rc = l1if_init(); + if (rc < 0) + return -EINVAL; +#endif + handle_options(argc, argv); if ((!!spoof_mcc) + (!!spoof_mnc) == 1) { fprintf(stderr, "--mcc and --mnc must be specified " -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibf2a3a058c826f6ee5b740eee72d5be94d460517 Gerrit-Change-Number: 31574 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to disconnect PDCH

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31573 ) Change subject: pcu_l1_if_phy: add new PHY API function to disconnect PDCH ...................................................................... pcu_l1_if_phy: add new PHY API function to disconnect PDCH There is a function l1if_connect_pdch, but no complementary function like we have it with l1if_open_pdch and l1if_close_pdch. The reason for this is that the PHY implementations that rely on a femtocell DSP do not need to disconnect the pdch explcitly. However, the planned support for the E1 based Ercisson RBS CCU will require an explicit disconnect. So lets add a function call for this. Change-Id: Ied88f3289bda87c48f5f9255c4591470633cc805 Related: OS#5198 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if.cpp M src/pcu_l1_if_phy.h M tests/alloc/AllocTest.cpp M tests/alloc/MslotTest.cpp M tests/app_info/AppInfoTest.cpp M tests/edge/EdgeTest.cpp M tests/emu/pcu_emu.cpp M tests/fn/FnTest.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp M tests/ulc/PdchUlcTest.cpp 16 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/73/31573/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index 053844f..580cdf0 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -145,6 +145,11 @@ return l1if_req_pdch(fl1h, msg); } +int l1if_disconnect_pdch(void *obj, uint8_t ts) +{ + return 0; +} + static int handle_ph_readytosend_ind(struct lc15l1_hdl *fl1h, GsmL1_PhReadyToSendInd_t *rts_ind) { diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index 1ea0b26..48005a2 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -146,6 +146,11 @@ return l1if_req_pdch(fl1h, msg); } +int l1if_disconnect_pdch(void *obj, uint8_t ts) +{ + return 0; +} + static int handle_ph_readytosend_ind(struct oc2gl1_hdl *fl1h, GsmL1_PhReadyToSendInd_t *rts_ind) { diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index 31028f5..18378b6 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -128,6 +128,11 @@ return l1if_req_pdch(fl1h, msg); } +int l1if_disconnect_pdch(void *obj, uint8_t ts) +{ + return 0; +} + static int handle_ph_readytosend_ind(struct femtol1_hdl *fl1h, GsmL1_PhReadyToSendInd_t *rts_ind) { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index fdee83d..258a118 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -918,6 +918,10 @@ trx_nr, ts_nr, pdch->tsc, pdch->fh.enabled ? "yes" : "no"); } else { if (pdch->is_enabled()) { +#ifdef ENABLE_DIRECT_PHY + if ((info_ind->flags & PCU_IF_FLAG_SYSMO)) + l1if_disconnect_pdch(bts->trx[trx_nr].fl1h, ts_nr); +#endif pcu_tx_act_req(bts, pdch, 0); pdch->disable(); } diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index 73d0b6f..318d0aa 100644 --- a/src/pcu_l1_if_phy.h +++ b/src/pcu_l1_if_phy.h @@ -7,4 +7,5 @@ int l1if_connect_pdch(void *obj, uint8_t ts); int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len); +int l1if_disconnect_pdch(void *obj, uint8_t ts); int l1if_close_pdch(void *obj); diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 21fa6f2..08f5910 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -861,6 +861,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/alloc/MslotTest.cpp b/tests/alloc/MslotTest.cpp index 1b06b0b..1d5ff97 100644 --- a/tests/alloc/MslotTest.cpp +++ b/tests/alloc/MslotTest.cpp @@ -175,6 +175,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 668b081..659c011 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -198,6 +198,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index dd318c0..4cc7960 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1427,6 +1427,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index b08c31d..c1ccf07 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -170,6 +170,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/fn/FnTest.cpp b/tests/fn/FnTest.cpp index ae15164..f4b998c 100644 --- a/tests/fn/FnTest.cpp +++ b/tests/fn/FnTest.cpp @@ -171,6 +171,8 @@ abort(); } void l1if_connect_pdch() { abort(); + } void l1if_disconnect_pdch() { + abort(); } void l1if_close_pdch() { abort(); diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index bdc5863..547dc79 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -381,6 +381,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index cbafee9..6a770c9 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -661,6 +661,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index aa3c121..0b2e868 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3517,6 +3517,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index c728af1..a4f6db6 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -975,6 +975,7 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } +void l1if_disconnect_pdch() { abort(); } void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } diff --git a/tests/ulc/PdchUlcTest.cpp b/tests/ulc/PdchUlcTest.cpp index a199311..44aef34 100644 --- a/tests/ulc/PdchUlcTest.cpp +++ b/tests/ulc/PdchUlcTest.cpp @@ -338,6 +338,8 @@ abort(); } void l1if_connect_pdch() { abort(); + } void l1if_disconnect_pdch() { + abort(); } void l1if_close_pdch() { abort(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ied88f3289bda87c48f5f9255c4591470633cc805 Gerrit-Change-Number: 31573 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023