[S] Change in osmo-remsim[master]: bankd: Don't use 127.0.0.1 as default IP address for the server
Attention is currently required from: mschramm, laforge. roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33813 ) Change subject: bankd: Don't use 127.0.0.1 as default IP address for the server .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3deb05e31cdf35232cf9a118d5a5fcdb5d0ab601 Gerrit-Change-Number: 33813 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: mschramm Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Attention: mschramm Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 19 Jul 2023 15:13:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ccid-firmware[master]: add simple gangupdater for multiple octsim boards
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 ) Change subject: add simple gangupdater for multiple octsim boards .. add simple gangupdater for multiple octsim boards Change-Id: Ic10572c121ac55586ec43126b63d69529757132b --- A contrib/flash_all_octsim.sh 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/26896/1 diff --git a/contrib/flash_all_octsim.sh b/contrib/flash_all_octsim.sh new file mode 100644 index 000..4f4c89b --- /dev/null +++ b/contrib/flash_all_octsim.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# this script is to scan for octsim boards, sort them by usb path and call dfu-util on each to update the board +# basic flow +# - get usb path and serialno tupel from dfu-util -l +# - reformat and sort by usbpath, drop the usbpath (grep cut tr sort cut) +# - flash the boards + +# TODO: +# - error handling +# - filter dfu-util output and generate nice summary + +dfu-util -l \ + | grep "^Found" \ + | grep "\[1d50:6141\]" \ + | cut -d ' ' -f 8,13 \ + | tr -d ',' \ + | cut -d \" -f 2,4 \ + | tr \" ' ' \ + | sort \ + | cut -d ' ' -f 2 + | xargs -n 1 dfu-util -d 1d50:6141 -D sysmoOCTSIM.bin -R -p -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic10572c121ac55586ec43126b63d69529757132b Gerrit-Change-Number: 26896 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in osmo-ccid-firmware[master]: update test expectations to follow Change-Id: I5f39c0fe82cbfa6f2bc4b8...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26425 ) Change subject: update test expectations to follow Change-Id: I5f39c0fe82cbfa6f2bc4b84784a7142b461b64fb .. update test expectations to follow Change-Id: I5f39c0fe82cbfa6f2bc4b84784a7142b461b64fb Change-Id: I0d4a072d18011ffb00d6251481473b19d5a97c50 --- M tests/sysmo-octsim/03_check_lsusb.out 1 file changed, 3 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/25/26425/1 diff --git a/tests/sysmo-octsim/03_check_lsusb.out b/tests/sysmo-octsim/03_check_lsusb.out index bdc7672..2dc3f09 100644 --- a/tests/sysmo-octsim/03_check_lsusb.out +++ b/tests/sysmo-octsim/03_check_lsusb.out @@ -18,8 +18,8 @@ Configuration Descriptor: bLength 9 bDescriptorType 2 -wTotalLength 0x00a9 -bNumInterfaces 4 +wTotalLength 0x006f +bNumInterfaces 2 bConfigurationValue 1 iConfiguration 3 A bmAttributes 0x80 @@ -28,68 +28,6 @@ Interface Descriptor: bLength 9 bDescriptorType 4 - bInterfaceNumber1 - bAlternateSetting 0 - bNumEndpoints 1 - bInterfaceClass 2 Communications - bInterfaceSubClass 2 Abstract (modem) - bInterfaceProtocol 0 - iInterface 4 debug UART - CDC Header: -bcdCDC 10.01 - CDC Call Management: -bmCapabilities 0x01 - call management -bDataInterface 0 - CDC ACM: -bmCapabilities 0x02 - line coding and serial state - CDC Union: -bMasterInterface1 -bSlaveInterface 2 - Endpoint Descriptor: -bLength 7 -bDescriptorType 5 -bEndpointAddress 0x82 EP 2 IN -bmAttributes3 - Transfer TypeInterrupt - Synch Type None - Usage Type Data -wMaxPacketSize 0x0040 1x 64 bytes -bInterval 10 -Interface Descriptor: - bLength 9 - bDescriptorType 4 - bInterfaceNumber2 - bAlternateSetting 0 - bNumEndpoints 2 - bInterfaceClass10 CDC Data - bInterfaceSubClass 0 - bInterfaceProtocol 0 - iInterface 5 debug UART - Endpoint Descriptor: -bLength 7 -bDescriptorType 5 -bEndpointAddress 0x01 EP 1 OUT -bmAttributes2 - Transfer TypeBulk - Synch Type None - Usage Type Data -wMaxPacketSize 0x0040 1x 64 bytes -bInterval 0 - Endpoint Descriptor: -bLength 7 -bDescriptorType 5 -bEndpointAddress 0x81 EP 1 IN -bmAttributes2 - Transfer TypeBulk - Synch Type None - Usage Type Data -wMaxPacketSize 0x0040 1x 64 bytes -bInterval 0 -Interface Descriptor: - bLength 9 - bDescriptorType 4 bInterfaceNumber0 bAlternateSetting 0 bNumEndpoints 3 @@ -157,7 +95,7 @@ Interface Descriptor: bLength 9 bDescriptorType 4 - bInterfaceNumber3 + bInterfaceNumber1 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 254 Application Specific Interface -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0d4a072d18011ffb00d6251481473b19d5a97c50 Gerrit-Change-Number: 26425 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in simtrace2[master]: add initial testing scripts for a hw-driven ci - flash every image an...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25967 ) Change subject: add initial testing scripts for a hw-driven ci - flash every image and test .. add initial testing scripts for a hw-driven ci - flash every image and test Change-Id: I88bc32334f23e6fd702e0cbcb1b1510029909b20 --- A tests/README A tests/run-tests A tests/simtrace2/01_check_rig.out A tests/simtrace2/01_check_rig.sh A tests/simtrace2/02_erase_board.out A tests/simtrace2/02_erase_board.sh A tests/simtrace2/03_flash_bl_bossac.out A tests/simtrace2/03_flash_bl_bossac.sh A tests/simtrace2/04_flash_dfu.out A tests/simtrace2/04_flash_dfu.sh A tests/simtrace2/05_check_lsusb.out A tests/simtrace2/05_check_lsusb.sh A tests/simtrace2/06_check_dfu_lsusb.out A tests/simtrace2/06_check_dfu_lsusb.sh A tests/simtrace2/07_flash_dfu_from_app.out A tests/simtrace2/07_flash_dfu_from_app.sh A tests/simtrace2/08_test_simtrace.out A tests/simtrace2/08_test_simtrace.sh A tests/simtrace2/README A tests/simtrace2/TODO A tests/simtrace2/ctl_erase_target.sh A tests/simtrace2/ctl_get_relay_sn.sh A tests/simtrace2/ctl_reset_target.sh A tests/simtrace2/ctl_reset_to_dfu.sh A tests/simtrace2/fetch_image.sh A tests/simtrace2/flash_simtrace_bossac.sh A tests/simtrace2/flash_simtrace_dfu.sh A tests/simtrace2/get_installed_version.sh A tests/simtrace2/notes_relay_board.txt A tests/simtrace2/notes_wiring.txt A tests/simtrace2/prepare A tests/simtrace2/regen A tests/simtrace2/run-tests A tests/simtrace2/test-data 34 files changed, 879 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/67/25967/1 diff --git a/tests/README b/tests/README new file mode 100644 index 000..3c10c7f --- /dev/null +++ b/tests/README @@ -0,0 +1,9 @@ +simtrace2-firmware +== + +this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware. + +to run it you will need a usb controlled relay board and a simtrace board, a simcard and a pcsc compatible cardreader. a hub is recommended to only need one instead of 3 upstream ports. + +the simtrace is modified to allow for switchable vcc, remote buttons and jumpers - vcc, bootloader, reset, erase-jumper which are wired to 4 relays. + diff --git a/tests/run-tests b/tests/run-tests new file mode 100755 index 000..6bb5f63 --- /dev/null +++ b/tests/run-tests @@ -0,0 +1,14 @@ +#!/bin/sh -e +echo "==" +echo "EXECUTING TESTS FOR SIMTRACE-FIRMWARE" +echo "==" +echo "" +cd ./simtrace2 +echo "Location $PWD" +echo "" +sh ./run-tests +cd .. +echo "" +echo "" +echo "" +echo "" diff --git a/tests/simtrace2/01_check_rig.out b/tests/simtrace2/01_check_rig.out new file mode 100644 index 000..4a6e0f1 --- /dev/null +++ b/tests/simtrace2/01_check_rig.out @@ -0,0 +1,240 @@ +relay box + +ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS +Device Descriptor: + bLength18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass2 Communications + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x04d8 Microchip Technology, Inc. + idProduct 0xffee Devantech USB-ISS + bcdDevice1.00 + iManufacturer 1 + iProduct2 + iSerial 3 + bNumConfigurations 1 + Configuration Descriptor: +bLength 9 +bDescriptorType 2 +wTotalLength 67 +bNumInterfaces 2 +bConfigurationValue 1 +iConfiguration 0 +bmAttributes 0xc0 + Self Powered +MaxPower 100mA +Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber0 + bAlternateSetting 0 + bNumEndpoints 1 + bInterfaceClass 2 Communications + bInterfaceSubClass 2 Abstract (modem) + bInterfaceProtocol 1 AT-commands (v.25ter) + iInterface 0 + CDC Header: +bcdCDC 1.10 + CDC ACM: +bmCapabilities 0x02 + line coding and serial state + CDC Union: +bMasterInterface0 +bSlaveInterface 1 + CDC Call Management: +bmCapabilities 0x00 +bDataInterface 1 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x81 EP 1 IN +bmAttributes3 + Transfer TypeInterrupt + Synch Type None + Usage Type Data +
Change in pysim[master]: update readme detail about cmd2 - make sure people get 1.5 from pip i...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25269 ) Change subject: update readme detail about cmd2 - make sure people get 1.5 from pip instead of some old debian-pkg .. update readme detail about cmd2 - make sure people get 1.5 from pip instead of some old debian-pkg Change-Id: I92a1e4c5a34ca11ce8d8b5f69257fdfedad2f8d6 --- M README.md 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/25269/1 diff --git a/README.md b/README.md index a45934c..7f46085 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,7 @@ Example for Debian: ``` -apt-get install python3-pyscard python3-serial python3-cmd2 python3-pip python3-yaml -pip3 install pytlv jsonpath-ng construct bidict gsm0338 -``` - -Alternatively, everything can be installed using pip: -``` +apt-get install python3-pyscard python3-serial python3-pip python3-yaml pip3 install -r requirements.txt ``` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I92a1e4c5a34ca11ce8d8b5f69257fdfedad2f8d6 Gerrit-Change-Number: 25269 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in osmo-ccid-firmware[master]: add script to generate a inititial osmo-bankd slotconfig sorted by us...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062 to look at the new patch set (#3). Change subject: add script to generate a inititial osmo-bankd slotconfig sorted by usb path .. add script to generate a inititial osmo-bankd slotconfig sorted by usb path Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3 --- A contrib/gen_bankd_pcsc_slots-csv.sh 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/62/25062/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3 Gerrit-Change-Number: 25062 Gerrit-PatchSet: 3 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: add script to generate a inititial osmo-bankd slotconfig sorted by us...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062 to look at the new patch set (#2). Change subject: add script to generate a inititial osmo-bankd slotconfig sorted by usb path .. add script to generate a inititial osmo-bankd slotconfig sorted by usb path Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3 --- A contrib/gen_bankd_pcsc_slots-csv.sh 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/62/25062/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3 Gerrit-Change-Number: 25062 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: add script to generate a inititial osmo-bankd slotconfig sorted by us...
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062 )
Change subject: add script to generate a inititial osmo-bankd slotconfig sorted
by usb path
..
add script to generate a inititial osmo-bankd slotconfig sorted by usb path
Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3
---
A contrib/gen_bankd_pcsc_slots-csv.sh
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/62/25062/1
diff --git a/contrib/gen_bankd_pcsc_slots-csv.sh
b/contrib/gen_bankd_pcsc_slots-csv.sh
new file mode 100755
index 000..3a27e84
--- /dev/null
+++ b/contrib/gen_bankd_pcsc_slots-csv.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# this script is to scan for octsim boards, sort them by usb path and generate
a bankd_pcsc_slots.csv on stdout
+
+dfu-util -l |grep "Found Runtime: \[1d50:6141\]" |cut -d ' ' -f 8,13|tr -d
','|cut -d \" -f 2,4|tr \" ' '|sort |cut -d ' ' -f 2 | awk 'BEGIN {count=0}{for
(slot=0; slot<8; slot++) {print count, $0, 0slot; count++}}'|awk '{print
"\"1\",\""$1"\",\"sysmocom sysmoOCTSIM \[CCID\] \("$2"\) [A-F0-9]{2} "$3"\""}'
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25062
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: Ibb5e7db78c8a2129d2093b0dd5ecaa7c13ab9ee3
Gerrit-Change-Number: 25062
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Gerrit-MessageType: newchange
Change in osmo-pcap[master]: add --vty-ref-* support in osmo-pcap-client and -server, basic manual...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/23691 to look at the new patch set (#2). Change subject: add --vty-ref-* support in osmo-pcap-client and -server, basic manuals stub .. add --vty-ref-* support in osmo-pcap-client and -server, basic manuals stub Change-Id: I28353f51de798535a3bb6efdc6c2da443d96ddfb --- M .gitignore M configure.ac M contrib/jenkins.sh M doc/Makefile.am A doc/manuals/Makefile.am M src/osmo_client_main.c M src/osmo_server_main.c 7 files changed, 167 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/91/23691/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/23691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I28353f51de798535a3bb6efdc6c2da443d96ddfb Gerrit-Change-Number: 23691 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcap[master]: add --vty-ref-* support in osmo-pcap-client and -server
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcap/+/23691 )
Change subject: add --vty-ref-* support in osmo-pcap-client and -server
..
add --vty-ref-* support in osmo-pcap-client and -server
Change-Id: I28353f51de798535a3bb6efdc6c2da443d96ddfb
---
M .gitignore
M configure.ac
M src/osmo_client_main.c
M src/osmo_server_main.c
4 files changed, 138 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/91/23691/1
diff --git a/.gitignore b/.gitignore
index dd48c7d..19c1a47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,16 @@
tests/testsuite.log
contrib/osmo-pcap.spec
+
+# manuals
+doc/manuals/*.html
+doc/manuals/*.svg
+doc/manuals/*.pdf
+doc/manuals/*__*.png
+doc/manuals/*.check
+doc/manuals/generated/
+doc/manuals/osmo-pcap-usermanual.xml
+doc/manuals/common
+doc/manuals/build
+doc/manuals/vty/osmo-pcap_vty_reference.xml
+
diff --git a/configure.ac b/configure.ac
index 8ec9c88..90dbc3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,46 @@
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_TESTDIR(tests)
+AC_ARG_ENABLE(manuals,
+ [AS_HELP_STRING(
+ [--enable-manuals],
+ [Generate manual PDFs [default=no]],
+ )],
+ [osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"])
+AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"])
+AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files,
overriding pkg-config and "../osmo-gsm-manuals"
+ fallback])
+if test x"$osmo_ac_build_manuals" = x"yes"
+then
+ # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback)
+ if test -n "$OSMO_GSM_MANUALS_DIR"; then
+ echo "checking for OSMO_GSM_MANUALS_DIR...
$OSMO_GSM_MANUALS_DIR (from env)"
+ else
+ OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals
--variable=osmogsmmanualsdir 2>/dev/null)"
+ if test -n "$OSMO_GSM_MANUALS_DIR"; then
+ echo "checking for OSMO_GSM_MANUALS_DIR...
$OSMO_GSM_MANUALS_DIR (from pkg-conf)"
+ else
+ OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals"
+ echo "checking for OSMO_GSM_MANUALS_DIR...
$OSMO_GSM_MANUALS_DIR (fallback)"
+ fi
+ fi
+ if ! test -d "$OSMO_GSM_MANUALS_DIR"; then
+ AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install
osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.")
+ fi
+
+ # Find and run check-depends
+ CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh"
+ if ! test -x "$CHECK_DEPENDS"; then
+ CHECK_DEPENDS="osmo-gsm-manuals-check-depends"
+ fi
+ if ! $CHECK_DEPENDS; then
+ AC_MSG_ERROR("missing dependencies for --enable-manuals")
+ fi
+
+ # Put in Makefile with absolute path
+ OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")"
+ AC_SUBST([OSMO_GSM_MANUALS_DIR])
+fi
CFLAGS="$CFLAGS -std=gnu11"
@@ -61,6 +101,8 @@
CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
fi
+
+
# https://www.freedesktop.org/software/systemd/man/daemon.html
AC_ARG_WITH([systemdsystemunitdir],
[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd
service files])],,
@@ -150,5 +192,6 @@
contrib/osmo-pcap.spec
doc/Makefile
doc/examples/Makefile
+doc/manuals/Makefile
tests/Makefile
Makefile)
diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c
index c7d68d4..b0727d6 100644
--- a/src/osmo_client_main.c
+++ b/src/osmo_client_main.c
@@ -98,20 +98,51 @@
printf(" -T --timestamp. Print a timestamp in the debug output.\n");
printf(" -e --log-level number. Set a global loglevel.\n");
printf(" -c --config-file filename The config file to use.\n");
+
+ printf("\nVTY reference generation:\n");
+ printf(" --vty-ref-mode MODE VTY reference generation mode
(e.g. 'expert').\n");
+ printf(" --vty-ref-xml Generate the VTY reference XML
output and exit.\n");
+}
+
+static void handle_long_options(const char *prog_name, const int long_option)
+{
+ static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT;
+ switch (long_option) {
+ case 1:
+ vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg);
+ if (vty_ref_mode < 0) {
+ fprintf(stderr, "%s: Unknown VTY reference generation "
+ "mode '%s'\n", prog_name, optarg);
+ exit(2);
+ }
+
Change in pysim[master]: Readme.md: update debian deps, add python3-yaml
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/22342 ) Change subject: Readme.md: update debian deps, add python3-yaml .. Readme.md: update debian deps, add python3-yaml Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/22342/1 diff --git a/README.md b/README.md index 105ca3f..3234665 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Example for Debian: - apt-get install python3-pyscard python3-serial python3-pip + apt-get install python3-pyscard python3-serial python3-pip python3-yaml pip3 install pytlv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic0d53ec3f312afee9d28f2f63d35e5c56dfd4686 Gerrit-Change-Number: 22342 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in pysim[master]: Readme.md: update apt-get invocation for python3 dep.
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/21680 ) Change subject: Readme.md: update apt-get invocation for python3 dep. .. Patch Set 1: > Patch Set 1: Code-Review+1 > > Keep in mind that pySim has not yet fully migrated to Python 3, see: > > https://gerrit.osmocom.org/c/pysim/+/15504 sure. it just broke for me on normal 'useage' with a recent checkout and this fixed it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/21680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b Gerrit-Change-Number: 21680 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 11 Dec 2020 19:29:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: Readme.md: update apt-get invocation for python3 dep.
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/21680 ) Change subject: Readme.md: update apt-get invocation for python3 dep. .. Readme.md: update apt-get invocation for python3 dep. Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/21680/1 diff --git a/README.md b/README.md index 7074ffa..105ca3f 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ Example for Debian: - apt-get install python-pyscard python-serial python-pip - pip install pytlv + apt-get install python3-pyscard python3-serial python3-pip + pip3 install pytlv Mailing List -- To view, visit https://gerrit.osmocom.org/c/pysim/+/21680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09204d6bc0d89fa8b793ff6df773cdefc19c5b Gerrit-Change-Number: 21680 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in osmo-e1-hardware[master]: mechanical/e1-tracer: add CAD construction + stripped dxf for a fisch...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/20551 ) Change subject: mechanical/e1-tracer: add CAD construction + stripped dxf for a fischer bgt modular faceplate. uses 2x GB4 mounting block (segor) .. mechanical/e1-tracer: add CAD construction + stripped dxf for a fischer bgt modular faceplate. uses 2x GB4 mounting block (segor) Change-Id: Idddc6c223fc036919fa035b3cfb1f541b14e4683 --- A mechanical/e1-tracer-enclosure/e1-tracer-faceplate_fischer_bgt_tfp_construction.dxf A mechanical/e1-tracer-enclosure/e1-tracer-faceplate_fischer_bgt_tfp_export.dxf 2 files changed, 59,784 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/51/20551/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/20551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Idddc6c223fc036919fa035b3cfb1f541b14e4683 Gerrit-Change-Number: 20551 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK...
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/20289/1/include/osmocom/gsm/protocol/gsm_12_21.h@794 PS1, Line 794: 0x00 sure this should be 0x00 and not 0xff to make this compatible with the ip protocol/next header fields? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 29 Sep 2020 16:24:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK...
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20289 ) Change subject: gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e279bb20940c66eea5196f281184cb4f8a5cc5f Gerrit-Change-Number: 20289 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 29 Sep 2020 16:22:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ccid-firmware[master]: switch to using 'usbrelay' and more generic, inexpensive relay board
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17492 ) Change subject: switch to using 'usbrelay' and more generic,inexpensive relay board .. switch to using 'usbrelay' and more generic,inexpensive relay board Change-Id: I292e3fd8127d393838b11db7fb058eb638524abc --- M tests/README M tests/sysmo-octsim/01_check_rig.out M tests/sysmo-octsim/README M tests/sysmo-octsim/ctl_reset_target.sh M tests/sysmo-octsim/ctl_reset_to_dfu.sh M tests/sysmo-octsim/prepare M tests/sysmo-octsim/test-data 7 files changed, 40 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/92/17492/1 diff --git a/tests/README b/tests/README index 552ac71..0508a4a 100644 --- a/tests/README +++ b/tests/README @@ -3,5 +3,5 @@ this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware. -to run it you will need a usb controlled relay board like the devantech_Ltd._USB-RLY08 and a sysmo-octsim board. +to run it you will need a usb controlled relay board and a sysmo-octsim board. diff --git a/tests/sysmo-octsim/01_check_rig.out b/tests/sysmo-octsim/01_check_rig.out index 1bd7d66..2a0d463 100644 --- a/tests/sysmo-octsim/01_check_rig.out +++ b/tests/sysmo-octsim/01_check_rig.out @@ -1,51 +1,50 @@ -ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS +ID 16c0:05df Van Ooijen Technische Informatica HID device except mice, keyboards, and joysticks Device Descriptor: bLength18 bDescriptorType 1 - bcdUSB 2.00 - bDeviceClass2 Communications + bcdUSB 1.10 + bDeviceClass0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 8 - idVendor 0x04d8 Microchip Technology, Inc. - idProduct 0xffee Devantech USB-ISS + idVendor 0x16c0 Van Ooijen Technische Informatica + idProduct 0x05df HID device except mice, keyboards, and joysticks bcdDevice1.00 - iManufacturer 1 Devantech Ltd. - iProduct2 USB-RLY08 - iSerial 3 00021197 + iManufacturer 1 www.dcttech.com + iProduct2 USBRelay2 + iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 -wTotalLength 0x0043 -bNumInterfaces 2 +wTotalLength 0x0022 +bNumInterfaces 1 bConfigurationValue 1 iConfiguration 0 -bmAttributes 0xc0 - Self Powered -MaxPower 100mA +bmAttributes 0x80 + (Bus Powered) +MaxPower 20mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber0 bAlternateSetting 0 bNumEndpoints 1 - bInterfaceClass 2 Communications - bInterfaceSubClass 2 Abstract (modem) - bInterfaceProtocol 1 AT-commands (v.25ter) + bInterfaceClass 3 Human Interface Device + bInterfaceSubClass 0 + bInterfaceProtocol 0 iInterface 0 - CDC Header: -bcdCDC 1.10 - CDC ACM: -bmCapabilities 0x02 - line coding and serial state - CDC Union: -bMasterInterface0 -bSlaveInterface 1 - CDC Call Management: -bmCapabilities 0x00 -bDataInterface 1 +HID Device Descriptor: + bLength 9 + bDescriptorType33 + bcdHID 1.01 + bCountryCode0 Not supported + bNumDescriptors 1 + bDescriptorType34 Report + wDescriptorLength 22 + Report Descriptors: + ** UNAVAILABLE ** Endpoint Descriptor: bLength 7 bDescriptorType 5 @@ -55,36 +54,6 @@ Synch Type None Usage Type Data wMaxPacketSize 0x0008 1x 8 bytes -bInterval 2 -Interface Descriptor: - bLength 9 - bDescriptorType 4 - bInterfaceNumber1 - bAlternateSetting 0 - bNumEndpoints 2 - bInterfaceClass10 CDC Data - bInterfaceSubClass 0 - bInterfaceProtocol 0 - iInterface 0 - Endpoint Descriptor: -bLength 7 -bDescriptorType 5 -bEndpointAddress 0x02 EP 2 OUT -bmAttributes2 - Transfer TypeBulk - Synch Type None - Usage Type Data -wMaxPacketSize
Change in osmo-remsim[master]: fix config defaults for systemd startscripts
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17389 ) Change subject: fix config defaults for systemd startscripts .. Patch Set 2: > Patch Set 1: > > the -s/-i makes sense, but why would you change the client_ids? They look > fine as-is to me. this is what is configured on the testbed. i was under the assumption that every osmo-remsim-client-st2 process needs its own client-id as well as slot. -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7f38c951cc515db61a857221346bc4309f2b4740 Gerrit-Change-Number: 17389 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: roh Gerrit-Comment-Date: Fri, 06 Mar 2020 15:52:55 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-remsim[master]: fix config defaults for systemd startscripts
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17389 ) Change subject: fix config defaults for systemd startscripts .. fix config defaults for systemd startscripts Change-Id: I7f38c951cc515db61a857221346bc4309f2b4740 --- M contrib/etc_default/osmo-remsim-client M contrib/etc_default/osmo-remsim-client-1 M contrib/etc_default/osmo-remsim-client-2 M contrib/etc_default/osmo-remsim-client-3 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/89/17389/1 diff --git a/contrib/etc_default/osmo-remsim-client b/contrib/etc_default/osmo-remsim-client index b1a2187..6c977f1 100644 --- a/contrib/etc_default/osmo-remsim-client +++ b/contrib/etc_default/osmo-remsim-client @@ -1,4 +1,4 @@ # Default settings for osmo-remsim-client This file is sourced by systemd # Options to pass to osmo-remsim-client -GLOBAL_CLIENT_OPTS="-s 10.9.99.10 -V 1d50 -P 4004 -C 1" +GLOBAL_CLIENT_OPTS="-i 10.9.99.10 -V 1d50 -P 4004 -C 1" diff --git a/contrib/etc_default/osmo-remsim-client-1 b/contrib/etc_default/osmo-remsim-client-1 index 99d1da8..c056f42 100644 --- a/contrib/etc_default/osmo-remsim-client-1 +++ b/contrib/etc_default/osmo-remsim-client-1 @@ -3,5 +3,5 @@ # Options to pass to osmo-remsim-client REMSIM_I="1" REMSIM_H="2-1.1" -REMSIM_c="0" +REMSIM_c="1" REMSIM_n="1" diff --git a/contrib/etc_default/osmo-remsim-client-2 b/contrib/etc_default/osmo-remsim-client-2 index c705df0..ca5d831 100644 --- a/contrib/etc_default/osmo-remsim-client-2 +++ b/contrib/etc_default/osmo-remsim-client-2 @@ -3,5 +3,5 @@ # Options to pass to osmo-remsim-client REMSIM_I="0" REMSIM_H="2-1.4" -REMSIM_c="0" +REMSIM_c="2" REMSIM_n="2" diff --git a/contrib/etc_default/osmo-remsim-client-3 b/contrib/etc_default/osmo-remsim-client-3 index da48eaa..417d884 100644 --- a/contrib/etc_default/osmo-remsim-client-3 +++ b/contrib/etc_default/osmo-remsim-client-3 @@ -3,5 +3,5 @@ # Options to pass to osmo-remsim-client REMSIM_I="1" REMSIM_H="2-1.4" -REMSIM_c="0" +REMSIM_c="3" REMSIM_n="3" -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7f38c951cc515db61a857221346bc4309f2b4740 Gerrit-Change-Number: 17389 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in osmo-ccid-firmware[master]: generic improvements for the testsbed
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 ) Change subject: generic improvements for the testsbed .. Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1//COMMIT_MSG@7 PS1, Line 7: generic improvements for the testsbed: > first line of the commit log message should be brief one-line summary > followed by empty line before […] done https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.out File tests/sysmo-octsim/05_flash_dfu_from_app.out: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.out@12 PS1, Line 12: Run-time device DFU version 0100 > this kind of matching of the full stdout will break every time the > distribution updates dfu-util... […] i think this is ok, since we do not update that often (0.9 is in there for ages) and the output lets us find out which way dfu was run (from app mode or from bootloader - we test both) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.sh File tests/sysmo-octsim/05_flash_dfu_from_app.sh: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.sh@3 PS1, Line 3: > is it intentional that we continue this script even if one of the called > scripts return error? Othe […] changed all scripts but the main testwalker to use set -e -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 Gerrit-Change-Number: 17257 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 12:54:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-ccid-firmware[master]: generic improvements for the testsbed
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 to look at the new patch set (#2). Change subject: generic improvements for the testsbed .. generic improvements for the testsbed * fix run-tests so it can return != 0 * bail out if prepare fails * add more sanity checks to prepare * generalize usb-ids, paths * add test for flashing from application mode * add test reading simcards via pysim Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 --- M tests/run-tests M tests/sysmo-octsim/01_check_rig.sh M tests/sysmo-octsim/02_flash_dfu.sh M tests/sysmo-octsim/03_check_lsusb.sh M tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/05_flash_dfu_from_app.out A tests/sysmo-octsim/05_flash_dfu_from_app.sh A tests/sysmo-octsim/06_test_simcards.out A tests/sysmo-octsim/06_test_simcards.sh M tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_get_relay_sn.sh M tests/sysmo-octsim/ctl_reset_target.sh M tests/sysmo-octsim/ctl_reset_to_dfu.sh M tests/sysmo-octsim/fetch_image.sh M tests/sysmo-octsim/flash_octsim_dfu.sh M tests/sysmo-octsim/get_installed_version.sh M tests/sysmo-octsim/prepare M tests/sysmo-octsim/regen M tests/sysmo-octsim/run-tests M tests/sysmo-octsim/test-data 20 files changed, 214 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/57/17257/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 Gerrit-Change-Number: 17257 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: generic improvements for the testsbed: * fix run-tests so it can retu...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 ) Change subject: generic improvements for the testsbed: * fix run-tests so it can return != 0 * bail out if prepare fails * add more sanity checks to prepare * generalize usb-ids, paths * add test for flashing from application mode * add test reading simcards via pysim .. generic improvements for the testsbed: * fix run-tests so it can return != 0 * bail out if prepare fails * add more sanity checks to prepare * generalize usb-ids, paths * add test for flashing from application mode * add test reading simcards via pysim Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 --- M tests/run-tests M tests/sysmo-octsim/01_check_rig.sh M tests/sysmo-octsim/03_check_lsusb.sh M tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/05_flash_dfu_from_app.out A tests/sysmo-octsim/05_flash_dfu_from_app.sh A tests/sysmo-octsim/06_test_simcards.out A tests/sysmo-octsim/06_test_simcards.sh M tests/sysmo-octsim/README M tests/sysmo-octsim/ctl_reset_target.sh M tests/sysmo-octsim/ctl_reset_to_dfu.sh M tests/sysmo-octsim/fetch_image.sh M tests/sysmo-octsim/flash_octsim_dfu.sh M tests/sysmo-octsim/get_installed_version.sh M tests/sysmo-octsim/prepare M tests/sysmo-octsim/regen M tests/sysmo-octsim/run-tests M tests/sysmo-octsim/test-data 18 files changed, 206 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/57/17257/1 diff --git a/tests/run-tests b/tests/run-tests index bfc942d..802765d 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -3,12 +3,23 @@ echo "EXECUTING TESTS FOR SYSMO-OCTSIM" echo "==" echo "" +NUM_FAIL=0 cd ./sysmo-octsim echo "Location $PWD" echo "" sh ./run-tests +if [ ! $? -eq 0 ]; then + NUM_FAIL=$((NUM_FAIL+1)) +fi + cd .. echo "" echo "" echo "" echo "" + +if [ $NUM_FAIL -gt 0 ]; then +exit 1 +else +exit 0 +fi diff --git a/tests/sysmo-octsim/01_check_rig.sh b/tests/sysmo-octsim/01_check_rig.sh index 3831fb6..d9a6811 100755 --- a/tests/sysmo-octsim/01_check_rig.sh +++ b/tests/sysmo-octsim/01_check_rig.sh @@ -1,4 +1,4 @@ #!/bin/sh . ./test-data -lsusb -d 04d8:ffee -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +lsusb -d $USBD_RELAY -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" diff --git a/tests/sysmo-octsim/03_check_lsusb.sh b/tests/sysmo-octsim/03_check_lsusb.sh index f12e7d4..f1508ad 100755 --- a/tests/sysmo-octsim/03_check_lsusb.sh +++ b/tests/sysmo-octsim/03_check_lsusb.sh @@ -1,4 +1,4 @@ #!/bin/sh . ./test-data -lsusb -d 1d50:6141 -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"|sed -e "s/^.*iProduct.*2.*sysmoOCTSIM.*$/ iProduct2 sysmoOCTSIM/g" +lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"|sed -e "s/^.*iProduct.*2.*sysmoOCTSIM.*$/ iProduct2 sysmoOCTSIM/g" diff --git a/tests/sysmo-octsim/04_check_dfu_lsusb.sh b/tests/sysmo-octsim/04_check_dfu_lsusb.sh index eef2246..bc6bbb2 100755 --- a/tests/sysmo-octsim/04_check_dfu_lsusb.sh +++ b/tests/sysmo-octsim/04_check_dfu_lsusb.sh @@ -2,5 +2,5 @@ . ./test-data ./ctl_reset_to_dfu.sh -lsusb -d 1d50:6141 -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" ./ctl_reset_target.sh diff --git a/tests/sysmo-octsim/05_flash_dfu_from_app.out b/tests/sysmo-octsim/05_flash_dfu_from_app.out new file mode 100644 index 000..3da656a --- /dev/null +++ b/tests/sysmo-octsim/05_flash_dfu_from_app.out @@ -0,0 +1,26 @@ +resetting target +done +dfu-util 0.9 + +Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. +Copyright 2010-2016 Tormod Volden and Stefan Schmidt +This program is Free Software and has ABSOLUTELY NO WARRANTY +Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ + +Opening DFU capable USB device... +ID 1d50:6141 +Run-time device DFU version 0100 +Claiming USB DFU Runtime Interface... +Determining device status: state = appIDLE, status = 0 +Device really in Runtime Mode, send DFU detach request... +Device will detach and reattach... +Opening DFU USB Device... +Claiming USB DFU Interface... +Setting Alternate Setting #0 ... +Determining device status: state = dfuIDLE, status = 0 +dfuIDLE, continuing +DFU mode device DFU version 0110 +Device returned transfer size 512 +Copying data from PC to DFU device +Download done. +Resetting USB to switch back to runtime mode diff --git a/tests/sysmo-octsim/05_flash_dfu_from_app.sh b/tests/sysmo-octsim/05_flash_dfu_from_app.sh new file mode 100755 index 000..a4e2d98 --- /dev/null +++ b/t
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 ) Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 Gerrit-Change-Number: 17099 Gerrit-PatchSet: 4 Gerrit-Owner: roh Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 25 Feb 2020 13:22:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
roh has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 ) Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Implement CI scripts for testing the resulting binary on hardware for jenkins Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 --- A tests/README A tests/run-tests A tests/sysmo-octsim/01_check_rig.out A tests/sysmo-octsim/01_check_rig.sh A tests/sysmo-octsim/02_flash_dfu.out A tests/sysmo-octsim/02_flash_dfu.sh A tests/sysmo-octsim/03_check_lsusb.out A tests/sysmo-octsim/03_check_lsusb.sh A tests/sysmo-octsim/04_check_dfu_lsusb.out A tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_reset_target.sh A tests/sysmo-octsim/ctl_reset_to_dfu.sh A tests/sysmo-octsim/fetch_image.sh A tests/sysmo-octsim/flash_octsim_dfu.sh A tests/sysmo-octsim/get_installed_version.sh A tests/sysmo-octsim/prepare A tests/sysmo-octsim/regen A tests/sysmo-octsim/run-tests A tests/sysmo-octsim/test-data 20 files changed, 506 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve roh: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/README b/tests/README new file mode 100644 index 000..552ac71 --- /dev/null +++ b/tests/README @@ -0,0 +1,7 @@ +osmo-ccid-firmware +== + +this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware. + +to run it you will need a usb controlled relay board like the devantech_Ltd._USB-RLY08 and a sysmo-octsim board. + diff --git a/tests/run-tests b/tests/run-tests new file mode 100755 index 000..bfc942d --- /dev/null +++ b/tests/run-tests @@ -0,0 +1,14 @@ +#!/bin/sh +echo "==" +echo "EXECUTING TESTS FOR SYSMO-OCTSIM" +echo "==" +echo "" +cd ./sysmo-octsim +echo "Location $PWD" +echo "" +sh ./run-tests +cd .. +echo "" +echo "" +echo "" +echo "" diff --git a/tests/sysmo-octsim/01_check_rig.out b/tests/sysmo-octsim/01_check_rig.out new file mode 100644 index 000..1bd7d66 --- /dev/null +++ b/tests/sysmo-octsim/01_check_rig.out @@ -0,0 +1,90 @@ + +ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS +Device Descriptor: + bLength18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass2 Communications + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x04d8 Microchip Technology, Inc. + idProduct 0xffee Devantech USB-ISS + bcdDevice1.00 + iManufacturer 1 Devantech Ltd. + iProduct2 USB-RLY08 + iSerial 3 00021197 + bNumConfigurations 1 + Configuration Descriptor: +bLength 9 +bDescriptorType 2 +wTotalLength 0x0043 +bNumInterfaces 2 +bConfigurationValue 1 +iConfiguration 0 +bmAttributes 0xc0 + Self Powered +MaxPower 100mA +Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber0 + bAlternateSetting 0 + bNumEndpoints 1 + bInterfaceClass 2 Communications + bInterfaceSubClass 2 Abstract (modem) + bInterfaceProtocol 1 AT-commands (v.25ter) + iInterface 0 + CDC Header: +bcdCDC 1.10 + CDC ACM: +bmCapabilities 0x02 + line coding and serial state + CDC Union: +bMasterInterface0 +bSlaveInterface 1 + CDC Call Management: +bmCapabilities 0x00 +bDataInterface 1 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x81 EP 1 IN +bmAttributes3 + Transfer TypeInterrupt + Synch Type None + Usage Type Data +wMaxPacketSize 0x0008 1x 8 bytes +bInterval 2 +Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber1 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass10 CDC Data + bInterfaceSubClass 0 + bInterfaceProtocol 0 + iInterface 0 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x02 EP 2 OUT +bmAttri
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
Hello Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 to look at the new patch set (#4). Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Implement CI scripts for testing the resulting binary on hardware for jenkins Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 --- A tests/README A tests/run-tests A tests/sysmo-octsim/01_check_rig.out A tests/sysmo-octsim/01_check_rig.sh A tests/sysmo-octsim/02_flash_dfu.out A tests/sysmo-octsim/02_flash_dfu.sh A tests/sysmo-octsim/03_check_lsusb.out A tests/sysmo-octsim/03_check_lsusb.sh A tests/sysmo-octsim/04_check_dfu_lsusb.out A tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_reset_target.sh A tests/sysmo-octsim/ctl_reset_to_dfu.sh A tests/sysmo-octsim/fetch_image.sh A tests/sysmo-octsim/flash_octsim_dfu.sh A tests/sysmo-octsim/get_installed_version.sh A tests/sysmo-octsim/prepare A tests/sysmo-octsim/regen A tests/sysmo-octsim/run-tests A tests/sysmo-octsim/test-data 20 files changed, 506 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/99/17099/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 Gerrit-Change-Number: 17099 Gerrit-PatchSet: 4 Gerrit-Owner: roh Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
Hello Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 to look at the new patch set (#3). Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Implement CI scripts for testing the resulting binary on hardware for jenkins Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 --- A tests/run-tests A tests/sysmo-octsim/01_check_rig.out A tests/sysmo-octsim/01_check_rig.sh A tests/sysmo-octsim/02_flash_dfu.out A tests/sysmo-octsim/02_flash_dfu.sh A tests/sysmo-octsim/03_check_lsusb.out A tests/sysmo-octsim/03_check_lsusb.sh A tests/sysmo-octsim/04_check_dfu_lsusb.out A tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_reset_target.sh A tests/sysmo-octsim/ctl_reset_to_dfu.sh A tests/sysmo-octsim/fetch_image.sh A tests/sysmo-octsim/flash_octsim_dfu.sh A tests/sysmo-octsim/get_installed_version.sh A tests/sysmo-octsim/prepare A tests/sysmo-octsim/regen A tests/sysmo-octsim/run-tests A tests/sysmo-octsim/test-data 19 files changed, 499 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/99/17099/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 Gerrit-Change-Number: 17099 Gerrit-PatchSet: 3 Gerrit-Owner: roh Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 to look at the new patch set (#2). Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Implement CI scripts for testing the resulting binary on hardware for jenkins Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 --- A tests/run-tests A tests/sysmo-octsim/01_check_rig.out A tests/sysmo-octsim/01_check_rig.sh A tests/sysmo-octsim/02_flash_dfu.out A tests/sysmo-octsim/02_flash_dfu.sh A tests/sysmo-octsim/03_check_lsusb.out A tests/sysmo-octsim/03_check_lsusb.sh A tests/sysmo-octsim/04_check_dfu_lsusb.out A tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_reset_target.sh A tests/sysmo-octsim/ctl_reset_to_dfu.sh A tests/sysmo-octsim/fetch_image.sh A tests/sysmo-octsim/flash_octsim_dfu.sh A tests/sysmo-octsim/prepare A tests/sysmo-octsim/regen A tests/sysmo-octsim/run-tests A tests/sysmo-octsim/test-data 18 files changed, 471 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/99/17099/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 Gerrit-Change-Number: 17099 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ccid-firmware[master]: Implement CI scripts for testing the resulting binary on hardware for...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17099 ) Change subject: Implement CI scripts for testing the resulting binary on hardware for jenkins .. Implement CI scripts for testing the resulting binary on hardware for jenkins Change-Id: I3ddd2b9afda0e15883603566259c6e58571d2bc8 --- A tests/run-tests A tests/sysmo-octsim/01_check_rig.out A tests/sysmo-octsim/01_check_rig.sh A tests/sysmo-octsim/02_flash_dfu.out A tests/sysmo-octsim/02_flash_dfu.sh A tests/sysmo-octsim/03_check_lsusb.out A tests/sysmo-octsim/03_check_lsusb.sh A tests/sysmo-octsim/04_check_dfu_lsusb.out A tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_reset_target.sh A tests/sysmo-octsim/ctl_reset_to_dfu.sh A tests/sysmo-octsim/fetch_image.sh A tests/sysmo-octsim/flash_octsim_dfu.sh A tests/sysmo-octsim/prepare A tests/sysmo-octsim/regen A tests/sysmo-octsim/run-tests A tests/sysmo-octsim/test-data 18 files changed, 312 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/99/17099/1 diff --git a/tests/run-tests b/tests/run-tests new file mode 100755 index 000..bfc942d --- /dev/null +++ b/tests/run-tests @@ -0,0 +1,14 @@ +#!/bin/sh +echo "==" +echo "EXECUTING TESTS FOR SYSMO-OCTSIM" +echo "==" +echo "" +cd ./sysmo-octsim +echo "Location $PWD" +echo "" +sh ./run-tests +cd .. +echo "" +echo "" +echo "" +echo "" diff --git a/tests/sysmo-octsim/01_check_rig.out b/tests/sysmo-octsim/01_check_rig.out new file mode 100644 index 000..1bd7d66 --- /dev/null +++ b/tests/sysmo-octsim/01_check_rig.out @@ -0,0 +1,90 @@ + +ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS +Device Descriptor: + bLength18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass2 Communications + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x04d8 Microchip Technology, Inc. + idProduct 0xffee Devantech USB-ISS + bcdDevice1.00 + iManufacturer 1 Devantech Ltd. + iProduct2 USB-RLY08 + iSerial 3 00021197 + bNumConfigurations 1 + Configuration Descriptor: +bLength 9 +bDescriptorType 2 +wTotalLength 0x0043 +bNumInterfaces 2 +bConfigurationValue 1 +iConfiguration 0 +bmAttributes 0xc0 + Self Powered +MaxPower 100mA +Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber0 + bAlternateSetting 0 + bNumEndpoints 1 + bInterfaceClass 2 Communications + bInterfaceSubClass 2 Abstract (modem) + bInterfaceProtocol 1 AT-commands (v.25ter) + iInterface 0 + CDC Header: +bcdCDC 1.10 + CDC ACM: +bmCapabilities 0x02 + line coding and serial state + CDC Union: +bMasterInterface0 +bSlaveInterface 1 + CDC Call Management: +bmCapabilities 0x00 +bDataInterface 1 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x81 EP 1 IN +bmAttributes3 + Transfer TypeInterrupt + Synch Type None + Usage Type Data +wMaxPacketSize 0x0008 1x 8 bytes +bInterval 2 +Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber1 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass10 CDC Data + bInterfaceSubClass 0 + bInterfaceProtocol 0 + iInterface 0 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x02 EP 2 OUT +bmAttributes2 + Transfer TypeBulk + Synch Type None + Usage Type Data +wMaxPacketSize 0x0040 1x 64 bytes +bInterval 0 + Endpoint Descriptor: +bLength 7 +bDescriptorType 5 +bEndpointAddress 0x82 EP 2 IN +bmAttributes2 + Transfer TypeBulk + Synch Type None + Usage Type Data +wMaxPacketSize 0x0040 1x 64 bytes +
Change in simtrace2[master]: add/fix mcp23017 i2c gpio expander functions and tests
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/simtrace2/+/15875 )
Change subject: add/fix mcp23017 i2c gpio expander functions and tests
..
add/fix mcp23017 i2c gpio expander functions and tests
Change-Id: Ia2e5a1bf3f97272931014e54e587109297556c03
---
M firmware/apps/gpio_test/gpio_test.c
M firmware/libboard/octsimtest/include/i2c.h
M firmware/libboard/octsimtest/include/mcp23017.h
M firmware/libboard/octsimtest/source/board_octsimtest.c
M firmware/libboard/octsimtest/source/i2c.c
M firmware/libboard/octsimtest/source/mcp23017.c
6 files changed, 52 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/75/15875/1
diff --git a/firmware/apps/gpio_test/gpio_test.c
b/firmware/apps/gpio_test/gpio_test.c
index 2ab23e7..a6b0a00 100644
--- a/firmware/apps/gpio_test/gpio_test.c
+++ b/firmware/apps/gpio_test/gpio_test.c
@@ -2,9 +2,7 @@
#include "utils.h"
#include "chip.h"
-
-
void gpio_test_init(void)
{
- printf("FIXME run tests here\n\n");
+ printf("FIXME run tests here\n\r");
}
diff --git a/firmware/libboard/octsimtest/include/i2c.h
b/firmware/libboard/octsimtest/include/i2c.h
index 5a8c908..6c94d26 100644
--- a/firmware/libboard/octsimtest/include/i2c.h
+++ b/firmware/libboard/octsimtest/include/i2c.h
@@ -22,7 +22,7 @@
bool i2c_write_byte(bool send_start, bool send_stop, uint8_t byte);
uint8_t i2c_read_byte(bool nack, bool send_stop);
-static void i2c_stop_cond(void);
+void i2c_stop_cond(void);
int eeprom_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
int eeprom_read_byte(uint8_t slave, uint8_t addr);
diff --git a/firmware/libboard/octsimtest/include/mcp23017.h
b/firmware/libboard/octsimtest/include/mcp23017.h
index dea6285..962a1d5 100644
--- a/firmware/libboard/octsimtest/include/mcp23017.h
+++ b/firmware/libboard/octsimtest/include/mcp23017.h
@@ -19,5 +19,7 @@
#define MCP23017_ADDRESS 0x20
int mcp23017_init(uint8_t slave);
+int mcp23017_test(uint8_t slave);
+int mcp23017_toggle(uint8_t slave);
//int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
//int mcp23017_read_byte(uint8_t slave, uint8_t addr);
diff --git a/firmware/libboard/octsimtest/source/board_octsimtest.c
b/firmware/libboard/octsimtest/source/board_octsimtest.c
index 2772015..b7d7245 100644
--- a/firmware/libboard/octsimtest/source/board_octsimtest.c
+++ b/firmware/libboard/octsimtest/source/board_octsimtest.c
@@ -32,12 +32,20 @@
case '?':
printf("\t?\thelp\n\r");
printf("\tR\treset SAM3\n\r");
+ printf("\tm\trun mcp23017 test\n\r");
+ printf("\tR\ttoggle MSB of gpio on mcp23017\n\r");
break;
case 'R':
printf("Asking NVIC to reset us\n\r");
USBD_Disconnect();
NVIC_SystemReset();
break;
+ case 'm':
+ mcp23017_test(MCP23017_ADDRESS);
+ break;
+ case 't':
+ mcp23017_toggle(MCP23017_ADDRESS);
+ break;
default:
printf("Unknown command '%c'\n\r", ch);
break;
@@ -50,7 +58,8 @@
usb_buf_init();
i2c_pin_init();
- mcp23017_init(MCP23017_ADDRESS);
+ if (!mcp23017_init(MCP23017_ADDRESS))
+ printf("mcp23017 not found!\n\r");
/* Initialize checking for card insert/remove events */
//card_present_init();
#endif
diff --git a/firmware/libboard/octsimtest/source/i2c.c
b/firmware/libboard/octsimtest/source/i2c.c
index a708704..2cd8423 100644
--- a/firmware/libboard/octsimtest/source/i2c.c
+++ b/firmware/libboard/octsimtest/source/i2c.c
@@ -96,7 +96,7 @@
i2c_started = true;
}
-static void i2c_stop_cond(void)
+void i2c_stop_cond(void)
{
clear_sda();
set_scl();
diff --git a/firmware/libboard/octsimtest/source/mcp23017.c
b/firmware/libboard/octsimtest/source/mcp23017.c
index 63390b4..167bf34 100644
--- a/firmware/libboard/octsimtest/source/mcp23017.c
+++ b/firmware/libboard/octsimtest/source/mcp23017.c
@@ -94,13 +94,47 @@
int mcp23017_init(uint8_t slave)
{
- printf("mcp23017_init\n");
+ printf("mcp23017_init\n\r");
// all gpio input
if (mcp23017_write_byte(slave, MCP23017_IODIRA, 0xff))
return false;
- if (mcp23017_write_byte(slave, MCP23017_IODIRB, 0xff))
+ // msb of portb output, rest input
+ if (mcp23017_write_byte(slave, MCP23017_IODIRB, 0x7f))
return false;
- printf("mcp23017 found\n");
+ if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP
(autoinc addressing)
+ return false;
+ printf("mcp23017 found\n\r");
return true;
}
+int mcp23017_
Change in ...osmo-remsim[master]: add contrib/remsim-apitool.py to control the REST-interface of osmo-r...
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/14968 to look at the new patch set (#2). Change subject: add contrib/remsim-apitool.py to control the REST-interface of osmo-remsim-server .. add contrib/remsim-apitool.py to control the REST-interface of osmo-remsim-server Change-Id: Ia01b0a89e21af18b898becd8f5440c32936772b7 --- M Makefile.am A contrib/remsim-apitool.py 2 files changed, 118 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/68/14968/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ia01b0a89e21af18b898becd8f5440c32936772b7 Gerrit-Change-Number: 14968 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...simtrace2[master]: add new board and app for gpio testing on octsimtest board
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/14969 to look at the new patch set (#2). Change subject: add new board and app for gpio testing on octsimtest board .. add new board and app for gpio testing on octsimtest board Change-Id: I01243044002f51b34e8dc12c1b1f565bbf1740a2 --- M firmware/README.txt A firmware/apps/gpio_test/Makefile A firmware/apps/gpio_test/gpio_test.c A firmware/apps/gpio_test/main.c A firmware/apps/gpio_test/usb_strings.txt A firmware/libboard/octsimtest/include/board.h A firmware/libboard/octsimtest/include/i2c.h A firmware/libboard/octsimtest/include/mcp23017.h A firmware/libboard/octsimtest/source/board_octsimtest.c A firmware/libboard/octsimtest/source/i2c.c A firmware/libboard/octsimtest/source/mcp23017.c 11 files changed, 687 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/69/14969/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/14969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I01243044002f51b34e8dc12c1b1f565bbf1740a2 Gerrit-Change-Number: 14969 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...simtrace2[master]: add new board and app for gpio testing on octsimtest board
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/simtrace2/+/14969
Change subject: add new board and app for gpio testing on octsimtest board
..
add new board and app for gpio testing on octsimtest board
Change-Id: I01243044002f51b34e8dc12c1b1f565bbf1740a2
---
A firmware/apps/gpio_test/Makefile
A firmware/apps/gpio_test/gpio_test.c
A firmware/apps/gpio_test/main.c
A firmware/apps/gpio_test/usb_strings.txt
A firmware/libboard/octsimtest/include/board.h
A firmware/libboard/octsimtest/include/i2c.h
A firmware/libboard/octsimtest/include/mcp23017.h
A firmware/libboard/octsimtest/source/board_octsimtest.c
A firmware/libboard/octsimtest/source/i2c.c
A firmware/libboard/octsimtest/source/mcp23017.c
10 files changed, 686 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/69/14969/1
diff --git a/firmware/apps/gpio_test/Makefile b/firmware/apps/gpio_test/Makefile
new file mode 100644
index 000..b2b4707
--- /dev/null
+++ b/firmware/apps/gpio_test/Makefile
@@ -0,0 +1,3 @@
+C_FILES += $(C_LIBUSB_RT)
+
+C_FILES += gpio_test.c
diff --git a/firmware/apps/gpio_test/gpio_test.c
b/firmware/apps/gpio_test/gpio_test.c
new file mode 100644
index 000..2ab23e7
--- /dev/null
+++ b/firmware/apps/gpio_test/gpio_test.c
@@ -0,0 +1,10 @@
+#include
+#include "utils.h"
+#include "chip.h"
+
+
+
+void gpio_test_init(void)
+{
+ printf("FIXME run tests here\n\n");
+}
diff --git a/firmware/apps/gpio_test/main.c b/firmware/apps/gpio_test/main.c
new file mode 100644
index 000..8fe68b3
--- /dev/null
+++ b/firmware/apps/gpio_test/main.c
@@ -0,0 +1,54 @@
+
+#include "board.h"
+#include "utils.h"
+#include "osmocom/core/timer.h"
+
+extern void gpio_test_init(void);
+
+/* returns '1' in case we should break any endless loop */
+static void check_exec_dbg_cmd(void)
+{
+ int ch;
+
+ if (!UART_IsRxReady())
+ return;
+
+ ch = UART_GetChar();
+
+ board_exec_dbg_cmd(ch);
+}
+
+
+extern int main(void)
+{
+ led_init();
+ led_blink(LED_RED, BLINK_ALWAYS_ON);
+ led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+
+ /* Enable watchdog for 2000 ms, with no window */
+ WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
+ (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
+
+ PIO_InitializeInterrupts(0);
+
+
+ printf("\n\r\n\r"
+
"=\n\r"
+ "GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\n\r"
+
"=\n\r");
+
+ board_main_top();
+
+ TRACE_INFO("starting gpio test...\n\r");
+ gpio_test_init();
+
+ TRACE_INFO("entering main loop...\n\r");
+ while (1) {
+ WDT_Restart(WDT);
+
+ check_exec_dbg_cmd();
+ osmo_timers_prepare();
+ osmo_timers_update();
+ }
+
+}
diff --git a/firmware/apps/gpio_test/usb_strings.txt
b/firmware/apps/gpio_test/usb_strings.txt
new file mode 100644
index 000..0e797ac
--- /dev/null
+++ b/firmware/apps/gpio_test/usb_strings.txt
@@ -0,0 +1,10 @@
+sysmocom - s.f.m.c. GmbH
+SIMtrace 2 compatible device
+SIMtrace Sniffer
+SIMtrace CCID
+SIMtrace Phone
+SIMtrace MITM
+CardEmulator Modem 1
+CardEmulator Modem 2
+CardEmulator Modem 3
+CardEmulator Modem 4
diff --git a/firmware/libboard/octsimtest/include/board.h
b/firmware/libboard/octsimtest/include/board.h
new file mode 100644
index 000..018cfdd
--- /dev/null
+++ b/firmware/libboard/octsimtest/include/board.h
@@ -0,0 +1,155 @@
+/* SIMtrace with SAM3S board definition
+ *
+ * (C) 2016-2017 by Harald Welte
+ * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ */
+#pragma once
+#include "board_common.h"
+#include "simtrace_usb.h"
+
+/* Name of the board */
+#define BOARD_NAME "OCTSIMTEST"
+/* Board definition */
+#define octsimtest
+
+/** oscillator
Change in ...osmo-remsim[master]: add contrib/remsim-apitool.py to control the REST-interface of osmo-r...
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-remsim/+/14968
Change subject: add contrib/remsim-apitool.py to control the REST-interface of
osmo-remsim-server
..
add contrib/remsim-apitool.py to control the REST-interface of
osmo-remsim-server
Change-Id: Ia01b0a89e21af18b898becd8f5440c32936772b7
---
M Makefile.am
A contrib/remsim-apitool.py
2 files changed, 114 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/68/14968/1
diff --git a/Makefile.am b/Makefile.am
index 4843641..0ff9363 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmo-rspro.pc
-EXTRA_DIST = asn1 .version README.md
+EXTRA_DIST = asn1 .version README.md contrib/remsim-apitool.py
pkgcofigdir = $(libdir)/pkgconfig
diff --git a/contrib/remsim-apitool.py b/contrib/remsim-apitool.py
new file mode 100755
index 000..8f8f29f
--- /dev/null
+++ b/contrib/remsim-apitool.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+
+import sys
+import argparse
+import requests
+
+version = "0.1"
+
+#access rest
+def build_url(suffix):
+BASE_PATH = "/api/backend/v1"
+return ("http://; + server_host + ":" + server_port + BASE_PATH + suffix)
+
+def rest_get(suffix):
+if verbose:
+print("GET "+ build_url(suffix))
+resp = requests.get(build_url(suffix))
+if resp.ok:
+try:
+js = resp.json()
+print("%s: %s" % (suffix, js))
+except:
+return
+else:
+return None
+
+def rest_post(suffix, js = None):
+if verbose:
+print("POST "+ build_url(suffix)+ str(js))
+resp = requests.post(build_url(suffix), json=js)
+if not resp.ok:
+print("post failed")
+
+def rest_delete(suffix):
+if verbose:
+print("DELETE "+ build_url(suffix))
+resp = requests.delete(build_url(suffix))
+if not resp.ok:
+print("delete failed")
+
+#rest calls
+def slotmap_create(bank_id, bank_slot, client_id, client_slot):
+js = {
+'bank': {'bankId': bank_id, 'slotNr': bank_slot},
+'client': {'clientId': client_id, 'slotNr': client_slot},
+}
+return rest_post('/slotmaps', js)
+
+def slotmap_delete(bank_id, bank_slot):
+slotmap_id = bank_id * 65536 + bank_slot
+return rest_delete("/slotmaps/%u"%slotmap_id)
+
+def reset_global():
+return rest_post('/global-reset')
+
+def main(argv):
+global server_port, server_host, verbose
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-H", "--host",help="host to connect to",
default="127.0.0.1")
+parser.add_argument("-p", "--port",help="port to connect to",
default="9997")
+parser.add_argument("-v", "--verbose", help="increase output verbosity",
action="count", default=0)
+group = parser.add_mutually_exclusive_group()
+group.add_argument("-r", "--reset",help="remove all mappings (POST
/global-reset)", action="store_true")
+group.add_argument("-c", "--clients", help="show clients (GET
/clients)",nargs='?',const="all",default=None)
+group.add_argument("-b", "--banks",help="show banks (GET
/banks)",nargs='?',const="all",default=None)
+group.add_argument("-s", "--slotmaps", help="show slotmaps(GET
/slotmaps)",nargs='?',const="all",default=None)
+group.add_argument("-m", "--map", help="create new slotmapping
(POST /slotmaps)",nargs=4,metavar=('bank_id',
'bank_slot','client_id','client_slot'))
+group.add_argument("-d", "--delete", help="delete slotmapping
(DELETE /slotmaps/:id)", type=int, nargs=2, metavar=('bank_id','bank_slot'))
+group.add_argument("-a", "--all", help="show all (default if no
argument given)", action="store_true")
+
+args = parser.parse_args()
+if args.verbose:
+print("verbosity = ", args.verbose)
+
+server_host = args.host
+server_port = args.port
+verbose = args.verbose
+
+if args.reset:
+reset_global()
+return
+if args.clients:
+if args.clients == "all":
+rest_get("/clients")
+else:
+rest_get("/clients/" + str(args.clients))
+return
+if args.banks:
+if args.banks == "all":
+rest_get("/banks")
+else:
+
Change in ...osmo-remsim[master]: add examples to remsim-server (json output)
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/14668 to look at the new patch set (#2). Change subject: add examples to remsim-server (json output) .. add examples to remsim-server (json output) Change-Id: I102a79a5d1f0055586a9fa1f9688acd4258f585b --- M doc/manuals/chapters/remsim-server.adoc 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/68/14668/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I102a79a5d1f0055586a9fa1f9688acd4258f585b Gerrit-Change-Number: 14668 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-remsim[master]: add examples to the command line options for remsim-bankd and remsim-...
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/14667 to look at the new patch set (#2). Change subject: add examples to the command line options for remsim-bankd and remsim-client .. add examples to the command line options for remsim-bankd and remsim-client Change-Id: Idfa6352ce90dd36dd27306d6c8a2023935ed822d --- M contrib/etc_default/osmo-remsim-client-0 M contrib/etc_default/osmo-remsim-client-1 M contrib/etc_default/osmo-remsim-client-2 M contrib/etc_default/osmo-remsim-client-3 M contrib/systemd/osmo-remsim-client@.service M doc/manuals/chapters/remsim-bankd.adoc M doc/manuals/chapters/remsim-client.adoc 7 files changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/67/14667/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idfa6352ce90dd36dd27306d6c8a2023935ed822d Gerrit-Change-Number: 14667 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-remsim[master]: add examples to the command line options for remsim-bankd and remsim-...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/14667 Change subject: add examples to the command line options for remsim-bankd and remsim-client .. add examples to the command line options for remsim-bankd and remsim-client Change-Id: Idfa6352ce90dd36dd27306d6c8a2023935ed822d --- M doc/manuals/chapters/remsim-bankd.adoc M doc/manuals/chapters/remsim-client.adoc 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/67/14667/1 diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index be9b2c0..d35056b 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -85,6 +85,16 @@ Specify the local TCP port to whicc the socket for incoming connections from `osmo-remsim-client`s is bound to. + Examples +.remsim-server is on 10.2.3.4, cardreader has 5 slots: + +osmo-remsim-bankd -i 10.2.3.4 -n 5 + +.remsim-server is on 10.2.3.4, cardreader has 4 slots, local ip is 10.5.4.3 + +osmo-remsim-bankd -i 10.2.3.4 -n 4 -I 10.5.4.3 + + === Logging `osmo-remsim-bankd` currently logs to stdout only, and the logging diff --git a/doc/manuals/chapters/remsim-client.adoc b/doc/manuals/chapters/remsim-client.adoc index 0526dbb..26c1661 100644 --- a/doc/manuals/chapters/remsim-client.adoc +++ b/doc/manuals/chapters/remsim-client.adoc @@ -83,6 +83,15 @@ and will later be overridden by the ATR as specified by `osmo-remsim-bankd` once a card has been mapped to this client. + Examples +.remsim-server is on 10.2.3.4, sysmoQMOD on usb bus, all 4 modems: + +osmo-remsim-client-st2 -s 10.2.3.4 -V 1d50 -P 4004 -C 1 -I 0 -H 2-1.1 -c 0 +osmo-remsim-client-st2 -s 10.2.3.4 -V 1d50 -P 4004 -C 1 -I 1 -H 2-1.1 -c 0 +osmo-remsim-client-st2 -s 10.2.3.4 -V 1d50 -P 4004 -C 1 -I 0 -H 2-1.4 -c 0 +osmo-remsim-client-st2 -s 10.2.3.4 -V 1d50 -P 4004 -C 1 -I 1 -H 2-1.4 -c 0 + + === Logging `osmo-remsim-client` currently logs to stdout only, and the logging -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idfa6352ce90dd36dd27306d6c8a2023935ed822d Gerrit-Change-Number: 14667 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange
Change in ...osmo-remsim[master]: add examples to remsim-server (json output)
roh has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-remsim/+/14668
Change subject: add examples to remsim-server (json output)
..
add examples to remsim-server (json output)
Change-Id: I102a79a5d1f0055586a9fa1f9688acd4258f585b
---
M doc/manuals/chapters/remsim-server.adoc
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/68/14668/1
diff --git a/doc/manuals/chapters/remsim-server.adoc
b/doc/manuals/chapters/remsim-server.adoc
index 01d24b2..c0ca6b8 100644
--- a/doc/manuals/chapters/remsim-server.adoc
+++ b/doc/manuals/chapters/remsim-server.adoc
@@ -76,3 +76,13 @@
*POST* performs a global reset of the `osmo-remsim-server` state. This
means all mappings are removed.
+
+ Examples
+.remsim-server is on 10.2.3.4, one simbank with 5 cards:
http://10.2.3.4:9997/api/backend/v1/banks
+
+{"banks":[{"peer":"B1","state":"CONNECTED_BANKD","component_id":{"type_":"remsimBankd","name":"fixme-name","software":"remsim-bankd","swVersion":"0.1.0.17-6d8a"},"bankId":1,"numberOfSlots":5}]}
+
+.remsim-server is on 10.2.3.4, 4 clients:
http://10.2.3.4:9997/api/backend/v1/clients
+
+{"clients":[{"peer":"C0:0","state":"CONNECTED_CLIENT","component_id":{"type_":"remsimClient","name":"simtrace2-remsim-client","software":"remsim-client","swVersion":"0.1.0.17-6d8a"}},{"peer":"C0:0","state":"CONNECTED_CLIENT","component_id":{"type_":"remsimClient","name":"simtrace2-remsim-client","software":"remsim-client","swVersion":"0.1.0.17-6d8a"}},{"peer":"C0:0","state":"CONNECTED_CLIENT","component_id":{"type_":"remsimClient","name":"simtrace2-remsim-client","software":"remsim-client","swVersion":"0.1.0.17-6d8a"}},{"peer":"C0:0","state":"CONNECTED_CLIENT","component_id":{"type_":"remsimClient","name":"simtrace2-remsim-client","software":"remsim-client","swVersion":"0.1.0.17-6d8a"}}]}
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14668
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I102a79a5d1f0055586a9fa1f9688acd4258f585b
Gerrit-Change-Number: 14668
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Gerrit-MessageType: newchange
Change in ...osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267 to look at the new patch set (#2). Change subject: osmo-remsim-client: add systemd service script template and etc/default configs .. osmo-remsim-client: add systemd service script template and etc/default configs Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 --- A contrib/etc_default/osmo-remsim-client A contrib/etc_default/osmo-remsim-client-0 A contrib/etc_default/osmo-remsim-client-1 A contrib/etc_default/osmo-remsim-client-2 A contrib/etc_default/osmo-remsim-client-3 A contrib/systemd/osmo-remsim-client@.service 6 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/67/14267/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 Gerrit-Change-Number: 14267 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/14267 ) Change subject: osmo-remsim-client: add systemd service script template and etc/default config .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service File contrib/systemd/osmo-remsim-client_.service: https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service@8 PS1, Line 8: 2-1.1 > wouldn't that mandate that it is attached at a certain position in the bus? yes - but this is a template to be copied n (number of modems) times and modified to fit the specific modem served. i am open to better ideas for iterators of this than hardcoding it in config -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 Gerrit-Change-Number: 14267 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:30:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14168 ) Change subject: Add VTY commands to set error ctr thresholds .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a Gerrit-Change-Number: 14168 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 11 Jun 2019 14:20:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/14267 Change subject: osmo-remsim-client: add systemd service script template and etc/default config .. osmo-remsim-client: add systemd service script template and etc/default config Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 --- A contrib/etc_default/osmo-remsim-client A contrib/systemd/osmo-remsim-client_.service 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/67/14267/1 diff --git a/contrib/etc_default/osmo-remsim-client b/contrib/etc_default/osmo-remsim-client new file mode 100644 index 000..23621de --- /dev/null +++ b/contrib/etc_default/osmo-remsim-client @@ -0,0 +1,5 @@ +# Default settings for osmo-remsim-client This file is sourced by systemd + +# (global) Options to pass to osmo-remsim-client +CLIENT_OPTS="-s 10.9.99.10 -V 1d50 -P 4004 -C 1" + diff --git a/contrib/systemd/osmo-remsim-client_.service b/contrib/systemd/osmo-remsim-client_.service new file mode 100644 index 000..e7129c2 --- /dev/null +++ b/contrib/systemd/osmo-remsim-client_.service @@ -0,0 +1,13 @@ +[Unit] +Description=Osmocom Remote SIM Client + +[Service] +Type=simple +Restart=always +EnvironmentFile=/etc/default/osmo-remsim-client +ExecStart=/usr/bin/osmo-remsim-client-st2 $CLIENT_OPTS -I 0 -H 2-1.1 -c 0 +RestartSec=2 + +[Install] +WantedBy=multi-user.target + -- To view, visit https://gerrit.osmocom.org/14267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 Gerrit-Change-Number: 14267 Gerrit-PatchSet: 1 Gerrit-Owner: roh
Change in osmo-remsim[master]: osmo-remsim-bankd: add systemd service script and etc/default config
roh has uploaded this change for review. ( https://gerrit.osmocom.org/14228 Change subject: osmo-remsim-bankd: add systemd service script and etc/default config .. osmo-remsim-bankd: add systemd service script and etc/default config Change-Id: Iefa6e65c7a03b232a124758cf8890b660abf6885 --- A contrib/etc_default/osmo-remsim-bankd A contrib/systemd/osmo-remsim-bankd.service 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/28/14228/1 diff --git a/contrib/etc_default/osmo-remsim-bankd b/contrib/etc_default/osmo-remsim-bankd new file mode 100644 index 000..9f8a9a9 --- /dev/null +++ b/contrib/etc_default/osmo-remsim-bankd @@ -0,0 +1,5 @@ +# Default settings for osmo-remsim-bankd This file is sourced by systemd + +# Options to pass to osmo-remsim-bankd +BANKD_OPTS="-i 10.9.99.1 -n 5" + diff --git a/contrib/systemd/osmo-remsim-bankd.service b/contrib/systemd/osmo-remsim-bankd.service new file mode 100644 index 000..58f5435 --- /dev/null +++ b/contrib/systemd/osmo-remsim-bankd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Osmocom Remote SIM BankD + +[Service] +Type=simple +Restart=always +EnvironmentFile=/etc/default/osmo-remsim-bankd +WorkingDirectory=/etc/osmocom +ExecStart=/usr/bin/osmo-remsim-bankd $BANKD_OPTS +RestartSec=2 + +[Install] +WantedBy=multi-user.target + -- To view, visit https://gerrit.osmocom.org/14228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iefa6e65c7a03b232a124758cf8890b660abf6885 Gerrit-Change-Number: 14228 Gerrit-PatchSet: 1 Gerrit-Owner: roh
Change in osmo-remsim[master]: osmo-remsim-bankd: Fix typo in help for --num-slots
roh has uploaded this change for review. ( https://gerrit.osmocom.org/14225 Change subject: osmo-remsim-bankd: Fix typo in help for --num-slots .. osmo-remsim-bankd: Fix typo in help for --num-slots Change-Id: If09833f0d0ba46d7bb204ac9b3b7f8128b4b3799 --- M src/bankd/bankd_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/25/14225/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 268794b..8cfeb96 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -219,7 +219,7 @@ " -i --server-host A.B.C.Dremsim-server IP address (default: 127.0.0.1)\n" " -p --server-port <1-65535> remsim-server TCP port (default: 9998)\n" " -b --bank-id <1-65535> Bank Identifier of this SIM bank (default: 1)\n" -" -b --num-slots <1-65535>Number of Slots in this SIM bank (default: 8)\n" +" -n --num-slots <1-65535>Number of Slots in this SIM bank (default: 8)\n" " -I --bind-ip A.B.C.DLocal IP address to bind for incoming client\n" " connections (default: INADDR_ANY)\n" " -P --bind-port <1-65535>Local TCP port to bind for incoming client\n" -- To view, visit https://gerrit.osmocom.org/14225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If09833f0d0ba46d7bb204ac9b3b7f8128b4b3799 Gerrit-Change-Number: 14225 Gerrit-PatchSet: 1 Gerrit-Owner: roh
Change in osmo-remsim[master]: osmo-remsim-server: add systemd service script
roh has uploaded this change for review. ( https://gerrit.osmocom.org/14226 Change subject: osmo-remsim-server: add systemd service script .. osmo-remsim-server: add systemd service script Change-Id: I310a78b49a8a17e4f954179553ed2a3376e3bd50 --- A contrib/systemd/osmo-remsim-server.service 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/26/14226/1 diff --git a/contrib/systemd/osmo-remsim-server.service b/contrib/systemd/osmo-remsim-server.service new file mode 100644 index 000..e91e08b --- /dev/null +++ b/contrib/systemd/osmo-remsim-server.service @@ -0,0 +1,12 @@ +[Unit] +Description=Osmocom Remote SIM Server + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-remsim-server +RestartSec=2 + +[Install] +WantedBy=multi-user.target + -- To view, visit https://gerrit.osmocom.org/14226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I310a78b49a8a17e4f954179553ed2a3376e3bd50 Gerrit-Change-Number: 14226 Gerrit-PatchSet: 1 Gerrit-Owner: roh
Change in osmo-bts[master]: sysmo: Fix "nominal power" / BS power display in VTY
roh has posted comments on this change. ( https://gerrit.osmocom.org/14137 ) Change subject: sysmo: Fix "nominal power" / BS power display in VTY .. Patch Set 1: Code-Review+2 looks good -- To view, visit https://gerrit.osmocom.org/14137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If92d0b15c48dafc63776b82c7ff5f3c2b3505f68 Gerrit-Change-Number: 14137 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: roh Gerrit-Comment-Date: Thu, 23 May 2019 15:19:34 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: nightly-packages: Update limesuite hash to support LimeNet-Micro
roh has posted comments on this change. ( https://gerrit.osmocom.org/13696 ) Change subject: nightly-packages: Update limesuite hash to support LimeNet-Micro .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62779f3bdbc4a459363a1d660d96d5f02f7763c1 Gerrit-Change-Number: 13696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: roh Gerrit-Comment-Date: Thu, 18 Apr 2019 16:02:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: nightly-packages: Update limesuite hash to support LimeNet-Micro
roh has posted comments on this change. ( https://gerrit.osmocom.org/13696 ) Change subject: nightly-packages: Update limesuite hash to support LimeNet-Micro .. Patch Set 1: seems fine to me. -- To view, visit https://gerrit.osmocom.org/13696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62779f3bdbc4a459363a1d660d96d5f02f7763c1 Gerrit-Change-Number: 13696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: roh Gerrit-Comment-Date: Thu, 18 Apr 2019 16:02:21 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-trx[master]: lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start
roh has posted comments on this change. ( https://gerrit.osmocom.org/13662 ) Change subject: lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/13662/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/13662/2/Transceiver52M/device/lms/LMSDevice.cpp@373 PS2, Line 373: lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max); > You forgot to apply my last comments regarding this section. […] i actually would like to keep it this way. otherwise i'll need to have the whole bw calculation inside whatever calls do_filters. also do_filters is not simpler if it would have 2 more parameters (dir_tx and lpfwbw) -- To view, visit https://gerrit.osmocom.org/13662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37 Gerrit-Change-Number: 13662 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 16 Apr 2019 21:32:40 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-trx[master]: lms: add device type detection and device specific gains
Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13663 to look at the new patch set (#3). Change subject: lms: add device type detection and device specific gains .. lms: add device type detection and device specific gains add device dependant max gain setup - limesdr mini and limenet micro need slightly reduced maximum gains to get a PASS on phase error measurements rework clock reference setup - external clock needs to be selected before calling LMS_Init(), internal can only be set after. remove now unused compat_LMS_VCTCXO* functions - we do not set the VCTXCO directly anymore Change-Id: I3cf905b0a84bc1ec200891762a6646141ee37181 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M configure.ac 3 files changed, 40 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/63/13663/3 -- To view, visit https://gerrit.osmocom.org/13663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3cf905b0a84bc1ec200891762a6646141ee37181 Gerrit-Change-Number: 13663 Gerrit-PatchSet: 3 Gerrit-Owner: roh Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-trx[master]: lms: properly call close if set_antennas() fails, add some comments
roh has uploaded this change for review. ( https://gerrit.osmocom.org/13667
Change subject: lms: properly call close if set_antennas() fails, add some
comments
..
lms: properly call close if set_antennas() fails, add some comments
Change-Id: I9ebe986ee3a15842a15853424ee98e9a2fa6a5df
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/13667/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 15064e8..94160b4 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -222,6 +222,7 @@
goto out_close;
}
+ /* set samplerate */
if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, _sr))
goto out_close;
print_range("Sample Rate", _sr);
@@ -237,9 +238,10 @@
/* FIXME: make this device/model dependent, like
UHDDevice:dev_param_map! */
ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time
* sample_rate */
+ /* configure antennas */
if (!set_antennas()) {
LOGC(DDEV, ALERT) << "LMS antenna setting failed";
- return -1;
+ goto out_close;
}
samplesRead = 0;
@@ -281,6 +283,7 @@
if (!do_calib(i))
return false;
+ /* configure Streams */
m_lms_stream_rx[i] = {};
m_lms_stream_rx[i].isTx = false;
m_lms_stream_rx[i].channel = i;
--
To view, visit https://gerrit.osmocom.org/13667
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ebe986ee3a15842a15853424ee98e9a2fa6a5df
Gerrit-Change-Number: 13667
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Change in osmo-trx[master]: lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13662 to look at the new patch set (#2). Change subject: lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start .. lms: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start bandwidth, freqency, gain stages need to be set before calibration can be successful Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 50 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/13662/2 -- To view, visit https://gerrit.osmocom.org/13662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37 Gerrit-Change-Number: 13662 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-trx[master]: lms: add device type detection and device specific gains
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13663 to look at the new patch set (#2). Change subject: lms: add device type detection and device specific gains .. lms: add device type detection and device specific gains add device dependant max gain setup - limesdr mini and limenet micro need slightly reduced maximum gains to get a PASS on phase error measurements rework clock reference setup - external clock needs to be selected before calling LMS_Init(), internal can only be set after. remove now unused compat_LMS_VCTCXO* functions - we do not set the VCTXCO directly anymore Change-Id: I3cf905b0a84bc1ec200891762a6646141ee37181 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M configure.ac 3 files changed, 40 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/63/13663/2 -- To view, visit https://gerrit.osmocom.org/13663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3cf905b0a84bc1ec200891762a6646141ee37181 Gerrit-Change-Number: 13663 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-trx[master]: lms: Remove wrong unused code copied from -uhd
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13660 to look at the new patch set (#2). Change subject: lms: Remove wrong unused code copied from -uhd .. lms: Remove wrong unused code copied from -uhd Change-Id: I2bc7fcfa429d1f82c2d8e95d31dfed367f2b3f9d --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/60/13660/2 -- To view, visit https://gerrit.osmocom.org/13660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2bc7fcfa429d1f82c2d8e95d31dfed367f2b3f9d Gerrit-Change-Number: 13660 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-trx[master]: lms: move LMS_EnableChannel from Start/Stop to Open/Close device
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13661 to look at the new patch set (#2). Change subject: lms: move LMS_EnableChannel from Start/Stop to Open/Close device .. lms: move LMS_EnableChannel from Start/Stop to Open/Close device move enable: it is important that channels are actually enabled before applying any configuration (besides external clock) move disable: move to close, so channels are not disabled and not enabled again while osmotrx is active. Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/61/13661/2 -- To view, visit https://gerrit.osmocom.org/13661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9 Gerrit-Change-Number: 13661 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol
Change in osmo-trx[master]: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start (bw...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/13662
Change subject: move LMS_GetLPFBWRange and LMS_Calibrate calls from open to
start (bw, freq, power need to be set)
..
move LMS_GetLPFBWRange and LMS_Calibrate calls from open to start (bw, freq,
power need to be set)
Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 50 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/13662/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index cb41858..ab4e868 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -153,8 +153,8 @@
{
//lms_info_str_t dev_str;
lms_info_str_t* info_list;
- lms_range_t range_lpfbw_rx, range_lpfbw_tx, range_sr;
- float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;
+ lms_range_t range_sr;
+ float_type sr_host, sr_rf;
uint16_t dac_val;
unsigned int i, n;
int rc, dev_id;
@@ -244,36 +244,11 @@
goto out_close;
}
- if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, _lpfbw_rx))
- goto out_close;
- print_range("LPFBWRange Rx", _lpfbw_rx);
- if (LMS_GetLPFBWRange(m_lms_dev, LMS_CH_RX, _lpfbw_tx))
- goto out_close;
- print_range("LPFBWRange Tx", _lpfbw_tx);
- lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min),
range_lpfbw_rx.max);
- lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min),
range_lpfbw_tx.max);
-
- LOGC(DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx;
-
if (!set_antennas()) {
LOGC(DDEV, ALERT) << "LMS antenna setting failed";
return -1;
}
- /* Perform Rx and Tx calibration */
- for (i=0; ihttps://gerrit.osmocom.org/13662
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1090effdf0f43e5183a402e4c1a1ffe5abdefd37
Gerrit-Change-Number: 13662
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Change in osmo-trx[master]: move LMS_EnableChannel from Start/Stop to Open/Close device
roh has uploaded this change for review. ( https://gerrit.osmocom.org/13661
Change subject: move LMS_EnableChannel from Start/Stop to Open/Close device
..
move LMS_EnableChannel from Start/Stop to Open/Close device
Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/61/13661/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 52ef4a4..cb41858 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -78,8 +78,14 @@
LMSDevice::~LMSDevice()
{
+ unsigned int i;
LOGC(DDEV, INFO) << "Closing LMS device";
if (m_lms_dev) {
+ /* disable all channels */
+ for (i=0; ihttps://gerrit.osmocom.org/13661
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82878913254ce15a85db8d006e13d5eb639793e9
Gerrit-Change-Number: 13661
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Change in osmo-trx[master]: add device type detection
roh has uploaded this change for review. ( https://gerrit.osmocom.org/13663
Change subject: add device type detection
..
add device type detection
device dependant max gain setup
rework clock reference setup
remove now unused compat_LMS_VCTCXO* functions
Change-Id: I3cf905b0a84bc1ec200891762a6646141ee37181
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 50 insertions(+), 45 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/63/13663/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index ab4e868..06c506e 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -41,24 +41,6 @@
#define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */
#define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED)
-static int compat_LMS_VCTCXORead(lms_device_t *dev, uint16_t *val, bool memory)
-{
-#if HAVE_LMS_VCTCXO_EEPROM_SAVING
- return LMS_VCTCXORead(dev, val, memory);
-#else
- return LMS_VCTCXORead(dev, val);
-#endif
-}
-
-static int compat_LMS_VCTCXOWrite(lms_device_t *dev, uint16_t val, bool memory)
-{
-#if HAVE_LMS_VCTCXO_EEPROM_SAVING
- return LMS_VCTCXOWrite(dev, val, memory);
-#else
- return LMS_VCTCXOWrite(dev, val);
-#endif
-}
-
LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t
chans, double lo_offset,
const std::vector& tx_paths,
const std::vector& rx_paths):
@@ -151,11 +133,10 @@
int LMSDevice::open(const std::string , int ref, bool swap_channels)
{
- //lms_info_str_t dev_str;
lms_info_str_t* info_list;
+ const lms_dev_info_t* device_info;
lms_range_t range_sr;
float_type sr_host, sr_rf;
- uint16_t dac_val;
unsigned int i, n;
int rc, dev_id;
@@ -194,12 +175,45 @@
delete [] info_list;
+ device_info = LMS_GetDeviceInfo(m_lms_dev);
+
+ if ((ref != REF_EXTERNAL) && (ref != REF_INTERNAL)){
+ LOGC(DDEV, ALERT) << "Invalid reference type";
+ goto out_close;
+ }
+
+ /* if reference clock is external setup must happen _before_ calling
LMS_Init */
+ /* FIXME make external reference frequency configurable */
+ if (ref == REF_EXTERNAL) {
+ LOGC(DDEV, INFO) << "Setting External clock reference to 10MHz";
+ /* Assume an external 10 MHz reference clock */
+ if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 1000.0) <
0)
+ goto out_close;
+ }
+
LOGC(DDEV, INFO) << "Init LMS device";
if (LMS_Init(m_lms_dev) != 0) {
LOGC(DDEV, ERROR) << "LMS_Init() failed";
goto out_close;
}
+ /* LimeSDR-Mini does not have switches but needs soldering to select
external/internal clock */
+ /* LimeNET-Micro also does not like selecting internal clock*/
+ /* also set device specific maximum tx levels selected by phasenoise
measurements*/
+ if (strncmp(device_info->deviceName,"LimeSDR-USB",11)==0){
+ /* if reference clock is internal setup must happen _after_
calling LMS_Init */
+ if (ref == REF_INTERNAL) {
+ LOGC(DDEV, INFO) << "Setting Internal clock reference";
+ if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, -1) <
0)
+ goto out_close;
+ }
+ maxTxGainClamp = 73.0;
+ } else
+ if (strncmp(device_info->deviceName,"LimeSDR-Mini",12)==0)
+ maxTxGainClamp = 66.0;
+ else
+ maxTxGainClamp = 71.0; /* "LimeNET-Micro", etc FIXME
pciE based LMS boards?*/
+
/* enable all used channels */
for (i=0; i(8.9e-5 * GSMRATE * tx_sps); /* time
* sample_rate */
- switch (ref) {
- case REF_INTERNAL:
- LOGC(DDEV, INFO) << "Setting Internal clock reference";
- /* Ugly API: Selecting clock source implicit by writing to
VCTCXO DAC ?!? */
- if (compat_LMS_VCTCXORead(m_lms_dev, _val, false) < 0)
- goto out_close;
- LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val;
- if (compat_LMS_VCTCXOWrite(m_lms_dev, dac_val, false) < 0)
- goto out_close;
- break;
- case REF_EXTERNAL:
- LOGC(DDEV, INFO) << "Setting External clock reference to " <<
1000.0;
- /* Assume an external 10 MHz reference clock */
-
Change in osmo-trx[master]: cleanup: remove comment copied from -uhd
roh has uploaded this change for review. ( https://gerrit.osmocom.org/13660
Change subject: cleanup: remove comment copied from -uhd
..
cleanup: remove comment copied from -uhd
Change-Id: I2bc7fcfa429d1f82c2d8e95d31dfed367f2b3f9d
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/60/13660/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index b004308..52ef4a4 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -548,11 +548,8 @@
}
GSM::Time LMSDevice::minLatency() {
- /* Empirical data from a handful of
- relatively recent machines shows that the B100 will underrun when
- the transmit threshold is reduced to a time of 6 and a half frames,
- so we set a minimum 7 frame threshold. */
- return GSM::Time(6,7);
+ /* UNUSED on limesdr (only used on usrp1/2) */
+ return GSM::Time(0,0);
}
void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool *
overrun)
--
To view, visit https://gerrit.osmocom.org/13660
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc7fcfa429d1f82c2d8e95d31dfed367f2b3f9d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Change in osmo-trx[master]: change scaling factor from .3 to .7 for lms sdr devices to improve th...
roh has abandoned this change. ( https://gerrit.osmocom.org/11949 ) Change subject: change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope .. Abandoned superseeded by I71702feaa11f53e7614a6938a984dd748405474a -- To view, visit https://gerrit.osmocom.org/11949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b Gerrit-Change-Number: 11949 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Pau Espin Pedrol
Change in osmo-trx[master]: change scaling factor from .3 to .7 for lms sdr devices to improve th...
roh has uploaded this change for review. ( https://gerrit.osmocom.org/11949
Change subject: change scaling factor from .3 to .7 for lms sdr devices to
improve the signal slope
..
change scaling factor from .3 to .7 for lms sdr devices to improve the signal
slope
Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b
---
M Transceiver52M/device/lms/LMSDevice.h
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/49/11949/1
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index 349efbb..b73ad89 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -28,7 +28,8 @@
#include
#include
-#define LIMESDR_TX_AMPL 0.3
+// this was 0.3 before - values above 0.8 give more phase noise, values below
0.6 give too much amplitude resolution/noise to pass gmsk validation on a E4406
+#define LIMESDR_TX_AMPL 0.7
/** A class to handle a LimeSuite supported device */
class LMSDevice:public RadioDevice {
--
To view, visit https://gerrit.osmocom.org/11949
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b
Gerrit-Change-Number: 11949
Gerrit-PatchSet: 1
Gerrit-Owner: roh
