pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42217?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: Makefile.am: Avoid removing tcap.h during make -C src/ regen
......................................................................
Makefile.am: Avoid removing tcap.h during make -C src/ regen
That header is ours and is the public entry towards the library.
Change-Id: I89a34ef61e6f74ba7482a5abcf55404c157a14fb
---
M src/Makefile.am
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/src/Makefile.am b/src/Makefile.am
index ef91d4b..6c2f830 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -210,7 +210,9 @@
regen: regenerate-from-asn1-source
regenerate-from-asn1-source:
- rm -f $(top_srcdir)/src/gen/*.c $(top_srcdir)/include/osmocom/tcap/*.h
+ rm -f $(top_srcdir)/src/gen/*.c
+# Remove all .h files except our tcap.h:
+ find $(top_srcdir)/include/osmocom/tcap/ -type f -name '*.h' -type f -not -name 'tcap.h' -delete
ASN1C_PREFIX="TCAP_" ${ASN1C_BIN_PATH} \
-S $(ASN1C_SKELETON_PATH) \
-D $(top_srcdir)/src/gen \
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42217?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: I89a34ef61e6f74ba7482a5abcf55404c157a14fb
Gerrit-Change-Number: 42217
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(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>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42218?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: tests: Use mem alloc macro instead of direct calloc() call
......................................................................
tests: Use mem alloc macro instead of direct calloc() call
This way we make sure the proper function to alloc is called.
Change-Id: Ia9c7cf1f958f273dd7a5e23cf7633e45fa9d577f
---
M tests/parse/tcap_parse_test.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/tests/parse/tcap_parse_test.c b/tests/parse/tcap_parse_test.c
index 6a52cea..0f44963 100644
--- a/tests/parse/tcap_parse_test.c
+++ b/tests/parse/tcap_parse_test.c
@@ -30,7 +30,7 @@
{
asn_dec_rval_t rc;
struct TCAP_TCMessage *tcapmsg;
- tcapmsg = calloc(1, sizeof(*tcapmsg));
+ tcapmsg = CALLOC(1, sizeof(*tcapmsg));
printf("Basic TCAP decode testing.\n");
--
To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42218?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-asn1-tcap
Gerrit-Branch: master
Gerrit-Change-Id: Ia9c7cf1f958f273dd7a5e23cf7633e45fa9d577f
Gerrit-Change-Number: 42218
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(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>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42227?usp=email )
Change subject: clang-format: set ColumnLimit: 0
......................................................................
clang-format: set ColumnLimit: 0
While our coding style says "we accept line lengths of up to 120
characters", in practice we oftentimes end up preferring longer lines
(e.g. due to having comments at the end, or to keep them consistent with
similar but shorter lines).
The checkpatch config has already been adjusted to just ignore the line
length completely. Adjust the clang-format config to do the same.
Related: osmo-ci I88fd86ac550fddb3017aeceb647c3d9e75367372
Change-Id: I1f0d511d90a0725f195e08dd6a99eb3d55bd6fc1
---
M .clang-format
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/.clang-format b/.clang-format
index 4de65a5..e1b8d44 100644
--- a/.clang-format
+++ b/.clang-format
@@ -52,7 +52,7 @@
#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: false
-ColumnLimit: 120
+ColumnLimit: 0
CommentPragmas: '^ IWYU pragma:'
#CompactNamespaces: false # Unknown to clang-format-4.0
ConstructorInitializerAllOnOneLineOrOnePerLine: false
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42227?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I1f0d511d90a0725f195e08dd6a99eb3d55bd6fc1
Gerrit-Change-Number: 42227
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(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-CC: pespin <pespin(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/42204?usp=email )
Change subject: checkpatch.conf: lint more code
......................................................................
checkpatch.conf: lint more code
The current linter configuration misses to find lots of formatting
errors as we've seen here:
https://gerrit.osmocom.org/c/osmo-trx/+/42198/comments/f8f1b5a2_3c7e1389
This is caused by the following exclude rules in .checkpatch.conf, which
were added there to avoid that some of the checkpatch rules don't work
correctly with C++ code:
---exclude .*h
---exclude Transceiver52M/grgsm_vitac/.*
---exclude utils/va-test/.*
Fix this by splitting the .checkpatch.conf into two files,
.checkpatch.c.conf and .checkpatch.c++.conf. Let the C version use the
default rules. Let the C++ version ignore the rules that don't work with
C++ code:
* SPACING
Fails on:
std::vector<std::string>
With:
ERROR:SPACING: spaces required around that '<' (ctx:VxV)
ERROR:SPACING: spaces required around that '>' (ctx:VxW)
* FUNCTION_ARGUMENTS
Fails on:
ScopedLock lock(mLock);
With:
WARNING:FUNCTION_ARGUMENTS: function definition argument 'mLock' should also have an identifier name
* INDENTED_LABEL
Fails on:
private:
protected:
With:
WARNING:INDENTED_LABEL: labels should not be indented
* NEW_TYPEDEFS
Fails on:
typedef std::map<K,D*> Map;
With:
WARNING:NEW_TYPEDEFS: do not add new typedefs
With the new config, the linter only complains about the following
things across the existing C++ code, which seem to be legitimate linting
problems (and if not, can be ignored as well):
BRACES_NOT_NECESSARY, CODE_INDENT, LEADING_SPACE,
MULTISTATEMENT_MACRO_USE_DO_WHILE, OPEN_BRACE, POINTER_LOCATION,
PRINTF_I_OSMO, SINGLE_STATEMENT_DO_WHILE_MACRO, SPACE_BEFORE_TAB,
STATIC_CONST_CHAR_ARRAY, TABSTOP, TRAILING_WHITESPACE
Depends: osmo-ci Ia2e75d9783382cefc3900a4ab51a5a919a2cbbbc
Change-Id: I0df5b6f2f0bf1469a80a1f5859809c30f523f683
---
A .checkpatch.c++.conf
A .checkpatch.c.conf
D .checkpatch.conf
3 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/.checkpatch.c++.conf b/.checkpatch.c++.conf
new file mode 100644
index 0000000..907c8b3
--- /dev/null
+++ b/.checkpatch.c++.conf
@@ -0,0 +1,7 @@
+--exclude osmocom-bb/.*
+--exclude ^.*\.c$
+--ignore FUNCTION_ARGUMENTS
+--ignore FUNCTION_WITHOUT_ARGS
+--ignore INDENTED_LABEL
+--ignore NEW_TYPEDEFS
+--ignore SPACING
diff --git a/.checkpatch.c.conf b/.checkpatch.c.conf
new file mode 100644
index 0000000..6974059
--- /dev/null
+++ b/.checkpatch.c.conf
@@ -0,0 +1,3 @@
+--exclude osmocom-bb/.*
+--exclude ^.*\.cpp$
+--exclude ^.*\.h$
diff --git a/.checkpatch.conf b/.checkpatch.conf
deleted file mode 100644
index 1699801..0000000
--- a/.checkpatch.conf
+++ /dev/null
@@ -1,5 +0,0 @@
---exclude osmocom-bb/.*
---exclude .*h
---exclude Transceiver52M/grgsm_vitac/.*
---exclude utils/va-test/.*
---ignore FUNCTION_WITHOUT_ARGS
\ No newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42204?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I0df5b6f2f0bf1469a80a1f5859809c30f523f683
Gerrit-Change-Number: 42204
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: falconia, fixeria, pespin.
Hello Jenkins Builder, falconia, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/42244?usp=email
to look at the new patch set (#5).
Change subject: tch: fix RTP clock not ticking for unhandled payload types
......................................................................
tch: fix RTP clock not ticking for unhandled payload types
When the payload type from the DSP is not handled by the switch
in l1if_tch_rx(), rmsg stays NULL and we return 0 without calling
add_l1sap_header(), silently dropping a 20ms RTP tick.
Always allocate an empty RTP frame when rmsg is NULL so the RTP
clock keeps ticking.
Related: OS#5974
Change-Id: I202522ea6f83d77872a2f84d9a2622b87e829a0c
---
M src/osmo-bts-sysmo/tch.c
1 file changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/42244/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42244?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I202522ea6f83d77872a2f84d9a2622b87e829a0c
Gerrit-Change-Number: 42244
Gerrit-PatchSet: 5
Gerrit-Owner: Thorkell Thorkelsson <thorkellmanithorkelsson(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>