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

usb reset doesn't cause ccid exit

Browse Source
This commit is contained in:
NIIBE Yutaka
2015-09-15 10:17:40 +09:00
parent c53bd96eb8
commit 9b7d400550
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2015-09-15 Niibe Yutaka <gniibe@fsij.org>
* src/usb-icc.c (ccid_thread): Don't finish on reset, but
keep running.
* src/usb_ctrl.c (usb_cb_device_reset): Stop the interface.
* src/usb_stm32f103.c (std_set_interface): Bug fix for conf.

18
src/usb-icc.c
View File

@@ -1350,10 +1350,8 @@ ccid_thread (chopstx_t thd)
struct ep_out *epo = &endpoint_out;
struct ccid *c = &ccid;
struct apdu *a = &apdu;
uint8_t int_msg[2];
int_msg[0] = NOTIFY_SLOT_CHANGE;
reset:
epi_init (epi, ENDP1, notify_tx, c);
epo_init (epo, ENDP1, notify_icc, c);
apdu_init (a);
@@ -1367,9 +1365,20 @@ ccid_thread (chopstx_t thd)
m = eventflag_wait_timeout (&c->ccid_comm, USB_ICC_TIMEOUT);
if (m == EV_USB_RESET)
break;
{
if (c->application)
{
chopstx_cancel (c->application);
chopstx_join (c->application, NULL);
c->application = 0;
}
goto reset;
}
else if (m == EV_CARD_CHANGE)
{
uint8_t int_msg[2];
int_msg[0] = NOTIFY_SLOT_CHANGE;
if (c->icc_state == ICC_STATE_NOCARD)
{ /* Inserted! */
c->icc_state = ICC_STATE_START;
@@ -1452,7 +1461,6 @@ ccid_thread (chopstx_t thd)
if (c->application)
{
chopstx_cancel (c->application);
chopstx_join (c->application, NULL);
c->application = 0;
}