- gerrit-log - lists.osmocom.org

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26976 ) Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d --- M contrib/simtrace.lua 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index efae492..83bc925 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -174,8 +174,11 @@ function usb_simtrace_protocol.init() local usb_product_dissectors = DissectorTable.get("usb.product") -usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) +usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST +usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM +usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2 +usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD +usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol) DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol) --concatss = ByteArray.new() -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26976 ) Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:04:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26976 to look at the new patch set (#2). Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d --- M contrib/simtrace.lua 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/26976/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: host: properly zero-initialize interface match structures

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26975 ) Change subject: host: properly zero-initialize interface match structures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 Gerrit-Change-Number: 26975 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26997 ) Change subject: card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan ...................................................................... card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan This is what we do in all other functions, not sure why this one wants to silently ignore any such programming errors. Change-Id: I022eee86a5a3b5077abe59897161578ed960f1b1 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/97/26997/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index edd500f..7fd069a 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -410,10 +410,9 @@ /* call-back from card_emu.c to force a USART interrupt */ void card_emu_uart_interrupt(uint8_t uart_chan) { + OSMO_ASSERT(uart_chan < ARRAY_SIZE(cardem_inst)); Usart *usart = get_usart_by_chan(uart_chan); - if (!usart) { - return; - } + if (USART0 == usart) { NVIC_SetPendingIRQ(USART0_IRQn); } else if (USART1 == usart) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I022eee86a5a3b5077abe59897161578ed960f1b1 Gerrit-Change-Number: 26997 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: cardem: Report the VCC voltage (if supported)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26996 ) Change subject: cardem: Report the VCC voltage (if supported) ...................................................................... cardem: Report the VCC voltage (if supported) The SIMtrace2 protocol alwasy contained a field for the VCC voltage, the cardem firmware just never populated that field, even on those boards that use the ADC to determine its voltage. Change-Id: Idcecad553fb36380e916378e1420488acbbfa8e3 --- M firmware/libcommon/include/card_emu.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/96/26996/1 diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index 177fad2..2668d73 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -69,6 +69,8 @@ void card_emu_uart_wait_tx_idle(uint8_t uart_chan); void card_emu_uart_interrupt(uint8_t uart_chan); +int card_emu_get_vcc(uint8_t uart_chan); + struct cardemu_usb_msg_config; int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, unsigned int scfg_len); diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 19a519a..c85b08c 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1058,7 +1058,10 @@ sts->flags |= CEMU_STATUS_F_CLK_ACTIVE; if (ch->in_reset) sts->flags |= CEMU_STATUS_F_RESET_ACTIVE; - /* FIXME: voltage + card insert */ +#ifdef DETECT_VCC_BY_ADC + sts->voltage_mv = card_emu_get_vcc(ch->num); +#endif + /* FIXME: card insert */ sts->F_index = ch->F_index; sts->D_index = ch->D_index; sts->wi = ch->wi; @@ -1102,7 +1105,12 @@ card_set_state(ch, ISO_S_WAIT_POWER); chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } else if (active == 1 && ch->vcc_active == 0) { +#ifdef DETECT_VCC_BY_ADC + TRACE_INFO("%u: VCC activated (%d mV)\r\n", ch->num, + card_emu_get_vcc(ch->num)); +#else TRACE_INFO("%u: VCC activated\r\n", ch->num); +#endif card_set_state(ch, ISO_S_WAIT_CLK); chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index ff76863..edd500f 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -168,6 +168,16 @@ #endif } +int card_emu_get_vcc(uint8_t uart_chan) +{ + struct cardem_inst *ci = &cardem_inst[uart_chan]; +#ifdef DETECT_VCC_BY_ADC + return ci->vcc_uv / 1000; +#else + return -1; +#endif +} + /* call-back from card_emu.c to enable/disable transmit and/or receive */ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idcecad553fb36380e916378e1420488acbbfa8e3 Gerrit-Change-Number: 26996 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: cardem: set more reasonable interrupt priorities

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26995 ) Change subject: cardem: set more reasonable interrupt priorities ...................................................................... cardem: set more reasonable interrupt priorities the ISO7816 UARTs have highest priority, while console has lowest. remaining sources (USB, ADC, GPIO) are in between. Change-Id: Ie6c97d61d8da3990b6e44144f36cb6d37d194307 --- M firmware/libboard/common/source/uart_console.c M firmware/libcommon/source/mode_cardemu.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/95/26995/1 diff --git a/firmware/libboard/common/source/uart_console.c b/firmware/libboard/common/source/uart_console.c index bcfb0b7..ead5555 100644 --- a/firmware/libboard/common/source/uart_console.c +++ b/firmware/libboard/common/source/uart_console.c @@ -100,6 +100,7 @@ /* Enable TX interrupts */ pUart->UART_IER = UART_IER_TXRDY; + NVIC_SetPriority(CONSOLE_IRQ, 15); /* lowest priority */ NVIC_EnableIRQ(CONSOLE_IRQ); /* Enable receiver and transmitter */ diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 8e4acf9..ff76863 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -461,6 +461,7 @@ ADC->ADC_CHER |= ADC_CHER_CH6; ADC->ADC_IER |= ADC_IER_EOC6; #endif + NVIC_SetPriority(ADC_IRQn, 13); NVIC_EnableIRQ(ADC_IRQn); ADC->ADC_CR |= ADC_CR_START; @@ -564,6 +565,8 @@ TRACE_ENTRY(); + NVIC_SetPriority(UDP_IRQn, 14); + #ifdef PINS_CARDSIM PIO_Configure(pins_cardsim, PIO_LISTSIZE(pins_cardsim)); #endif @@ -577,6 +580,7 @@ /* configure USART as ISO-7816 slave (e.g. card) */ ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE); + NVIC_SetPriority(FIRST_USART_IRQ, 0); NVIC_EnableIRQ(FIRST_USART_IRQ); PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler); PIO_EnableIt(&pin_usim1_rst); @@ -604,6 +608,7 @@ PIO_Configure(pins_usim2, PIO_LISTSIZE(pins_usim2)); ISO7816_Init(&cardem_inst[1].usart_info, CLK_SLAVE); /* TODO enable timeout */ + NVIC_SetPriority(USART0_IRQn, 0); NVIC_EnableIRQ(USART0_IRQn); PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler); PIO_EnableIt(&pin_usim2_rst); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie6c97d61d8da3990b6e44144f36cb6d37d194307 Gerrit-Change-Number: 26995 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in libosmo-sccp[2021q4]: sccp_user: do not force the role ASP when configured differently

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/26994 ) Change subject: sccp_user: do not force the role ASP when configured differently ...................................................................... sccp_user: do not force the role ASP when configured differently The current implementation of osmo_sccp_simple_client forces the ASP to run in ASP role. Even then when the user has configured it differently via VTY. The osmo_sccp_simple_client should respect the VTY configuration. Change-Id: Ib57c513407747d36e503a4fb01c50c69dea0cb85 Related: SYS#5796 --- M src/sccp_user.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/94/26994/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index ade9487..839ef64 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -633,7 +633,11 @@ /* Ensure that the ASP we use is set to client mode. */ asp->cfg.is_server = false; - asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; + + /* Make sure that the role of this ASP is set to ASP unless the user + * made a concious decision about the role via the VTY */ + if (!asp->cfg.role_set_by_vty) + asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; /* Restart ASP */ if (prot != OSMO_SS7_ASP_PROT_IPA) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/26994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: 2021q4 Gerrit-Change-Id: Ib57c513407747d36e503a4fb01c50c69dea0cb85 Gerrit-Change-Number: 26994 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fixup for conn cleanup, fixing three failing tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26991 ) Change subject: bsc: fixup for conn cleanup, fixing three failing tests ...................................................................... bsc: fixup for conn cleanup, fixing three failing tests Three tests fail after recent patch "bsc: properly clean up conn after each test" I9396efcabc085d2850244c6468b83c5f3a3ff3a2 In TC_assignment_emerg_setup_deny_bts(), do not expect an RR Rel. In TC_assignment_emerg_setup_deny_msc() and TC_cm_reestablishment(), drop the additional f_expect_dlcx_conns(). Related: OS#5337 Change-Id: I1d1d27f0927e640a430b24c6dc3d5d851a5c4cb9 --- M bsc/BSC_Tests.ttcn 1 file changed, 26 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 634e629..1510af8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7932,6 +7932,31 @@ deactivate(ack_rel_req); } +friend function f_perform_clear_no_rr_rel(RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT rsl_proc_pt := RSL_PROC) +runs on MSC_ConnHdlr { + var default ack_dlcx := activate(as_mgcp_ack_all_dlcx()); + var default ack_rel_req := activate(as_rsl_ack_all_rel_req()); + f_logp(BSCVTY, "MSC instructs BSC to clear channel"); + BSSAP.send(ts_BSSMAP_ClearCommand(0)); + interleave { + [] rsl_pt.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) { + f_logp(BSCVTY, "Got RSL Deact SACCH"); + } + [] BSSAP.receive(tr_BSSMAP_ClearComplete) { + f_logp(BSCVTY, "Got BSSMAP Clear Complete"); + /* Also drop the SCCP connection */ + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + } + [] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) { + f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack"); + rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr)); + f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt); + } + } + deactivate(ack_dlcx); + deactivate(ack_rel_req); +} + private function f_perform_clear_test_ct(DchanTuple dt) runs on test_CT { @@ -8707,7 +8732,7 @@ } } BSSAP.receive(tr_BSSMAP_ClearRequest); - f_perform_clear(); + f_perform_clear_no_rr_rel(); } /* EMERGENCY CALL situation #1, allowed globally and by BTS */ @@ -10198,7 +10223,6 @@ } } f_perform_clear() - f_expect_dlcx_conns(); f_create_mgcp_delete_ep(g_media.mgcp_ep); COORD.send(REEST_CLEAR_DONE); } @@ -10259,7 +10283,6 @@ f_logp(BSCVTY, "f_tc_cm_reestablishment_2 clearing"); f_perform_clear(RSL1, RSL1_PROC); - f_expect_dlcx_conns(); } testcase TC_cm_reestablishment() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26991 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: I1d1d27f0927e640a430b24c6dc3d5d851a5c4cb9 Gerrit-Change-Number: 26991 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fixup for conn cleanup, fixing three failing tests

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26991 ) Change subject: bsc: fixup for conn cleanup, fixing three failing tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26991 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: I1d1d27f0927e640a430b24c6dc3d5d851a5c4cb9 Gerrit-Change-Number: 26991 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 13:05:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log