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

Update to Chopstx 1.0

Browse Source
This commit is contained in:
Niibe Yutaka
2016-06-17 14:54:52 +09:00
parent 73c698c67e
commit eabcec107e
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2016-06-17 Niibe Yutaka <gniibe@fsij.org>
* chopstx: Update to 1.0.
2016-06-15 NIIBE Yutaka <gniibe@fsij.org> 2016-06-15 NIIBE Yutaka <gniibe@fsij.org>
* src/gnuk.ld.in (__process2_stack_size__): Update * src/gnuk.ld.in (__process2_stack_size__): Update

2
chopstx

Submodule chopstx updated: 52626a3368...40adf95c24

15
src/usb-ccid.c
View File

@@ -1492,13 +1492,8 @@ ccid_thread (void *arg)
{ {
chopstx_intr_t interrupt; chopstx_intr_t interrupt;
uint32_t timeout; uint32_t timeout;
eventmask_t m;
struct usb_dev dev; struct usb_dev dev;
struct ep_in *epi = &endpoint_in;
struct ep_out *epo = &endpoint_out;
struct ccid *c = &ccid; struct ccid *c = &ccid;
struct apdu *a = &apdu;
(void)arg; (void)arg;
@@ -1510,10 +1505,16 @@ ccid_thread (void *arg)
usb_event_handle (&dev); /* For old SYS < 3.0 */ usb_event_handle (&dev); /* For old SYS < 3.0 */
device_reset: device_reset:
{
struct ep_in *epi = &endpoint_in;
struct ep_out *epo = &endpoint_out;
struct apdu *a = &apdu;
epi_init (epi, ENDP1, notify_tx, c); epi_init (epi, ENDP1, notify_tx, c);
epo_init (epo, ENDP1, notify_icc, c); epo_init (epo, ENDP1, notify_icc, c);
apdu_init (a); apdu_init (a);
ccid_init (c, epi, epo, a); ccid_init (c, epi, epo, a);
}
while (bDeviceState != CONFIGURED) while (bDeviceState != CONFIGURED)
{ {
@@ -1521,7 +1522,7 @@ ccid_thread (void *arg)
if (interrupt.ready) if (interrupt.ready)
usb_event_handle (&dev); usb_event_handle (&dev);
m = eventflag_get (&c->ccid_comm); eventflag_get (&c->ccid_comm);
/* Ignore event while not-configured. */ /* Ignore event while not-configured. */
} }
@@ -1531,6 +1532,8 @@ ccid_thread (void *arg)
ccid_notify_slot_change (c); ccid_notify_slot_change (c);
while (1) while (1)
{ {
eventmask_t m;
poll_event_intr (&timeout, &c->ccid_comm, &interrupt); poll_event_intr (&timeout, &c->ccid_comm, &interrupt);
if (interrupt.ready) if (interrupt.ready)
{ {