January 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: contrib/simtrace.lua: print length + slot-number in decimal only

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26984 ) Change subject: contrib/simtrace.lua: print length + slot-number in decimal only ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia9a969b88170c49f8bb1cb0cda6918d6a894d3ba Gerrit-Change-Number: 26984 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:05:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add header with author/description/usage

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26978 ) Change subject: contrib/simtrace.lua: Add header with author/description/usage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I56574741cd77436f9f452420677c00d8049a50cc Gerrit-Change-Number: 26978 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:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: cosmetic: contrib/simtrace.lua: more consistent formatting

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26977 ) Change subject: cosmetic: contrib/simtrace.lua: more consistent formatting ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4 Gerrit-Change-Number: 26977 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:05:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26975 ) Change subject: host: properly zero-initialize interface match structures ...................................................................... host: properly zero-initialize interface match structures This can lead to some fields not properly zero-initialized, fooling our matching code into the application having requested certain fields to match ('0' is usually assumed to be unspecified). Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-tool.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 3ec7509..8b08f36 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -549,6 +549,7 @@ do { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d705796..9c9b5ed 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -303,6 +303,7 @@ do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; -- 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-MessageType: merged

3 years, 4 months

1
0
0 0

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, 4 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, 4 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, 4 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, 4 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, 4 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, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022