From 65689199e7ec0aed9b34bde44ee6f7299450d18f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 7 Dec 2018 08:35:27 +0900 Subject: [PATCH] Fix order of EV_* for CCID thread. Since openpgp thread has lower priority than CCID thread, there is no case where two consecutive messages EV_EXEC_ACK_REQUIRED and EV_EXEC_FINISHED are handled simultaneously (openpgp thread needs to work some time to send EV_EXEC_FINISHED, after sending EV_EXEC_ACK_REQUIRED). But just in case, when there are two messages at once, EV_EXEC_ACK_REQUIRED should been handled before EV_EXEC_FINISHED. --- ChangeLog | 5 +++++ src/gnuk.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4ff511..477d907 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-12-07 NIIBE Yutaka + + * src/gnuk.h (EV_EXEC_ACK_REQUIRED): Have precedence + than EV_EXEC_FINISHED. + 2018-12-06 NIIBE Yutaka * src/usb-ccid.c (ccid_thread): Priority of handling diff --git a/src/gnuk.h b/src/gnuk.h index 383241b..2082c3d 100644 --- a/src/gnuk.h +++ b/src/gnuk.h @@ -25,8 +25,8 @@ void ccid_card_change_signal (int how); /* CCID thread */ #define EV_RX_DATA_READY 1 /* USB Rx data available */ -#define EV_EXEC_ACK_REQUIRED 2 /* OpenPGPcard Execution ACK required*/ -#define EV_EXEC_FINISHED 4 /* OpenPGPcard Execution finished */ +#define EV_EXEC_FINISHED 2 /* OpenPGPcard Execution finished */ +#define EV_EXEC_ACK_REQUIRED 4 /* OpenPGPcard Execution ACK required */ #define EV_TX_FINISHED 8 /* CCID Tx finished */ #define EV_CARD_CHANGE 16