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

[XS] Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Fix LATEST_BIN variable setting for tagged versions

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39792?usp=email ) Change subject: contrib/jenkins.sh: Fix LATEST_BIN variable setting for tagged versions ...................................................................... contrib/jenkins.sh: Fix LATEST_BIN variable setting for tagged versions sysmoOCTSIM-*-*.bin only works if the build is not a version that was just tagged. In that case the file name is sysmoOCTSIM-0.3.bin which doesn't match the above pattern as it has no git hash appended. Change-Id: I4927f24407a25c87ca59f6230d64d24761558c18 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/92/39792/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 961acf1..9111965 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -71,7 +71,7 @@ [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" - LATEST_BIN="$(cd "$TOPDIR"/sysmoOCTSIM/gcc/; ls -1 sysmoOCTSIM-*-*.bin)" + LATEST_BIN="$(cd "$TOPDIR"/sysmoOCTSIM/gcc/; ls -1 sysmoOCTSIM-*.bin)" echo "LATEST_BIN: $LATEST_BIN" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4927f24407a25c87ca59f6230d64d24761558c18 Gerrit-Change-Number: 39792 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: contrib/jenkins: fix upload

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email ) Change subject: contrib/jenkins: fix upload ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File gcc/Makefile: https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787/comment/5e4587d1_3de5a3a… : PS2, Line 140: ln -sf $(OUTPUT_FILE_NAME)-dfu.elf bootloader-$(BOARD_LC).elf I don't think we'd want that... doesn't make sense IMHO. The pure bootloader (for flashing via JTAG) and the DFU image for updating the bootloader over DFU are two different things. -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I767d3b99840eba5e1b395079c878dcbae78b08a0 Gerrit-Change-Number: 39787 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Mar 2025 09:54:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: contrib/jenkins: fix upload

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email ) Change subject: contrib/jenkins: fix upload ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: sorry, I just pushed a conflicting change :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I767d3b99840eba5e1b395079c878dcbae78b08a0 Gerrit-Change-Number: 39787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Mar 2025 09:49:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: gcc/Makefile: fail early if xxd is not installed

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39786?usp=email ) Change subject: gcc/Makefile: fail early if xxd is not installed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I6a3e7021929ba58c14f1ffced5702d2dfa839ebe Gerrit-Change-Number: 39786 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Mar 2025 09:49:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: gcc/Makefile: set shell: bash -o pipefail -e

by laforge

Attention is currently required from: Hoernchen, osmith, pespin. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39785?usp=email ) Change subject: gcc/Makefile: set shell: bash -o pipefail -e ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I9459f63828eab461607fa9f226716d32ae898549 Gerrit-Change-Number: 39785 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Mar 2025 09:49:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ccid-firmware[master]: [cosmetic]: Fix coding style issues in ccid_common

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39790?usp=email ) Change subject: [cosmetic]: Fix coding style issues in ccid_common ...................................................................... [cosmetic]: Fix coding style issues in ccid_common Change-Id: If1035d558d326f2d1fe58974773a2c91ab6df73f --- M ccid_common/ccid_device.c M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/iso7816_fsm.c 4 files changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/90/39790/1 diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 398a2b4..acee696 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -718,7 +718,7 @@ return ccid_send(ci, resp); } - if(!cs->icc_present) { + if (!cs->icc_present) { LOGPCS(cs, LOGL_ERROR, "No icc present, but another cmd received\n"); /* FIXME: ABORT logic as per section 5.3.1 of CCID Spec v1.1 */ resp = gen_err_resp(ch->bMessageType, ch->bSlot, get_icc_status(cs), ch->bSeq, diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index eb0c145..0c56275 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -91,7 +91,7 @@ static void iso_fsm_slot_icc_set_insertion_status(struct ccid_slot *cs, bool present) { struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); - if(present == cs->icc_present) + if (present == cs->icc_present) return; cs->icc_present = present; @@ -116,13 +116,20 @@ LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n"); switch (pwrsel) { - case CCID_PWRSEL_5V0: cctl = CUART_CTL_POWER_5V0; break; - case CCID_PWRSEL_3V0: cctl = CUART_CTL_POWER_3V0; break; - case CCID_PWRSEL_1V8: cctl = CUART_CTL_POWER_1V8; break; - default: cctl = CUART_CTL_POWER_5V0; + case CCID_PWRSEL_5V0: + cctl = CUART_CTL_POWER_5V0; + break; + case CCID_PWRSEL_3V0: + cctl = CUART_CTL_POWER_3V0; + break; + case CCID_PWRSEL_1V8: + cctl = CUART_CTL_POWER_1V8; + break; + default: + cctl = CUART_CTL_POWER_5V0; } - if (! cs->icc_powered) { + if (!cs->icc_powered) { /* FIXME: do this via a FSM? */ card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); @@ -198,7 +205,7 @@ volatile uint32_t event = cs->event; volatile void * volatile data = cs->event_data; - if(!event) + if (!event) return 0; // if(event && !data) // return 0; @@ -208,13 +215,11 @@ tpdu = data; LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=0)\n", __func__, event); - /* perform deactivation */ card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false); cs->icc_powered = false; - resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_FAILED, CCID_ERR_ICC_MUTE, 0, 0); ccid_slot_send_unbusy(cs, resp); cs->event = 0; @@ -223,7 +228,7 @@ tpdu = data; /* inverse condition, error interrupt is always disabled during atr and reenabled here after atr */ - if(*msgb_data(tpdu) == 0x3f) { + if (*msgb_data(tpdu) == 0x3f) { card_uart_ctrl(ss->cuart, CUART_CTL_ERROR_AND_INV, true); } else { card_uart_ctrl(ss->cuart, CUART_CTL_ERROR_AND_INV, false); diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 9c96891..d228c13 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -68,7 +68,7 @@ { int secs, usecs; - if(!cuart->current_wtime_byte) + if (!cuart->current_wtime_byte) return; int etu_in_us = get_etu_in_us(cuart) + 1; diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index d82380b..f6d2185 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1635,7 +1635,6 @@ struct pps_fsm_priv *ppsp; struct tpdu_fsm_priv *tpdup; - fi = osmo_fsm_inst_alloc(&iso7816_3_fsm, ctx, NULL, log_level, id); ip = talloc_zero(fi, struct iso7816_3_priv); if (!ip) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If1035d558d326f2d1fe58974773a2c91ab6df73f Gerrit-Change-Number: 39790 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ccid-firmware[master]: sysmoOCTSIM/README: Describe how to build matching libosmocore

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39789?usp=email ) Change subject: sysmoOCTSIM/README: Describe how to build matching libosmocore ...................................................................... sysmoOCTSIM/README: Describe how to build matching libosmocore we currently require a libosmocore that's cross-compiled for this specific embedded target. This information was so far hidden in contrib/jenkins.sh - let's expose it to README.md (slightly modified command to install it to /usr/local/arm-none-eabi) Change-Id: I3392d134ed75dbdd558643aac6d58407e00d23ba --- M sysmoOCTSIM/README.md 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/89/39789/1 diff --git a/sysmoOCTSIM/README.md b/sysmoOCTSIM/README.md index 1927255..3eae229 100644 --- a/sysmoOCTSIM/README.md +++ b/sysmoOCTSIM/README.md @@ -24,7 +24,16 @@ GNU make and the arm-none-eabi-gcc compiler are required to build the firmware. -The compile the firmware, run the following commands: +Also, you will need a libosmocore built for arm-none-eabi installed to /usr/local/arm-none-eabi + +You can use the following commands (in the libosmocore directory) to build + +``` +./configure --prefix=/usr/local/arm-none-eabi --enable-static --host=arm-none-eabi --enable-embedded --disable-log-macros --disable-doxygen --disable-shared --disable-pseudotalloc --disable-libsctp --disable-libusb --disable-gb --enable-external-tests CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /my/path/to/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" CPPFLAGS="-D__thread=''" +make install +``` + +To subsequently compile the firmware, run the following commands (in osmo-ccid-firmware): ``` cd sysmoOCTSIM/gcc -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3392d134ed75dbdd558643aac6d58407e00d23ba Gerrit-Change-Number: 39789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ccid-firmware[master]: ccid_proto.h: Add USB_CLASS_CCID dfefinition

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39791?usp=email ) Change subject: ccid_proto.h: Add USB_CLASS_CCID dfefinition ...................................................................... ccid_proto.h: Add USB_CLASS_CCID dfefinition Change-Id: I587475fcfb0f4e6fda94cf154edba90b7be6d02e --- M ccid_common/ccid_proto.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/91/39791/1 diff --git a/ccid_common/ccid_proto.h b/ccid_common/ccid_proto.h index 1c6dd07..e26a051 100644 --- a/ccid_common/ccid_proto.h +++ b/ccid_common/ccid_proto.h @@ -21,6 +21,8 @@ #include <stdint.h> #include <osmocom/core/utils.h> +#define USB_CLASS_CCID 11 + /* Identifies the length of type of subordinate descriptors of a CCID device * Table 5.1-1 Smart Card Device Class descriptors */ struct usb_ccid_class_descriptor { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I587475fcfb0f4e6fda94cf154edba90b7be6d02e Gerrit-Change-Number: 39791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: contrib/jenkins.sh: make sure latest bootloader rsync works

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39788?usp=email ) Change subject: contrib/jenkins.sh: make sure latest bootloader rsync works ...................................................................... contrib/jenkins.sh: make sure latest bootloader rsync works The filenames have changed slightly after introduction of the blupdate in commit 4127315e24977dfb7a88ac70a78f3472ff1b56aa Change-Id: I28437770ea7ad0b8263ef9006655c48ddd9286a2 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e9296c6..a897dda 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -40,7 +40,7 @@ EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" rsync --archive --copy-links --verbose --compress --delete --rsh "$SSH_COMMAND" \ - $TOPDIR/gcc/bootloader-sysmooctsim.{bin,elf} \ + $TOPDIR/gcc/bootloader-sysmooctsim-{flash,dfu}.{bin,elf} \ binaries@ftp.osmocom.org:web-files/osmo-asf4-dfu/latest/ rsync --archive --verbose --compress --rsh "$SSH_COMMAND" \ $TOPDIR/gcc/bootloader-*-*.{bin,elf} \ -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I28437770ea7ad0b8263ef9006655c48ddd9286a2 Gerrit-Change-Number: 39788 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-asf4-dfu[master]: contrib/jenkins.sh: make sure latest bootloader rsync works

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39788?usp=email ) Change subject: contrib/jenkins.sh: make sure latest bootloader rsync works ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I28437770ea7ad0b8263ef9006655c48ddd9286a2 Gerrit-Change-Number: 39788 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 14 Mar 2025 09:47:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025