laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/33927 )
Change subject: ms: update osmocom-bb
......................................................................
ms: update osmocom-bb
..and sync the log levels.
Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af
---
M Transceiver52M/Makefile.am
M Transceiver52M/ms/logging.c
M Transceiver52M/ms/ms_upper.cpp
M osmocom-bb
4 files changed, 48 insertions(+), 20 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 681809f..f8556f0 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -80,6 +80,7 @@
TRXCON_LDADD = \
$(top_builddir)/osmocom-bb/src/host/trxcon/src/.libs/libtrxcon.a \
$(top_builddir)/osmocom-bb/src/host/trxcon/src/.libs/libl1sched.a \
+ $(top_builddir)/osmocom-bb/src/host/trxcon/src/.libs/libl1gprs.a \
$(LIBOSMOCODING_LIBS)
MS_LOWER_SRC = \
diff --git a/Transceiver52M/ms/logging.c b/Transceiver52M/ms/logging.c
index ee59299..af397e0 100644
--- a/Transceiver52M/ms/logging.c
+++ b/Transceiver52M/ms/logging.c
@@ -1,5 +1,7 @@
/*
- * (C) 2016-2022 by Vadim Yanitskiy <[email protected]>
+ * OsmocomBB <-> SDR connection bridge
+ *
+ * (C) 2016-2017 by Vadim Yanitskiy <[email protected]>
*
* All Rights Reserved
*
@@ -19,48 +21,61 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/utils.h>
-#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trxcon.h>
+#include <osmocom/bb/trxcon/logging.h>
static struct log_info_cat trxcon_log_info_cat[] = {
[DAPP] = {
.name = "DAPP",
- .color = "\033[1;35m",
.description = "Application",
- .loglevel = LOGL_NOTICE,
- .enabled = 1,
+ .color = "\033[1;35m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
},
[DL1C] = {
.name = "DL1C",
- .color = "\033[1;31m",
.description = "Layer 1 control interface",
- .loglevel = LOGL_NOTICE,
- .enabled = 1,
+ .color = "\033[1;31m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
},
[DL1D] = {
.name = "DL1D",
- .color = "\033[1;31m",
.description = "Layer 1 data",
- .loglevel = LOGL_NOTICE,
- .enabled = 1,
+ .color = "\033[1;31m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DTRXC] = {
+ .name = "DTRXC",
+ .description = "Transceiver control interface",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DTRXD] = {
+ .name = "DTRXD",
+ .description = "Transceiver data interface",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
},
[DSCH] = {
.name = "DSCH",
- .color = "\033[1;36m",
.description = "Scheduler management",
- .loglevel = LOGL_NOTICE,
- .enabled = 0,
+ .color = "\033[1;36m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
},
[DSCHD] = {
.name = "DSCHD",
- .color = "\033[1;36m",
.description = "Scheduler data",
- .loglevel = LOGL_NOTICE,
- .enabled = 0,
+ .color = "\033[1;36m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DGPRS] = {
+ .name = "DGPRS",
+ .description = "L1 GPRS (MAC layer)",
+ .color = "\033[1;36m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
},
};
-static struct log_info trxcon_log_info = {
+static const struct log_info trxcon_log_info = {
.cat = trxcon_log_info_cat,
.num_cat = ARRAY_SIZE(trxcon_log_info_cat),
};
@@ -71,6 +86,7 @@
[TRXCON_LOGC_L1D] = DL1D,
[TRXCON_LOGC_SCHC] = DSCH,
[TRXCON_LOGC_SCHD] = DSCHD,
+ [TRXCON_LOGC_GPRS] = DGPRS,
};
void trxc_log_init(void *tallctx)
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index 4b2f919..0a2c333 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -395,7 +395,7 @@
msgb_talloc_ctx_init(tall_trxcon_ctx, 0);
trxc_log_init(tall_trxcon_ctx);
- g_trxcon = trxcon_inst_alloc(tall_trxcon_ctx, 0, 0);
+ g_trxcon = trxcon_inst_alloc(tall_trxcon_ctx, 0);
g_trxcon->gsmtap = nullptr;
g_trxcon->phyif = nullptr;
g_trxcon->phy_quirks.fbsb_extend_fns = 866; // 4 seconds, known to work.
diff --git a/osmocom-bb b/osmocom-bb
index c209242..3f409eb 160000
--- a/osmocom-bb
+++ b/osmocom-bb
@@ -1 +1 @@
-Subproject commit c209242d196a9c30401c383104f5063d4dbde4cd
+Subproject commit 3f409eb94eac9ffa67a7528f29f58275f0b836b8
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33927
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af
Gerrit-Change-Number: 33927
Gerrit-PatchSet: 7
Gerrit-Owner: Hoernchen <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-CC: fixeria <[email protected]>
Gerrit-MessageType: merged
