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

Change in osmocom-bb[master]: trxcon: Makefile.am: fix make {dist,distcheck} targets

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28501 ) Change subject: trxcon: Makefile.am: fix make {dist,distcheck} targets ...................................................................... trxcon: Makefile.am: fix make {dist,distcheck} targets File '.version' must be also listed in EXTRA_DIST, otherwise I get: echo 0.0.0 > ../../.version-t && mv ../../.version-t ../../.version /bin/sh: line 1: ../../.version-t: Permission denied Change-Id: I65f7c505f5a231bab114c45f5fdd7421601dfbc0 Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 0c71e97..893d9ab 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -44,8 +44,14 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +BUILT_SOURCES = \ + $(top_srcdir)/.version \ + $(NULL) +EXTRA_DIST = \ + .version \ + $(NULL) + # versioning magic -BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I65f7c505f5a231bab114c45f5fdd7421601dfbc0 Gerrit-Change-Number: 28501 Gerrit-PatchSet: 1 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: group header files into 'include/osmocom/bb/trxcon'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28502 ) Change subject: trxcon: group header files into 'include/osmocom/bb/trxcon' ...................................................................... trxcon: group header files into 'include/osmocom/bb/trxcon' This is the first step towards the goal of moving the scheduler into a separate library. Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am M src/host/trxcon/configure.ac A src/host/trxcon/include/Makefile.am A src/host/trxcon/include/osmocom/Makefile.am A src/host/trxcon/include/osmocom/bb/Makefile.am A src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h A src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h R src/host/trxcon/include/osmocom/bb/trxcon/logging.h R src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h R src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h R src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h R src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/l1ctl.c M src/host/trxcon/l1ctl_link.c D src/host/trxcon/l1ctl_proto.h M src/host/trxcon/logging.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_desc.c M src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_lchan_rach.c M src/host/trxcon/sched_lchan_sch.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_lchan_xcch.c M src/host/trxcon/sched_mframe.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/trx_if.c M src/host/trxcon/trxcon.c 32 files changed, 116 insertions(+), 89 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 893d9ab..aa0ae56 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -1,5 +1,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 +SUBDIRS = \ + include \ + $(NULL) + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index 1f24260..0e5ce6f 100644 --- a/src/host/trxcon/configure.ac +++ b/src/host/trxcon/configure.ac @@ -31,5 +31,9 @@ dnl Checks for typedefs, structures and compiler characteristics -AC_OUTPUT( - Makefile) +AC_CONFIG_FILES([include/Makefile + include/osmocom/Makefile + include/osmocom/bb/Makefile + include/osmocom/bb/trxcon/Makefile + Makefile]) +AC_OUTPUT diff --git a/src/host/trxcon/include/Makefile.am b/src/host/trxcon/include/Makefile.am new file mode 100644 index 0000000..9d963a0 --- /dev/null +++ b/src/host/trxcon/include/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmocom \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/Makefile.am b/src/host/trxcon/include/osmocom/Makefile.am new file mode 100644 index 0000000..83c6385 --- /dev/null +++ b/src/host/trxcon/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + bb \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am b/src/host/trxcon/include/osmocom/bb/Makefile.am new file mode 100644 index 0000000..008a966 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + trxcon \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am new file mode 100644 index 0000000..e506520 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am @@ -0,0 +1,10 @@ +noinst_HEADERS = \ + l1ctl_proto.h \ + l1ctl_link.h \ + l1ctl.h \ + scheduler.h \ + sched_trx.h \ + trx_if.h \ + logging.h \ + trxcon.h \ + $(NULL) diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h similarity index 90% rename from src/host/trxcon/l1ctl.h rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 48bbe09..f93908d 100644 --- a/src/host/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -3,8 +3,8 @@ #include <stdint.h> #include <osmocom/core/msgb.h> -#include "l1ctl_link.h" -#include "l1ctl_proto.h" +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> /* Event handlers */ int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg); diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h similarity index 100% rename from src/host/trxcon/l1ctl_link.h rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h new file mode 120000 index 0000000..7ab0f41 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/logging.h b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h similarity index 100% rename from src/host/trxcon/logging.h rename to src/host/trxcon/include/osmocom/bb/trxcon/logging.h diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h similarity index 98% rename from src/host/trxcon/sched_trx.h rename to src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h index 74b41e3..ab8ef34 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h @@ -9,8 +9,8 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/linuxlist.h> -#include "logging.h" -#include "scheduler.h" +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/scheduler.h> #define GSM_BURST_LEN 148 #define GSM_BURST_PL_LEN 116 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h similarity index 100% rename from src/host/trxcon/scheduler.h rename to src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h similarity index 95% rename from src/host/trxcon/trx_if.h rename to src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h index fa66d4a..89c7dd0 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -5,8 +5,8 @@ #include <osmocom/core/timer.h> #include <osmocom/core/fsm.h> -#include "scheduler.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> #define TRXC_BUF_SIZE 1024 #define TRXD_BUF_SIZE 512 diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h similarity index 100% rename from src/host/trxcon/trxcon.h rename to src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 94a4d18..ca78e9b 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -35,12 +35,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include "logging.h" -#include "l1ctl_link.h" -#include "l1ctl_proto.h" +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> -#include "trx_if.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/sched_trx.h> static const char *arfcn2band_name(uint16_t arfcn) { diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 552fc8b..b10d9da 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -36,10 +36,10 @@ #include <osmocom/core/socket.h> #include <osmocom/core/write_queue.h> -#include "trxcon.h" -#include "logging.h" -#include "l1ctl_link.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl.h> static struct value_string l1ctl_evt_names[] = { { 0, NULL } /* no events? */ diff --git a/src/host/trxcon/l1ctl_proto.h b/src/host/trxcon/l1ctl_proto.h deleted file mode 120000 index 75862ba..0000000 --- a/src/host/trxcon/l1ctl_proto.h +++ /dev/null @@ -1 +0,0 @@ -../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c index 8352e6a..04f3568 100644 --- a/src/host/trxcon/logging.c +++ b/src/host/trxcon/logging.c @@ -21,7 +21,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> -#include "logging.h" +#include <osmocom/bb/trxcon/logging.h> static struct log_info_cat trx_log_info_cat[] = { [DAPP] = { diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 9476ccd..1e962aa 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -38,9 +38,9 @@ #include <osmocom/core/timer_compat.h> #include <osmocom/gsm/a5.h> -#include "scheduler.h" -#include "logging.h" -#include "trx_if.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index ac6d262..f5ee866 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -36,13 +36,13 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trxcon.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */ const uint8_t sched_nb_training_bits[8][26] = { diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index b6a72b3..ed7b141 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -26,7 +26,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/gsmtap.h> -#include "sched_trx.h" +#include <osmocom/bb/trxcon/sched_trx.h> /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c index ad6a736..3dabc6b 100644 --- a/src/host/trxcon/sched_lchan_pdtch.c +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index 76c0abb..33c0022 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> /* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */ #define RACH_EXT_TAIL_BITS_LEN 8 diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c index 4d7804e..ed914a0 100644 --- a/src/host/trxcon/sched_lchan_sch.c +++ b/src/host/trxcon/sched_lchan_sch.c @@ -31,12 +31,12 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info) { diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index caf3586..6669bb0 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -32,12 +32,12 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/codec/codec.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c index ae67de4..3be3a59 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -35,12 +35,12 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/codec/codec.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> static const uint8_t tch_h0_traffic_block_map[3][4] = { /* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */ diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index 9fdbcc7..e3accf3 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -30,12 +30,12 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/coding/gsm0503_coding.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "logging.h" -#include "trx_if.h" -#include "l1ctl.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/l1ctl.h> int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c index 9b759af..f5fb6c9 100644 --- a/src/host/trxcon/sched_mframe.c +++ b/src/host/trxcon/sched_mframe.c @@ -25,7 +25,7 @@ #include <osmocom/gsm/gsm_utils.h> -#include "sched_trx.h" +#include <osmocom/bb/trxcon/sched_trx.h> /* Non-combined CCCH */ static const struct trx_frame frame_bcch[51] = { diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e5554ea..847ebd3 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -29,10 +29,10 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> -#include "scheduler.h" -#include "sched_trx.h" -#include "trx_if.h" -#include "logging.h" +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> /** * Initializes a new primitive by allocating memory diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 828787e..618ce8b 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -31,11 +31,11 @@ #include <osmocom/core/logging.h> #include <osmocom/core/linuxlist.h> -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" -#include "trx_if.h" -#include "logging.h" +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> static void sched_trx_a5_burst_enc(struct trx_lchan_state *lchan, struct sched_burst_req *br); diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 8dbbd12..7528609 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -39,11 +39,11 @@ #include <osmocom/gsm/gsm_utils.h> -#include "l1ctl.h" -#include "trxcon.h" -#include "trx_if.h" -#include "logging.h" -#include "scheduler.h" +#include <osmocom/bb/trxcon/l1ctl.h> +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/scheduler.h> static struct value_string trx_evt_names[] = { { 0, NULL } /* no events? */ diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index d6ba0c4..998fdde 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -39,14 +39,14 @@ #include <osmocom/gsm/gsm_utils.h> -#include "trxcon.h" -#include "trx_if.h" -#include "logging.h" -#include "l1ctl.h" -#include "l1ctl_link.h" -#include "l1ctl_proto.h" -#include "scheduler.h" -#include "sched_trx.h" +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl.h> +#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/trxcon/scheduler.h> +#include <osmocom/bb/trxcon/sched_trx.h> #define COPYRIGHT \ "Copyright (C) 2016-2020 by Vadim Yanitskiy <axilirator(a)gmail.com>\n" \ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Gerrit-Change-Number: 28502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Makefile.am: move versioning magic to the bottom

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28500 ) Change subject: trxcon: Makefile.am: move versioning magic to the bottom ...................................................................... trxcon: Makefile.am: move versioning magic to the bottom This is a more usual place for manually added targets. Change-Id: I69892f8689fd7062ca26b6f1337c972b11b1906e Related: OS#5599, OS#3761 --- M src/host/trxcon/Makefile.am 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index b51db02..0c71e97 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -1,12 +1,5 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -# versioning magic -BUILT_SOURCES = $(top_srcdir)/.version -$(top_srcdir)/.version: - echo $(VERSION) > $@-t && mv $@-t $@ -dist-hook: - echo $(VERSION) > $(distdir)/.tarball-version - AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ @@ -50,3 +43,10 @@ $(LIBOSMOCODING_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) + +# versioning magic +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I69892f8689fd7062ca26b6f1337c972b11b1906e Gerrit-Change-Number: 28500 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: group header files into 'include/osmocom/bb/trxcon'

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28502 ) Change subject: trxcon: group header files into 'include/osmocom/bb/trxcon' ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Gerrit-Change-Number: 28502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Jul 2022 08:01:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: coverity: compile tests, but not execute them

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28512 ) Change subject: coverity: compile tests, but not execute them ...................................................................... coverity: compile tests, but not execute them Compiling unit tests would allow Coverity to analyze them too and thus find more bugs. The problem is that binaries listed in check_PROGRAMS are not compiled during 'make all', but only during 'make check'. One approach [1] is to run 'make check' in do_build(), however it breaks 'Coverity-Upload' job because some unit tests are failing. This is why I had to revert bf84ba9f69a0a2125bfd4327519b0e6fa212d664 together with ae41942214ef43bbb6aeb257bad2985765035ad7 that was supposed to fix it. Even if all unit tests were passing, we still don't want to execute them because running tests is beyond the scope of 'Coverity-Upload' job. Another approach is to patch Makefile.am files replacing check_PROGRAMS with noinst_PROGRAMS, so that the test binaries are compiled during 'make all' but not executed. Change-Id: Idf0714a59356633021be21acc47f9471d059b7fe Related: [1] I3f3149a61df96646798c72d0ad31c41b97e6b81f --- M coverity/prepare_source_Osmocom.sh 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 452af3e..22d72e7 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -47,6 +47,13 @@ else git clone git://git.osmocom.org/$proj fi + + # We want to compile tests, but not execute them. Using 'noinst_PROGRAMS' + # instead of 'check_PROGRAMS' allows building test binaries during 'make all'. + files="$(git -C $proj grep -l check_PROGRAMS)" + if [ -n "$files" ]; then + sed -i "s/check_PROGRAMS/noinst_PROGRAMS/" $files + fi done if ! [ -d layer1-api ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idf0714a59356633021be21acc47f9471d059b7fe Gerrit-Change-Number: 28512 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: Revert "coverity/build_Osmocom.sh: don't do check for all"

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28510 ) Change subject: Revert "coverity/build_Osmocom.sh: don't do check for all" ...................................................................... Revert "coverity/build_Osmocom.sh: don't do check for all" This reverts commit ae41942214ef43bbb6aeb257bad2985765035ad7. Change-Id: I5018e0da020f32e3a46a2772e79794e5a3a686ca --- M coverity/build_Osmocom.sh 1 file changed, 3 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index ec764be..fe9806c 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -5,7 +5,6 @@ base_dir="$PWD" src_dir="$base_dir/source-Osmocom" prefix="$base_dir/install-Osmocom" -check="check" install -d "$prefix" @@ -19,16 +18,10 @@ --disable-doxygen \ $* - make $PARALLEL_MAKE $check + make $PARALLEL_MAKE check make install } -do_build_no_check() { - check="" - do_build "$@" - check="check" -} - build_default() { pushd $1 shift @@ -36,13 +29,6 @@ popd } -build_no_check() { - pushd $1 - shift - do_build_no_check $* - popd -} - build_layer1api() { pushd layer1-api install -d "$prefix/include/sysmocom/femtobts/" @@ -83,10 +69,10 @@ rm -rf "$prefix" build_layer1api -build_no_check asn1c +build_default asn1c build_default libosmocore build_libasn1c -build_no_check libusrp +build_libusrp build_default libosmo-abis build_default libosmo-netif build_default libosmo-sccp 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5018e0da020f32e3a46a2772e79794e5a3a686ca Gerrit-Change-Number: 28510 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: Revert "coverity/build_Osmocom.sh: run 'make check' in do_build()"

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28511 ) Change subject: Revert "coverity/build_Osmocom.sh: run 'make check' in do_build()" ...................................................................... Revert "coverity/build_Osmocom.sh: run 'make check' in do_build()" This reverts commit bf84ba9f69a0a2125bfd4327519b0e6fa212d664. Change-Id: I722f8cbb1934a4f5ce2969e243f223019f123777 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index fe9806c..a7f8cdd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -18,7 +18,7 @@ --disable-doxygen \ $* - make $PARALLEL_MAKE check + make $PARALLEL_MAKE make install } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I722f8cbb1934a4f5ce2969e243f223019f123777 Gerrit-Change-Number: 28511 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in simtrace2[master]: host/cardem: fix integer overflow in process_do_rx_da()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/28513 to look at the new patch set (#3). Change subject: host/cardem: fix integer overflow in process_do_rx_da() ...................................................................... host/cardem: fix integer overflow in process_do_rx_da() osmo_apdu_segment_in() may return a negative number on receipt of "unknown APDU case", and that would crash simtrace2-cardem-pcsc: msgb(0x55d2cf7aa8a0): Not enough tailroom msgb_put (allocated 920, head at 0, len 7, tailroom 1017 < want tailroom 65534) backtrace() returned 19 addresses Change-Id: I9e97b955a28ec886a429d744f9316e7e71be4481 Related: OS#5600 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/28513/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9e97b955a28ec886a429d744f9316e7e71be4481 Gerrit-Change-Number: 28513 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in simtrace2[master]: host/cardem: fix integer overflow in process_do_rx_da()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/28513 to look at the new patch set (#2). Change subject: host/cardem: fix integer overflow in process_do_rx_da() ...................................................................... host/cardem: fix integer overflow in process_do_rx_da() osmo_apdu_segment_in() may return a negative number on receipt of "unknown APDU case", and that would crash simtrace2-cardem-pcsc: msgb(0x55d2cf7aa8a0): Not enough tailroom msgb_put (allocated 920, head at 0, len 7, tailroom 1017 < want tailroom 65534) backtrace() returned 19 addresses Change-Id: I9e97b955a28ec886a429d744f9316e7e71be4481 Related: OS#5600 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/28513/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9e97b955a28ec886a429d744f9316e7e71be4481 Gerrit-Change-Number: 28513 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: coverity: compile tests, but not execute them

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28512 ) Change subject: coverity: compile tests, but not execute them ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idf0714a59356633021be21acc47f9471d059b7fe Gerrit-Change-Number: 28512 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Jul 2022 07:51:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022