diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-08-25 06:13:11 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-08-25 06:13:11 +0200 |
| commit | 6df8608c3ebefaee191bb51fe702b7f1682c47c5 (patch) | |
| tree | f7ea9e60e72775a8f91bb9ae1d9801882185601c /scd | |
| parent | scd: Add a libusb debug level. (diff) | |
| download | gnupg2-6df8608c3ebefaee191bb51fe702b7f1682c47c5.tar.xz gnupg2-6df8608c3ebefaee191bb51fe702b7f1682c47c5.zip | |
scd: Add npth_unprotect/npth_protect for blocking operations.
* scd/ccid-driver.c (ccid_open_usb_reader): Name the thread.
(ccid_vendor_specific_setup, ccid_open_usb_reader): Wrap
blocking operations by npth_unprotect/npth_protect.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ccid-driver.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index f527b49ff..ad1e16a12 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -1345,7 +1345,13 @@ ccid_vendor_specific_setup (ccid_driver_t handle) { if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532) { +#ifdef USE_NPTH + npth_unprotect (); +#endif libusb_clear_halt (handle->idev, handle->ep_intr); +#ifdef USE_NPTH + npth_protect (); +#endif } return 0; } @@ -1725,6 +1731,7 @@ ccid_open_usb_reader (const char *spec_reader_name, *handle = NULL; return err; } + npth_setname_np (thread, "ccid_usb_thread"); npth_attr_destroy (&tattr); } @@ -1769,9 +1776,15 @@ ccid_open_usb_reader (const char *spec_reader_name, goto leave; } +#ifdef USE_NPTH + npth_unprotect (); +#endif rc = libusb_claim_interface (idev, ifc_no); if (rc) { +#ifdef USE_NPTH + npth_protect (); +#endif DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); rc = map_libusb_error (rc); goto leave; @@ -1781,11 +1794,18 @@ ccid_open_usb_reader (const char *spec_reader_name, rc = libusb_set_interface_alt_setting (idev, ifc_no, set_no); if (rc) { +#ifdef USE_NPTH + npth_protect (); +#endif DEBUGOUT_1 ("usb_set_interface_alt_setting failed: %d\n", rc); rc = map_libusb_error (rc); goto leave; } +#ifdef USE_NPTH + npth_protect (); +#endif + rc = ccid_vendor_specific_init (*handle); leave: |