From b936e4bac6296826ece41a6027fd5f2287b10024 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Sun, 3 Nov 2013 13:01:38 +0900 Subject: [PATCH] Update Chopstx --- ChangeLog | 6 ++++++ chopstx | 2 +- src/main.c | 4 ++-- src/pin-cir.c | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b325b4..5251f19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-03 Niibe Yutaka + + * chopstx: Update to 0.01. + * src/pin-cir.c: Chatter fix to 200ms. + * src/main.c: Fix bDeviceState. + 2013-11-02 Niibe Yutaka * src/usb_lld.h, src/usb_stm32f103.c (std_get_descriptor): Change diff --git a/chopstx b/chopstx index 9fe6cef..e957d1a 160000 --- a/chopstx +++ b/chopstx @@ -1 +1 @@ -Subproject commit 9fe6cefdc0564b6bb3d938c0c1074d57a4b9500f +Subproject commit e957d1aff84b2d7020dd6ad453363da4ffdd5983 diff --git a/src/main.c b/src/main.c index 7e34f67..1e9051f 100644 --- a/src/main.c +++ b/src/main.c @@ -220,7 +220,7 @@ static eventmask_t display_status_code (void) if (icc_state == ICC_STATE_START) return emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP); else - /* GPGthread running */ + /* OpenPGP card thread running */ { if ((m = emit_led ((auth_status & AC_ADMIN_AUTHORIZED)? LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, @@ -295,7 +295,7 @@ extern void *usb_intr (void *arg); static void gnuk_malloc_init (void); -static uint32_t bDeviceState; +extern uint32_t bDeviceState; /* * Entry point. diff --git a/src/pin-cir.c b/src/pin-cir.c index cd65fbc..544d5a9 100644 --- a/src/pin-cir.c +++ b/src/pin-cir.c @@ -520,8 +520,8 @@ cir_getchar (uint32_t timeout) if (notification == 0) return -1; - /* Sleep 100ms to avoid detecting chatter inputs. */ - chopstx_usec_wait (100 * 1000); + /* Sleep 200ms to avoid detecting chatter inputs. */ + chopstx_usec_wait (200 * 1000); #if defined(DEBUG_CIR) DEBUG_INFO ("****\r\n");