coelner/gnuk
1
0
Fork 0
mirror of https://salsa.debian.org/gnuk-team/gnuk/gnuk.git synced 2024-09-20 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_nobtn' into 'master'

Browse Source 
Fix ACKBTN_SUPPORT support

See merge request gnuk-team/gnuk/gnuk!5
This commit is contained in:
David G. F. 2024-04-27 20:51:52 +00:00
commit 1fdfb90a29
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/usb-ccid.c
View File

@ -1689,12 +1689,14 @@ ccid_thread (void *arg)
struct ep_out *epo = &endpoint_out;
struct apdu *a = &apdu;
#ifdef ACKBTN_SUPPORT
if (ackbtn_active)
{
ackbtn_active = 0;
ackbtn_disable ();
led_blink (LED_WAIT_FOR_BUTTON);
}
#endif
epi_init (epi, ENDP1, c);
epo_init (epo, ENDP1, c);
@ -1797,9 +1799,7 @@ ccid_thread (void *arg)
else if (m == EV_EXEC_FINISHED)
if (c->ccid_state == CCID_STATE_EXECUTE)
{
#ifdef ACKBTN_SUPPORT
exec_done:
#endif
if (c->a->sw == GPG_THREAD_TERMINATED)
{
c->sw1sw2[0] = 0x90;
@ -1868,8 +1868,10 @@ ccid_thread (void *arg)
if (c->timeout_cnt == 7
&& c->ccid_state == CCID_STATE_ACK_REQUIRED_1)
{
#ifdef ACKBTN_SUPPORT
ackbtn_active = 0;
ackbtn_disable ();
#endif
led_blink (LED_WAIT_FOR_BUTTON);
c->a->sw = GPG_ACK_TIMEOUT;
c->a->res_apdu_data_len = 0;