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

[S] Change in osmocom-bb[master]: virt_phy: clean up and improve Makefile.am
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31849 ) Change subject: virt_phy: clean up and improve Makefile.am ...................................................................... virt_phy: clean up and improve Makefile.am * Make virtphy_{SOURCES,LDADD} git-friendly: one file per line; * Remove '-pthread' from LDADD, it's not really needed; * Remove debugging leftovers. Change-Id: Iccd07614aabfc2845424d25962f48e4231a50a90 Related: OS#5500 --- M src/host/virt_phy/src/Makefile.am 1 file changed, 35 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/virt_phy/src/Makefile.am b/src/host/virt_phy/src/Makefile.am index 66e70cb..902284d 100644 --- a/src/host/virt_phy/src/Makefile.am +++ b/src/host/virt_phy/src/Makefile.am @@ -2,10 +2,25 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include bin_PROGRAMS = virtphy -virtphy_SOURCES = virtphy.c l1ctl_sock.c gsmtapl1_if.c l1ctl_sap.c virt_prim_pm.c virt_prim_fbsb.c virt_prim_rach.c virt_prim_data.c virt_prim_traffic.c virt_l1_sched_simple.c logging.c virt_l1_model.c shared/virtual_um.c shared/osmo_mcast_sock.c -virtphy_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -virtphy_LDFLAGS = -pthread -# debug output -all: - $(info $$AM_CPPFLAGS is [${AM_CPPFLAGS}]) +virtphy_SOURCES = \ + virtphy.c \ + logging.c \ + gsmtapl1_if.c \ + l1ctl_sock.c \ + l1ctl_sap.c \ + virt_prim_pm.c \ + virt_prim_fbsb.c \ + virt_prim_rach.c \ + virt_prim_data.c \ + virt_prim_traffic.c \ + virt_l1_sched_simple.c \ + virt_l1_model.c \ + shared/virtual_um.c \ + shared/osmo_mcast_sock.c \ + $(NULL) + +virtphy_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iccd07614aabfc2845424d25962f48e4231a50a90 Gerrit-Change-Number: 31849 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31651 ) Change subject: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC ...................................................................... trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC The event TRXCON_EV_TX_DATA_CNF is not premitted in state TRXCON_ST_PACKET_DATA, and is not of any use for l1gprs. Change-Id: Iee5ee404f1eb77091c388a641d0a78d01a8d7e7f Related: OS#5500 --- M src/host/trxcon/src/trxcon_shim.c 1 file changed, 19 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/trxcon_shim.c b/src/host/trxcon/src/trxcon_shim.c index f8b1872..de3de91 100644 --- a/src/host/trxcon/src/trxcon_shim.c +++ b/src/host/trxcon/src/trxcon_shim.c @@ -151,7 +151,6 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; - bool is_traffic = false; const uint8_t *data; uint8_t ra_buf[2]; size_t data_len; @@ -160,14 +159,16 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; switch (dt) { - case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - is_traffic = true; - /* fall-through */ + data_len = lchan->prim->payload_len; + data = lchan->prim->payload; + rc = 0; + break; /* do not send DATA.cnf */ case L1SCHED_DT_SIGNALING: + case L1SCHED_DT_TRAFFIC: { struct trxcon_param_tx_data_cnf cnf = { - .traffic = is_traffic, + .traffic = (dt == L1SCHED_DT_TRAFFIC), .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .band_arfcn = trxcon->l1p.band_arfcn, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iee5ee404f1eb77091c388a641d0a78d01a8d7e7f Gerrit-Change-Number: 31651 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in osmocom-bb[master]: virt_phy: rearrange and clean up header files
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31848 ) Change subject: virt_phy: rearrange and clean up header files ...................................................................... virt_phy: rearrange and clean up header files * Build up the usual include directory hierarchy. * Move l1ctl_proto.h to 'include/osmocom/bb/'. * System headers first, then libosmo*, the local ones. Change-Id: I25145630ec53c2b8065a42fb12a778eec010f10c Related: OS#5500 --- M src/host/virt_phy/configure.ac M src/host/virt_phy/include/Makefile.am A src/host/virt_phy/include/osmocom/Makefile.am A src/host/virt_phy/include/osmocom/bb/Makefile.am A src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h A src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am R src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h R src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h R src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h R src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h R src/host/virt_phy/include/osmocom/bb/virtphy/logging.h R src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h R src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h R src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h R src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h D src/host/virt_phy/include/virtphy/l1ctl_proto.h M src/host/virt_phy/src/gsmtapl1_if.c M src/host/virt_phy/src/l1ctl_sap.c M src/host/virt_phy/src/l1ctl_sock.c M src/host/virt_phy/src/logging.c M src/host/virt_phy/src/shared/osmo_mcast_sock.c M src/host/virt_phy/src/shared/virtual_um.c M src/host/virt_phy/src/virt_l1_model.c M src/host/virt_phy/src/virt_l1_sched_simple.c M src/host/virt_phy/src/virt_prim_data.c M src/host/virt_phy/src/virt_prim_fbsb.c M src/host/virt_phy/src/virt_prim_pm.c M src/host/virt_phy/src/virt_prim_rach.c M src/host/virt_phy/src/virt_prim_traffic.c M src/host/virt_phy/src/virtphy.c 30 files changed, 150 insertions(+), 101 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/virt_phy/configure.ac b/src/host/virt_phy/configure.ac index 2a29bc8..19e4bc7 100644 --- a/src/host/virt_phy/configure.ac +++ b/src/host/virt_phy/configure.ac @@ -60,6 +60,9 @@ AC_CONFIG_FILES([ Makefile include/Makefile + include/osmocom/Makefile + include/osmocom/bb/Makefile + include/osmocom/bb/virtphy/Makefile src/Makefile ]) AC_OUTPUT diff --git a/src/host/virt_phy/include/Makefile.am b/src/host/virt_phy/include/Makefile.am index ff3e8cb..9d963a0 100644 --- a/src/host/virt_phy/include/Makefile.am +++ b/src/host/virt_phy/include/Makefile.am @@ -1,11 +1,3 @@ -noinst_HEADERS = \ - virtphy/logging.h \ - virtphy/osmo_mcast_sock.h \ - virtphy/l1ctl_proto.h \ - virtphy/l1ctl_sock.h \ - virtphy/virtual_um.h \ - virtphy/gsmtapl1_if.h \ - virtphy/virt_l1_sched.h \ - virtphy/common_util.h \ - virtphy/l1ctl_sap.h \ - virtphy/virt_l1_model.h +SUBDIRS = \ + osmocom \ + $(NULL) diff --git a/src/host/virt_phy/include/osmocom/Makefile.am b/src/host/virt_phy/include/osmocom/Makefile.am new file mode 100644 index 0000000..83c6385 --- /dev/null +++ b/src/host/virt_phy/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + bb \ + $(NULL) diff --git a/src/host/virt_phy/include/osmocom/bb/Makefile.am b/src/host/virt_phy/include/osmocom/bb/Makefile.am new file mode 100644 index 0000000..c52fb93 --- /dev/null +++ b/src/host/virt_phy/include/osmocom/bb/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = \ + virtphy \ + $(NULL) + +noinst_HEADERS = \ + l1ctl_proto.h \ + $(NULL) diff --git a/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h b/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h new file mode 120000 index 0000000..ee19b80 --- /dev/null +++ b/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am b/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am new file mode 100644 index 0000000..7584609 --- /dev/null +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am @@ -0,0 +1,11 @@ +noinst_HEADERS = \ + logging.h \ + osmo_mcast_sock.h \ + l1ctl_sock.h \ + virtual_um.h \ + gsmtapl1_if.h \ + virt_l1_sched.h \ + common_util.h \ + l1ctl_sap.h \ + virt_l1_model.h \ + $(NULL) diff --git a/src/host/virt_phy/include/virtphy/common_util.h b/src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h similarity index 100% rename from src/host/virt_phy/include/virtphy/common_util.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h diff --git a/src/host/virt_phy/include/virtphy/gsmtapl1_if.h b/src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h similarity index 72% rename from src/host/virt_phy/include/virtphy/gsmtapl1_if.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h index 8dab6b2..c9e9252 100644 --- a/src/host/virt_phy/include/virtphy/gsmtapl1_if.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h @@ -2,9 +2,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/gsmtap.h> -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/virt_l1_model.h> + +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> void gsmtapl1_init(struct l1_model_ms *model); void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui, diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h similarity index 95% rename from src/host/virt_phy/include/virtphy/l1ctl_sap.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h index 6306eeb..662efb6 100644 --- a/src/host/virt_phy/include/virtphy/l1ctl_sap.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h @@ -1,11 +1,13 @@ #pragma once #include <stdint.h> + #include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_proto.h> -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/virt_l1_model.h> + +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/l1ctl_proto.h> /* following sizes are used for message allocation */ /* size of layer 3 header */ diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sock.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h similarity index 100% rename from src/host/virt_phy/include/virtphy/l1ctl_sock.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h diff --git a/src/host/virt_phy/include/virtphy/logging.h b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h similarity index 100% rename from src/host/virt_phy/include/virtphy/logging.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/logging.h diff --git a/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h b/src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h similarity index 100% rename from src/host/virt_phy/include/virtphy/osmo_mcast_sock.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h diff --git a/src/host/virt_phy/include/virtphy/virt_l1_model.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h similarity index 97% rename from src/host/virt_phy/include/virtphy/virt_l1_model.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h index ffed708..b729c44 100644 --- a/src/host/virt_phy/include/virtphy/virt_l1_model.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h @@ -2,11 +2,12 @@ /* Per-MS specific state, closely attached to the L1CTL user progran */ -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/timer.h> +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> + #define L1S_NUM_NEIGH_CELL 6 #define A5_KEY_LEN 8 diff --git a/src/host/virt_phy/include/virtphy/virt_l1_sched.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h similarity index 92% rename from src/host/virt_phy/include/virtphy/virt_l1_sched.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h index b8d401f..d5a1630 100644 --- a/src/host/virt_phy/include/virtphy/virt_l1_sched.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h @@ -1,9 +1,11 @@ #pragma once + #include <osmocom/core/msgb.h> -#include <virtphy/virt_l1_model.h> #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/gsm_utils.h> -#include <virtphy/virt_l1_sched.h> + +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> struct l1_model_ms; diff --git a/src/host/virt_phy/include/virtphy/virtual_um.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h similarity index 100% rename from src/host/virt_phy/include/virtphy/virtual_um.h rename to src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h diff --git a/src/host/virt_phy/include/virtphy/l1ctl_proto.h b/src/host/virt_phy/include/virtphy/l1ctl_proto.h deleted file mode 120000 index 95d4161..0000000 --- a/src/host/virt_phy/include/virtphy/l1ctl_proto.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c index 1496ee9..719d370 100644 --- a/src/host/virt_phy/src/gsmtapl1_if.c +++ b/src/host/virt_phy/src/gsmtapl1_if.c @@ -20,6 +20,11 @@ * */ +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + #include <osmocom/core/gsmtap.h> #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/utils.h> @@ -28,18 +33,15 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/core/msgb.h> -#include <stddef.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <virtphy/l1ctl_proto.h> -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/virt_l1_model.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/logging.h> -#include <virtphy/virt_l1_sched.h> + +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/l1ctl_proto.h> static char *pseudo_lchan_name(uint16_t arfcn, uint8_t ts, uint8_t ss, uint8_t sub_type) { diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c index ffe94ac..ab917c6 100644 --- a/src/host/virt_phy/src/l1ctl_sap.c +++ b/src/host/virt_phy/src/l1ctl_sap.c @@ -19,6 +19,9 @@ * */ +#include <stdio.h> +#include <string.h> +#include <netinet/in.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> @@ -28,17 +31,15 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/rsl.h> #include <osmocom/gprs/gprs_rlc.h> -#include <stdio.h> -#include <virtphy/l1ctl_proto.h> -#include <netinet/in.h> -#include <string.h> -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/virt_l1_model.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/logging.h> -#include <virtphy/virt_l1_sched.h> + +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/l1ctl_proto.h> static void l1ctl_rx_tbf_cfg_req(struct l1_model_ms *ms, struct msgb *msg); static void l1ctl_rx_data_tbf_req(struct l1_model_ms *ms, struct msgb *msg); diff --git a/src/host/virt_phy/src/l1ctl_sock.c b/src/host/virt_phy/src/l1ctl_sock.c index 7951f46..089d9ca 100644 --- a/src/host/virt_phy/src/l1ctl_sock.c +++ b/src/host/virt_phy/src/l1ctl_sock.c @@ -40,8 +40,8 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/socket.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/logging.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/logging.h> #define L1CTL_SOCK_MSGB_SIZE 256 diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 76caa27..5febff5 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -19,7 +19,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/application.h> -#include <virtphy/logging.h> +#include <osmocom/bb/virtphy/logging.h> static const char* l1ctlPrimNames[] = { "_L1CTL_NONE", diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c b/src/host/virt_phy/src/shared/osmo_mcast_sock.c index d0c5b6d..d3ae4fe 100644 --- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c +++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c @@ -1,14 +1,16 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h> -#include <osmocom/core/socket.h> -#include <osmocom/core/select.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <talloc.h> #include <unistd.h> -#include <virtphy/osmo_mcast_sock.h> + +#include <osmocom/core/socket.h> +#include <osmocom/core/select.h> + +#include <osmocom/bb/virtphy/osmo_mcast_sock.h> /* server socket is what we use for transmission. It is not subscribed * to a multicast group or locally bound, but it is just a normal UDP diff --git a/src/host/virt_phy/src/shared/virtual_um.c b/src/host/virt_phy/src/shared/virtual_um.c index ef3ad37..e55bb03 100644 --- a/src/host/virt_phy/src/shared/virtual_um.c +++ b/src/host/virt_phy/src/shared/virtual_um.c @@ -19,17 +19,18 @@ * */ +#include <unistd.h> +#include <errno.h> + #include <osmocom/core/select.h> #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> #include <osmocom/core/gsmtap.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <virtphy/osmo_mcast_sock.h> -#include <virtphy/virtual_um.h> -#include <unistd.h> -#include <errno.h> +#include <osmocom/bb/virtphy/osmo_mcast_sock.h> +#include <osmocom/bb/virtphy/virtual_um.h> /** * Virtual UM interface file descriptor callback. diff --git a/src/host/virt_phy/src/virt_l1_model.c b/src/host/virt_phy/src/virt_l1_model.c index 5738bed..704a54c 100644 --- a/src/host/virt_phy/src/virt_l1_model.c +++ b/src/host/virt_phy/src/virt_l1_model.c @@ -19,11 +19,12 @@ * */ -#include <virtphy/virt_l1_model.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/logging.h> #include <talloc.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/logging.h> + static uint32_t next_ms_nr; struct l1_model_ms *l1_model_ms_init(void *ctx, struct l1ctl_sock_client *lsc, struct virt_um_inst *vui) diff --git a/src/host/virt_phy/src/virt_l1_sched_simple.c b/src/host/virt_phy/src/virt_l1_sched_simple.c index 486d319..3cad2ce 100644 --- a/src/host/virt_phy/src/virt_l1_sched_simple.c +++ b/src/host/virt_phy/src/virt_l1_sched_simple.c @@ -18,13 +18,15 @@ * */ -#include <virtphy/virt_l1_sched.h> -#include <osmocom/core/linuxlist.h> -#include <virtphy/virt_l1_model.h> -#include <virtphy/logging.h> #include <time.h> #include <talloc.h> +#include <osmocom/core/linuxlist.h> + +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/logging.h> + /** * @brief Start scheduler thread based on current gsm time from model */ diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c index 51f7585..74050b8 100644 --- a/src/host/virt_phy/src/virt_prim_data.c +++ b/src/host/virt_phy/src/virt_prim_data.c @@ -27,12 +27,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/virt_l1_sched.h> -#include <virtphy/logging.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/l1ctl_proto.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/l1ctl_proto.h> /** * @brief Handler callback function for DATA request. diff --git a/src/host/virt_phy/src/virt_prim_fbsb.c b/src/host/virt_phy/src/virt_prim_fbsb.c index 7c634cb..d012036 100644 --- a/src/host/virt_phy/src/virt_prim_fbsb.c +++ b/src/host/virt_phy/src/virt_prim_fbsb.c @@ -25,11 +25,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/virt_l1_sched.h> #include <osmocom/core/gsmtap.h> -#include <virtphy/logging.h> -#include <virtphy/l1ctl_proto.h> + +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/l1ctl_proto.h> static uint16_t sync_count = 0; diff --git a/src/host/virt_phy/src/virt_prim_pm.c b/src/host/virt_phy/src/virt_prim_pm.c index bb7875d..5883bbb 100644 --- a/src/host/virt_phy/src/virt_prim_pm.c +++ b/src/host/virt_phy/src/virt_prim_pm.c @@ -22,14 +22,15 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/gsmtap.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/virt_l1_sched.h> -#include <osmocom/core/gsmtap.h> -#include <virtphy/logging.h> -#include <virtphy/l1ctl_proto.h> + +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/l1ctl_proto.h> /** * @brief Change the signal strength for a given arfcn. diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c index a8a8ffa..22b8e29 100644 --- a/src/host/virt_phy/src/virt_prim_rach.c +++ b/src/host/virt_phy/src/virt_prim_rach.c @@ -23,16 +23,16 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/virt_l1_sched.h> -#include <virtphy/logging.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/l1ctl_proto.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/l1ctl_proto.h> /* use if we have a combined uplink (RACH, SDCCH, ...) (see * http://www.rfwireless-world.com/Terminology/GSM-combined-channel-configurat…) diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c index ae87ad6..3468931 100644 --- a/src/host/virt_phy/src/virt_prim_traffic.c +++ b/src/host/virt_phy/src/virt_prim_traffic.c @@ -23,16 +23,16 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocom/core/msgb.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/virt_l1_sched.h> -#include <virtphy/logging.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/l1ctl_proto.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/l1ctl_proto.h> /** * @brief Handler callback function for TRAFFIC request. diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index f2b8e5d..ad09a53 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -20,10 +20,6 @@ * */ -#include <osmocom/core/msgb.h> -#include <osmocom/core/select.h> -#include <osmocom/core/gsmtap.h> -#include <osmocom/core/application.h> #include <stdint.h> #include <string.h> #include <stdio.h> @@ -31,13 +27,19 @@ #include <getopt.h> #include <errno.h> #include <signal.h> -#include <virtphy/virtual_um.h> -#include <virtphy/l1ctl_sock.h> -#include <virtphy/virt_l1_model.h> -#include <virtphy/l1ctl_sap.h> -#include <virtphy/gsmtapl1_if.h> -#include <virtphy/logging.h> -#include <virtphy/virt_l1_sched.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/gsmtap.h> +#include <osmocom/core/application.h> + +#include <osmocom/bb/virtphy/virtual_um.h> +#include <osmocom/bb/virtphy/l1ctl_sock.h> +#include <osmocom/bb/virtphy/virt_l1_model.h> +#include <osmocom/bb/virtphy/l1ctl_sap.h> +#include <osmocom/bb/virtphy/gsmtapl1_if.h> +#include <osmocom/bb/virtphy/logging.h> +#include <osmocom/bb/virtphy/virt_l1_sched.h> #define DEFAULT_LOG_MASK "DL1C,2:DL1P,2:DVIRPHY,2:DMAIN,1" -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I25145630ec53c2b8065a42fb12a778eec010f10c Gerrit-Change-Number: 31848 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: virt_phy: cosmetic: make the linter happy about identifier names
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31852 ) Change subject: virt_phy: cosmetic: make the linter happy about identifier names ...................................................................... virt_phy: cosmetic: make the linter happy about identifier names Change-Id: I415f4b6f65c16a5dac84c75c5f97bf12109c74e5 Related: OS#5500 --- M src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h 1 file changed, 35 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h index 1a61f29..e77de84 100644 --- a/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h @@ -42,39 +42,39 @@ uint16_t arfcn); /* receive routines */ -void l1ctl_rx_fbsb_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_dm_est_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_dm_rel_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_param_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_dm_freq_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_crypto_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_rach_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_data_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_pm_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_reset_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_ccch_mode_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_tch_mode_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_neigh_pm_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_traffic_req(struct l1_model_ms *, struct msgb *msg); -void l1ctl_rx_sim_req(struct l1_model_ms *, struct msgb *msg); +void l1ctl_rx_fbsb_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_dm_est_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_dm_rel_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_param_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_dm_freq_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_crypto_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_rach_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_data_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_pm_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_reset_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_ccch_mode_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_tch_mode_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_neigh_pm_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_traffic_req(struct l1_model_ms *ms, struct msgb *msg); +void l1ctl_rx_sim_req(struct l1_model_ms *ms, struct msgb *msg); /* transmit routines */ -void l1ctl_tx_reset(struct l1_model_ms *, uint8_t msg_type, uint8_t reset_type); -void l1ctl_tx_rach_conf(struct l1_model_ms *, uint32_t fn, uint16_t arfcn); -void l1ctl_tx_data_conf(struct l1_model_ms *, uint32_t fn, uint16_t snr, uint16_t arfcn); -void l1ctl_tx_data_ind(struct l1_model_ms *, struct msgb *msg, uint16_t arfcn, uint8_t link_id, +void l1ctl_tx_reset(struct l1_model_ms *ms, uint8_t msg_type, uint8_t reset_type); +void l1ctl_tx_rach_conf(struct l1_model_ms *ms, uint32_t fn, uint16_t arfcn); +void l1ctl_tx_data_conf(struct l1_model_ms *ms, uint32_t fn, uint16_t snr, uint16_t arfcn); +void l1ctl_tx_data_ind(struct l1_model_ms *ms, struct msgb *msg, uint16_t arfcn, uint8_t link_id, uint8_t chan_nr, uint32_t fn, uint8_t snr, uint8_t signal_dbm, uint8_t num_biterr, uint8_t fire_crc); -void l1ctl_tx_traffic_conf(struct l1_model_ms *, uint32_t fn, uint16_t snr, uint16_t arfcn); -void l1ctl_tx_traffic_ind(struct l1_model_ms *, struct msgb *msg, uint16_t arfcn, uint8_t link_id, +void l1ctl_tx_traffic_conf(struct l1_model_ms *ms, uint32_t fn, uint16_t snr, uint16_t arfcn); +void l1ctl_tx_traffic_ind(struct l1_model_ms *ms, struct msgb *msg, uint16_t arfcn, uint8_t link_id, uint8_t chan_nr, uint32_t fn, uint8_t snr, uint8_t signal_dbm, uint8_t num_biterr, uint8_t fire_crc); -void l1ctl_tx_pm_conf(struct l1_model_ms *, struct l1ctl_pm_req *pm_req); -void l1ctl_tx_fbsb_conf(struct l1_model_ms *, uint8_t res, uint16_t arfcn); -void l1ctl_tx_ccch_mode_conf(struct l1_model_ms *, uint8_t ccch_mode); -void l1ctl_tx_tch_mode_conf(struct l1_model_ms *, uint8_t tch_mode, uint8_t audio_mode); +void l1ctl_tx_pm_conf(struct l1_model_ms *ms, struct l1ctl_pm_req *pm_req); +void l1ctl_tx_fbsb_conf(struct l1_model_ms *ms, uint8_t res, uint16_t arfcn); +void l1ctl_tx_ccch_mode_conf(struct l1_model_ms *ms, uint8_t ccch_mode); +void l1ctl_tx_tch_mode_conf(struct l1_model_ms *ms, uint8_t tch_mode, uint8_t audio_mode); /* scheduler functions */ uint32_t sched_fn_ul(struct gsm_time cur_time, uint8_t chan_nr, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I415f4b6f65c16a5dac84c75c5f97bf12109c74e5 Gerrit-Change-Number: 31852 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: virt_phy: cosmetic: make the linter happy about code indent
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31851 ) Change subject: virt_phy: cosmetic: make the linter happy about code indent ...................................................................... virt_phy: cosmetic: make the linter happy about code indent Change-Id: Iba777a4aff261006ae1aec9b583fecd12295c837 Related: OS#5500 --- M src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h M src/host/virt_phy/src/logging.c M src/host/virt_phy/src/virt_prim_data.c 3 files changed, 56 insertions(+), 46 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h index 662efb6..1a61f29 100644 --- a/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h @@ -39,7 +39,7 @@ /* utility methods */ struct msgb *l1ctl_msgb_alloc(uint8_t msg_type); struct msgb *l1ctl_create_l2_msg(int msg_type, uint32_t fn, uint16_t snr, - uint16_t arfcn); + uint16_t arfcn); /* receive routines */ void l1ctl_rx_fbsb_req(struct l1_model_ms *, struct msgb *msg); @@ -63,14 +63,14 @@ void l1ctl_tx_rach_conf(struct l1_model_ms *, uint32_t fn, uint16_t arfcn); void l1ctl_tx_data_conf(struct l1_model_ms *, uint32_t fn, uint16_t snr, uint16_t arfcn); void l1ctl_tx_data_ind(struct l1_model_ms *, struct msgb *msg, uint16_t arfcn, uint8_t link_id, - uint8_t chan_nr, uint32_t fn, uint8_t snr, - uint8_t signal_dbm, uint8_t num_biterr, - uint8_t fire_crc); + uint8_t chan_nr, uint32_t fn, uint8_t snr, + uint8_t signal_dbm, uint8_t num_biterr, + uint8_t fire_crc); void l1ctl_tx_traffic_conf(struct l1_model_ms *, uint32_t fn, uint16_t snr, uint16_t arfcn); void l1ctl_tx_traffic_ind(struct l1_model_ms *, struct msgb *msg, uint16_t arfcn, uint8_t link_id, - uint8_t chan_nr, uint32_t fn, uint8_t snr, - uint8_t signal_dbm, uint8_t num_biterr, - uint8_t fire_crc); + uint8_t chan_nr, uint32_t fn, uint8_t snr, + uint8_t signal_dbm, uint8_t num_biterr, + uint8_t fire_crc); void l1ctl_tx_pm_conf(struct l1_model_ms *, struct l1ctl_pm_req *pm_req); void l1ctl_tx_fbsb_conf(struct l1_model_ms *, uint8_t res, uint16_t arfcn); void l1ctl_tx_ccch_mode_conf(struct l1_model_ms *, uint8_t ccch_mode); @@ -78,4 +78,4 @@ /* scheduler functions */ uint32_t sched_fn_ul(struct gsm_time cur_time, uint8_t chan_nr, - uint8_t link_id); + uint8_t link_id); diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 5febff5..04667d1 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -22,42 +22,42 @@ #include <osmocom/bb/virtphy/logging.h> static const char* l1ctlPrimNames[] = { - "_L1CTL_NONE", - "L1CTL_FBSB_REQ", - "L1CTL_FBSB_CONF", - "L1CTL_DATA_IND", - "L1CTL_RACH_REQ", - "L1CTL_DM_EST_REQ", - "L1CTL_DATA_REQ", - "L1CTL_RESET_IND", - "L1CTL_PM_REQ", - "L1CTL_PM_CONF", - "L1CTL_ECHO_REQ", - "L1CTL_ECHO_CONF", - "L1CTL_RACH_CONF", - "L1CTL_RESET_REQ", - "L1CTL_RESET_CONF", - "L1CTL_DATA_CONF", - "L1CTL_CCCH_MODE_REQ", - "L1CTL_CCCH_MODE_CONF", - "L1CTL_DM_REL_REQ", - "L1CTL_PARAM_REQ", - "L1CTL_DM_FREQ_REQ", - "L1CTL_CRYPTO_REQ", - "L1CTL_SIM_REQ", - "L1CTL_SIM_CONF", - "L1CTL_TCH_MODE_REQ", - "L1CTL_TCH_MODE_CONF", - "L1CTL_NEIGH_PM_REQ", - "L1CTL_NEIGH_PM_IND", - "L1CTL_TRAFFIC_REQ", - "L1CTL_TRAFFIC_CONF", - "L1CTL_TRAFFIC_IND", - "L1CTL_BURST_IND", - "L1CTL_TBF_CFG_REQ", - "L1CTL_TBF_CFG_CONF", - "L1CTL_DATA_TBF_REQ", - "L1CTL_DATA_TBF_CONF" + "_L1CTL_NONE", + "L1CTL_FBSB_REQ", + "L1CTL_FBSB_CONF", + "L1CTL_DATA_IND", + "L1CTL_RACH_REQ", + "L1CTL_DM_EST_REQ", + "L1CTL_DATA_REQ", + "L1CTL_RESET_IND", + "L1CTL_PM_REQ", + "L1CTL_PM_CONF", + "L1CTL_ECHO_REQ", + "L1CTL_ECHO_CONF", + "L1CTL_RACH_CONF", + "L1CTL_RESET_REQ", + "L1CTL_RESET_CONF", + "L1CTL_DATA_CONF", + "L1CTL_CCCH_MODE_REQ", + "L1CTL_CCCH_MODE_CONF", + "L1CTL_DM_REL_REQ", + "L1CTL_PARAM_REQ", + "L1CTL_DM_FREQ_REQ", + "L1CTL_CRYPTO_REQ", + "L1CTL_SIM_REQ", + "L1CTL_SIM_CONF", + "L1CTL_TCH_MODE_REQ", + "L1CTL_TCH_MODE_CONF", + "L1CTL_NEIGH_PM_REQ", + "L1CTL_NEIGH_PM_IND", + "L1CTL_TRAFFIC_REQ", + "L1CTL_TRAFFIC_CONF", + "L1CTL_TRAFFIC_IND", + "L1CTL_BURST_IND", + "L1CTL_TBF_CFG_REQ", + "L1CTL_TBF_CFG_CONF", + "L1CTL_DATA_TBF_REQ", + "L1CTL_DATA_TBF_CONF" }; static const struct log_info_cat default_categories[] = { diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c index 74050b8..d63a532 100644 --- a/src/host/virt_phy/src/virt_prim_data.c +++ b/src/host/virt_phy/src/virt_prim_data.c @@ -77,8 +77,8 @@ } void l1ctl_tx_data_ind(struct l1_model_ms *ms, struct msgb *msg, uint16_t arfcn, uint8_t link_id, - uint8_t chan_nr, uint32_t fn, uint8_t snr, - uint8_t signal_dbm, uint8_t num_biterr, uint8_t fire_crc) + uint8_t chan_nr, uint32_t fn, uint8_t snr, + uint8_t signal_dbm, uint8_t num_biterr, uint8_t fire_crc) { struct msgb *l1ctl_msg = NULL; struct l1ctl_data_ind * l1di; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iba777a4aff261006ae1aec9b583fecd12295c837 Gerrit-Change-Number: 31851 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC
by laforge 13 Mar '23

13 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31847 ) Change subject: osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC ...................................................................... osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC Forwarding of PDCH related data over multicast works for me. Without these features osmo-bsc would reject the OML connection if it's configured with [E]GPRS enabled. Change-Id: I5e13c153805c56904e51d222007228e1c2872c88 Related: OS#5500 --- M src/osmo-bts-virtual/main.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 20b480f..6efbca5 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -64,6 +64,8 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); + osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS); + osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_EFR); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e13c153805c56904e51d222007228e1c2872c88 Gerrit-Change-Number: 31847 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC
by laforge 13 Mar '23

13 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31847 ) Change subject: osmo-bts-virtual: indicate BTS_FEAT_[E]GPRS to the BSC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e13c153805c56904e51d222007228e1c2872c88 Gerrit-Change-Number: 31847 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 21:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: virt_phy: avoid confusion between RSSI (dBm) and RxLev (0..63)
by laforge 13 Mar '23

13 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31850 ) Change subject: virt_phy: avoid confusion between RSSI (dBm) and RxLev (0..63) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4f2982cd8fa1b7a47f983c9cd11bf0180f7878ec Gerrit-Change-Number: 31850 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 21:41:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: virt_phy: cosmetic: make the linter happy about identifier names
by laforge 13 Mar '23

13 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31852 ) Change subject: virt_phy: cosmetic: make the linter happy about identifier names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I415f4b6f65c16a5dac84c75c5f97bf12109c74e5 Gerrit-Change-Number: 31852 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 21:41:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: virt_phy: cosmetic: make the linter happy about code indent
by laforge 13 Mar '23

13 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31851 ) Change subject: virt_phy: cosmetic: make the linter happy about code indent ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iba777a4aff261006ae1aec9b583fecd12295c837 Gerrit-Change-Number: 31851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 21:41:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0