Always enable ACKBTN support.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 12 Nov 2018 05:25:22 +0000 (14:25 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 12 Nov 2018 05:25:22 +0000 (14:25 +0900)
ChangeLog
chopstx
src/configure
src/usb-ccid.c

index dd36574..a3c2fb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-12  NIIBE Yutaka  <gniibe@fsij.org>
+
+       * src/configure (ackbtn_support): Always yes.
+       * src/usb-ccid.c: Fix comma separator.
+
 2018-11-09  NIIBE Yutaka  <gniibe@fsij.org>
 
        * tool/kdf_calc.py (kdf_calc): Use libgcrypt.so.20.
diff --git a/chopstx b/chopstx
index 1369361..39683db 160000 (submodule)
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit 1369361e5934e0aa4701b17d1b53811afc453f7a
+Subproject commit 39683dbc5f66e92457f031bdf303c8226e75d55e
index ffa9d9d..2f50592 100755 (executable)
@@ -44,7 +44,7 @@ pinpad=no
 certdo=no
 hid_card_change=no
 factory_reset=no
-ackbtn_support=no
+ackbtn_support=yes
 flash_override=""
 # For emulation
 prefix=/usr/local
@@ -205,7 +205,6 @@ BLUE_PILL_G)
   ;;
 FST_01SZ)
   MHZ=96
-  ackbtn_support=yes
   ;;
 *)
   ;;
index 01d37a0..c86a74d 100644 (file)
@@ -1714,9 +1714,9 @@ usb_event_handle (struct usb_dev *dev)
 static chopstx_poll_cond_t ccid_event_poll_desc;
 static struct chx_poll_head *const ccid_poll[] = {
   (struct chx_poll_head *const)&usb_intr,
-  (struct chx_poll_head *const)&ccid_event_poll_desc
+  (struct chx_poll_head *const)&ccid_event_poll_desc,
 #ifdef ACKBTN_SUPPORT
-  (struct chx_poll_head *const)&ack_intr,
+  (struct chx_poll_head *const)&ack_intr
 #endif
 };
 #define CCID_POLL_NUM (sizeof (ccid_poll)/sizeof (struct chx_poll_head *))