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

Update Chopstx

Browse Source
This commit is contained in:
NIIBE Yutaka 2013-11-03 13:01:38 +09:00
parent 1be80272d7
commit b936e4bac6
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-03 Niibe Yutaka <gniibe@fsij.org>
* chopstx: Update to 0.01.
* src/pin-cir.c: Chatter fix to 200ms.
* src/main.c: Fix bDeviceState.
2013-11-02 Niibe Yutaka <gniibe@fsij.org> 2013-11-02 Niibe Yutaka <gniibe@fsij.org>
* src/usb_lld.h, src/usb_stm32f103.c (std_get_descriptor): Change * src/usb_lld.h, src/usb_stm32f103.c (std_get_descriptor): Change

2
chopstx

@ -1 +1 @@
Subproject commit 9fe6cefdc0564b6bb3d938c0c1074d57a4b9500f Subproject commit e957d1aff84b2d7020dd6ad453363da4ffdd5983

4
src/main.c
View File

@ -220,7 +220,7 @@ static eventmask_t display_status_code (void)
if (icc_state == ICC_STATE_START) if (icc_state == ICC_STATE_START)
return emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP); return emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP);
else else
/* GPGthread running */ /* OpenPGP card thread running */
{ {
if ((m = emit_led ((auth_status & AC_ADMIN_AUTHORIZED)? if ((m = emit_led ((auth_status & AC_ADMIN_AUTHORIZED)?
LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO,
@ -295,7 +295,7 @@ extern void *usb_intr (void *arg);
static void gnuk_malloc_init (void); static void gnuk_malloc_init (void);
static uint32_t bDeviceState; extern uint32_t bDeviceState;
/* /*
* Entry point. * Entry point.

4
src/pin-cir.c
View File

@ -520,8 +520,8 @@ cir_getchar (uint32_t timeout)
if (notification == 0) if (notification == 0)
return -1; return -1;
/* Sleep 100ms to avoid detecting chatter inputs. */ /* Sleep 200ms to avoid detecting chatter inputs. */
chopstx_usec_wait (100 * 1000); chopstx_usec_wait (200 * 1000);
#if defined(DEBUG_CIR) #if defined(DEBUG_CIR)
DEBUG_INFO ("****\r\n"); DEBUG_INFO ("****\r\n");