Changeset 1649


Ignore:
Timestamp:
02/21/10 21:29:53 (11 years ago)
Author:
alno
Message:

WebIf:

  • Merging revisions 1646-1647 of trunk (THX Landlord, THX roro)
Location:
branches/monitor-improvement
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/CMakeLists.txt

    r1641 r1649  
    271271add_subdirectory (csctapi)
    272272add_subdirectory (cscrypt)
    273 if (HAVE_LIBUSB)
    274 add_subdirectory (utils)
    275 endif (HAVE_LIBUSB)
     273
     274if( HAVE_LIBRT OR HAVE_LIBRT_STATIC)
     275    if (HAVE_LIBUSB)
     276        add_subdirectory (utils)
     277    endif (HAVE_LIBUSB)
     278endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC)
    276279
    277280#----------------------- file groups ------------------------------
  • branches/monitor-improvement/csctapi/ifd_smartreader.c

    r1641 r1649  
    315315    pthread_join(reader->rt,NULL);
    316316    libusb_close(reader->sr_config.usb_dev_handle);
     317    libusb_exit(NULL);
    317318    return OK;
    318319
     
    507508    reader->sr_config.usb_dev = NULL;
    508509    reader->sr_config.usb_dev_handle=NULL;
    509     reader->sr_config.usb_read_timeout = 5000;
    510     reader->sr_config.usb_write_timeout = 5000;
     510    reader->sr_config.usb_read_timeout = 10000;
     511    reader->sr_config.usb_write_timeout = 10000;
    511512
    512513    reader->sr_config.type = TYPE_BM;    /* chip type */
Note: See TracChangeset for help on using the changeset viewer.