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/.
Hoernchen gerrit-no-reply at lists.osmocom.orgHoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16289 ) Change subject: change uart ctl define names ...................................................................... change uart ctl define names Change-Id: I656e9e32c67d6e7b70a53f8f113583f25619e00f --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.h M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/89/16289/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index fef1515..3a591d7 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -195,8 +195,8 @@ * - after ATR while card is idle * - after PPS while card is idle */ - card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK_FREQ, fmax); - card_uart_ctrl(ss->cuart, CUART_CTL_FD, F/D); + card_uart_ctrl(ss->cuart, CUART_CTL_SET_CLOCK_FREQ, fmax); + card_uart_ctrl(ss->cuart, CUART_CTL_SET_FD, F/D); card_uart_ctrl(ss->cuart, CUART_CTL_WTIME, cs->proposed_pars.t0.waiting_integer); cs->pars = cs->proposed_pars; diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h index 32a8daa..c72b51c 100644 --- a/ccid_common/cuart.h +++ b/ccid_common/cuart.h @@ -26,10 +26,10 @@ CUART_CTL_NO_RXTX, /* enable/disable receiver */ CUART_CTL_POWER, /* enable/disable ICC power */ CUART_CTL_CLOCK, /* enable/disable ICC clock */ - CUART_CTL_CLOCK_FREQ, /* set ICC clock frequency (hz)*/ + CUART_CTL_SET_CLOCK_FREQ, /* set ICC clock frequency (hz)*/ CUART_CTL_RST, /* enable/disable ICC reset */ CUART_CTL_WTIME, /* set the waiting time (in etu) */ - CUART_CTL_FD, + CUART_CTL_SET_FD, }; struct card_uart; diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index a0b3821..db3dc79 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -384,7 +384,7 @@ case CUART_CTL_CLOCK: /* no clock stop support */ break; - case CUART_CTL_CLOCK_FREQ: + case CUART_CTL_SET_CLOCK_FREQ: ncn8025_get(cuart->u.asf4.slot_nr, &settings); /* 2,5/5/10/20 supported by dividers */ @@ -398,7 +398,7 @@ settings.clkdiv = clkdiv; ncn8025_set(cuart->u.asf4.slot_nr, &settings); break; - case CUART_CTL_FD: + case CUART_CTL_SET_FD: ncn8025_get(cuart->u.asf4.slot_nr, &settings); uint8_t divider = ncn8025_div_val[settings.clkdiv]; uint32_t baudrate = (20e6/divider)/arg; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16289 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: I656e9e32c67d6e7b70a53f8f113583f25619e00f Gerrit-Change-Number: 16289 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191127/aa58cbd8/attachment.htm>