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

Change in osmo-mgw[master]: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate()

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27392 ) Change subject: mgcp_codec: fix oa/bwe comparison in mgcp_codec_pt_translate() ...................................................................... Patch Set 1: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/27392/comment/19b735ca_e3e9e5c9 PS1, Line 19: since osmo-mgw offers conversion between the payload type format it I think it's important to grasp from here that we use that here for AMR specificly now, but in fact it's a generic improvement: First try to select an exact codec match, otherwise try to find a suitable transcoding method (in this this case AMR OA<->BE). File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/c/osmo-mgw/+/27392/comment/c4d7ae31_39bd7fd0 PS1, Line 369: static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b, bool match_pload_fmt) I'd make this more generic: bool allow_transcoding It's to be used the opposite way true/false as you are using it now. https://gerrit.osmocom.org/c/osmo-mgw/+/27392/comment/7ca435b5_43b5646c PS1, Line 431: /* In case we weren't able to find an exact match, we will try to find a match that is the same codec, but the Make all this generic. Either match codec exactly, or pick one up requiring some sort of translating/transcoding. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifbd201a2749009a4644a29bd77e1d0fc0c124a9d Gerrit-Change-Number: 27392 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 14:45:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-mgw[master]: Revert "mgcp_codec: do not differentiate between oa and bwe when comp...

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27391 ) Change subject: Revert "mgcp_codec: do not differentiate between oa and bwe when comparing codec" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0b2854ef2397f38606fab3425be586a3d0ca27d1 Gerrit-Change-Number: 27391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 14:41:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-mgw[master]: mgcp_network: fix typo

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27390 ) Change subject: mgcp_network: fix typo ...................................................................... Patch Set 1: (2 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/27390/comment/cf5410cb_cc0e99a8 PS1, Line 1533: /* If AMR is configured for the ingress connection a conversion of the This line is also difficult to read. I'd rewrite the entire phrase as: """ If AMR is configured for the ingress connection, then a conversion of the framing mode (octet-aligned vs. bandwith-efficient) is explicitly defined, so we check if the incoming payload matches that expectation. """ https://gerrit.osmocom.org/c/osmo-mgw/+/27390/comment/b943de60_957267c5 PS1, Line 1534: * framing mode (octet-aligned vs. bandwith-efficient is explicitly I think there's a ")" missing here too, can you fix it while at it? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I23f6672338b26eb74f6d3a753a3863e02af24ae0 Gerrit-Change-Number: 27390 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 14:40:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Detect card power-up without RESET

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27001 ) Change subject: simtrace2-cardem-pcsc: Detect card power-up without RESET ...................................................................... simtrace2-cardem-pcsc: Detect card power-up without RESET In some readers (at least CardMan 3121), the simtrace2-cardem firmware claims there are power-up sequences where RESET is released before VCC becomes active. Let's detect such spec-incompliant power-up sequences and use them to trigger a cold reset of the card. Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Closes: OS#5421 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 23 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8a3b234..0eaf2c3 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -74,22 +74,40 @@ static uint32_t last_status_flags = 0; +#define NO_RESET 0 +#define COLD_RESET 1 +#define WARM_RESET 2 + static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) { struct osim_card_hdl *card = ci->chan->card; + int reset = NO_RESET; + /* check if card is _now_ operational: VCC+CLK present, RST absent */ if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) { /* a reset has just ended, forward it to the real card */ - bool cold_reset = true; if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT) - cold_reset = false; - LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", - cold_reset ? "Cold" : "Warm"); - osim_card_reset(card, cold_reset); + reset = WARM_RESET; + else + reset = COLD_RESET; + } else if (!(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* power-up has just happened, perform cold reset */ + reset = COLD_RESET; } + } else if (flags == CEMU_STATUS_F_VCC_PRESENT && + !(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* improper power-up: Only power enabled, but no reset active. */ + reset = COLD_RESET; } + + if (reset) { + LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", + reset == COLD_RESET ? "Cold" : "Warm"); + osim_card_reset(card, reset == COLD_RESET ? true : false); + } + last_status_flags = flags; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Gerrit-Change-Number: 27001 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Move all logging into libosmocore

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27000 ) Change subject: simtrace2-cardem-pcsc: Move all logging into libosmocore ...................................................................... simtrace2-cardem-pcsc: Move all logging into libosmocore * drop log statements that are already in libosmo-simtrace2 * don't printf directly, but go via LOGCI * make LOGCI use libosmocore logging * configure libosmocore logging in a 'convenient' way Change-Id: I6fa0da966e6d8e723c187404c17e90cfb3f3dd9f --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 19 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 6a9c9c6..8a3b234 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -1,7 +1,7 @@ /* simtrace2-cardem-pcsc - main program for the host PC to provide a remote SIM * using the SIMtrace 2 firmware in card emulation mode * - * (C) 2016-2021 by Harald Welte <hwelte(a)hmw-consulting.de> + * (C) 2016-2022 by Harald Welte <hwelte(a)hmw-consulting.de> * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon(a)sysmocom.de> * * This program is free software; you can redistribute it and/or @@ -49,7 +49,7 @@ #include <osmocom/sim/class_tables.h> #include <osmocom/sim/sim.h> -#define LOGCI(ci, lvl, fmt, args ...) printf(fmt, ## args) +#define LOGCI(ci, lvl, fmt, args ...) LOGP(DLGLOBAL, lvl, fmt, ## args) static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { @@ -93,6 +93,17 @@ last_status_flags = flags; } +static const char *cemu_data_flags2str(uint32_t flags) +{ + static char out[64]; + snprintf(out, sizeof(out), "%s%s%s%s", + flags & CEMU_DATA_F_TPDU_HDR ? "HDR " : "", + flags & CEMU_DATA_F_FINAL ? "FINAL " : "", + flags & CEMU_DATA_F_PB_AND_TX ? "PB_AND_TX " : "", + flags & CEMU_DATA_F_PB_AND_RX ? "PB_AND_RX" : ""); + return out; +} + /*********************************************************************** * Incoming Messages ***********************************************************************/ @@ -104,7 +115,7 @@ char fbuf[80]; cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); - printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + LOGCI(ci, LOGL_NOTICE, "=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); @@ -119,7 +130,7 @@ struct cardemu_usb_msg_pts_info *pts; pts = (struct cardemu_usb_msg_pts_info *) buf; - printf("=> PTS req: %s\n", osmo_hexdump(pts->req, sizeof(pts->req))); + LOGCI(ci, LOGL_NOTICE, "=> PTS req: %s\n", osmo_hexdump(pts->req, pts->pts_len)); return 0; } @@ -133,8 +144,8 @@ data = (struct cardemu_usb_msg_rx_data *) buf; - printf("=> DATA: flags=%x, %s: ", data->flags, - osmo_hexdump(data->data, data->data_len)); + LOGCI(ci, LOGL_INFO, "=> DATA: flags=0x%02x (%s), %s\n ", data->flags, + cemu_data_flags2str(data->flags), osmo_hexdump(data->data, data->data_len)); rc = osmo_apdu_segment_in(&ac, data->data, data->data_len, data->flags & CEMU_DATA_F_TPDU_HDR); @@ -163,7 +174,6 @@ msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg); ac.sw[0] = msgb_apdu_sw(tmsg) >> 8; ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff; - printf("SW=0x%04x, len_rx=%d\n", msgb_apdu_sw(tmsg), msgb_l3len(tmsg)); if (msgb_l3len(tmsg)) osmo_st2_cardem_request_pb_and_tx(ci, ac.hdr.ins, tmsg->l3h, msgb_l3len(tmsg)); osmo_st2_cardem_request_sw_tx(ci, ac.sw); @@ -179,8 +189,6 @@ struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; int rc; - printf("-> %s\n", osmo_hexdump(buf, len)); - buf += sizeof(*sh); switch (sh->msg_type) { @@ -213,7 +221,7 @@ char fbuf[80]; cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); - LOGCI(ci, LOGL_INFO, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + LOGCI(ci, LOGL_NOTICE, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); @@ -227,8 +235,6 @@ struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; int rc; - LOGCI(ci, LOGL_INFO, "SIMtrace IRQ %s\n", osmo_hexdump(buf, len)); - buf += sizeof(*sh); switch (sh->msg_type) { @@ -351,7 +357,7 @@ static void print_welcome(void) { printf("simtrace2-cardem-pcsc - Using PC/SC reader as SIM\n" - "(C) 2010-2020, Harald Welte <laforge(a)gnumonks.org>\n" + "(C) 2010-2022, Harald Welte <laforge(a)gnumonks.org>\n" "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon(a)sysmocom.de>\n\n"); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6fa0da966e6d8e723c187404c17e90cfb3f3dd9f Gerrit-Change-Number: 27000 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: rename 'flags' to 'status_flags'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26999 ) Change subject: simtrace2-cardem-pcsc: rename 'flags' to 'status_flags' ...................................................................... simtrace2-cardem-pcsc: rename 'flags' to 'status_flags' there are other flags in the simtrace/cardem protocol... Change-Id: I6362936c642e7abf4c501b4526a1654a25afedfe --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index c402df7..6a9c9c6 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -62,7 +62,7 @@ atr[atr_len-1] = csum; } -static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags) +static void cemu_status_flags2str(char *out, unsigned int out_len, uint32_t flags) { snprintf(out, out_len, "%s%s%s%s%s", flags & CEMU_STATUS_F_RESET_ACTIVE ? "RESET " : "", @@ -72,25 +72,25 @@ flags & CEMU_STATUS_F_RCEMU_ACTIVE ? "RCEMU " : ""); } -static uint32_t last_flags = 0; +static uint32_t last_status_flags = 0; -static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) +static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) { struct osim_card_hdl *card = ci->chan->card; if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { - if (last_flags & CEMU_STATUS_F_RESET_ACTIVE) { + if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) { /* a reset has just ended, forward it to the real card */ bool cold_reset = true; - if (last_flags & CEMU_STATUS_F_VCC_PRESENT) + if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT) cold_reset = false; LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", cold_reset ? "Cold" : "Warm"); osim_card_reset(card, cold_reset); } } - last_flags = flags; + last_status_flags = flags; } /*********************************************************************** @@ -103,12 +103,12 @@ struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; char fbuf[80]; - cemu_flags2str(fbuf, sizeof(fbuf), status->flags); + cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); - update_flags(ci, status->flags); + update_status_flags(ci, status->flags); return 0; } @@ -212,12 +212,12 @@ const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; char fbuf[80]; - cemu_flags2str(fbuf, sizeof(fbuf), status->flags); - LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); + LOGCI(ci, LOGL_INFO, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); - update_flags(ci, status->flags); + update_status_flags(ci, status->flags); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6362936c642e7abf4c501b4526a1654a25afedfe Gerrit-Change-Number: 26999 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: host: Always initialize libosmocore logging before using it

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27394 ) Change subject: host: Always initialize libosmocore logging before using it ...................................................................... host: Always initialize libosmocore logging before using it This avoids related ASSERTs or error messages in case any of the libosmocore / libosmousb API functions internally tries to log something. Change-Id: I611c435516856c5c8928d7810fd9a9b831adc199 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-tool.c M host/src/simtrace2_usb.c 3 files changed, 16 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8b08f36..c402df7 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -447,13 +447,21 @@ print_welcome(); + osmo_init_logging2(NULL, &log_info); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); return rc; } - osmo_init_logging2(NULL, &log_info); + log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category(osmo_stderr_target, true); + log_set_print_level(osmo_stderr_target, true); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_category_filter(osmo_stderr_target, DLINP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); while (1) { int option_index = 0; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 9c9b5ed..b0fac6c 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -290,6 +290,8 @@ transp->udp_fd = -1; + print_welcome(); + osmo_init_logging2(NULL, &log_info); rc = osmo_libusb_init(NULL); @@ -298,8 +300,6 @@ goto do_exit; } - print_welcome(); - do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 10dc948..8ebc4f7 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -18,6 +18,8 @@ #include <errno.h> #include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/application.h> #include <osmocom/usb/libusb.h> #include <osmocom/simtrace2/simtrace_usb.h> @@ -71,8 +73,11 @@ return num_interfaces; } +static struct log_info log_info = {}; + int main(int argc, char **argv) { + osmo_init_logging2(NULL, &log_info); osmo_libusb_init(NULL); find_devices(); return 0; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I611c435516856c5c8928d7810fd9a9b831adc199 Gerrit-Change-Number: 27394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

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

by laforge

laforge has submitted this change. ( 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/apps/cardem/main.c M firmware/libboard/common/source/uart_console.c M firmware/libcommon/source/mode_cardemu.c 3 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index d212d2a..347ccbd 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -155,7 +155,7 @@ WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000)); - PIO_InitializeInterrupts(0); + PIO_InitializeInterrupts(10); print_banner(); board_main_top(); 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 2a8e477..7fd069a 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -470,6 +470,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; @@ -573,6 +574,8 @@ TRACE_ENTRY(); + NVIC_SetPriority(UDP_IRQn, 14); + #ifdef PINS_CARDSIM PIO_Configure(pins_cardsim, PIO_LISTSIZE(pins_cardsim)); #endif @@ -586,6 +589,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); @@ -613,6 +617,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: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Detect card power-up without RESET

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27001 ) Change subject: simtrace2-cardem-pcsc: Detect card power-up without RESET ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Gerrit-Change-Number: 27001 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 14:32:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Move all logging into libosmocore

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27000 ) Change subject: simtrace2-cardem-pcsc: Move all logging into libosmocore ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6fa0da966e6d8e723c187404c17e90cfb3f3dd9f Gerrit-Change-Number: 27000 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 14:32:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022