This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 ) Change subject: PC_to_RDR_SetDataRateAndClockFrequency support ...................................................................... PC_to_RDR_SetDataRateAndClockFrequency support Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 --- M ccid_common/ccid_device.c M ccid_common/ccid_device.h M ccid_common/ccid_slot_fsm.c 3 files changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index b14f194..34fdcc8 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -649,7 +649,7 @@ int rc; /* FIXME: which rate to return in failure case? */ - rc = cs->ci->slot_ops->set_rate_and_clock(cs, freq_hz, rate_bps); + rc = cs->ci->slot_ops->set_rate_and_clock(cs, &freq_hz, &rate_bps); if (rc < 0) resp = ccid_gen_clock_and_rate(cs, seq, CCID_CMD_STATUS_FAILED, -rc, 9600, 2500000); else diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h index f364f72..bcf5d12 100644 --- a/ccid_common/ccid_device.h +++ b/ccid_common/ccid_device.h @@ -86,7 +86,7 @@ void (*set_clock)(struct ccid_slot *cs, enum ccid_clock_command cmd); int (*set_params)(struct ccid_slot *cs, uint8_t seq, enum ccid_protocol_num proto, const struct ccid_pars_decoded *pars_dec); - int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps); + int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps); void (*icc_set_insertion_status)(struct ccid_slot *cs, bool present); int (*handle_fsm_events)(struct ccid_slot *cs, bool enable); }; diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 08cbbad..747fef3 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -323,9 +323,14 @@ return 0; } -static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps) +static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps) { - /* we always acknowledge all rates/clocks */ + /* we return the currently used values, since we support automatic features */ + struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); + + *rate_bps = card_uart_ctrl(ss->cuart, CUART_CTL_GET_BAUDRATE, false); + *freq_hz = card_uart_ctrl(ss->cuart, CUART_CTL_GET_CLOCK_FREQ, false)/1000; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 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: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 Gerrit-Change-Number: 17038 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200128/9ce36e3f/attachment.htm>