Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 419s] ar: `u' modifier ignored since `D' is the default (see `U') [ 419s] libtool: link: ranlib .libs/libtransceiver_common.a [ 419s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 419s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 420s] libtool: link: g++ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd -pthread [ 420s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 420s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 420s] collect2: error: ld returned 1 exit status [ 420s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 420s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 420s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 420s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 420s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 420s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 420s] make[1]: *** [Makefile:444: all] Error 2 [ 420s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 420s] dh_auto_build: make -j1 returned exit code 2 [ 420s] make: *** [debian/rules:6: build] Error 255 [ 420s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 420s] [ 420s] morla5 failed "build osmo-trx_1.1.1.30.92814.dsc" at Thu Oct 10 02:43:22 UTC 2019. [ 420s] [ 420s] ### VM INTERACTION START ### [ 423s] [ 404.197256] sysrq: SysRq : Power Off [ 423s] [ 404.205908] reboot: Power down [ 423s] ### VM INTERACTION END ### [ 423s] [ 423s] morla5 failed "build osmo-trx_1.1.1.30.92814.dsc" at Thu Oct 10 02:43:26 UTC 2019. [ 423s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-netif in Debian_8.0/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_8.0/x86_64
Package network:osmocom:nightly/libosmo-netif failed to build in
Debian_8.0/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly libosmo-netif
Last lines of build log:
[ 133s] -sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9698
timestamp=1681779177 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] -sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9699
timestamp=1681779337 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18304
timestamp=847016806 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18305
timestamp=847016966 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18306
timestamp=847017126 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18307
timestamp=847017286 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18308
timestamp=847017446 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] sys={28.604242}, mono={5.18}: clock_override_add
[ 133s] -sys={28.604242}, mono={5.18}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9700
timestamp=1681779497 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] +sys={28.604242}, mono={5.18}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18309
timestamp=847017606 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 133s] sys={28.624242}, mono={5.20}: clock_override_add
[ 133s] sys={28.624242}, mono={5.20}: OK: Test passed
[ 133s] 2. testsuite.at:11: 2. osmux_test (testsuite.at:11): FAILED
(testsuite.at:14)
[ 133s] debian/rules:27: recipe for target 'override_dh_auto_test' failed
[ 133s] make[1]: *** [override_dh_auto_test] Error 1
[ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 133s] debian/rules:13: recipe for target 'build' failed
[ 133s] make: *** [build] Error 2
[ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 133s]
[ 133s] morla3 failed "build libosmo-netif_0.6.0.9.77ba.dsc" at Thu Oct 10
01:58:27 UTC 2019.
[ 133s]
[ 133s] ### VM INTERACTION START ###
[ 134s] Powering off.
[ 134s] [ 119.650214] reboot: Power down
[ 134s] ### VM INTERACTION END ###
[ 134s]
[ 134s] morla3 failed "build libosmo-netif_0.6.0.9.77ba.dsc" at Thu Oct 10
01:58:29 UTC 2019.
[ 134s]
--
Configure notifications at https://build.opensuse.org/my/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-netif in Debian_8.0/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_8.0/i586
Package network:osmocom:nightly/libosmo-netif failed to build in Debian_8.0/i586
Check out the package for editing:
osc checkout network:osmocom:nightly libosmo-netif
Last lines of build log:
[ 74s] -sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9698
timestamp=1681779177 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] -sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9699
timestamp=1681779337 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18304
timestamp=847016806 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18305
timestamp=847016966 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18306
timestamp=847017126 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18307
timestamp=847017286 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.584242}, mono={5.16}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18308
timestamp=847017446 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] sys={28.604242}, mono={5.18}: clock_override_add
[ 74s] -sys={28.604242}, mono={5.18}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9700
timestamp=1681779497 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] +sys={28.604242}, mono={5.18}: extracted packet: RTP ver=2
ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=18309
timestamp=847017606 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ]
[ 74s] sys={28.624242}, mono={5.20}: clock_override_add
[ 74s] sys={28.624242}, mono={5.20}: OK: Test passed
[ 74s] 2. testsuite.at:11: 2. osmux_test (testsuite.at:11): FAILED
(testsuite.at:14)
[ 74s] debian/rules:27: recipe for target 'override_dh_auto_test' failed
[ 74s] make[1]: *** [override_dh_auto_test] Error 1
[ 74s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 74s] debian/rules:13: recipe for target 'build' failed
[ 74s] make: *** [build] Error 2
[ 74s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 74s]
[ 74s] build80 failed "build libosmo-netif_0.6.0.9.77ba.dsc" at Thu Oct 10
01:46:11 UTC 2019.
[ 74s]
[ 74s] ### VM INTERACTION START ###
[ 75s] Powering off.
[ 75s] [ 67.166349] reboot: Power down
[ 75s] ### VM INTERACTION END ###
[ 75s]
[ 75s] build80 failed "build libosmo-netif_0.6.0.9.77ba.dsc" at Thu Oct 10
01:46:12 UTC 2019.
[ 75s]
--
Configure notifications at https://build.opensuse.org/my/notifications
openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bts[master]: log: set L1 SAPI log context
laforge has removed a vote on this change. Change subject: log: set L1 SAPI log context .. Removed Code-Review+1 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: deleteVote
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Disable UART receiver when entering WAIT_TPDU state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15747 ) Change subject: iso7816_fsm: Disable UART receiver when entering WAIT_TPDU state .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15747 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: Iab58c2ffba935152450f965338599cbaabb4662b Gerrit-Change-Number: 15747 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:39:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Handle WTIME expiry during ATR reception
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15746 ) Change subject: iso7816_fsm: Handle WTIME expiry during ATR reception .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15746 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: I62d47cb5e06b480941c67122f3c7d7a462ea2099 Gerrit-Change-Number: 15746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:38:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Allow ATR FSM to always return back to initial state (RE...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15745 ) Change subject: iso7816_fsm: Allow ATR FSM to always return back to initial state (RESET) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15745 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: I71adefadc43bc8f5db7ce043393f9143cd45684f Gerrit-Change-Number: 15745 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:38:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: cuart: Integrate software WT (waiting time) timer
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15742 ) Change subject: cuart: Integrate software WT (waiting time) timer .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15742 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: If94d7bdca0e5571d4f2f53862fc574c33a05ce43 Gerrit-Change-Number: 15742 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:38:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: card_uart_ctrl: change from bool to integer argument
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741 ) Change subject: card_uart_ctrl: change from bool to integer argument .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741 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: Ifa8dde9dbcd27b79055aaac1a05bb040be616e05 Gerrit-Change-Number: 15741 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:38:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Allow caller to specify if Rx should be active after Tx
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15743 ) Change subject: card_uart_tx: Allow caller to specify if Rx should be active after Tx .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15743 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: Ibe02d283701dbfff5ab47e1b8195369c134cde03 Gerrit-Change-Number: 15743 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:37:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: cuart_[fsm]_test: Avoid hard-coded 'ttyUSB5'; use command line arg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15744 ) Change subject: cuart_[fsm]_test: Avoid hard-coded 'ttyUSB5'; use command line arg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15744 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: I0b66ed7c037376e4a5a9283cb972012594bc35d2 Gerrit-Change-Number: 15744 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 20:36:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: README.md: update osmo-bts-trx specific limitations
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15740 ) Change subject: README.md: update osmo-bts-trx specific limitations .. README.md: update osmo-bts-trx specific limitations The ticket has been closed, BER and C/I measurements are now being sent to OsmoPCU (see Ia58043bd2381a4d34d604522e02899ae64ee0d26). Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d --- M README.md 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index 7e26d82..eaff165 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,3 @@ * no clear indication of nominal transmit power, various power related computations are likely off * no OML attribute validation during bts_model_check_oml() - -osmo-bts-trx - - - * No BER value delivered to OsmoPCU (https://osmocom.org/issues/1855) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d Gerrit-Change-Number: 15740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-bts[master]: README.md: update osmo-bts-trx specific limitations
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15740 ) Change subject: README.md: update osmo-bts-trx specific limitations .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d Gerrit-Change-Number: 15740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 20:32:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Disable UART receiver when entering WAIT_TPDU state
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15747
Change subject: iso7816_fsm: Disable UART receiver when entering WAIT_TPDU state
..
iso7816_fsm: Disable UART receiver when entering WAIT_TPDU state
Change-Id: Iab58c2ffba935152450f965338599cbaabb4662b
---
M ccid_common/iso7816_fsm.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/47/15747/1
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index af7892c..21378e0 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -294,6 +294,7 @@
{
struct iso7816_3_priv *ip = get_iso7816_3_priv(fi);
OSMO_ASSERT(fi->fsm == _3_fsm);
+ card_uart_ctrl(ip->uart, CUART_CTL_RX, false);
/* reset the TPDU state machine */
osmo_fsm_inst_dispatch(ip->tpdu_fi, ISO7816_E_TPDU_CLEAR_REQ, NULL);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15747
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: Iab58c2ffba935152450f965338599cbaabb4662b
Gerrit-Change-Number: 15747
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-ccid-firmware[master]: cuart: Integrate software WT (waiting time) timer
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15742
Change subject: cuart: Integrate software WT (waiting time) timer
..
cuart: Integrate software WT (waiting time) timer
Change-Id: If94d7bdca0e5571d4f2f53862fc574c33a05ce43
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_host/cuart_driver_tty.c
3 files changed, 53 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/42/15742/1
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index fc3cfb6..4ea82ba 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -2,6 +2,7 @@
#include
#include
#include
+#include
#include "cuart.h"
@@ -25,6 +26,34 @@
return NULL;
}
+/* obtain the current ETU in us */
+static int get_etu_in_us(struct card_uart *cuart)
+{
+ /* FIXME: actually implement this based on the real baud rate */
+ return (100/9600);
+}
+
+/* software waiting-time timer has expired */
+static void card_uart_wtime_cb(void *data)
+{
+ struct card_uart *cuart = (struct card_uart *) data;
+ card_uart_notification(cuart, CUART_E_RX_TIMEOUT, NULL);
+ /* should we automatically disable the receiver? */
+}
+
+void card_uart_wtime_restart(struct card_uart *cuart)
+{
+ int secs, usecs;
+
+ usecs = get_etu_in_us(cuart) * cuart->wtime_etu;
+ if (usecs > 100) {
+ secs = usecs / 100;
+ usecs = usecs % 100;
+ } else
+ secs = 0;
+ osmo_timer_schedule(>wtime_tmr, secs, usecs);
+}
+
int card_uart_open(struct card_uart *cuart, const char *driver_name, const
char *device_name)
{
struct card_uart_driver *drv = cuart_drv_by_name(driver_name);
@@ -33,8 +62,10 @@
if (!drv)
return -ENODEV;
+ cuart->wtime_etu = 9600; /* ISO 7816-3 Section 8.1 */
cuart->rx_enabled = true;
cuart->rx_threshold = 1;
+ osmo_timer_setup(>wtime_tmr, card_uart_wtime_cb, cuart);
rc = drv->ops->open(cuart, device_name);
if (rc < 0)
@@ -60,13 +91,19 @@
OSMO_ASSERT(cuart->driver);
OSMO_ASSERT(cuart->driver->ops);
OSMO_ASSERT(cuart->driver->ops->ctrl);
+
rc = cuart->driver->ops->ctrl(cuart, ctl, arg);
if (rc < 0)
return rc;
switch (ctl) {
+ case CUART_CTL_WTIME:
+ cuart->wtime_etu = arg;
+ break;
case CUART_CTL_RX:
cuart->rx_enabled = arg ? true : false;
+ if (!cuart->rx_enabled)
+ osmo_timer_del(>wtime_tmr);
break;
default:
break;
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index f35cdd2..9d56035 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -2,6 +2,7 @@
#include
#include
#include
+#include
#include
#include "utils_ringbuffer.h"
@@ -23,6 +24,7 @@
CUART_CTL_POWER,
CUART_CTL_CLOCK,
CUART_CTL_RST,
+ CUART_CTL_WTIME,
};
struct card_uart;
@@ -65,6 +67,9 @@
* issue CUART_E_RX_SINGLE; if it is > 1, we will issue
CUART_E_RX_COMPLETE */
uint32_t rx_threshold;
+ uint32_t wtime_etu;
+ struct osmo_timer_list wtime_tmr;
+
/* driver-specific private data */
union {
struct {
@@ -103,6 +108,9 @@
/*! Set the Rx notification threshold in number of bytes received */
void card_uart_set_rx_threshold(struct card_uart *cuart, size_t rx_threshold);
+/* (re)start the software WTIME timer */
+void card_uart_wtime_restart(struct card_uart *cuart);
+
void card_uart_notification(struct card_uart *cuart, enum card_uart_event evt,
void *data);
int card_uart_driver_register(struct card_uart_driver *drv);
diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 10ea60f..5f635b5 100644
--- a/ccid_host/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
@@ -143,6 +143,8 @@
if (!cuart->rx_enabled)
continue;
+ card_uart_wtime_restart(cuart);
+
if (cuart->rx_threshold == 1) {
/* bypass ringbuffer and report byte directly */
card_uart_notification(cuart,
CUART_E_RX_SINGLE, [i]);
@@ -263,9 +265,10 @@
}
/* We do our best here, but lots of [USB] serial drivers seem
to ignore
* CREAD, see
https://bugzilla.kernel.org/show_bug.cgi?id=205033 */
- if (arg)
+ if (arg) {
tio.c_cflag |= CREAD;
- else
+ card_uart_wtime_restart(cuart);
+ } else
tio.c_cflag &= ~CREAD;
rc = tcsetattr(cuart->u.tty.ofd.fd, TCSANOW, );
if (rc < 0) {
Change in ...osmo-ccid-firmware[master]: cuart_[fsm]_test: Avoid hard-coded 'ttyUSB5'; use command line arg
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15744
Change subject: cuart_[fsm]_test: Avoid hard-coded 'ttyUSB5'; use command line
arg
..
cuart_[fsm]_test: Avoid hard-coded 'ttyUSB5'; use command line arg
Change-Id: I0b66ed7c037376e4a5a9283cb972012594bc35d2
---
M ccid_host/cuart_fsm_test.c
M ccid_host/cuart_test.c
2 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/44/15744/1
diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c
index 92f3437..1151b34 100644
--- a/ccid_host/cuart_fsm_test.c
+++ b/ccid_host/cuart_fsm_test.c
@@ -61,7 +61,14 @@
signal(SIGUSR1, _handler);
- rc = card_uart_open(_cuart, "tty", "/dev/ttyUSB5");
+ if (argc < 2) {
+ fprintf(stderr, "You must specify the UART tty device as
argument\n");
+ exit(2);
+ }
+
+ printf("Opening UART device %s\n", argv[1]);
+
+ rc = card_uart_open(_cuart, "tty", argv[1]);
if (rc < 0) {
perror("opening UART");
exit(1);
diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c
index 0ed6614..e2b1ce2 100644
--- a/ccid_host/cuart_test.c
+++ b/ccid_host/cuart_test.c
@@ -58,8 +58,15 @@
uint8_t atr[64];
int rc;
+ if (argc < 2) {
+ fprintf(stderr, "You must specify the UART tty device as
argument\n");
+ exit(2);
+ }
+
+ printf("Opening UART device %s\n", argv[1]);
+
g_cuart.handle_event = _event;
- rc = card_uart_open(_cuart, "tty", "/dev/ttyUSB5");
+ rc = card_uart_open(_cuart, "tty", argv[1]);
if (rc < 0) {
perror("opening UART");
exit(1);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15744
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: I0b66ed7c037376e4a5a9283cb972012594bc35d2
Gerrit-Change-Number: 15744
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Allow ATR FSM to always return back to initial state (RE...
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15745
Change subject: iso7816_fsm: Allow ATR FSM to always return back to initial
state (RESET)
..
iso7816_fsm: Allow ATR FSM to always return back to initial state (RESET)
Change-Id: I71adefadc43bc8f5db7ce043393f9143cd45684f
---
M ccid_common/iso7816_fsm.c
1 file changed, 15 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/45/15745/1
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index b98e2bb..8705ad9 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -659,7 +659,8 @@
[ATR_S_WAIT_T0] = {
.name = "WAIT_T0",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TA) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TA) |
S(ATR_S_WAIT_TB) |
S(ATR_S_WAIT_TC) |
S(ATR_S_WAIT_TD) |
@@ -671,7 +672,8 @@
[ATR_S_WAIT_TA] = {
.name = "WAIT_TA",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TB) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TB) |
S(ATR_S_WAIT_TC) |
S(ATR_S_WAIT_TD) |
S(ATR_S_WAIT_HIST) |
@@ -682,7 +684,8 @@
[ATR_S_WAIT_TB] = {
.name = "WAIT_TB",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TC) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TC) |
S(ATR_S_WAIT_TD) |
S(ATR_S_WAIT_HIST) |
S(ATR_S_WAIT_TCK) |
@@ -692,7 +695,8 @@
[ATR_S_WAIT_TC] = {
.name = "WAIT_TC",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TD) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TD) |
S(ATR_S_WAIT_HIST) |
S(ATR_S_WAIT_TCK) |
S(ATR_S_WAIT_T0),
@@ -701,7 +705,8 @@
[ATR_S_WAIT_TD] = {
.name = "WAIT_TD",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TA) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TA) |
S(ATR_S_WAIT_TB) |
S(ATR_S_WAIT_TC) |
S(ATR_S_WAIT_TD) |
@@ -713,20 +718,22 @@
[ATR_S_WAIT_HIST] = {
.name = "WAIT_HIST",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_WAIT_TCK) |
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_WAIT_TCK) |
S(ATR_S_WAIT_T0),
.action = atr_wait_tX_action,
},
[ATR_S_WAIT_TCK] = {
.name = "WAIT_TCK",
.in_event_mask =S(ISO7816_E_RX_SINGLE),
- .out_state_mask = S(ATR_S_DONE),
+ .out_state_mask = S(ATR_S_WAIT_TS) |
+ S(ATR_S_DONE),
.action = atr_wait_tX_action,
},
[ATR_S_DONE] = {
.name = "DONE",
.in_event_mask =0,
- .out_state_mask = S(ATR_S_WAIT_T0),
+ .out_state_mask = S(ATR_S_WAIT_TS),
//.action = atr_done_action,
},
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15745
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: I71adefadc43bc8f5db7ce043393f9143cd45684f
Gerrit-Change-Number: 15745
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-ccid-firmware[master]: card_uart_ctrl: change from bool to integer argument
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741
Change subject: card_uart_ctrl: change from bool to integer argument
..
card_uart_ctrl: change from bool to integer argument
This allows for control functions for e.g. baud rate or waiting time
Change-Id: Ifa8dde9dbcd27b79055aaac1a05bb040be616e05
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_host/cuart_driver_tty.c
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/41/15741/1
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index 895717a..fc3cfb6 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -53,20 +53,20 @@
return cuart->driver->ops->close(cuart);
}
-int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable)
+int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int arg)
{
int rc;
OSMO_ASSERT(cuart);
OSMO_ASSERT(cuart->driver);
OSMO_ASSERT(cuart->driver->ops);
OSMO_ASSERT(cuart->driver->ops->ctrl);
- rc = cuart->driver->ops->ctrl(cuart, ctl, enable);
+ rc = cuart->driver->ops->ctrl(cuart, ctl, arg);
if (rc < 0)
return rc;
switch (ctl) {
case CUART_CTL_RX:
- cuart->rx_enabled = enable;
+ cuart->rx_enabled = arg ? true : false;
break;
default:
break;
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index 790c277..f35cdd2 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -33,7 +33,7 @@
int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len);
int (*async_rx)(struct card_uart *cuart, uint8_t *data, size_t len);
- int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable);
+ int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, int arg);
};
/* Card UART driver */
@@ -98,7 +98,7 @@
/*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE)
*/
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);
-int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable);
+int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int arg);
/*! Set the Rx notification threshold in number of bytes received */
void card_uart_set_rx_threshold(struct card_uart *cuart, size_t rx_threshold);
diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 3695b58..10ea60f 100644
--- a/ccid_host/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
@@ -249,7 +249,7 @@
return i;
}
-static int tty_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable)
+static int tty_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int
arg)
{
struct termios tio;
int rc;
@@ -263,7 +263,7 @@
}
/* We do our best here, but lots of [USB] serial drivers seem
to ignore
* CREAD, see
https://bugzilla.kernel.org/show_bug.cgi?id=205033 */
- if (enable)
+ if (arg)
tio.c_cflag |= CREAD;
else
tio.c_cflag &= ~CREAD;
@@ -274,8 +274,8 @@
}
break;
case CUART_CTL_RST:
- _set_rts(cuart->u.tty.ofd.fd, enable);
- if (enable)
+ _set_rts(cuart->u.tty.ofd.fd, arg ? true : false);
+ if (arg)
_flush(cuart->u.tty.ofd.fd);
break;
case CUART_CTL_POWER:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741
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: Ifa8dde9dbcd27b79055aaac1a05bb040be616e05
Gerrit-Change-Number: 15741
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Allow caller to specify if Rx should be active after Tx
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15743
Change subject: card_uart_tx: Allow caller to specify if Rx should be active
after Tx
..
card_uart_tx: Allow caller to specify if Rx should be active after Tx
This reverts commit 02dd9111635a8adbcd804671695de88f22ffa5ae.
Change-Id: Ibe02d283701dbfff5ab47e1b8195369c134cde03
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_common/iso7816_fsm.c
M ccid_host/cuart_test.c
4 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/43/15743/1
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index 4ea82ba..9a68167 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -112,7 +112,7 @@
return rc;
}
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len)
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete)
{
OSMO_ASSERT(cuart);
OSMO_ASSERT(cuart->driver);
@@ -121,6 +121,7 @@
OSMO_ASSERT(!cuart->tx_busy);
cuart->tx_busy = true;
+ cuart->rx_after_tx_compl = rx_after_complete;
/* disable receiver to avoid receiving what we transmit */
card_uart_ctrl(cuart, CUART_CTL_RX, false);
@@ -150,7 +151,8 @@
case CUART_E_TX_COMPLETE:
cuart->tx_busy = false;
/* re-enable receiver if we're done with transmit */
- card_uart_ctrl(cuart, CUART_CTL_RX, true);
+ if (cuart->rx_after_tx_compl)
+ card_uart_ctrl(cuart, CUART_CTL_RX, true);
break;
default:
break;
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index 9d56035..b94eb2c 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -62,6 +62,8 @@
bool tx_busy;
/* is the receiver currently enabled or not? */
bool rx_enabled;
+ /* should the receiver automatically be nabled after TX completion? */
+ bool rx_after_tx_compl;
/*! after how many bytes should we notify the user? If this is '1', we
will
* issue CUART_E_RX_SINGLE; if it is > 1, we will issue
CUART_E_RX_COMPLETE */
@@ -98,7 +100,7 @@
int card_uart_close(struct card_uart *cuart);
/*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after
completion */
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len);
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete);
/*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE)
*/
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index e173030..b98e2bb 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -829,7 +829,7 @@
tfp->is_command ? "COMMAND" : "RESPONSE",
osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);
- card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));
+ card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh), true);
break;
default:
OSMO_ASSERT(0);
@@ -875,7 +875,7 @@
} else if (byte == tpduh->ins) {
if (tfp->is_command) {
/* transmit all remaining bytes */
- card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu));
+ card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu), true);
osmo_fsm_inst_state_chg(fi,
TPDU_S_TX_REMAINING, 0, 0);
} else {
card_uart_set_rx_threshold(ip->uart, tpduh->p3);
@@ -886,7 +886,7 @@
if (tfp->is_command) {
/* transmit *next*, not first byte */
OSMO_ASSERT(msgb_l3len(tfp->tpdu) >= 0);
- card_uart_tx(ip->uart, msgb_l3(tfp->tpdu), 1);
+ card_uart_tx(ip->uart, msgb_l3(tfp->tpdu), 1,
false);
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_SINGLE,
0, 0);
} else {
osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE,
0, 0);
diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c
index d4d8faf..0ed6614 100644
--- a/ccid_host/cuart_test.c
+++ b/ccid_host/cuart_test.c
@@ -44,7 +44,7 @@
static void test_apdu(void)
{
const uint8_t select_mf[] = "\xa0\xa4\x04\x00\x02\x3f\x00";
- card_uart_tx(_cuart, select_mf, 5);
+ card_uart_tx(_cuart, select_mf, 5, true);
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Handle WTIME expiry during ATR reception
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15746
Change subject: iso7816_fsm: Handle WTIME expiry during ATR reception
..
iso7816_fsm: Handle WTIME expiry during ATR reception
There are some cards that state a wrong length of the historical
bytes in their ATR header, resulting in WTIME expiry. Let's dispatch
ISO7816_E_WTIME_EXP into the ATR FSM and treat it as normal ATR_DONE if
it happens during rx of historical bytes or TCK.
Also introdcue an ISO7816_E_ATR_ERR_IND for those situations where
waiting time expiration occurs during reception of TS/T0/TA/TB/TC/TD
bytes.
Change-Id: I62d47cb5e06b480941c67122f3c7d7a462ea2099
---
M ccid_common/iso7816_fsm.c
M ccid_common/iso7816_fsm.h
2 files changed, 58 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/46/15746/1
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index 8705ad9..af7892c 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -141,6 +141,7 @@
{ ISO7816_E_RX_ERR_IND, "RX_ERR_IND" },
{ ISO7816_E_TX_ERR_IND, "TX_ERR_IND" },
{ ISO7816_E_ATR_DONE_IND, "ATR_DONE_IND" },
+ { ISO7816_E_ATR_ERR_IND,"ATR_ERR_IND" },
{ ISO7816_E_TPDU_DONE_IND, "TPDU_DONE_IND" },
{ ISO7816_E_XCEIVE_TPDU_CMD,"XCEIVE_TPDU_CMD" },
/* allstate events */
@@ -251,6 +252,10 @@
osmo_fsm_inst_state_chg(fi, ISO7816_S_IN_ATR, 0, 0);
osmo_fsm_inst_dispatch(ip->atr_fi, event, data);
break;
+ case ISO7816_E_WTIME_EXP:
+ ip->user_cb(fi, event, 0, NULL);
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -265,6 +270,7 @@
switch (event) {
case ISO7816_E_RX_SINGLE:
case ISO7816_E_RX_ERR_IND:
+ case ISO7816_E_WTIME_EXP:
/* simply pass this through to the child FSM for the ATR */
osmo_fsm_inst_dispatch(ip->atr_fi, event, data);
break;
@@ -275,6 +281,10 @@
/* notify user about ATR */
ip->user_cb(fi, event, 0, atr);
break;
+ case ISO7816_E_ATR_ERR_IND:
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ ip->user_cb(fi, event, 0, atr);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -326,6 +336,10 @@
/* hand finished TPDU to user */
ip->user_cb(fi, event, 0, apdu);
break;
+ case ISO7816_E_WTIME_EXP:
+ /* FIXME: power off? */
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -336,7 +350,6 @@
OSMO_ASSERT(fi->fsm == _3_fsm);
switch (event) {
- case ISO7816_E_WTIME_EXP:
case ISO7816_E_HW_ERR_IND:
case ISO7816_E_CARD_REMOVAL:
/* FIXME: power off? */
@@ -366,7 +379,8 @@
},
[ISO7816_S_WAIT_ATR] = {
.name = "WAIT_ATR",
- .in_event_mask =S(ISO7816_E_RX_SINGLE),
+ .in_event_mask =S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_IN_ATR),
.action = iso7816_3_wait_atr_action,
@@ -375,7 +389,9 @@
.name = "IN_ATR",
.in_event_mask =S(ISO7816_E_RX_SINGLE) |
S(ISO7816_E_RX_ERR_IND) |
- S(ISO7816_E_ATR_DONE_IND),
+ S(ISO7816_E_ATR_DONE_IND) |
+ S(ISO7816_E_ATR_ERR_IND) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_IN_ATR) |
S(ISO7816_S_WAIT_TPDU),
@@ -398,7 +414,8 @@
S(ISO7816_E_TX_COMPL) |
S(ISO7816_E_RX_ERR_IND) |
S(ISO7816_E_TX_ERR_IND) |
- S(ISO7816_E_TPDU_DONE_IND),
+ S(ISO7816_E_TPDU_DONE_IND) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_WAIT_TPDU) |
S(ISO7816_S_IN_TPDU),
@@ -435,8 +452,7 @@
.log_subsys = DISO7816,
.event_names =
Change in ...osmo-bts[master]: README.md: update osmo-bts-trx specific limitations
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15740 ) Change subject: README.md: update osmo-bts-trx specific limitations .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d Gerrit-Change-Number: 15740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Oct 2019 18:56:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: README.md: update osmo-bts-trx specific limitations
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15740 Change subject: README.md: update osmo-bts-trx specific limitations .. README.md: update osmo-bts-trx specific limitations The ticket has been closed, BER and C/I measurements are now being sent to OsmoPCU (see Ia58043bd2381a4d34d604522e02899ae64ee0d26). Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d --- M README.md 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/15740/1 diff --git a/README.md b/README.md index 7e26d82..eaff165 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,3 @@ * no clear indication of nominal transmit power, various power related computations are likely off * no OML attribute validation during bts_model_check_oml() - -osmo-bts-trx - - - * No BER value delivered to OsmoPCU (https://osmocom.org/issues/1855) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1909a70b82421802f32c1bc4f69a2e4210db5b2d Gerrit-Change-Number: 15740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: log: set L1 SAPI log context
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI log context .. Patch Set 7: (3 comments) https://gerrit.osmocom.org/#/c/15539/7/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/#/c/15539/7/src/common/l1sap.c@319 PS7, Line 319: L1SAP_COMMON_SAPI_PDTCH We may want to check if L1SAP_IS_PTCCH(u32Fn) here, and assign L1SAP_COMMON_SAPI_PTCCH. https://gerrit.osmocom.org/#/c/15539/7/src/common/l1sap.c@333 PS7, Line 333: L1SAP_IS_PTCCH There can be no DATA.ind on PTCCH, only DATA.req (comes from the PCU). https://gerrit.osmocom.org/#/c/15539/7/src/common/l1sap.c@338 PS7, Line 338: L1SAP_COMMON_SAPI_RACH Access Bursts can be also sent on PDTCH/U and PTCCH/U. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Oct 2019 18:26:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Fix common misspellings and typos
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14819 ) Change subject: Fix common misspellings and typos .. Patch Set 1: roox, any chance you might incorporate review and resubmit? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8e0fe9d67d1e1e8dfce319610de63cde170694c5 Gerrit-Change-Number: 14819 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 17:16:08 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmocom-bb[master]: Fix common misspellings and typos
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/14818 ) Change subject: Fix common misspellings and typos .. Patch Set 1: roox, any chance you might incorporate review and resubmit? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I75df25d3bc2ecb4985bf6fefdde6e44b21bffed9 Gerrit-Change-Number: 14818 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 17:16:21 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: Fix common misspellings and typos
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14821 ) Change subject: Fix common misspellings and typos .. Patch Set 1: roox, any chance you might incorporate review and resubmit? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00ebf013104b55decbdd7f758756a19b220dc7b3 Gerrit-Change-Number: 14821 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 17:15:54 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: encoding: fix space, tabs
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15717 )
Change subject: encoding: fix space, tabs
..
encoding: fix space, tabs
Change-Id: I80ac88f50bfedfd2b86d548883313b5a187b1e8f
---
M src/encoding.cpp
1 file changed, 30 insertions(+), 30 deletions(-)
Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 8270354..b46f568 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -96,21 +96,21 @@
*/
static int write_tfi_usf(bitvec *dest, const gprs_rlcmac_ul_tbf *tbf, uint8_t
usf)
{
- int rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT
*/
- CHECK(rc);
+ int rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT
*/
+ CHECK(rc);
- SET_0(dest); /* POLLING -- no action is required from MS */
+ SET_0(dest); /* POLLING -- no action is required from MS */
- SET_0(dest);
+ SET_0(dest);
- rc = bitvec_set_u64(dest, usf, 3, false); /* USF */
- CHECK(rc);
+ rc = bitvec_set_u64(dest, usf, 3, false); /* USF */
+ CHECK(rc);
- SET_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit
one RLC/MAC block */
+ SET_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit
one RLC/MAC block */
- SET_0(dest); /* No P0 nor PR_MODE */
+ SET_0(dest); /* No P0 nor PR_MODE */
- return 0;
+ return 0;
}
/* { 0 | 1 < TIMING_ADVANCE_INDEX : bit (4) > } */
@@ -201,11 +201,11 @@
rc = write_alpha_gamma(dest, alpha, gamma);
CHECK(rc);
- rc = bitvec_set_bit(dest, (bit_value)polling); /* POLLING */
+ rc = bitvec_set_bit(dest, (bit_value) polling); /* POLLING */
CHECK(rc);
/* N. B: NOT related to TAI! */
- rc = bitvec_set_bit(dest, (bit_value)ta_valid); /* TA_VALID */
+ rc = bitvec_set_bit(dest, (bit_value) ta_valid); /* TA_VALID */
CHECK(rc);
rc = write_ta_index(dest, ta_idx);
@@ -215,7 +215,7 @@
SET_1(dest);
rc = write_tbf_start_time(dest, fn);
CHECK(rc);
- } else
+ } else
SET_0(dest);
SET_0(dest); /* No P0 nor PR_MODE */
@@ -225,7 +225,7 @@
rc = bitvec_set_u64(dest, enc_ws(tbf->window_size()), 5,
false); /* EGPRS Window Size */
CHECK(rc);
- /* The mobile station shall not report measurements: (see 3GPP
TS 44.060 Table 11.2.7.1) */
+ /* The mobile station shall not report measurements: (see 3GPP
TS 44.060 Table 11.2.7.1) */
SET_0(dest); SET_0(dest); /* LINK_QUALITY_MEASUREMENT_MODE */
SET_1(dest); /* No BEP_PERIOD2 */
} else
@@ -867,16 +867,16 @@
/* static size of 16 bits
..1. = ACKNACK: (Union)
0 000 Length
-Desc
-
-...0 = FINAL_ACK_INDICATION: False
-
- 1... = BEGINNING_OF_WINDOW: 1
-
- .1.. = END_OF_WINDOW: 1
-
- ..10 0101 0001 1... = STARTING_SEQUENCE_NUMBER: 1187
-
+ Desc
+
+ ...0 = FINAL_ACK_INDICATION: False
+
+ 1... = BEGINNING_OF_WINDOW: 1
+
+ .1.. = END_OF_WINDOW: 1
+
+ ..10 0101 0001 1... = STARTING_SEQUENCE_NUMBER: 1187
+
.0.. = CRBB Exist: 0
minimal size is 24 rest_bits */
rest_bits -= 24;
@@ -1051,15 +1051,15 @@
{
unsigned wp = 0;
- bitvec_write_field(dest, ,0x1,2); // Payload Type
- bitvec_write_field(dest, ,0x0,3); // No polling
- bitvec_write_field(dest, ,0x0,3); // Uplink state flag
- bitvec_write_field(dest, ,0x22,6); // MESSAGE TYPE
+ bitvec_write_field(dest, , 0x1, 2); // Payload Type
+ bitvec_write_field(dest, , 0x0, 3); // No polling
+ bitvec_write_field(dest, , 0x0, 3); // Uplink state flag
+ bitvec_write_field(dest, , 0x22, 6); // MESSAGE TYPE
- bitvec_write_field(dest, ,0x0,2); // Page Mode
+ bitvec_write_field(dest, , 0x0, 2); // Page Mode
- bitvec_write_field(dest, ,0x0,1); // No PERSISTENCE_LEVEL
- bitvec_write_field(dest, ,0x0,1); // No NLN
+ bitvec_write_field(dest, , 0x0, 1); // No PERSISTENCE_LEVEL
+ bitvec_write_field(dest, , 0x0, 1); // No NLN
return wp;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15717
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I80ac88f50bfedfd2b86d548883313b5a187b1e8f
Gerrit-Change-Number: 15717
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Change in ...osmo-bts[master]: remove dummy UL measurement results for lost sacch frames
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14762 ) Change subject: remove dummy UL measurement results for lost sacch frames .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa123f8d02a9d8be1f6de6923fc2a8628020145 Gerrit-Change-Number: 14762 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 17:14:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: gprs_mm_state_iu_fsm.c: fix: assign timer_cb to mm_state_iu_fsm
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15718 ) Change subject: gprs_mm_state_iu_fsm.c: fix: assign timer_cb to mm_state_iu_fsm .. gprs_mm_state_iu_fsm.c: fix: assign timer_cb to mm_state_iu_fsm GCC warns us that 'pmm_state_fsm_timer_cb' is defined but not used. This function was introduced in [1], but was not assigned to the FSM. [1] I66c2ac0350cb074aefd9a22c5121acf723f239d3 Change-Id: Ib040befc87b2676aad2b8fe3671404fb3f5b030b --- M src/sgsn/gprs_mm_state_iu_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index e6b80d7..ea31941 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -140,6 +140,7 @@ .states = mm_state_iu_fsm_states, .num_states = ARRAY_SIZE(mm_state_iu_fsm_states), .event_names = mm_state_iu_fsm_event_names, + .timer_cb = pmm_state_fsm_timer_cb, .log_subsys = DMM, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib040befc87b2676aad2b8fe3671404fb3f5b030b Gerrit-Change-Number: 15718 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-MessageType: merged
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15560 ) Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 17:13:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: SRAM linker script: shift start of RAM by 64kByte
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15688 ) Change subject: SRAM linker script: shift start of RAM by 64kByte .. Patch Set 4: I guess this can be abandoned, it was part of a somewhat misguided attempt to run the whole fw from ram. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15688 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: I69ed656ac7007c5b8aa08c18569a7da5fe6ef277 Gerrit-Change-Number: 15688 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Oct 2019 17:04:25 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: paging: reduce paging response timer to 3 sec
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15527 ) Change subject: paging: reduce paging response timer to 3 sec .. Patch Set 5: This is possibly dangerous. Paging on GSM can take a rather long time, and it depends on factors such as CCCH/PCH capacity, configuration parameters such as number of paging groups, DRX cycle, ... See e.g. http://gsm-optimization.blogspot.com/2012/04/paging-group.html or http://etutorials.org/Mobile+devices/gprs+mobile+internet/Chapter+5+Radio+Interface+RLC+MAC+Layer/Listening+to+MS+Paging+Blocks/ If you have configured 9 paging groups, then the paging of one group only occurs once every 9 51-multiframes, which is 9*240ms, i.e. 2.1 seconds. And as you mapy page any number of MS at the same time in that paging group, there's queueing and quite a bit of delay. so 10s is actually not even the upper bound, IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie695aa67458753794d70ed5154df51bfe6696da3 Gerrit-Change-Number: 15527 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:56:37 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: WIP: change IRQ endpoint re-submit logic.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15689 ) Change subject: WIP: change IRQ endpoint re-submit logic. .. Patch Set 4: The interrupt EP is not driven semi-synchronously by reacting to corresponding transfers from the host like the bulk EPs (the SIE will only automagically NAK all IN transfers from the host as long as no data is available), data is instead prepared asynchronously caused by changes to the sim card status, therefore attempting to submit a transfer while the ep is busy should not be an error condition. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15689 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: I41e77eec5f01bf082f8cb7331fbf7baae1c132ed Gerrit-Change-Number: 15689 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Oct 2019 16:54:42 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: log: set L1 SAPI log context
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI log context .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Oct 2019 16:48:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15550 ) Change subject: vty: add "logging filter l1-sapi" .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:48:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15726 )
Change subject: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
..
VTY: refactor pcu_vty_show_ms_all(): use show_ms()
Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750
---
M src/pcu_vty_functions.cpp
1 file changed, 11 insertions(+), 24 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index 3008267..fd8474b 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -124,30 +124,6 @@
return CMD_SUCCESS;
}
-int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data)
-{
- BTS *bts = bts_data->bts;
- LListHead *ms_iter;
-
- llist_for_each(ms_iter, >ms_store().ms_list()) {
- GprsMs *ms = ms_iter->entry();
-
- vty_out(vty, "MS TLLI=%08x, TA=%d, CS-UL=%s, CS-DL=%s, LLC=%zd,
Cl=%d, E-Cl=%d,"
- " TBF-UL=%s, TBF-DL=%s, IMSI=%s%s",
- ms->tlli(),
- ms->ta(), mcs_name(ms->current_cs_ul()),
- mcs_name(ms->current_cs_dl()),
- ms->llc_queue()->size(),
- ms->ms_class(),
- ms->egprs_ms_class(),
- ms->ul_tbf() ? ms->ul_tbf()->state_name() : "NA",
- ms->dl_tbf() ? ms->dl_tbf()->state_name() : "NA",
- ms->imsi(),
- VTY_NEWLINE);
- }
- return CMD_SUCCESS;
-}
-
static int show_ms(struct vty *vty, GprsMs *ms)
{
unsigned i;
@@ -230,6 +206,17 @@
return CMD_SUCCESS;
}
+int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data)
+{
+ BTS *bts = bts_data->bts;
+ LListHead *ms_iter;
+
+ llist_for_each(ms_iter, >ms_store().ms_list())
+ show_ms(vty, ms_iter->entry());
+
+ return CMD_SUCCESS;
+}
+
int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t tlli)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15726
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750
Gerrit-Change-Number: 15726
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-pcu[master]: VTY: fix command 'show tbf all': properly filter TBFs
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15727 )
Change subject: VTY: fix command 'show tbf all': properly filter TBFs
..
VTY: fix command 'show tbf all': properly filter TBFs
For a long time the VTY command to show all active TBFs was broken.
The TBF filtering (by allocation origin) logic allows one to show
TBFs allocated on CCCH, PACCH, or on both of them. In the latter
case we have been checking whether a TBF was allocated on both
logical channels at the same time.
Let's fix this by passing a flag-mask instead of boolean arguments.
To be able to use GPRS_RLCMAC_FLAG_* definitions from "tbf.h", let's
exclude them from "#ifdef __cplusplus ... #endif" block.
Change-Id: I1c9f401368af880a97d32905c4cce0da481ffc21
---
M src/pcu_vty.c
M src/pcu_vty_functions.cpp
M src/pcu_vty_functions.h
M src/tbf.h
4 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index 23a42e7..996ce61 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -1165,13 +1165,14 @@
"TBFs allocated via PACCH\n")
{
struct gprs_rlcmac_bts *bts = bts_main_data();
- if (!strcmp(argv[0], "all"))
- return pcu_vty_show_tbf_all(vty, bts, true, true);
+ uint32_t flags = UINT32_MAX;
- if (!strcmp(argv[0], "ccch"))
- return pcu_vty_show_tbf_all(vty, bts_main_data(), true, false);
+ if (argv[0][0] == 'c')
+ flags = (1 << GPRS_RLCMAC_FLAG_CCCH);
+ else if (argv[0][0] == 'p')
+ flags = (1 << GPRS_RLCMAC_FLAG_PACCH);
- return pcu_vty_show_tbf_all(vty, bts_main_data(), false, true);
+ return pcu_vty_show_tbf_all(vty, bts, flags);
}
DEFUN(show_ms_all,
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index fd8474b..7b6c84f 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -45,17 +45,11 @@
#include "coding_scheme.h"
}
-static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf, bool
show_ccch, bool show_pacch)
+static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf)
{
gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);
gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);
- if (show_ccch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))
- return;
-
- if (show_pacch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))
- return;
-
vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s",
tbf->tfi(),
tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid",
tbf->ta(),
@@ -108,18 +102,22 @@
vty_out(vty, "%s%s", VTY_NEWLINE, VTY_NEWLINE);
}
-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
bool show_ccch, bool show_pacch)
+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t flags)
{
BTS *bts = bts_data->bts;
- LListHead *ms_iter;
+ LListHead *iter;
vty_out(vty, "UL TBFs%s", VTY_NEWLINE);
- llist_for_each(ms_iter, >ul_tbfs())
- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch,
show_pacch);
+ llist_for_each(iter, >ul_tbfs()) {
+ if (iter->entry()->state_flags & flags)
+ tbf_print_vty_info(vty, iter->entry());
+ }
vty_out(vty, "%sDL TBFs%s", VTY_NEWLINE, VTY_NEWLINE);
- llist_for_each(ms_iter, >dl_tbfs())
- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch,
show_pacch);
+ llist_for_each(iter, >dl_tbfs()) {
+ if (iter->entry()->state_flags & flags)
+ tbf_print_vty_info(vty, iter->entry());
+ }
return CMD_SUCCESS;
}
diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h
index 3fef208..6fbc366 100644
--- a/src/pcu_vty_functions.h
+++ b/src/pcu_vty_functions.h
@@ -27,7 +27,7 @@
struct vty;
struct gprs_rlcmac_bts;
-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
bool show_ccch, bool show_pacch);
+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t flags);
int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data);
int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t tlli);
diff --git a/src/tbf.h b/src/tbf.h
index fd65b20..9545385 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -38,6 +38,8 @@
class GprsMs;
struct gprs_rlcmac_bts;
+#endif
+
/*
* TBF instance
*/
@@ -171,6 +173,8 @@
#define TBF_ASS_TYPE_SET(t, kind) do { t->ass_type_mod(kind, false, __FILE__,
__LINE__); } while(0)
#define TBF_ASS_TYPE_UNSET(t, kind) do { t->ass_type_mod(kind, true, __FILE__,
__LINE__); } while(0)
Change in ...osmo-pcu[master]: VTY: fix command 'show tbf all': properly filter TBFs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15727 ) Change subject: VTY: fix command 'show tbf all': properly filter TBFs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1c9f401368af880a97d32905c4cce0da481ffc21 Gerrit-Change-Number: 15727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:47:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15726 ) Change subject: VTY: refactor pcu_vty_show_ms_all(): use show_ms() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750 Gerrit-Change-Number: 15726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:46:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15716 ) Change subject: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d Gerrit-Change-Number: 15716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:45:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15714 )
Change subject: L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U
..
L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U
Change-Id: Id69010ffa8c697e8c01bbb21509253c330f95343
---
M src/common/l1sap.c
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 0696fab..7d403f0 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -333,13 +333,6 @@
if (L1SAP_IS_PTCCH(fn)) {
*chan_type = GSMTAP_CHANNEL_PTCCH;
*ss = L1SAP_FN2PTCCHBLOCK(fn);
- if (l1sap->oph.primitive == PRIM_OP_INDICATION) {
- OSMO_ASSERT(len > 0);
- if ((*data[0]) == 7)
- return -EINVAL;
- (*data)++;
- (*len)--;
- }
} else
*chan_type = GSMTAP_CHANNEL_PACCH;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15714
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id69010ffa8c697e8c01bbb21509253c330f95343
Gerrit-Change-Number: 15714
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15716 )
Change subject: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject
them
..
L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d
---
M src/common/l1sap.c
1 file changed, 18 insertions(+), 16 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 87ef01b..2008f0e 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1109,11 +1109,20 @@
DEBUGPGT(DL1P, _time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x
len=%d\n",
rsl_chan_nr_str(chan_nr), link_id, len);
+ /* Actually, there can be no DATA.ind on PTCCH/U (rather RACH.ind
instead),
+* but some BTS models with buggy implementation may still be sending
them
+* to us. Let's keep this for backwards compatibility. */
+ if (L1SAP_IS_CHAN_PDCH(chan_nr) && L1SAP_IS_PTCCH(fn)) {
+ LOGPGT(DL1P, LOGL_NOTICE, _time, "There can be no DATA.ind on
PTCCH/U. "
+ "This is probably a bug of the BTS model you're using,
please fix!\n");
+ return -EINVAL;
+ }
+
if (ts_is_pdch(>ts[tn])) {
lchan = get_lchan_by_chan_nr(trx, chan_nr);
if (!lchan)
LOGPGT(DL1P, LOGL_ERROR, _time, "No lchan for
chan_nr=%s\n", rsl_chan_nr_str(chan_nr));
- if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) {
+ if (lchan && lchan->loopback) {
/* we are in loopback mode (for BER testing)
* mode and need to enqeue the frame to be
* returned in downlink */
@@ -1128,21 +1137,14 @@
/* don't send bad frames to PCU */
if (len == 0)
return -EINVAL;
- if (L1SAP_IS_PTCCH(fn)) {
- pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PTCCH, fn,
- trx->arfcn, L1SAP_FN2PTCCHBLOCK(fn),
- data, len, rssi, data_ind->ber10k,
- data_ind->ta_offs_256bits/64,
- data_ind->lqual_cb);
- } else {
- /* drop incomplete UL block */
- if (pr_info != PRES_INFO_BOTH)
- return 0;
- /* PDTCH / PACCH frame handling */
- pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PDTCH, fn,
trx->arfcn,
- L1SAP_FN2MACBLOCK(fn), data, len, rssi,
data_ind->ber10k,
- data_ind->ta_offs_256bits/64,
data_ind->lqual_cb);
- }
+ /* drop incomplete UL block */
+ if (pr_info != PRES_INFO_BOTH)
+ return 0;
+
+ /* PDTCH / PACCH frame handling */
+ pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PDTCH, fn, trx->arfcn,
+ L1SAP_FN2MACBLOCK(fn), data, len, rssi,
data_ind->ber10k,
+ data_ind->ta_offs_256bits/64,
data_ind->lqual_cb);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15716
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d
Gerrit-Change-Number: 15716
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15715 )
Change subject: L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default
..
L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default
We don't know whether a data block on PDCH belongs to PDTCH or PACCH
without parsing it, because the latter one is being allocated on
demand. Let's use GSMTAP_CHANNEL_PDTCH by default, rather than
GSMTAP_CHANNEL_PACCH.
Change-Id: I7639215ef936a8ac05ca417a91f4e12755f318d4
---
M src/common/l1sap.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 7d403f0..87ef01b 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -333,8 +333,10 @@
if (L1SAP_IS_PTCCH(fn)) {
*chan_type = GSMTAP_CHANNEL_PTCCH;
*ss = L1SAP_FN2PTCCHBLOCK(fn);
- } else
- *chan_type = GSMTAP_CHANNEL_PACCH;
+ } else {
+ /* TODO: distinguish PACCH */
+ *chan_type = GSMTAP_CHANNEL_PDTCH;
+ }
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15715
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7639215ef936a8ac05ca417a91f4e12755f318d4
Gerrit-Change-Number: 15715
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: L1SAP: use the actual ARFCN for outgoing PCUIF messages
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15713 )
Change subject: L1SAP: use the actual ARFCN for outgoing PCUIF messages
..
L1SAP: use the actual ARFCN for outgoing PCUIF messages
Change-Id: I07b3aac97603d85fb6cf077d3a342b12b0643171
---
M src/common/l1sap.c
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 67d569b..0696fab 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -802,10 +802,10 @@
} else {
/* forward RTS.ind to PCU */
if (L1SAP_IS_PTCCH(rts_ind->fn)) {
- pcu_tx_rts_req(>ts[tn], 1, fn, 1 /* ARFCN
*/,
+ pcu_tx_rts_req(>ts[tn], 1, fn, trx->arfcn,
L1SAP_FN2PTCCHBLOCK(fn));
} else {
- pcu_tx_rts_req(>ts[tn], 0, fn, 0 /* ARFCN
*/,
+ pcu_tx_rts_req(>ts[tn], 0, fn, trx->arfcn,
L1SAP_FN2MACBLOCK(fn));
}
/* return early, PCU takes care of rest */
@@ -1135,7 +1135,7 @@
return -EINVAL;
if (L1SAP_IS_PTCCH(fn)) {
pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PTCCH, fn,
- 0 /* ARFCN */, L1SAP_FN2PTCCHBLOCK(fn),
+ trx->arfcn, L1SAP_FN2PTCCHBLOCK(fn),
data, len, rssi, data_ind->ber10k,
data_ind->ta_offs_256bits/64,
data_ind->lqual_cb);
@@ -1144,7 +1144,7 @@
if (pr_info != PRES_INFO_BOTH)
return 0;
/* PDTCH / PACCH frame handling */
- pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PDTCH, fn, 0
/* ARFCN */,
+ pcu_tx_data_ind(>ts[tn], PCU_IF_SAPI_PDTCH, fn,
trx->arfcn,
L1SAP_FN2MACBLOCK(fn), data, len, rssi,
data_ind->ber10k,
data_ind->ta_offs_256bits/64,
data_ind->lqual_cb);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15713
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I07b3aac97603d85fb6cf077d3a342b12b0643171
Gerrit-Change-Number: 15713
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15715 ) Change subject: L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7639215ef936a8ac05ca417a91f4e12755f318d4 Gerrit-Change-Number: 15715 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:45:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15714 ) Change subject: L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id69010ffa8c697e8c01bbb21509253c330f95343 Gerrit-Change-Number: 15714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:44:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: use the actual ARFCN for outgoing PCUIF messages
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15713 ) Change subject: L1SAP: use the actual ARFCN for outgoing PCUIF messages .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I07b3aac97603d85fb6cf077d3a342b12b0643171 Gerrit-Change-Number: 15713 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 16:44:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-gsm-manuals[master]: sigtran-osmocom.adoc: Fix typos
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 ) Change subject: sigtran-osmocom.adoc: Fix typos .. sigtran-osmocom.adoc: Fix typos Change-Id: I31314dd36bac202103483bc93350736bfbc76be1 --- M common/chapters/sigtran-osmocom.adoc 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/sigtran-osmocom.adoc b/common/chapters/sigtran-osmocom.adoc index 1f2bb1e..a0bc475 100644 --- a/common/chapters/sigtran-osmocom.adoc +++ b/common/chapters/sigtran-osmocom.adoc @@ -152,8 +152,8 @@ . implement SCCP connection coupling. This is something like a proxy for connection-oriented SCCP, and is what is used in SS7 to route - beyond a given MTP netwokr (e.g. at gateways between different MTP - networks) + beyond a given MTP network (e.g. at gateways between different MTP + networks). . consider all SCCP messages to be destined for the local point code of the receiver. This then means that the SG functionality must be @@ -231,7 +231,7 @@ * to point all BSCs and the MSC to connect to the IP+Port of the STP * to configure the point code of the MSC in the BSCs - A minimaal 3G configuration to get started + A minimal 3G configuration to get started You will be running the following programs: @@ -252,7 +252,7 @@ You can use the OsmoSTP fully dynamic registration feature, so the -HNBGWs, the SMC and the SGSNwill simply register with their point +HNBGWs, the MSC and the SGSN will simply register with their point codes to the STP, and the STP will create most configuration on the fly. @@ -345,7 +345,7 @@ |Description|More verbose description (for human user only) |Protocol|Protocol (M3UA, SUA, IPA) to be operated by this server |Routing Key|Routing Key (mostly Point Code) routed to this AS -|Traffic Mode|Theoretically Bradcast, Load-Balance. Currently only Ovverride +|Traffic Mode|Theoretically Broadcast, Load-Balance. Currently only Override |Recovery Timeout|Duration of the AS T(r) recovery timer. During this time, outgoing messages are queued. If the AS is ACTIVE before timer expiration, the queue is drained. At @@ -398,7 +398,7 @@ === Osmocom SCCP Instances -An Osmocom SS7 Instance can be bound to an Osmocom SS7 Instance. It +An Osmocom SCCP Instance can be bound to an Osmocom SS7 Instance. It will register/bind for the ITU-standard Service Indicator (SI). === Osmocom SCCP User @@ -419,7 +419,7 @@ This is how Osmocom represents each individual connection of connection-oriented SCCP. -To illustrate the practical applicaiton: For the common use case of +To illustrate the practical application: For the common use case of the A or Iu interfaces, this means that every dedicated radio channel that is currently active to any UE/MS has one SCCP connection to the MSC and/or SGSN. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I31314dd36bac202103483bc93350736bfbc76be1 Gerrit-Change-Number: 15739 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-gsm-manuals[master]: sigtran-osmocom.adoc: Fix typos
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 ) Change subject: sigtran-osmocom.adoc: Fix typos .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I31314dd36bac202103483bc93350736bfbc76be1 Gerrit-Change-Number: 15739 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Oct 2019 16:42:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-gsm-manuals[master]: sigtran-osmocom.adoc: Fix typos
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 Change subject: sigtran-osmocom.adoc: Fix typos .. sigtran-osmocom.adoc: Fix typos Change-Id: I31314dd36bac202103483bc93350736bfbc76be1 --- M common/chapters/sigtran-osmocom.adoc 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/39/15739/1 diff --git a/common/chapters/sigtran-osmocom.adoc b/common/chapters/sigtran-osmocom.adoc index 1f2bb1e..a0bc475 100644 --- a/common/chapters/sigtran-osmocom.adoc +++ b/common/chapters/sigtran-osmocom.adoc @@ -152,8 +152,8 @@ . implement SCCP connection coupling. This is something like a proxy for connection-oriented SCCP, and is what is used in SS7 to route - beyond a given MTP netwokr (e.g. at gateways between different MTP - networks) + beyond a given MTP network (e.g. at gateways between different MTP + networks). . consider all SCCP messages to be destined for the local point code of the receiver. This then means that the SG functionality must be @@ -231,7 +231,7 @@ * to point all BSCs and the MSC to connect to the IP+Port of the STP * to configure the point code of the MSC in the BSCs - A minimaal 3G configuration to get started + A minimal 3G configuration to get started You will be running the following programs: @@ -252,7 +252,7 @@ You can use the OsmoSTP fully dynamic registration feature, so the -HNBGWs, the SMC and the SGSNwill simply register with their point +HNBGWs, the MSC and the SGSN will simply register with their point codes to the STP, and the STP will create most configuration on the fly. @@ -345,7 +345,7 @@ |Description|More verbose description (for human user only) |Protocol|Protocol (M3UA, SUA, IPA) to be operated by this server |Routing Key|Routing Key (mostly Point Code) routed to this AS -|Traffic Mode|Theoretically Bradcast, Load-Balance. Currently only Ovverride +|Traffic Mode|Theoretically Broadcast, Load-Balance. Currently only Override |Recovery Timeout|Duration of the AS T(r) recovery timer. During this time, outgoing messages are queued. If the AS is ACTIVE before timer expiration, the queue is drained. At @@ -398,7 +398,7 @@ === Osmocom SCCP Instances -An Osmocom SS7 Instance can be bound to an Osmocom SS7 Instance. It +An Osmocom SCCP Instance can be bound to an Osmocom SS7 Instance. It will register/bind for the ITU-standard Service Indicator (SI). === Osmocom SCCP User @@ -419,7 +419,7 @@ This is how Osmocom represents each individual connection of connection-oriented SCCP. -To illustrate the practical applicaiton: For the common use case of +To illustrate the practical application: For the common use case of the A or Iu interfaces, this means that every dedicated radio channel that is currently active to any UE/MS has one SCCP connection to the MSC and/or SGSN. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I31314dd36bac202103483bc93350736bfbc76be1 Gerrit-Change-Number: 15739 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ccid-firmware[master]: 'cuart' Card-UART abstraction + driver for simple serial reader
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15691 )
Change subject: 'cuart' Card-UART abstraction + driver for simple serial reader
..
'cuart' Card-UART abstraction + driver for simple serial reader
Change-Id: Ic7e324d99f78b3bfb98fc667d9a1b7fa363f092d
---
A ccid_common/cuart.c
A ccid_common/cuart.h
M ccid_host/Makefile
A ccid_host/cuart_driver_tty.c
A ccid_host/cuart_test.c
A ccid_host/utils_ringbuffer.c
A ccid_host/utils_ringbuffer.h
7 files changed, 836 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
new file mode 100644
index 000..2c0428e
--- /dev/null
+++ b/ccid_common/cuart.c
@@ -0,0 +1,133 @@
+#include
+#include
+#include
+#include
+
+#include "cuart.h"
+
+static LLIST_HEAD(g_cuart_drivers);
+
+const struct value_string card_uart_event_vals[] = {
+ OSMO_VALUE_STRING(CUART_E_RX_SINGLE),
+ OSMO_VALUE_STRING(CUART_E_RX_COMPLETE),
+ OSMO_VALUE_STRING(CUART_E_RX_TIMEOUT),
+ OSMO_VALUE_STRING(CUART_E_TX_COMPLETE),
+ { 0, NULL }
+};
+
+static struct card_uart_driver *cuart_drv_by_name(const char *driver_name)
+{
+ struct card_uart_driver *drv;
+ llist_for_each_entry(drv, _cuart_drivers, list) {
+ if (!strcmp(drv->name, driver_name))
+ return drv;
+ }
+ return NULL;
+}
+
+int card_uart_open(struct card_uart *cuart, const char *driver_name, const
char *device_name)
+{
+ struct card_uart_driver *drv = cuart_drv_by_name(driver_name);
+ int rc;
+
+ if (!drv)
+ return -ENODEV;
+
+ cuart->rx_enabled = true;
+ cuart->rx_threshold = 1;
+
+ rc = drv->ops->open(cuart, device_name);
+ if (rc < 0)
+ return rc;
+
+ cuart->driver = drv;
+ return 0;
+}
+
+int card_uart_close(struct card_uart *cuart)
+{
+ OSMO_ASSERT(cuart);
+ OSMO_ASSERT(cuart->driver);
+ OSMO_ASSERT(cuart->driver->ops);
+ OSMO_ASSERT(cuart->driver->ops->close);
+ return cuart->driver->ops->close(cuart);
+}
+
+int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable)
+{
+ int rc;
+ OSMO_ASSERT(cuart);
+ OSMO_ASSERT(cuart->driver);
+ OSMO_ASSERT(cuart->driver->ops);
+ OSMO_ASSERT(cuart->driver->ops->ctrl);
+ rc = cuart->driver->ops->ctrl(cuart, ctl, enable);
+ if (rc < 0)
+ return rc;
+
+ switch (ctl) {
+ case CUART_CTL_RX:
+ cuart->rx_enabled = enable;
+ break;
+ default:
+ break;
+ }
+
+ return rc;
+}
+
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete)
+{
+ OSMO_ASSERT(cuart);
+ OSMO_ASSERT(cuart->driver);
+ OSMO_ASSERT(cuart->driver->ops);
+ OSMO_ASSERT(cuart->driver->ops->async_tx);
+
+ OSMO_ASSERT(!cuart->tx_busy);
+ cuart->tx_busy = true;
+ /* disable receiver to avoid receiving what we transmit */
+ card_uart_ctrl(cuart, CUART_CTL_RX, false);
+
+ return cuart->driver->ops->async_tx(cuart, data, len,
rx_after_complete);
+}
+
+int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len)
+{
+ OSMO_ASSERT(cuart);
+ OSMO_ASSERT(cuart->driver);
+ OSMO_ASSERT(cuart->driver->ops);
+ OSMO_ASSERT(cuart->driver->ops->async_rx);
+ return cuart->driver->ops->async_rx(cuart, data, len);
+}
+
+void card_uart_set_rx_threshold(struct card_uart *cuart, size_t rx_threshold)
+{
+ cuart->rx_threshold = rx_threshold;
+}
+
+void card_uart_notification(struct card_uart *cuart, enum card_uart_event evt,
void *data)
+{
+ OSMO_ASSERT(cuart);
+ OSMO_ASSERT(cuart->handle_event);
+
+ switch (evt) {
+ case CUART_E_TX_COMPLETE:
+ cuart->tx_busy = false;
+ /* re-enable receiver if we're done with transmit */
+ sleep(1);
+ card_uart_ctrl(cuart, CUART_CTL_RX, true);
+ break;
+ default:
+ break;
+ }
+
+ cuart->handle_event(cuart, evt, data);
+}
+
+int card_uart_driver_register(struct card_uart_driver *drv)
+{
+ OSMO_ASSERT(!cuart_drv_by_name(drv->name));
+ OSMO_ASSERT(drv->name);
+ OSMO_ASSERT(drv->ops);
+ llist_add_tail(>list, _cuart_drivers);
+ return 0;
+}
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
new file mode 100644
index 000..7e217db
--- /dev/null
+++ b/ccid_common/cuart.h
@@ -0,0 +1,107 @@
+#pragma once
+#include
+#include
+#include
+
+#include
+#include "utils_ringbuffer.h"
+
+enum card_uart_event {
+ /* a single byte was received, it's present at the (uint8_t *) data
location */
+ CUART_E_RX_SINGLE,
+ /* an entire block of data was
Change in ...osmo-ccid-firmware[master]: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15695 )
Change subject: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty
..
make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty
This works up to the point that we're getting the ATR displayed in
pcsc_scan
Change-Id: Ic656fff4a9c6b9aaf4b91aa16f66972ad28f8423
---
A ccid_common/ccid_slot_fsm.c
M ccid_host/Makefile
M ccid_host/ccid_main_functionfs.c
3 files changed, 218 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c
new file mode 100644
index 000..06c14f1
--- /dev/null
+++ b/ccid_common/ccid_slot_fsm.c
@@ -0,0 +1,210 @@
+/* Code providing a ccid_slot_ops implementation based on iso7716_fsm,
+ * (which in turn sits on top of card_uart) */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include "ccid_device.h"
+#include "cuart.h"
+#include "iso7816_fsm.h"
+
+struct iso_fsm_slot {
+ /* CCID slot above us */
+ struct ccid_slot *cs;
+ /* main ISO7816-3 FSM instance beneath us */
+ struct osmo_fsm_inst *fi;
+ /* UART beneath the ISO7816-3 FSM */
+ struct card_uart *cuart;
+ /* bSeq of the operation currently in progress */
+ uint8_t seq;
+};
+
+struct iso_fsm_slot_instance {
+ struct iso_fsm_slot slot[NR_SLOTS];
+};
+
+static struct iso_fsm_slot_instance g_si;
+
+struct iso_fsm_slot *ccid_slot2iso_fsm_slot(struct ccid_slot *cs)
+{
+ OSMO_ASSERT(cs->slot_nr < ARRAY_SIZE(g_si.slot));
+ return _si.slot[cs->slot_nr];
+}
+
+static const uint8_t sysmousim_sjs1_atr[] = {
+ 0x3B, 0x9F, 0x96, 0x80, 0x1F, 0xC7, 0x80, 0x31,
+ 0xA0, 0x73, 0xBE, 0x21, 0x13, 0x67, 0x43, 0x20,
+ 0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 };
+
+static const struct ccid_pars_decoded iso_fsm_def_pars = {
+ .fi = 372,
+ .di = 1,
+ .clock_stop = CCID_CLOCK_STOP_NOTALLOWED,
+ .inverse_convention = false,
+ .t0 = {
+ .guard_time_etu = 0,
+ .waiting_integer = 0,
+ },
+ /* FIXME: T=1 */
+};
+
+static void iso_fsm_slot_pre_proc_cb(struct ccid_slot *cs, struct msgb *msg)
+{
+ /* do nothing; real hardware would update the slot related state here */
+}
+
+static void iso_fsm_slot_icc_power_on_async(struct ccid_slot *cs, struct msgb
*msg,
+ const struct
ccid_pc_to_rdr_icc_power_on *ipo)
+{
+ struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);
+
+ ss->seq = ipo->hdr.bSeq;
+ LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n");
+
+ /* FIXME: do this via a FSM? */
+ card_uart_ctrl(ss->cuart, CUART_CTL_RST, true);
+ card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true);
+ osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL);
+ cs->icc_powered = true;
+ card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true);
+ usleep(1);
+ card_uart_ctrl(ss->cuart, CUART_CTL_RST, false);
+ osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL);
+
+ msgb_free(msg);
+ /* continues in iso_fsm_clot_user_cb once ATR is received */
+}
+static void iso_fsm_clot_user_cb(struct osmo_fsm_inst *fi, int event, int
cause, void *data)
+{
+ struct iso_fsm_slot *ss = iso7816_fsm_get_user_priv(fi);
+ struct ccid_slot *cs = ss->cs;
+ struct msgb *tpdu, *resp;
+
+ LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, cause=%d, data=%p)\n", __func__,
event, cause, data);
+
+ switch (event) {
+ case ISO7816_E_ATR_DONE_IND:
+ tpdu = data;
+ /* FIXME: copy response data over */
+ resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0,
+ msgb_data(tpdu), msgb_length(tpdu));
+ ccid_slot_send_unbusy(cs, resp);
+ msgb_free(tpdu);
+ break;
+ case ISO7816_E_TPDU_DONE_IND:
+ tpdu = data;
+ /* FIXME: copy response data over */
+ resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0,
msgb_l2(tpdu), msgb_l2len(tpdu));
+ ccid_slot_send_unbusy(cs, resp);
+ msgb_free(tpdu);
+ break;
+ }
+}
+
+static void iso_fsm_slot_xfr_block_async(struct ccid_slot *cs, struct msgb
*msg,
+ const struct ccid_pc_to_rdr_xfr_block *xfb)
+{
+ struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);
+
+ LOGPCS(cs, LOGL_DEBUG, "scheduling TPDU transfer\n");
+ ss->seq = xfb->hdr.bSeq;
+ osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_TPDU_CMD, msg);
+ /* continues in iso_fsm_clot_user_cb once response/error/timeout is
received */
+}
+
+
+static void
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Implement single-byte RX/TX
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697 )
Change subject: iso7816_fsm: Implement single-byte RX/TX
..
iso7816_fsm: Implement single-byte RX/TX
Change-Id: I31fb127e1cb2fda0856658a6511089c3d9e31c2a
---
M ccid_common/iso7816_fsm.c
1 file changed, 52 insertions(+), 17 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index f20cbcd..e173030 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -779,8 +779,22 @@
* TPDU FSM
***/
+/* In this FSM weu use the msgb for the TPDU as follows:
+ * - 5-byte TPDU header is at msg->data
+ * - COMMAND TPDU:
+ *- command bytes are provided after the header at msg->l2h
+ *- in case of incremental transmission, l3h points to next
to-be-transmitted byte
+ * - RESPONSE TPDU:
+ *- any response bytes are stored after the header at msg->l2h
+ */
+
+static inline struct osim_apdu_cmd_hdr *msgb_tpdu_hdr(struct msgb *msg) {
+ return (struct osim_apdu_cmd_hdr *) msgb_data(msg);
+}
+
struct tpdu_fsm_priv {
struct msgb *tpdu;
+ bool is_command; /* is this a command TPDU (true) or a response (false)
*/
};
/* type-safe method to obtain iso7816_3_priv from fi */
@@ -805,8 +819,14 @@
tfp->tpdu = (struct msgb *)data;
OSMO_ASSERT(msgb_length(tfp->tpdu) >= sizeof(*tpduh));
tfp->tpdu->l2h = msgb_data(tfp->tpdu) + sizeof(*tpduh);
- tpduh = msgb_data(tfp->tpdu);
- LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via
UART\n",
+ if (msgb_l2len(tfp->tpdu)) {
+ tfp->is_command = true;
+ tfp->tpdu->l3h = tfp->tpdu->l2h; /* next tx byte ==
first byte of body */
+ } else
+ tfp->is_command = false;
+ tpduh = msgb_tpdu_hdr(tfp->tpdu);
+ LOGPFSML(fi, LOGL_DEBUG, "Transmitting %s TPDU header %s via
UART\n",
+tfp->is_command ? "COMMAND" : "RESPONSE",
osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);
card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));
@@ -834,7 +854,7 @@
static void tpdu_s_procedure_action(struct osmo_fsm_inst *fi, uint32_t event,
void *data)
{
struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);
- struct osim_apdu_cmd_hdr *tpduh = msgb_data(tfp->tpdu);
+ struct osim_apdu_cmd_hdr *tpduh = msgb_tpdu_hdr(tfp->tpdu);
struct osmo_fsm_inst *parent_fi = fi->proc.parent;
struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);
uint8_t byte;
@@ -853,7 +873,7 @@
osmo_fsm_inst_state_chg(fi, TPDU_S_SW2, 0, 0);
break;
} else if (byte == tpduh->ins) {
- if (msgb_l2len(tfp->tpdu)) {
+ if (tfp->is_command) {
/* transmit all remaining bytes */
card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu));
osmo_fsm_inst_state_chg(fi,
TPDU_S_TX_REMAINING, 0, 0);
@@ -862,10 +882,15 @@
osmo_fsm_inst_state_chg(fi,
TPDU_S_RX_REMAINING, 0, 0);
}
} else if (byte == (tpduh->ins ^ 0xFF)) {
- osmo_panic("unsupported single-byte T=0 case");
- /* FIXME: transmit single byte then wait for proc */
- //osmo_fsm_inst_state_chg(fi, TPDU_S_xX_SINGLE, 0, 0);
- //osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);
+ /* transmit/recieve single byte then wait for proc */
+ if (tfp->is_command) {
+ /* transmit *next*, not first byte */
+ OSMO_ASSERT(msgb_l3len(tfp->tpdu) >= 0);
+ card_uart_tx(ip->uart, msgb_l3(tfp->tpdu), 1);
+ osmo_fsm_inst_state_chg(fi, TPDU_S_TX_SINGLE,
0, 0);
+ } else {
+ osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE,
0, 0);
+ }
} else
OSMO_ASSERT(0);
break;
@@ -893,10 +918,15 @@
/* UART is transmitting single byte of data; we wait for ISO7816_E_TX_COMPL */
static void tpdu_s_tx_single_action(struct osmo_fsm_inst *fi, uint32_t event,
void *data)
{
+ struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);
+
switch (event) {
case ISO7816_E_TX_COMPL:
- /*
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 )
Change subject: card_uart_tx: Remove last argument (we always have the receiver
active)
..
card_uart_tx: Remove last argument (we always have the receiver active)
Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_common/iso7816_fsm.c
M ccid_host/cuart_driver_tty.c
M ccid_host/cuart_test.c
5 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index 393bf55..895717a 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -75,7 +75,7 @@
return rc;
}
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete)
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len)
{
OSMO_ASSERT(cuart);
OSMO_ASSERT(cuart->driver);
@@ -87,7 +87,7 @@
/* disable receiver to avoid receiving what we transmit */
card_uart_ctrl(cuart, CUART_CTL_RX, false);
- return cuart->driver->ops->async_tx(cuart, data, len,
rx_after_complete);
+ return cuart->driver->ops->async_tx(cuart, data, len);
}
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len)
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index c28209f..790c277 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -30,7 +30,7 @@
struct card_uart_ops {
int (*open)(struct card_uart *cuart, const char *device_name);
int (*close)(struct card_uart *cuart);
- int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len, bool rx_after_complete);
+ int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len);
int (*async_rx)(struct card_uart *cuart, uint8_t *data, size_t len);
int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable);
@@ -93,7 +93,7 @@
int card_uart_close(struct card_uart *cuart);
/*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after
completion */
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete);
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len);
/*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE)
*/
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index f8fe14a..f20cbcd 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -809,7 +809,7 @@
LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via
UART\n",
osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);
- card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh), true);
+ card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));
break;
default:
OSMO_ASSERT(0);
@@ -855,7 +855,7 @@
} else if (byte == tpduh->ins) {
if (msgb_l2len(tfp->tpdu)) {
/* transmit all remaining bytes */
- card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu), true);
+ card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu));
osmo_fsm_inst_state_chg(fi,
TPDU_S_TX_REMAINING, 0, 0);
} else {
card_uart_set_rx_threshold(ip->uart, tpduh->p3);
diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 7fc8d3a..3695b58 100644
--- a/ccid_host/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
@@ -220,7 +220,7 @@
return 0;
}
-static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len, bool rx_after)
+static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len)
{
OSMO_ASSERT(cuart->driver == _uart_driver);
diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c
index 0ed6614..d4d8faf 100644
--- a/ccid_host/cuart_test.c
+++ b/ccid_host/cuart_test.c
@@ -44,7 +44,7 @@
static void test_apdu(void)
{
const uint8_t select_mf[] = "\xa0\xa4\x04\x00\x02\x3f\x00";
- card_uart_tx(_cuart, select_mf, 5, true);
+ card_uart_tx(_cuart, select_mf, 5);
osmo_select_main(true);
sleep(1);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696
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: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
Change in ...osmo-ccid-firmware[master]: cuart_driver_tty: Work around linux kernel bug ignoring CREAD
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15692 )
Change subject: cuart_driver_tty: Work around linux kernel bug ignoring CREAD
..
cuart_driver_tty: Work around linux kernel bug ignoring CREAD
Almost all linux USB serial drivers are ignoring CREAD and hence
cannot disable the receiver hardware, see
https://bugzilla.kernel.org/show_bug.cgi?id=205033
We therefore have to receive every byte we transmit before notifying the
user of transmit completion.
Change-Id: Id3cca29f78ee5469a1142aaa1ff754cc0427ec93
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_host/cuart_driver_tty.c
M ccid_host/cuart_test.c
4 files changed, 24 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index 2c0428e..393bf55 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -113,7 +113,6 @@
case CUART_E_TX_COMPLETE:
cuart->tx_busy = false;
/* re-enable receiver if we're done with transmit */
- sleep(1);
card_uart_ctrl(cuart, CUART_CTL_RX, true);
break;
default:
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index 7e217db..c28209f 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -77,6 +77,8 @@
size_t tx_buf_len;
/* index: offset of next to be transmitted byte in
tx_buf */
size_t tx_index;
+ /* number of bytes we have received echoed back during
transmit */
+ uint32_t rx_count_during_tx;
struct osmo_fd ofd;
unsigned int baudrate;
@@ -104,4 +106,3 @@
void card_uart_notification(struct card_uart *cuart, enum card_uart_event evt,
void *data);
int card_uart_driver_register(struct card_uart_driver *drv);
-
diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 6bd2b52..7fc8d3a 100644
--- a/ccid_host/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
@@ -125,7 +125,21 @@
rc = read(ofd->fd, buf, sizeof(buf));
OSMO_ASSERT(rc > 0);
for (i = 0; i < rc; i++) {
+#ifndef CREAD_ACTUALLY_WORKS
/* work-around for
https://bugzilla.kernel.org/show_bug.cgi?id=205033 */
+ if (cuart->tx_busy) {
+ if (cuart->u.tty.rx_count_during_tx <
cuart->u.tty.tx_buf_len) {
+ /* FIXME: compare! */
+ cuart->u.tty.rx_count_during_tx += 1;
+ if (cuart->u.tty.rx_count_during_tx ==
cuart->u.tty.tx_buf_len) {
+ cuart->tx_busy = false;
+ card_uart_notification(cuart,
CUART_E_TX_COMPLETE,
+ (void
*)cuart->u.tty.tx_buf);
+ }
+ continue;
+ }
+ }
+#endif
if (!cuart->rx_enabled)
continue;
@@ -152,12 +166,15 @@
/* if no more bytes to transmit, disable OSMO_FD_WRITE */
if (cuart->u.tty.tx_index >= cuart->u.tty.tx_buf_len) {
ofd->when &= ~BSC_FD_WRITE;
+#ifndef CREAD_ACTUALLY_WORKS
+ /* don't immediately notify user; first wait for
characters to be received */
+#else
/* ensure everything is written (tx queue/fifo drained)
*/
tcdrain(cuart->u.tty.ofd.fd);
- osmo_select_main(true);
cuart->tx_busy = false;
/* notify */
card_uart_notification(cuart, CUART_E_TX_COMPLETE,
(void *)cuart->u.tty.tx_buf);
+#endif
}
}
return 0;
@@ -209,7 +226,8 @@
cuart->u.tty.tx_buf = data;
cuart->u.tty.tx_buf_len = len;
- cuart->u.tty.tx_buf_len = len;
+ cuart->u.tty.tx_index = 0;
+ cuart->u.tty.rx_count_during_tx = 0;
cuart->tx_busy = true;
cuart->u.tty.ofd.when |= OSMO_FD_WRITE;
diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c
index aff9de7..0ed6614 100644
--- a/ccid_host/cuart_test.c
+++ b/ccid_host/cuart_test.c
@@ -47,6 +47,8 @@
card_uart_tx(_cuart, select_mf, 5, true);
osmo_select_main(true);
+ sleep(1);
+ osmo_select_main(true);
/* we should get an RX_SINGLE event here */
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15692
To unsubscribe, or for help writing mail filters, visit
Change in ...osmo-ccid-firmware[master]: 'cuart' Card-UART abstraction + driver for simple serial reader
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15691 ) Change subject: 'cuart' Card-UART abstraction + driver for simple serial reader .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15691 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: Ic7e324d99f78b3bfb98fc667d9a1b7fa363f092d Gerrit-Change-Number: 15691 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:36:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: Add cuart_fsm_test program
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15738 )
Change subject: Add cuart_fsm_test program
..
Add cuart_fsm_test program
Change-Id: I2b4be908b1bbd9b02f591a79b0eefaeae04badb8
---
M ccid_host/Makefile
A ccid_host/cuart_fsm_test.c
2 files changed, 122 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ccid_host/Makefile b/ccid_host/Makefile
index 8f75559..d7bc3be 100644
--- a/ccid_host/Makefile
+++ b/ccid_host/Makefile
@@ -1,7 +1,7 @@
CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I.
LIBS?=-lasan $(shell pkg-config --libs libosmocore)
-all: ccid_functionfs hub_functionfs cuart_test
+all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test
ccid_functionfs: ccid_main_functionfs.o \
ccid_slot_sim.o \
@@ -19,8 +19,16 @@
../ccid_common/cuart.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+cuart_fsm_test: cuart_fsm_test.o \
+ logging.o \
+ cuart_driver_tty.o \
+ utils_ringbuffer.o \
+ ../ccid_common/iso7816_fsm.o \
+ ../ccid_common/cuart.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim)
+
%.o: %.c
$(CC) $(CFLAGS) -o $@ -c $^
clean:
- rm -f ccid_functionfs hub_functionfs cuart_test *.o
+ rm -f ccid_functionfs hub_functionfs cuart_test cuart_fsm_test *.o
diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c
new file mode 100644
index 000..92f3437
--- /dev/null
+++ b/ccid_host/cuart_fsm_test.c
@@ -0,0 +1,112 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "logging.h"
+#include "cuart.h"
+#include "iso7816_fsm.h"
+
+static struct card_uart g_cuart;
+
+enum test_state {
+ ST_WAIT_ATR,
+ ST_ATR_DONE,
+ ST_IN_TPDU,
+};
+static enum test_state g_tstate = ST_WAIT_ATR;
+
+static void fsm_user_cb(struct osmo_fsm_inst *fi, int event, int cause, void
*data)
+{
+ printf("Handle FSM User Event %d: cause=%d, data=%p\n", event, cause,
data);
+ switch (event) {
+ case ISO7816_E_ATR_DONE_IND:
+ g_tstate = ST_ATR_DONE;
+ break;
+ case ISO7816_E_TPDU_DONE_IND:
+ printf("=== TPDU: %s\n", msgb_hexdump(data));
+ msgb_free(data);
+ g_tstate = ST_ATR_DONE;
+ default:
+ break;
+ }
+}
+
+static void *tall_main_ctx;
+
+static void signal_handler(int signal)
+{
+ switch (signal) {
+ case SIGUSR1:
+ talloc_report_full(tall_main_ctx, stderr);
+ break;
+ }
+}
+
+int main(int argc, char **argv)
+{
+ struct osmo_fsm_inst *fi;
+ uint8_t atr[64];
+ int rc;
+
+ tall_main_ctx = talloc_named_const(NULL, 0, "main");
+ msgb_talloc_ctx_init(tall_main_ctx, 0);
+ osmo_init_logging2(tall_main_ctx, _info);
+ osmo_fsm_log_addr(false);
+
+ signal(SIGUSR1, _handler);
+
+ rc = card_uart_open(_cuart, "tty", "/dev/ttyUSB5");
+ if (rc < 0) {
+ perror("opening UART");
+ exit(1);
+ }
+
+ fi = iso7816_fsm_alloc(NULL, LOGL_DEBUG, "SIM0", _cuart, fsm_user_cb,
NULL);
+ OSMO_ASSERT(fi);
+
+ /* activate reset, then power up */
+ card_uart_ctrl(_cuart, CUART_CTL_RST, true);
+ card_uart_ctrl(_cuart, CUART_CTL_POWER, true);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_POWER_UP_IND, NULL);
+
+ /* activate clock */
+ card_uart_ctrl(_cuart, CUART_CTL_CLOCK, true);
+
+ /* wait some time and release reset */
+ usleep(1);
+ card_uart_ctrl(_cuart, CUART_CTL_RST, false);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_RESET_REL_IND, NULL);
+
+ /* process any events in polling mode for initial change */
+ osmo_select_main(1);
+
+ struct msgb *apdu;
+ while (1) {
+ /* check if the new state requires us to do something */
+ switch (g_tstate) {
+ case ST_ATR_DONE:
+ apdu = msgb_alloc(512, "TPDU");
+ msgb_put_u8(apdu, 0x00);
+ msgb_put_u8(apdu, 0xa4);
+ msgb_put_u8(apdu, 0x00);
+ msgb_put_u8(apdu, 0x04);
+ msgb_put_u8(apdu, 0x02);
+ msgb_put_u8(apdu, 0x2f);
+ msgb_put_u8(apdu, 0x00);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_XCEIVE_TPDU_CMD,
apdu);
+ g_tstate = ST_IN_TPDU;
+ break;
+ default:
+ break;
+ }
+ osmo_select_main(0);
+ }
+
+ exit(0);
+}
--
To view, visit
Change in ...osmo-ccid-firmware[master]: add .gitignore file
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15693 ) Change subject: add .gitignore file .. add .gitignore file Change-Id: Iecd6caa00abf79f58199a8168aa8a1d3f5c9cf0a --- A .gitignore 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..67d3a67 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.o +ccid_host/ccid_functionfs +ccid_host/cuart_test +ccid_host/hub_functionfs -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15693 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: Iecd6caa00abf79f58199a8168aa8a1d3f5c9cf0a Gerrit-Change-Number: 15693 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-ccid-firmware[master]: Add cuart_fsm_test program
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15738 ) Change subject: Add cuart_fsm_test program .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15738 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: I2b4be908b1bbd9b02f591a79b0eefaeae04badb8 Gerrit-Change-Number: 15738 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 ) Change subject: card_uart_tx: Remove last argument (we always have the receiver active) .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 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: I8f82e9108d0eae86bbe4535403ccc680b7379a0e Gerrit-Change-Number: 15696 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15695 ) Change subject: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15695 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: Ic656fff4a9c6b9aaf4b91aa16f66972ad28f8423 Gerrit-Change-Number: 15695 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: ISO7816-3 FSMs as osmo_fsm
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15690 ) Change subject: ISO7816-3 FSMs as osmo_fsm .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15690 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: I0145b77e6165d36d33f18ef3a452f2c37913bd73 Gerrit-Change-Number: 15690 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: add .gitignore file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15693 ) Change subject: add .gitignore file .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15693 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: Iecd6caa00abf79f58199a8168aa8a1d3f5c9cf0a Gerrit-Change-Number: 15693 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: cuart_driver_tty: Work around linux kernel bug ignoring CREAD
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15692 ) Change subject: cuart_driver_tty: Work around linux kernel bug ignoring CREAD .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15692 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: Id3cca29f78ee5469a1142aaa1ff754cc0427ec93 Gerrit-Change-Number: 15692 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Implement single-byte RX/TX
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697 ) Change subject: iso7816_fsm: Implement single-byte RX/TX .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697 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: I31fb127e1cb2fda0856658a6511089c3d9e31c2a Gerrit-Change-Number: 15697 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: Add cuart_fsm_test program
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15738
Change subject: Add cuart_fsm_test program
..
Add cuart_fsm_test program
Change-Id: I2b4be908b1bbd9b02f591a79b0eefaeae04badb8
---
M ccid_host/Makefile
A ccid_host/cuart_fsm_test.c
2 files changed, 122 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/38/15738/1
diff --git a/ccid_host/Makefile b/ccid_host/Makefile
index 8f75559..d7bc3be 100644
--- a/ccid_host/Makefile
+++ b/ccid_host/Makefile
@@ -1,7 +1,7 @@
CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I.
LIBS?=-lasan $(shell pkg-config --libs libosmocore)
-all: ccid_functionfs hub_functionfs cuart_test
+all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test
ccid_functionfs: ccid_main_functionfs.o \
ccid_slot_sim.o \
@@ -19,8 +19,16 @@
../ccid_common/cuart.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+cuart_fsm_test: cuart_fsm_test.o \
+ logging.o \
+ cuart_driver_tty.o \
+ utils_ringbuffer.o \
+ ../ccid_common/iso7816_fsm.o \
+ ../ccid_common/cuart.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim)
+
%.o: %.c
$(CC) $(CFLAGS) -o $@ -c $^
clean:
- rm -f ccid_functionfs hub_functionfs cuart_test *.o
+ rm -f ccid_functionfs hub_functionfs cuart_test cuart_fsm_test *.o
diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c
new file mode 100644
index 000..92f3437
--- /dev/null
+++ b/ccid_host/cuart_fsm_test.c
@@ -0,0 +1,112 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "logging.h"
+#include "cuart.h"
+#include "iso7816_fsm.h"
+
+static struct card_uart g_cuart;
+
+enum test_state {
+ ST_WAIT_ATR,
+ ST_ATR_DONE,
+ ST_IN_TPDU,
+};
+static enum test_state g_tstate = ST_WAIT_ATR;
+
+static void fsm_user_cb(struct osmo_fsm_inst *fi, int event, int cause, void
*data)
+{
+ printf("Handle FSM User Event %d: cause=%d, data=%p\n", event, cause,
data);
+ switch (event) {
+ case ISO7816_E_ATR_DONE_IND:
+ g_tstate = ST_ATR_DONE;
+ break;
+ case ISO7816_E_TPDU_DONE_IND:
+ printf("=== TPDU: %s\n", msgb_hexdump(data));
+ msgb_free(data);
+ g_tstate = ST_ATR_DONE;
+ default:
+ break;
+ }
+}
+
+static void *tall_main_ctx;
+
+static void signal_handler(int signal)
+{
+ switch (signal) {
+ case SIGUSR1:
+ talloc_report_full(tall_main_ctx, stderr);
+ break;
+ }
+}
+
+int main(int argc, char **argv)
+{
+ struct osmo_fsm_inst *fi;
+ uint8_t atr[64];
+ int rc;
+
+ tall_main_ctx = talloc_named_const(NULL, 0, "main");
+ msgb_talloc_ctx_init(tall_main_ctx, 0);
+ osmo_init_logging2(tall_main_ctx, _info);
+ osmo_fsm_log_addr(false);
+
+ signal(SIGUSR1, _handler);
+
+ rc = card_uart_open(_cuart, "tty", "/dev/ttyUSB5");
+ if (rc < 0) {
+ perror("opening UART");
+ exit(1);
+ }
+
+ fi = iso7816_fsm_alloc(NULL, LOGL_DEBUG, "SIM0", _cuart, fsm_user_cb,
NULL);
+ OSMO_ASSERT(fi);
+
+ /* activate reset, then power up */
+ card_uart_ctrl(_cuart, CUART_CTL_RST, true);
+ card_uart_ctrl(_cuart, CUART_CTL_POWER, true);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_POWER_UP_IND, NULL);
+
+ /* activate clock */
+ card_uart_ctrl(_cuart, CUART_CTL_CLOCK, true);
+
+ /* wait some time and release reset */
+ usleep(1);
+ card_uart_ctrl(_cuart, CUART_CTL_RST, false);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_RESET_REL_IND, NULL);
+
+ /* process any events in polling mode for initial change */
+ osmo_select_main(1);
+
+ struct msgb *apdu;
+ while (1) {
+ /* check if the new state requires us to do something */
+ switch (g_tstate) {
+ case ST_ATR_DONE:
+ apdu = msgb_alloc(512, "TPDU");
+ msgb_put_u8(apdu, 0x00);
+ msgb_put_u8(apdu, 0xa4);
+ msgb_put_u8(apdu, 0x00);
+ msgb_put_u8(apdu, 0x04);
+ msgb_put_u8(apdu, 0x02);
+ msgb_put_u8(apdu, 0x2f);
+ msgb_put_u8(apdu, 0x00);
+ osmo_fsm_inst_dispatch(fi, ISO7816_E_XCEIVE_TPDU_CMD,
apdu);
+ g_tstate = ST_IN_TPDU;
+ break;
+ default:
+ break;
+ }
+ osmo_select_main(0);
+ }
+
+ exit(0);
+}
--
To view, visit
Change in ...osmo-ccid-firmware[master]: WIP: attempt to use iso7816_fsm + Cuart from firmware
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15724 to look at the new patch set (#5). Change subject: WIP: attempt to use iso7816_fsm + Cuart from firmware .. WIP: attempt to use iso7816_fsm + Cuart from firmware Change-Id: I1d7c9371406ecfadc565fdf047dd935ec48f --- M ccid_host/ccid_slot_sim.c M sysmoOCTSIM/gcc/Makefile 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/24/15724/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15724 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: I1d7c9371406ecfadc565fdf047dd935ec48f Gerrit-Change-Number: 15724 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 to look at the new patch set (#6). Change subject: card_uart_tx: Remove last argument (we always have the receiver active) .. card_uart_tx: Remove last argument (we always have the receiver active) Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e --- M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_host/cuart_driver_tty.c M ccid_host/cuart_test.c 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/15696/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 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: I8f82e9108d0eae86bbe4535403ccc680b7379a0e Gerrit-Change-Number: 15696 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: 'cuart' Card-UART abstraction + driver for simple serial reader
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15691 to look at the new patch set (#6). Change subject: 'cuart' Card-UART abstraction + driver for simple serial reader .. 'cuart' Card-UART abstraction + driver for simple serial reader Change-Id: Ic7e324d99f78b3bfb98fc667d9a1b7fa363f092d --- A ccid_common/cuart.c A ccid_common/cuart.h M ccid_host/Makefile A ccid_host/cuart_driver_tty.c A ccid_host/cuart_test.c A ccid_host/utils_ringbuffer.c A ccid_host/utils_ringbuffer.h 7 files changed, 836 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/91/15691/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15691 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: Ic7e324d99f78b3bfb98fc667d9a1b7fa363f092d Gerrit-Change-Number: 15691 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: WIP: change IRQ endpoint re-submit logic.
Hello Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15689 to look at the new patch set (#4). Change subject: WIP: change IRQ endpoint re-submit logic. .. WIP: change IRQ endpoint re-submit logic. Why? Change-Id: I41e77eec5f01bf082f8cb7331fbf7baae1c132ed --- M sysmoOCTSIM/main.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/89/15689/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15689 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: I41e77eec5f01bf082f8cb7331fbf7baae1c132ed Gerrit-Change-Number: 15689 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: iso7816_fsm: Implement single-byte RX/TX
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697 to look at the new patch set (#6). Change subject: iso7816_fsm: Implement single-byte RX/TX .. iso7816_fsm: Implement single-byte RX/TX Change-Id: I31fb127e1cb2fda0856658a6511089c3d9e31c2a --- M ccid_common/iso7816_fsm.c 1 file changed, 52 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/97/15697/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697 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: I31fb127e1cb2fda0856658a6511089c3d9e31c2a Gerrit-Change-Number: 15697 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: WIP: Add card_uart driver for ASF4 USART
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15723 to look at the new patch set (#5). Change subject: WIP: Add card_uart driver for ASF4 USART .. WIP: Add card_uart driver for ASF4 USART Change-Id: I9a141e9d2125fbfc992ad51aa4b11a39ee186607 --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.h A sysmoOCTSIM/cuart_driver_asf4_usart_async.c 3 files changed, 252 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/23/15723/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15723 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: I9a141e9d2125fbfc992ad51aa4b11a39ee186607 Gerrit-Change-Number: 15723 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: SRAM linker script: shift start of RAM by 64kByte
Hello Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15688 to look at the new patch set (#4). Change subject: SRAM linker script: shift start of RAM by 64kByte .. SRAM linker script: shift start of RAM by 64kByte Change-Id: I69ed656ac7007c5b8aa08c18569a7da5fe6ef277 FIXME: Why? --- M sysmoOCTSIM/gcc/gcc/same54n19a_sram.ld 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/88/15688/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15688 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: I69ed656ac7007c5b8aa08c18569a7da5fe6ef277 Gerrit-Change-Number: 15688 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15695 to look at the new patch set (#6). Change subject: make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty .. make ccid_main_functionfs use iso7816_fsm and cuart_driver_tty This works up to the point that we're getting the ATR displayed in pcsc_scan Change-Id: Ic656fff4a9c6b9aaf4b91aa16f66972ad28f8423 --- A ccid_common/ccid_slot_fsm.c M ccid_host/Makefile M ccid_host/ccid_main_functionfs.c 3 files changed, 218 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/95/15695/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15695 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: Ic656fff4a9c6b9aaf4b91aa16f66972ad28f8423 Gerrit-Change-Number: 15695 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: contrib/jenkins.sh: Also build host/gadget code
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 ) Change subject: contrib/jenkins.sh: Also build host/gadget code .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 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: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 Gerrit-Change-Number: 15722 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:01:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: contrib/jenkins.sh: Also build host/gadget code
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 ) Change subject: contrib/jenkins.sh: Also build host/gadget code .. contrib/jenkins.sh: Also build host/gadget code Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 --- M ccid_host/Makefile M contrib/jenkins.sh 2 files changed, 19 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_host/Makefile b/ccid_host/Makefile index 53ee932..c8862a2 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -1,13 +1,14 @@ -CFLAGS=-Wall -g -I../ccid_common -I. +CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I. +LIBS?=-lasan $(shell pkg-config --libs libosmocore) ccid_functionfs: ccid_main_functionfs.o \ ccid_slot_sim.o \ ../ccid_common/ccid_proto.o \ ../ccid_common/ccid_device.o - $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio + $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio hub_functionfs: hub_main_functionfs.o - $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio + $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19bc222..fb324cc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -13,6 +13,21 @@ inst="$TOPDIR/install" export deps inst + +echo +echo "=== libosmocore hostt build ===" +osmo-build-dep.sh libosmocore "" --disable-doxygen +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +echo +echo "=== CCID usb_gadget build ===" +cd $TOPDIR/ccid_host +make clean +make $PARALLEL_MAKE +make clean + # adapted from echo echo "=== libosmocore cross-build ===" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 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: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 Gerrit-Change-Number: 15722 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-ccid-firmware[master]: allow different prefixes, print memory usage
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 ) Change subject: allow different prefixes, print memory usage .. allow different prefixes, print memory usage Change-Id: If34b5eba2992f8f9f75ea234b94467af46b028c6 --- M sysmoOCTSIM/gcc/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 83b127f..3d89b25 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -2,7 +2,7 @@ # Manually edited. Do not overwrite with Automatically-generated file. -SYSTEM_PREFIX:=/usr/local/arm-none-eabi +SYSTEM_PREFIX?=/usr/local/arm-none-eabi EXTRA_LIBS=$(SYSTEM_PREFIX)/lib/libosmocore.a EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- @@ -161,7 +161,7 @@ @echo Building target: $@ @echo Invoking: ARM/GNU Linker $(CC) -o $(OUTPUT_FILE_NAME).elf $(OBJS) $(EXTRA_LIBS) -Wl,--start-group -lm -Wl,--end-group -mthumb \ --Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ +-Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -Wl,--print-memory-usage -mcpu=cortex-m4 \ \ -T"../gcc/gcc/same54n19a_dfu.ld" \ -L"../gcc/gcc" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 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: If34b5eba2992f8f9f75ea234b94467af46b028c6 Gerrit-Change-Number: 15737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-ccid-firmware[master]: allow different prefixes, print memory usage
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 ) Change subject: allow different prefixes, print memory usage .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 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: If34b5eba2992f8f9f75ea234b94467af46b028c6 Gerrit-Change-Number: 15737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:00:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce test TC_mo_ping_pong
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 ) Change subject: pcu: Introduce test TC_mo_ping_pong .. Patch Set 6: -Code-Review > Whether it is correct behavior or not according to specs can be checked later > [...] For sure, but merging a test case that verifies the observed behaviour of IUT, and not the expected (should be taken from the specs.) is not a good idea IMHO. I am pretty sure we would forget about this test case as soon as we see it passing in Jenkins. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 Gerrit-Change-Number: 15681 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:58:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: contrib/jenkins.sh: Also build host/gadget code
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: Also build host/gadget code .. contrib/jenkins.sh: Also build host/gadget code Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 --- M ccid_host/Makefile M contrib/jenkins.sh 2 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/22/15722/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722 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: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 Gerrit-Change-Number: 15722 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: allow different prefixes, print memory usage
Hello Hoernchen, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 to review the following change. Change subject: allow different prefixes, print memory usage .. allow different prefixes, print memory usage Change-Id: If34b5eba2992f8f9f75ea234b94467af46b028c6 --- M sysmoOCTSIM/gcc/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/37/15737/1 diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 83b127f..3d89b25 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -2,7 +2,7 @@ # Manually edited. Do not overwrite with Automatically-generated file. -SYSTEM_PREFIX:=/usr/local/arm-none-eabi +SYSTEM_PREFIX?=/usr/local/arm-none-eabi EXTRA_LIBS=$(SYSTEM_PREFIX)/lib/libosmocore.a EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- @@ -161,7 +161,7 @@ @echo Building target: $@ @echo Invoking: ARM/GNU Linker $(CC) -o $(OUTPUT_FILE_NAME).elf $(OBJS) $(EXTRA_LIBS) -Wl,--start-group -lm -Wl,--end-group -mthumb \ --Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ +-Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -Wl,--print-memory-usage -mcpu=cortex-m4 \ \ -T"../gcc/gcc/same54n19a_dfu.ld" \ -L"../gcc/gcc" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15737 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: If34b5eba2992f8f9f75ea234b94467af46b028c6 Gerrit-Change-Number: 15737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15716 ) Change subject: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d Gerrit-Change-Number: 15716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:33:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce test TC_mo_ping_pong
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 ) Change subject: pcu: Introduce test TC_mo_ping_pong .. Patch Set 6: > Patch Set 6: Code-Review+1 > > (1 comment) > > It seems to me that this case was implemented looking at the current > behaviour of OsmoPCU, which may be incorrect (remember the situation with > PTCCH/U, when everybody wrongly expected data blocks on it). Could you please > add the spec. references where the process of Downlink TBF establishment is > described? At least where they state that Immediate Assignment (assigning a > Downlink TBF) shall be sent on PCH (and not on AGCH). The code itself looks > good to me. It was indeed done looking at the current behaviour of OsmoPCU. Whether it is correct behavior or not according to specs can be checked later, but at least we have some code to test current behavior of osmo-pcu in here which is useful for now, and I need to move onto other stuff now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 Gerrit-Change-Number: 15681 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:32:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15726 ) Change subject: VTY: refactor pcu_vty_show_ms_all(): use show_ms() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750 Gerrit-Change-Number: 15726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:30:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: VTY: fix command 'show tbf all': properly filter TBFs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15727 ) Change subject: VTY: fix command 'show tbf all': properly filter TBFs .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1c9f401368af880a97d32905c4cce0da481ffc21 Gerrit-Change-Number: 15727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:29:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15716 to look at the new patch set (#2). Change subject: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them .. L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d --- M src/common/l1sap.c 1 file changed, 18 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/15716/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d Gerrit-Change-Number: 15716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15716 ) Change subject: L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15716/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/#/c/15716/1/src/common/l1sap.c@1119 PS1, Line 1119: > Remove this whitespace line. Oh, right! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib846a9b8e619c7da56b5f0a54d16f629913af80d Gerrit-Change-Number: 15716 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:25:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCUIF_RAW_Components.ttcn: ClckGen_CT: fix PTCCH event handling
fixeria has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15678 )
Change subject: PCUIF_RAW_Components.ttcn: ClckGen_CT: fix PTCCH event handling
..
PCUIF_RAW_Components.ttcn: ClckGen_CT: fix PTCCH event handling
Both TDMA_EV_PTCCH_DL_BLOCK and TDMA_EV_PTCCH_UL_BURST events may
happen together during the same TDMA frame (fn % 104 == 90). We
shall not skip TDMA_EV_PTCCH_UL_BURST. Let's fix this.
Change-Id: Ifc66d5d1c5f9eaa7bed6882105298c45257ebef0
---
M pcu/PCUIF_RAW_Components.ttcn
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn
index 7feeca2..465e398 100644
--- a/pcu/PCUIF_RAW_Components.ttcn
+++ b/pcu/PCUIF_RAW_Components.ttcn
@@ -148,11 +148,12 @@
} else if (fn13 == 3 or fn13 == 7 or fn13 == 11) {
/* 4/4 bursts of a PDTCH block on both Uplink and
Downlink */
CLCK.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PDTCH_BLOCK_END,
fn));
- } else if (fn104 == 90) {
- /* 4/4 bursts of a PTCCH (Timing Advance Control) block
on Downlink */
- CLCK.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PTCCH_DL_BLOCK,
fn));
} else if (fn52 == 12 or fn52 == 38) {
- /* One Access Burst on PTCCH/U */
+ /* 4/4 bursts of a PTCCH (Timing Advance Control) block
on Downlink */
+ if (fn104 == 90) {
+
CLCK.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PTCCH_DL_BLOCK, fn));
+ }
+ /* One Access Burst on PTCCH/U (goes 3 time-slots after
PTCCH/D) */
CLCK.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PTCCH_UL_BURST,
fn));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15678
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifc66d5d1c5f9eaa7bed6882105298c45257ebef0
Gerrit-Change-Number: 15678
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: fix ToA handling in as_ta_ptcch()
fixeria has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15679 )
Change subject: PCU_Tests_RAW.ttcn: fix ToA handling in as_ta_ptcch()
..
PCU_Tests_RAW.ttcn: fix ToA handling in as_ta_ptcch()
As it turns out, it was a bad idea to use a counter in altstep
as_ta_ptcch(), because its value is getting lost. Let's instead
introduce a new type PTCCH_TAI_ToA_MAP, which is basically a
list of ToA values for each PTCCH/U sub-slot (TA Index), and
pass it to the altstep.
Change-Id: I74252dfb929fcb32d07e8728d692674931fae727
---
M pcu/PCUIF_RAW_Components.ttcn
M pcu/PCU_Tests_RAW.ttcn
2 files changed, 65 insertions(+), 11 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn
index 465e398..ab8b3b7 100644
--- a/pcu/PCUIF_RAW_Components.ttcn
+++ b/pcu/PCUIF_RAW_Components.ttcn
@@ -133,6 +133,37 @@
var integer fn := 0;
}
+/* Derive PTCCH/U sub-slot from a given TDMA frame-number */
+function f_tdma_ptcch_fn2ss(integer fn) return integer
+{
+ var integer ss := -1;
+
+ /* See 3GPP TS 45.002, table 6 */
+ select (fn mod 416) {
+ case (12) { ss := 0; }
+ case (38) { ss := 1; }
+ case (64) { ss := 2; }
+ case (90) { ss := 3; }
+
+ case (116) { ss := 4; }
+ case (142) { ss := 5; }
+ case (168) { ss := 6; }
+ case (194) { ss := 7; }
+
+ case (220) { ss := 8; }
+ case (246) { ss := 9; }
+ case (272) { ss := 10; }
+ case (298) { ss := 11; }
+
+ case (324) { ss := 12; }
+ case (350) { ss := 13; }
+ case (376) { ss := 14; }
+ case (402) { ss := 15; }
+ }
+
+ return ss;
+}
+
function f_ClckGen_CT_handler()
runs on RAW_PCU_ClckGen_CT {
var integer fn104, fn52, fn13;
diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn
index 0771cf9..af1ef99 100644
--- a/pcu/PCU_Tests_RAW.ttcn
+++ b/pcu/PCU_Tests_RAW.ttcn
@@ -766,16 +766,33 @@
* indications to the PCU, checking the correctness of two received PTCCH/D
* messages (period of PTCCH/D is two multi-frames).
*/
-private altstep as_ta_ptcch(uint8_t bts_nr := 0, integer toa_factor := 0)
+
+/* List of ToA values for Access Bursts to be sent on PTCCH/U,
+ * each ToA (Timing of Arrival) value is in units of 1/4 of
+ * a symbol (i.e. 1 symbol is 4 QTA units). */
+type record length(16) of int16_t PTCCH_TAI_ToA_MAP;
+const PTCCH_TAI_ToA_MAP ptcch_toa_map_def := {
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0
+};
+
+private altstep as_ta_ptcch(uint8_t bts_nr := 0, /* TODO: TRX / TS number */
+ in PTCCH_TAI_ToA_MAP toa_map := ptcch_toa_map_def)
runs on RAW_PCU_Test_CT {
- var integer counter := 0;
var RAW_PCU_Event event;
+ var integer ss;
/* Send Access Bursts on PTCCH/U for every TA Index */
[] BTS.receive(tr_RAW_PCU_EV(TDMA_EV_PTCCH_UL_BURST)) -> value event {
+ ss := f_tdma_ptcch_fn2ss(event.data.tdma_fn);
+ if (ss < 0) { mtc.stop; } /* Shall not happen */
+
log("Sending an Access Burst on PTCCH/U",
+ ", sub-slot=", ss, " (TAI)",
", fn=", event.data.tdma_fn,
- ", ToA=", counter * toa_factor);
+ ", ToA=", toa_map[ss], " (QTA)");
/* TODO: do we care about RA and burst format? */
BTS.send(ts_PCUIF_RACH_IND(bts_nr := bts_nr,
ra := oct2int('3A'O),
@@ -783,14 +800,14 @@
burst_type := BURST_TYPE_0,
fn := event.data.tdma_fn,
arfcn := 871,
- qta := counter * toa_factor * 4,
+ qta := toa_map[ss],
sapi := PCU_IF_SAPI_PTCCH));
- counter := counter + 1;
repeat;
}
}
-private function f_TC_ta_ptcch_ul_multi_tbf(template PTCCHDownlinkMsg t_ta_msg)
+private function f_TC_ta_ptcch_ul_multi_tbf(in PTCCH_TAI_ToA_MAP ptcch_toa_map,
+ template PTCCHDownlinkMsg t_ta_msg)
runs on RAW_PCU_Test_CT {
var PTCCHDownlinkMsg ta_msg;
var PCUIF_Message pcu_msg;
@@ -804,7 +821,7 @@
alt {
/* Keep sending of Access Bursts during two multi-frames (period of
PTCCH/D)
* with increasing ToA (Timing of Arrival) values: 0, 7, 14, 28, 35...
*/
- [] as_ta_ptcch(bts_nr := 0, toa_factor := 7);
+ [] as_ta_ptcch(bts_nr := 0, toa_map := ptcch_toa_map);
/* In the end of 2nd multi-frame we should receive a PTCCH/D
Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce test TC_mo_ping_pong
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 ) Change subject: pcu: Introduce test TC_mo_ping_pong .. Patch Set 6: Code-Review+1 (1 comment) It seems to me that this case was implemented looking at the current behaviour of OsmoPCU, which may be incorrect (remember the situation with PTCCH/U, when everybody wrongly expected data blocks on it). Could you please add the spec. references where the process of Downlink TBF establishment is described? At least where they state that Immediate Assignment (assigning a Downlink TBF) shall be sent on PCH (and not on AGCH). The code itself looks good to me. https://gerrit.osmocom.org/#/c/15681/6/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/#/c/15681/6/pcu/PCU_Tests_RAW.ttcn@625 PS6, Line 625: data LOL, I just checked the source code of OsmoPCU, and, as it turns out, replying the whole payload from DATA.req is only needed to parse TLLI from it. Who ever thought it's a good idea... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 Gerrit-Change-Number: 15681 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:23:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCUIF_RAW_Components.ttcn: ClckGen_CT: fix PTCCH event handling
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15678 ) Change subject: PCUIF_RAW_Components.ttcn: ClckGen_CT: fix PTCCH event handling .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifc66d5d1c5f9eaa7bed6882105298c45257ebef0 Gerrit-Change-Number: 15678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:07:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: fix ToA handling in as_ta_ptcch()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15679 ) Change subject: PCU_Tests_RAW.ttcn: fix ToA handling in as_ta_ptcch() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I74252dfb929fcb32d07e8728d692674931fae727 Gerrit-Change-Number: 15679 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 15:07:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: test for "logging filter l1-sapi"
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 ) Change subject: bts: test for "logging filter l1-sapi" .. Abandoned Unfortunately, this test does not work anymore with the updated code in https://gerrit.osmocom.org/c/osmo-bts/+/15539. f_pcu_data_req() does not cause the bts to set the log context anymore. To set the log context, we would need to have an uplink/downlink message received by/sent to the PHY. The testsuite uses osmo-bts-trx, which does not deal with sapi message types in the osmo-bts/src/osmo-bts-trx uplink related code (therefore the log context is not set; it would have worked with osmo-bts-sysmo, -octphy, -oc2g, -litecell). I have looked into causing osmo-bts to send a downlink message to L1CTL from the testsuite. A good way to do this seemed to send the S13 information via RSL, which would then get sent to the L1CTL via BCCH, which also appears in the log. But then I realized, that this only gets sent the first time and I did not find an easy way to reset the connection and make the test send the message again. Then I looked into using another L1CTL message, but for some reason the existing L1CTL tests like TC_deact_sacch are not working in my local setup, when running the testsuite outside of docker (and the way the docker images are structured, the test cycles are too long when first pushing the changes to the git server, then rebuilding the testsuite with a new docker image). So all in all it seems that I'm spending too much time on this :\ abandoning this test. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Gerrit-Change-Number: 15540 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
Change in ...osmo-pcu[master]: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15726
Change subject: VTY: refactor pcu_vty_show_ms_all(): use show_ms()
..
VTY: refactor pcu_vty_show_ms_all(): use show_ms()
Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750
---
M src/pcu_vty_functions.cpp
1 file changed, 11 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/26/15726/1
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index 3008267..fd8474b 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -124,30 +124,6 @@
return CMD_SUCCESS;
}
-int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data)
-{
- BTS *bts = bts_data->bts;
- LListHead *ms_iter;
-
- llist_for_each(ms_iter, >ms_store().ms_list()) {
- GprsMs *ms = ms_iter->entry();
-
- vty_out(vty, "MS TLLI=%08x, TA=%d, CS-UL=%s, CS-DL=%s, LLC=%zd,
Cl=%d, E-Cl=%d,"
- " TBF-UL=%s, TBF-DL=%s, IMSI=%s%s",
- ms->tlli(),
- ms->ta(), mcs_name(ms->current_cs_ul()),
- mcs_name(ms->current_cs_dl()),
- ms->llc_queue()->size(),
- ms->ms_class(),
- ms->egprs_ms_class(),
- ms->ul_tbf() ? ms->ul_tbf()->state_name() : "NA",
- ms->dl_tbf() ? ms->dl_tbf()->state_name() : "NA",
- ms->imsi(),
- VTY_NEWLINE);
- }
- return CMD_SUCCESS;
-}
-
static int show_ms(struct vty *vty, GprsMs *ms)
{
unsigned i;
@@ -230,6 +206,17 @@
return CMD_SUCCESS;
}
+int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data)
+{
+ BTS *bts = bts_data->bts;
+ LListHead *ms_iter;
+
+ llist_for_each(ms_iter, >ms_store().ms_list())
+ show_ms(vty, ms_iter->entry());
+
+ return CMD_SUCCESS;
+}
+
int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t tlli)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15726
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I72aa1a1de22602a3ad2a4d19604ae0935c88c750
Gerrit-Change-Number: 15726
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-pcu[master]: VTY: fix command 'show tbf all': properly filter TBFs
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15727
Change subject: VTY: fix command 'show tbf all': properly filter TBFs
..
VTY: fix command 'show tbf all': properly filter TBFs
For a long time the VTY command to show all active TBFs was broken.
The TBF filtering (by allocation origin) logic allows one to show
TBFs allocated on CCCH, PACCH, or on both of them. In the latter
case we have been checking whether a TBF was allocated on both
logical channels at the same time.
Let's fix this by passing a flag-mask instead of boolean arguments.
To be able to use GPRS_RLCMAC_FLAG_* definitions from "tbf.h", let's
exclude them from "#ifdef __cplusplus ... #endif" block.
Change-Id: I1c9f401368af880a97d32905c4cce0da481ffc21
---
M src/pcu_vty.c
M src/pcu_vty_functions.cpp
M src/pcu_vty_functions.h
M src/tbf.h
4 files changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/15727/1
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index 23a42e7..996ce61 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -1165,13 +1165,14 @@
"TBFs allocated via PACCH\n")
{
struct gprs_rlcmac_bts *bts = bts_main_data();
- if (!strcmp(argv[0], "all"))
- return pcu_vty_show_tbf_all(vty, bts, true, true);
+ uint32_t flags = UINT32_MAX;
- if (!strcmp(argv[0], "ccch"))
- return pcu_vty_show_tbf_all(vty, bts_main_data(), true, false);
+ if (argv[0][0] == 'c')
+ flags = (1 << GPRS_RLCMAC_FLAG_CCCH);
+ else if (argv[0][0] == 'p')
+ flags = (1 << GPRS_RLCMAC_FLAG_PACCH);
- return pcu_vty_show_tbf_all(vty, bts_main_data(), false, true);
+ return pcu_vty_show_tbf_all(vty, bts, flags);
}
DEFUN(show_ms_all,
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index fd8474b..7b6c84f 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -45,17 +45,11 @@
#include "coding_scheme.h"
}
-static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf, bool
show_ccch, bool show_pacch)
+static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf)
{
gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);
gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);
- if (show_ccch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))
- return;
-
- if (show_pacch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))
- return;
-
vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s",
tbf->tfi(),
tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid",
tbf->ta(),
@@ -108,18 +102,22 @@
vty_out(vty, "%s%s", VTY_NEWLINE, VTY_NEWLINE);
}
-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
bool show_ccch, bool show_pacch)
+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t flags)
{
BTS *bts = bts_data->bts;
- LListHead *ms_iter;
+ LListHead *iter;
vty_out(vty, "UL TBFs%s", VTY_NEWLINE);
- llist_for_each(ms_iter, >ul_tbfs())
- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch,
show_pacch);
+ llist_for_each(iter, >ul_tbfs()) {
+ if (iter->entry()->state_flags & flags)
+ tbf_print_vty_info(vty, iter->entry());
+ }
vty_out(vty, "%sDL TBFs%s", VTY_NEWLINE, VTY_NEWLINE);
- llist_for_each(ms_iter, >dl_tbfs())
- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch,
show_pacch);
+ llist_for_each(iter, >dl_tbfs()) {
+ if (iter->entry()->state_flags & flags)
+ tbf_print_vty_info(vty, iter->entry());
+ }
return CMD_SUCCESS;
}
diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h
index 3fef208..6fbc366 100644
--- a/src/pcu_vty_functions.h
+++ b/src/pcu_vty_functions.h
@@ -27,7 +27,7 @@
struct vty;
struct gprs_rlcmac_bts;
-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
bool show_ccch, bool show_pacch);
+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t flags);
int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data);
int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,
uint32_t tlli);
diff --git a/src/tbf.h b/src/tbf.h
index fd65b20..9545385 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -38,6 +38,8 @@
class GprsMs;
struct gprs_rlcmac_bts;
+#endif
+
/*
* TBF instance
*/
@@ -171,6 +173,8 @@
#define TBF_ASS_TYPE_SET(t, kind) do { t->ass_type_mod(kind, false, __FILE__,
__LINE__); } while(0)
#define TBF_ASS_TYPE_UNSET(t, kind) do { t->ass_type_mod(kind, true, __FILE__,
__LINE__); } while(0)
+#ifdef __cplusplus
+
struct gprs_rlcmac_tbf {
Change in ...osmo-bts[master]: log: set L1 SAPI log context
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI log context .. Patch Set 7: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 09 Oct 2019 14:45:55 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 to look at the new patch set (#5). Change subject: vty: add "logging filter l1-sapi" .. vty: add "logging filter l1-sapi" Add VTY commands to filter by L1 SAPI. Allow to filter by multiple SAPIs by running the filter command multiple times: OsmoBTS> logging filter l1-sapi agch OsmoBTS> logging filter l1-sapi pch Related: OS#2356 Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 --- M src/common/logging.c M src/common/vty.c 2 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/15550/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: gitignore: add *.netcat.stderr
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15725 ) Change subject: gitignore: add *.netcat.stderr .. gitignore: add *.netcat.stderr Change-Id: I0119153aa0a7f035f067c5a8607f8f1930b9fc1c --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 519dc48..41add91 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ !bin/Makefile !deps/Makefile .*.sw? +*.netcat.stderr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0119153aa0a7f035f067c5a8607f8f1930b9fc1c Gerrit-Change-Number: 15725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce test TC_mo_ping_pong
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 to look at the new patch set (#6). Change subject: pcu: Introduce test TC_mo_ping_pong .. pcu: Introduce test TC_mo_ping_pong Ideally some more checks should be done on this test at the end, but it's fine keeping it as it is for now and can be extended later. Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/15681/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 Gerrit-Change-Number: 15681 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce test TC_mo_ping_pong
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 to look at the new patch set (#5). Change subject: pcu: Introduce test TC_mo_ping_pong .. pcu: Introduce test TC_mo_ping_pong Ideally some more checks should be done on this test at the end, but it's fine keeping it as it is for now and can be extended later. Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 90 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/15681/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3be5123ff5294e5851652ec14d54589442082b28 Gerrit-Change-Number: 15681 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
