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

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory
by wbokslag 28 Jul '23

28 Jul '23

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Fixed makefile to also clean crypto subdirectory Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 --- M src/Makefile 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/96/33996/1 diff --git a/src/Makefile b/src/Makefile index 9b12484..b424ea4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,4 +30,4 @@ tunctl: tunctl.o clean: - @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o *.a + @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o crypto/*.o *.a -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-tetra[master]: now also free tetra_crypto_state
by wbokslag 28 Jul '23

28 Jul '23

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: now also free tetra_crypto_state ...................................................................... now also free tetra_crypto_state Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h M src/tetra-rx.c 3 files changed, 116 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/97/33997/1 diff --git a/src/crypto/tetra_crypto.c b/src/crypto/tetra_crypto.c index 67997e1..9515a25 100644 --- a/src/crypto/tetra_crypto.c +++ b/src/crypto/tetra_crypto.c @@ -38,9 +38,9 @@ static const struct value_string tetra_key_types[] = { { KEYTYPE_UNDEFINED, "UNDEFINED" }, + { KEYTYPE_CCK_SCK, "CCK/SCK" }, { KEYTYPE_DCK, "DCK" }, { KEYTYPE_MGCK, "MGCK" }, - { KEYTYPE_CCK_SCK, "CCK/SCK" }, { KEYTYPE_GCK, "GCK" }, { 0, NULL } }; @@ -50,7 +50,7 @@ return get_value_string(tetra_key_types, key_type); } -static const struct value_string tetra_tea_types[] = { +static const struct value_string tetra_ksg_types[] = { { UNKNOWN, "UNKNOWN" }, { KSG_TEA1, "TEA1" }, { KSG_TEA2, "TEA2" }, @@ -66,9 +66,9 @@ const char *tetra_get_ksg_type_name(enum tetra_ksg_type ksg_type) { if (ksg_type >= KSG_PROPRIETARY) - return tetra_tea_types[KSG_PROPRIETARY].str; + return tetra_ksg_types[KSG_PROPRIETARY].str; else - return get_value_string(tetra_tea_types, ksg_type); + return get_value_string(tetra_ksg_types, ksg_type); } static const struct value_string tetra_security_classes[] = { @@ -86,14 +86,15 @@ void tetra_crypto_state_init(struct tetra_crypto_state *tcs) { - /* Initialize tetra_crypto_state */ - tcs = talloc_zero(NULL, struct tetra_crypto_state); + /* Initialize network info fields to -1 to designate unknown */ tcs->mnc = -1; tcs->mcc = -1; tcs->cck_id = -1; tcs->hn = -1; tcs->la = -1; tcs->cc = -1; + + /* Initialize database key/network pointers to zero */ tcs->cck = 0; tcs->network = 0; } @@ -116,8 +117,8 @@ { static char pbuf[1024]; - int c = snprintf(pbuf, sizeof(pbuf), "MCC %4d MNC %4d key_type %02X", - k->mcc, k->mnc, k->key_type); + int c = snprintf(pbuf, sizeof(pbuf), "MCC %4d MNC %4d key_type %s", + k->mcc, k->mnc, tetra_get_key_type_name(k->key_type)); if (k->key_type & (KEYTYPE_DCK | KEYTYPE_MGCK)) c += snprintf(pbuf + c, sizeof(pbuf) - c, " addr: %8d", k->addr); @@ -166,6 +167,98 @@ int load_keystore(char *tetra_keyfile) { + /* Keystore file: + * Each line contains network or key definition. + * Lines starting with # are ignored as comments. + * + * network mcc 123 mnc 456 ksg_type 1 security_class 2 + * - ksg_type: decimal, see enum tetra_ksg_type + * - security_class: 2 for SCK, 3 for CCK (and DCK per ISSI) + * + * key mcc 123 mnc 456 addr 00000000 key_type 1 key_num 002 key 1234deadbeefcafebabe + * - addr: decimal, leave zero for key type 1 (CCK/SCK) + * - key_type: 1 CCK/SCK, 2 DCK, 3 MGCK, 4 GCK + * - key_num: SCK_VN or group key number depending on type + * - key: 80-bit key hex string + */ + + int i, c; + char buf[1000]; // max line len + FILE *fp; + + tetra_crypto_db_init(); + + fp = fopen(tetra_keyfile, "r"); + if (!fp) { + printf("tetra_crypto: cannot read keyfile\n"); + exit(1); + } + + while (fgets(buf, sizeof(buf), fp)) { + + if (strlen(buf) <= 1 || buf[0] == '#') { + // Commented/empty line + continue; + + } else if (!strncmp(buf, "network ", 8)) { + + /* Network definition */ + i = tcdb->num_nets; + if (i > 0 && (i % TCDB_ALLOC_BLOCK_SIZE == 0)) + tcdb->nets = talloc_realloc(NULL, tcdb->nets, struct tetra_netinfo, i + TCDB_ALLOC_BLOCK_SIZE); + + c = sscanf(buf, "network mcc %d mnc %d ksg_type %d security_class %d\n", + &tcdb->nets[i].mcc, &tcdb->nets[i].mnc, + (uint32_t *) &tcdb->nets[i].ksg_type, + (uint32_t *) &tcdb->nets[i].security_class); + + if (c != 4) { + printf("tetra_crypto: Failed to parse network info element %d [%s] (%d)\n", i, buf, c); + exit(1); + } + printf("tetra_crypto: Loaded MNC [%s]\n", dump_network_info(&tcdb->nets[i])); + tcdb->num_nets++; + + } else if (!strncmp(buf, "key ", 4)) { + + /* Key definition */ + i = tcdb->num_keys; + if (i > 0 && (i % TCDB_ALLOC_BLOCK_SIZE == 0)) + tcdb->keys = talloc_realloc(NULL, tcdb->keys, struct tetra_key, i + TCDB_ALLOC_BLOCK_SIZE); + + c = sscanf(buf, "key mcc %d mnc %d addr %d key_type %d key_num %d key %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n", + &tcdb->keys[i].mcc, &tcdb->keys[i].mnc, &tcdb->keys[i].addr, + (uint32_t *) &tcdb->keys[i].key_type, &tcdb->keys[i].key_num, + (uint32_t *) &tcdb->keys[i].key[0], (uint32_t *) &tcdb->keys[i].key[1], + (uint32_t *) &tcdb->keys[i].key[2], (uint32_t *) &tcdb->keys[i].key[3], + (uint32_t *) &tcdb->keys[i].key[4], (uint32_t *) &tcdb->keys[i].key[5], + (uint32_t *) &tcdb->keys[i].key[6], (uint32_t *) &tcdb->keys[i].key[7], + (uint32_t *) &tcdb->keys[i].key[8], (uint32_t *) &tcdb->keys[i].key[9]); + tcdb->keys[i].index = i; + if (c != 15) { + printf("tetra_crypto: Failed to parse key %d [%s] (%d)\n", i, buf, c); + exit(1); + } + printf("tetra_crypto: Loaded key [%s]\n", dump_key(&tcdb->keys[i])); + tcdb->num_keys++; + + } else { + printf("tetra_crypto: Could not parse line: %s\n", buf); + exit(1); + } + } + + /* Check network info available for each key and set ptrs for convenience */ + for (i = 0; i < tcdb->num_keys; i++) { + struct tetra_netinfo *network_info_ptr = get_network_info(tcdb->keys[i].mcc, tcdb->keys[i].mnc); + if (!network_info_ptr) { + printf("tetra_crypto: Required network info is missing for %4d", tcdb->keys[i].mnc); + exit(1); + } + tcdb->keys[i].network_info = network_info_ptr; + } + + fclose(fp); return 0; } diff --git a/src/crypto/tetra_crypto.h b/src/crypto/tetra_crypto.h index 0f36e1f..e50a45e 100644 --- a/src/crypto/tetra_crypto.h +++ b/src/crypto/tetra_crypto.h @@ -35,15 +35,13 @@ #define TCDB_ALLOC_BLOCK_SIZE 16 enum tetra_key_type { - KEYTYPE_UNDEFINED = 0x00, + KEYTYPE_UNDEFINED = 0, /* Keytypes usable as ECK after applying TB5 */ - KEYTYPE_DCK = 0x01, - KEYTYPE_MGCK = 0x02, - KEYTYPE_CCK_SCK = 0x04, /* SCK in class 2, CCK in class 3 networks */ - - /* Can be combined with SCK/CCK to get MGCK */ - KEYTYPE_GCK = 0x20, + KEYTYPE_CCK_SCK = 1, /* SCK in class 2, CCK in class 3 networks */ + KEYTYPE_DCK = 2, /* FIXME: add support for DCK */ + KEYTYPE_MGCK = 4, /* FIXME: add support for MGCK */ + KEYTYPE_GCK = 8, /* FIXME: add support. Used with SCK/CCK to derive MGCK */ }; enum tetra_ksg_type { @@ -109,7 +107,6 @@ /* Key loading / unloading */ void tetra_crypto_state_init(struct tetra_crypto_state *tcs); -void tetra_crypto_db_init(void); int load_keystore(char *filename); /* Keystream generation and decryption functions */ diff --git a/src/tetra-rx.c b/src/tetra-rx.c index 2fe95b5..b37b4c0 100644 --- a/src/tetra-rx.c +++ b/src/tetra-rx.c @@ -93,6 +93,7 @@ free(tms->dumpdir); talloc_free(trs); + talloc_free(tms->tcs); talloc_free(tms); exit(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions
by pespin 28 Jul '23

28 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... pcu: Split f_ms_tx_ul_data_block() into helper functions This allows shrinking some tests which wish to send specificaly crafter LlcBlocks (since the way LlcBlocks are created for f_ms_tx_ul_data_block only allows sending data related to the same upper LLC PDU) Change-Id: I81176fa5c7caa2535bcc97eec26833579933ed7a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 57 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/33995/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 64a39dd..491a496 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -669,6 +669,45 @@ f_ms_tx_data_ind(ms, data, fn, nr := nr); } +function f_ms_tx_ul_data_blocks_gprs(inout GprsMS ms, template (value) LlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := blocks); + if (with_tlli) { + ul_data.data.mac_hdr.tlli_ind := true; + ul_data.data.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + +function f_ms_tx_ul_data_blocks_egprs(inout GprsMS ms, template (value) EgprsLlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn1 := ms.ul_tbf.bsn, + bsn2_offset := 0, + blocks := blocks); + if (with_tlli) { + ul_data.data_egprs.tlli_ind := true; + ul_data.data_egprs.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) @@ -676,29 +715,10 @@ var template (value) RlcmacUlBlock ul_data; if (f_rlcmac_cs_mcs_is_mcs(ms.ul_tbf.tx_cs_mcs)) { - ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn1 := ms.ul_tbf.bsn, - bsn2_offset := 0, - blocks := {t_RLCMAC_LLCBLOCK_EGPRS(payload)}) - if (with_tlli) { - ul_data.data_egprs.tlli_ind := true; - ul_data.data_egprs.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_egprs(ms, {t_RLCMAC_LLCBLOCK_EGPRS(payload)}, cv, with_tlli, fn, nr) } else { - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn := ms.ul_tbf.bsn, - blocks := {t_RLCMAC_LLCBLOCK(payload)}); - if (with_tlli) { - ul_data.data.mac_hdr.tlli_ind := true; - ul_data.data.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_gprs(ms, {t_RLCMAC_LLCBLOCK(payload)}, cv, with_tlli, fn, nr); } - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index c360e97..82ecb57 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3603,7 +3603,6 @@ var PCUIF_info_ind info_ind; var RlcmacDlBlock dl_block; var octetstring payload; - var template (value) RlcmacUlBlock ul_data; var template (value) LlcBlockHdr blk_hdr; var template (value) LlcBlocks blocks; var uint32_t sched_fn; @@ -3644,14 +3643,7 @@ more := false, e := true); blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) }; /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ - ul_data := t_RLCMAC_UL_DATA_TLLI(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks, - tlli := ms.tlli); - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, f_next_pdch_block(sched_fn)); + f_ms_tx_ul_data_blocks_gprs(ms, blocks, cv := 15, with_tlli := true, fn := sched_fn); blocks_sent := blocks_sent + 1; /* UL block should be received in SGSN */ @@ -3662,12 +3654,6 @@ tr_AckNackDescription(final_ack := '0'B))) f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks); - nr := f_ms_tx_TsTrxBtsNum(ms); BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -3683,9 +3669,7 @@ log("ACKING FN ", data_msg.raw.fn, " on FN ", ack_fn); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), ack_fn); } - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { @@ -3703,9 +3687,7 @@ tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-gprs[master]: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere
by osmith 28 Jul '23

28 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 ) Change subject: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If2d1946522bc4a1c19d65acb23605f1a3f05ab45 Gerrit-Change-Number: 33981 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 12:50:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: update osmocom-bb
by Hoernchen 28 Jul '23

28 Jul '23

Attention is currently required from: fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33927 ) Change subject: ms: update osmocom-bb ...................................................................... Patch Set 5: (2 comments) Patchset: PS4: > Please also add a dedicated logging category for l1gprs (`TRXCON_LOGC_GPRS`/`DGPRS`), like it's done […] Done File osmocom-bb: https://gerrit.osmocom.org/c/osmo-trx/+/33927/comment/b9df51a2_07f2006e PS4, Line 1: 60215bc051c96d87c552ece42d594be7f7388c4f > I recommend upgrading to even more recent version (`3f409eb94eac9ffa67a7528f29f58275f0b836b8`), whic […] Done -- 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: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 12:44:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: ms: update osmocom-bb
by Hoernchen 28 Jul '23

28 Jul '23

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 to look at the new patch set (#6). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/33927/6 -- 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: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-trx[master]: ms: restructure the va code to add rach support
by Hoernchen 28 Jul '23

28 Jul '23

Attention is currently required from: Hoernchen, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 to look at the new patch set (#7). Change subject: ms: restructure the va code to add rach support ...................................................................... ms: restructure the va code to add rach support Change-Id: I7275a647428661a788646fec10af429fcdcf577e new bb Change-Id: I36dbed6394243c8c2b5e14acbade7b1b82d0708c XX va trials Change-Id: Id1de531249922315da35d2d01778a7611879fb92 fugg Change-Id: Ibe5d538e9970e590877d2a901165defa6dc972fe tx->va needs scaling by 0.1 Change-Id: Ic3cc5748e00584971c4bd509eed7db9d5f09201c sch Change-Id: I41fabcdd5b4a5eb8cff4e42676438b0bffa2e1b9 va1 Change-Id: I93ab3cb8f91bf6e496175ae70e5da0323cabe911 xx Change-Id: I26b5957f80be02df913e31a370e1e7910f4484df va2 Change-Id: I09d6b560241e6797a533e7f8e68e899c42517baa va: max elemn fix max elem returns the first largest element - but the true value is skewed to the right in our case. Change-Id: I1de9b7e280d8723ce9876bef20c790383070e958 SDSD Change-Id: Ie32fc753548583896be9eef486346617ea8b9e88 adsad Change-Id: I3a9a2569c2057feae196b182f6e812edd08ccfa4 make ubsan happy Change-Id: Ic6ddfcf826539dd227e76e8054d3f3d777c97d5e wtf wip Change-Id: I0f465da6d17bf91f24a68b3ec2075995478b5fad a bit of channel impulse resp makes it work (?!) Change-Id: I2ab1d6bdf89a0d950ebe38b1fd5efb9764c9ba4f shp Change-Id: I7f936dd22b55145bd182f3b5e51b9c183ab1725f finally works as intended.. maybe. Change-Id: I2af965ab20af74b38975c645093626a81b7fdf72 cleanup Change-Id: If36f15a5f32465ce04113a669e3875dc19c69d6b cleanup Change-Id: I1163a6194570cdce93d46e40e4b710ad5239cce7 iomanip Change-Id: I20453a5381afcf8a7875b6e82805f7e8595163b2 cleanup3 Change-Id: I8e66f2a447984a1fd5a20814eca3ee019ba59717 cleanup3 Change-Id: Ib499fe0a5d42afd9198da96dbcba2a42705bbe73 use short inted burst Change-Id: I0bc7a7b35da474bce74f8a36834a22d5885bbdbc add burst dump Change-Id: I0ca9114b6a02cac7fb628ac47db2554b3ff3b967 cleanup va Change-Id: I1697925b0f0f36aaa05ee170a9483750611aef5d all tests Change-Id: Ie2db803ccb789699cdfaf82e74acba42123d961a transceiver: add va This needs slightly shifted rx windows that need to include the beginning ot the burst. Change-Id: I64f4f596875434bf3e7201ddbbe58924482f4559 va offset pretty #1 Change-Id: Ibb6d3b351bfd915d4bfc2587c5f5c47d129de360 va pretty #2 Change-Id: I8bd2cb9dbe449324be64d8514593815c0ca24c0b makeu Change-Id: I13ccc55a6f5c0438236490bb1e75f93a0e20fe2e xx mergeme Change-Id: Id8edf31fe1bf72a2f254e634edc7c12b3bba8833 sign comp Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 --- M Transceiver52M/grgsm_vitac/constants.h M Transceiver52M/grgsm_vitac/grgsm_vitac.cpp M Transceiver52M/grgsm_vitac/grgsm_vitac.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp 5 files changed, 255 insertions(+), 96 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/44/33944/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data
by Hoernchen 28 Jul '23

28 Jul '23

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 to look at the new patch set (#11). Change subject: ms/va: add test tool and data ...................................................................... ms/va: add test tool and data Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db --- M .checkpatch.conf M .gitignore M utils/Makefile.am A utils/va-test/burst-gen.cpp A utils/va-test/demodbits_tsc7.s8 A utils/va-test/nb_chunk_tsc7.cfile 6 files changed, 559 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/33945/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-trx[master]: ms: drop the tx burst padding
by Hoernchen 28 Jul '23

28 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33926 ) Change subject: ms: drop the tx burst padding ...................................................................... ms: drop the tx burst padding useless. Change-Id: Ied5c3ab5dde975e11b0ef6d9cbc86be19173c4e8 --- M Transceiver52M/ms/ms.cpp 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved; Verified diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index 896928e..ca41144 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -136,15 +136,16 @@ return; } - auto check = now_time + tosend; int64_t send_ts = now_ts + tosend.FN() * 8 * ONE_TS_BURST_LEN + tosend.TN() * ONE_TS_BURST_LEN - timing_advance; #ifdef DBGXX + auto check = now_time + tosend; std::cerr << "## fn DIFF: " << diff_fn << " ## tn DIFF: " << diff_tn << " tn LOCAL/OTHER: " << now_time.TN() << "/" << target_tn << " tndiff" << diff_tn << " tosend:" << tosend.FN() << ":" << tosend.TN() << " check: " << check.FN() << ":" << check.TN() << " target: " << target.FN() << ":" << target.TN() << " ts now: " << now_ts << " target ts:" << send_ts << std::endl; #endif -#if 1 +#if 0 + auto check = now_time + tosend; unsigned int pad = 4 * 4; blade_sample_type buf2[len + pad]; std::fill(buf2, buf2 + pad, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ied5c3ab5dde975e11b0ef6d9cbc86be19173c4e8 Gerrit-Change-Number: 33926 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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

1 0

[S] Change in osmo-trx[master]: ms: drop the tx burst padding
by Hoernchen 28 Jul '23

28 Jul '23

Attention is currently required from: laforge, fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33926 ) Change subject: ms: drop the tx burst padding ...................................................................... Patch Set 4: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ied5c3ab5dde975e11b0ef6d9cbc86be19173c4e8 Gerrit-Change-Number: 33926 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 12:19:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0