deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for regnual

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-11-18 14:07:47 +09:00
parent 4418ac3cab
commit fd15343bda
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2013-11-18 Niibe Yutaka <gniibe@fsij.org>
* src/openpgp.c (card_thread): Add noinline attribute.
* src/usb-icc.c (ccid_thread): Join the OpenPGP thread.
Add noinline attribute.
2013-11-15 Niibe Yutaka <gniibe@fsij.org> 2013-11-15 Niibe Yutaka <gniibe@fsij.org>
* src/configure (options): Add --enable-sys1-compat. * src/configure (options): Add --enable-sys1-compat.

2
src/openpgp.c
View File

@@ -1228,7 +1228,7 @@ openpgp_card_thread (void *arg)
chopstx_t openpgp_card_thd; chopstx_t openpgp_card_thd;
static void * static void * __attribute__ ((noinline))
card_thread (chopstx_t thd, struct eventflag *ccid_comm) card_thread (chopstx_t thd, struct eventflag *ccid_comm)
{ {
openpgp_card_thd = thd; openpgp_card_thd = thd;

8
src/usb-icc.c
View File

@@ -1307,7 +1307,7 @@ USBthread (void *arg)
return ccid_thread (thd); return ccid_thread (thd);
} }
static void * static void * __attribute__ ((noinline))
ccid_thread (chopstx_t thd) ccid_thread (chopstx_t thd)
{ {
struct ep_in *epi = &endpoint_in; struct ep_in *epi = &endpoint_in;
@@ -1386,5 +1386,11 @@ ccid_thread (chopstx_t thd)
c->icc_state = icc_handle_timeout (c); c->icc_state = icc_handle_timeout (c);
} }
if (c->application)
{
chopstx_join (c->application, NULL);
c->application = 0;
}
return NULL; return NULL;
} }