pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email )
Change subject: encoding: Use defines to set PAYLOAD_TYPE
......................................................................
encoding: Use defines to set PAYLOAD_TYPE
Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0
---
M src/encoding.cpp
M src/gsm_rlcmac.c
M src/gsm_rlcmac.h
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/77/39777/1
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 75b9a30..b10b9a3 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -602,7 +602,7 @@
Dynamic_Allocation_t *da;
/* RLC/MAC control block without the optional RLC/MAC control header */
- block->PAYLOAD_TYPE = 0x01; // Payload Type
+ block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // Payload Type
block->RRBP = rrbp; // RRBP (e.g. N+13)
block->SP = poll; // RRBP field is valid
block->USF = 0x00; // Uplink state flag
@@ -720,7 +720,7 @@
uint8_t tn;
- block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+ block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
block->RRBP = rrbp; // 0: N+13
block->SP = poll; // RRBP field is valid
block->USF = 0x0; // Uplink state flag
@@ -1759,7 +1759,7 @@
uint8_t container_idx, PNCDContainer_t *container)
{
- block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+ block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
block->RRBP = 0; // 0: N+13
block->SP = 0; // RRBP field is not valid
block->USF = 0x0; // Uplink state flag
@@ -1784,7 +1784,7 @@
uint16_t arfcn, uint8_t bsic, uint8_t container_id)
{
- block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+ block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
block->RRBP = rrbp; // RRBP (e.g. N+13)
block->SP = poll; // RRBP field is valid?
block->USF = 0x0; // Uplink state flag
diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index 931c85c..79fda90 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -36,12 +36,6 @@
#include <arpa/inet.h>
#include <gprs_debug.h>
-/* Payload type as defined in TS 44.060 / 10.4.7 */
-#define PAYLOAD_TYPE_DATA 0
-#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1
-#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2
-#define PAYLOAD_TYPE_RESERVED 3
-
/* CSN1 structures */
/*(not all parts of CSN_DESCR structure are always initialized.)*/
static const
diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h
index c43d418..d34024a 100644
--- a/src/gsm_rlcmac.h
+++ b/src/gsm_rlcmac.h
@@ -48,6 +48,12 @@
typedef guint8 N51_t;
typedef guint8 N26_t;
+/* Payload type as defined in TS 44.060 / 10.4.7 */
+#define PAYLOAD_TYPE_DATA 0
+#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1
+#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2
+#define PAYLOAD_TYPE_RESERVED 3
+
/* Starting Time IE as specified in 04.08 */
typedef struct
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0
Gerrit-Change-Number: 39777
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: laforge, pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email )
Change subject: nplab-{m3ua,sua}-test: Record pcap of all testsuite run
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
Gerrit-Change-Number: 39770
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Mar 2025 13:22:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: laforge, osmith, pespin.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: pcap-server: Introduce VTY cmd file-write-queue-max-length
......................................................................
pcap-server: Introduce VTY cmd file-write-queue-max-length
This allows dimensioning the write queue used to write msgbs to disk.
Related: SYS#7374
Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce
---
M include/osmo-pcap/osmo_pcap_server.h
M src/osmo_pcap_wr_file.c
M src/osmo_server_core.c
M src/osmo_server_vty.c
4 files changed, 49 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/39774/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce
Gerrit-Change-Number: 39774
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Attention is currently required from: laforge, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email )
Change subject: nplab-{m3ua,sua}-test: Record pcap of all testsuite run
......................................................................
Patch Set 4:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/docker-playground/+/39770/comment/f497f545_12a… :
PS3, Line 8:
> maybe note here that tcpdump-{start,stop}.sh were imported from osmo-ttcn3-hacks. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
Gerrit-Change-Number: 39770
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 12 Mar 2025 13:03:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Attention is currently required from: laforge, osmith, pespin.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+2 by osmith
The change is no longer submittable: Code-Review is unsatisfied now.
Change subject: nplab-{m3ua,sua}-test: Record pcap of all testsuite run
......................................................................
nplab-{m3ua,sua}-test: Record pcap of all testsuite run
Scripts are cherry-picked from osmo-ttcn3-hacks.git/ttcn3-tcpdump-{start,stop}.sh,
8fc1b2152ff7615f610e7a040cb3b5135dfc5351.
Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
---
A common/tcpdump-start.sh
A common/tcpdump-stop.sh
M debian-buster-build/Dockerfile
M nplab-m3ua-test/Dockerfile
M nplab-m3ua-test/jenkins.sh
M nplab-m3ua-test/osmo-stp.cfg
A nplab-m3ua-test/test.sh
M nplab-sua-test/Dockerfile
M nplab-sua-test/jenkins.sh
M nplab-sua-test/osmo-stp.cfg
A nplab-sua-test/test.sh
11 files changed, 239 insertions(+), 44 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/39770/4
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
Gerrit-Change-Number: 39770
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39775?usp=email )
Change subject: stream_{cli,srv}: fix copy-paste in API docs
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39775?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I8ec783b8db36a017dc3fe111b0ca0938488ae03d
Gerrit-Change-Number: 39775
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Mar 2025 12:54:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: laforge.
Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39434?usp=email )
Change subject: bl updater app
......................................................................
Patch Set 11:
(1 comment)
File atmel_start.c:
https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39434/comment/8470664b_844aa75… :
PS7, Line 9: // do not init usb here: might not be needed.
> might be useful to state those cases or some example of it?
the original bl would have required a comment that justifies why it attaches to the bus for no reason and hopes the firmware starts fast enough. this behaves as expected, the bootloader just.. bootloads all the things, there is no usb invovled.
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39434?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I1403d35497cdea41ea5bed2c94b9e729ca352772
Gerrit-Change-Number: 39434
Gerrit-PatchSet: 11
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 12 Mar 2025 12:19:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: laforge.
Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email )
Change subject: add fw update crcstub
......................................................................
Patch Set 12:
(2 comments)
File crc_code.c:
https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437/comment/ca6428e5_5ae9e5d… :
PS10, Line 102: // uint32_t length = strtoul(argv[3], NULL, 16);
> can this commented out code be removed? I guess every C developer knows that diferent base arguments […]
Done
File crc_params.c:
https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437/comment/67c3abd4_39ba744… :
PS10, Line 5: // __attribute__((used, section(".crc_par"))) const uint32_t __CRC_End = 0xFFFFFFFF; /* Placeholder */
> why do we have this commented-out code here? is this some earlier attempts? shouldn't it be removed?
those still exist in the ld file and might be needed in case the linker, gcc, make, objdump, objcopy, or any other part of this brittle house of cards breaks again and I need anther approach to patch the files.
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I39eae7aaafd5531db6ce48837c9499432caadbed
Gerrit-Change-Number: 39437
Gerrit-PatchSet: 12
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 12 Mar 2025 12:16:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>