Update chopstx to 1.1
authorNIIBE Yutaka <gniibe@fsij.org>
Fri, 1 Jul 2016 04:09:42 +0000 (13:09 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Fri, 1 Jul 2016 04:09:42 +0000 (13:09 +0900)
ChangeLog
chopstx
src/usb-ccid.c

index f09502b..e991d41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-01  NIIBE Yutaka  <gniibe@fsij.org>
+
+       * chopstx: Update to 1.1.
+       * src/usb-ccid.c (poll_event_intr, ccid_thread): Follow the
+       change.
+
 2016-06-21  Niibe Yutaka  <gniibe@fsij.org>
 
        * doc/index.rst: Update documentation by an example
diff --git a/chopstx b/chopstx
index 40adf95..09f2770 160000 (submodule)
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit 40adf95c24f85f475896e1c55e1af5f32349729a
+Subproject commit 09f27704f5be59ffe12dcb2a8e54083f44b014ee
index 6288c16..663d202 100644 (file)
@@ -1482,9 +1482,13 @@ static void
 poll_event_intr (uint32_t *timeout, struct eventflag *ev, chopstx_intr_t *intr)
 {
   chopstx_poll_cond_t poll_desc;
+  struct chx_poll_head *pd_array[2] = {
+    (struct chx_poll_head *)intr,
+    (struct chx_poll_head *)&poll_desc
+  };
 
   eventflag_prepare_poll (ev, &poll_desc);
-  chopstx_poll (timeout, 2, intr, &poll_desc);
+  chopstx_poll (timeout, 2, pd_array);
 }
 
 void *
@@ -1646,7 +1650,7 @@ ccid_thread (void *arg)
   /* Loading reGNUal.  */
   while (bDeviceState != UNCONNECTED)
     {
-      chopstx_poll (NULL, 1, &interrupt);
+      chopstx_intr_wait (&interrupt);
       usb_event_handle (&dev);
     }