From 5aee75fd4b4c53492f05c26f6322d95ea69759ad Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 9 Nov 2018 12:52:21 +0900 Subject: [PATCH] Remove unused CCID_STATE_RECEIVE and CCID_STATE_SEND state. It was used before when Gnuk uses extended APDU exchange (7 years ago). --- ChangeLog | 7 +++++++ src/gnuk.h | 3 +-- src/main.c | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ae503c..e390b57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-11-09 NIIBE Yutaka + + * src/main.c (display_status_code): There is + no case where ccid_state == CCID_STATE_RECEIVE. + * src/gnuk.h (CCID_STATE_RECEIVE): Remove. + (CCID_STATE_SEND): Remove. + 2018-10-12 NIIBE Yutaka * src/usb-ccid.c (ccid_thread): Notify host about ack button. diff --git a/src/gnuk.h b/src/gnuk.h index e2ea0a3..a03f4b4 100644 --- a/src/gnuk.h +++ b/src/gnuk.h @@ -54,11 +54,10 @@ enum ccid_state { CCID_STATE_NOCARD, /* No card available */ CCID_STATE_START, /* Initial */ CCID_STATE_WAIT, /* Waiting APDU */ + CCID_STATE_EXECUTE, /* Executing command */ CCID_STATE_ACK_REQUIRED_0, /* Ack required (executing)*/ CCID_STATE_ACK_REQUIRED_1, /* Waiting user's ACK (execution finished) */ - CCID_STATE_RECEIVE, /* APDU Received Partially */ - CCID_STATE_SEND, /* APDU Sent Partially */ CCID_STATE_EXITED, /* CCID Thread Terminated */ CCID_STATE_EXEC_REQUESTED, /* Exec requested */ diff --git a/src/main.c b/src/main.c index 9ebcc95..950c87b 100644 --- a/src/main.c +++ b/src/main.c @@ -170,8 +170,7 @@ display_status_code (void) { usec = LED_TIMEOUT_INTERVAL; chopstx_poll (&usec, 1, led_event_poll); - emit_led (ccid_state == CCID_STATE_RECEIVE? - LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_STOP); + emit_led (LED_TIMEOUT_ZERO, LED_TIMEOUT_STOP); } } }