Always enable ACKBTN support.

2018-11-12 14:25:22 +09:00
parent 3d37003d8c
commit 6c72147248
4 changed files with 9 additions and 5 deletions
--- a/5
+++ b/5
@@ -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.
--- a/2
+++ b/2
--- a/src/configure
+++ b/src/configure
@@ -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
  ;;
 *)
  ;;
--- a/src/usb-ccid.c
+++ b/src/usb-ccid.c
@@ -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 *))