Version 1.2.0

src/gnuk.h

@@ -421,8 +421,8 @@ extern const uint8_t gnuk_string_serial[];
 #define LED_ONESHOT		  1
 #define LED_TWOSHOTS		  2
 #define LED_SHOW_STATUS		  4
-#define LED_FINISH_COMMAND	  8
-#define LED_START_COMMAND	 16
+#define LED_START_COMMAND	  8
+#define LED_FINISH_COMMAND	 16
 #define LED_FATAL		 32
 #define LED_GNUK_EXEC		 64
 void led_blink (int spec);

src/main.c

@@ -259,9 +259,9 @@ main (int argc, char *argv[])
 	case LED_START_COMMAND:
 	  set_led (1);
 	  led_inverted = 1;
+	  chopstx_usec_wait (LED_TIMEOUT_STOP);
 	  break;
 	case LED_FINISH_COMMAND:
-	  chopstx_usec_wait (LED_TIMEOUT_STOP);
 	  led_inverted = 0;
 	  set_led (0);
 	  break;

src/usb-ccid.c

@@ -847,6 +847,7 @@ icc_send_status (struct ccid *c)
   c->epi->tx_done = 1;
   usb_lld_write (c->epi->ep_num, icc_reply, ICC_MSG_HEADER_SIZE);
 
+  led_blink (LED_SHOW_STATUS);
 #ifdef DEBUG_MORE
   DEBUG_INFO ("St\r\n");
 #endif
@@ -1333,7 +1334,7 @@ icc_handle_timeout (struct ccid *c)
       break;
     }
 
-  led_blink (LED_SHOW_STATUS);
+  led_blink (LED_ONESHOT);
   return next_state;
 }
 
@@ -1394,6 +1395,7 @@ ccid_thread (void *arg)
   apdu_init (a);
   ccid_init (c, epi, epo, a);
 
+  timeout = USB_ICC_TIMEOUT;
   icc_prepare_receive (c);
   while (1)
     {