laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27389 )
Change subject: simtrace2-cardem-pcsc: continue in case of LIBUSB_TRANSFER_ERROR
......................................................................
simtrace2-cardem-pcsc: continue in case of LIBUSB_TRANSFER_ERROR
Sometimes I get LIBUSB_TRANSFER_ERROR particularly when the USB bus
is very busy. We shouldn't terminate the program, but simply resubmit
it. That's what we have multiple transfers for...
Change-Id: I77d7bc636c21171fcff7e70e87c0109cbaee9b51
---
M host/src/simtrace2-cardem-pcsc.c
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/89/27389/1
diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c
index df4397a..c86f06a 100644
--- a/host/src/simtrace2-cardem-pcsc.c
+++ b/host/src/simtrace2-cardem-pcsc.c
@@ -278,6 +278,9 @@
/* hand the message up the stack */
process_usb_msg(ci, xfer->buffer, xfer->actual_length);
break;
+ case LIBUSB_TRANSFER_ERROR:
+ LOGCI(ci, LOGL_FATAL, "USB IN transfer error, trying resubmit\n");
+ break;
case LIBUSB_TRANSFER_NO_DEVICE:
LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");
exit(1);
@@ -329,6 +332,9 @@
case LIBUSB_TRANSFER_COMPLETED:
process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length);
break;
+ case LIBUSB_TRANSFER_ERROR:
+ LOGCI(ci, LOGL_FATAL, "USB INT transfer error, trying resubmit\n");
+ break;
case LIBUSB_TRANSFER_NO_DEVICE:
LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");
exit(1);
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27389
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I77d7bc636c21171fcff7e70e87c0109cbaee9b51
Gerrit-Change-Number: 27389
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27387 )
Change subject: simtrace: Enable VCC detection via ADC (voltage dependent)
......................................................................
simtrace: Enable VCC detection via ADC (voltage dependent)
SIMtrace should reject any card activation at 1.8V as it is a 3[.3]V device
without level shifters. For this, we must include the ADC in
determining the VCC voltage.
Change-Id: Ic76f06037590ff1c0dae818d5eb2c2019dd75f2d
FIXME: reporting uses raw ADC voltage, not the voltage before divider
---
M firmware/libboard/simtrace/include/board.h
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/87/27387/1
diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h
index 7cb30b0..d6905ea 100644
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -155,3 +155,7 @@
#endif
/* SIMtrace board supports man-in-the-middle mode */
//#define HAVE_MITM
+
+#define DETECT_VCC_BY_ADC
+#define VCC_UV_THRESH_1V8 (1500000/2) /* 10k/10k resistive divider halves voltage */
+#define VCC_UV_THRESH_3V (2500000/2) /* 10k/10k resistive divider halves voltage */
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27387
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Ic76f06037590ff1c0dae818d5eb2c2019dd75f2d
Gerrit-Change-Number: 27387
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27386 )
Change subject: system_information: fix DCS/PCS band indicator in generate_si6()
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
unit test would be great.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27386
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Iaa8377919a144e7f3799b76249f579c8f3874145
Gerrit-Change-Number: 27386
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: Thu, 03 Mar 2022 11:51:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment