29 Commits

Author SHA1 Message Date
Pete Batard dfc99bb006 replaced LIBUSB_API with LIBUSB_CALL 2010-09-20 15:39:26 +01:00
Pete Batard 972106d2c8 more residuals from official: samples 2010-07-30 00:02:18 +01:00
Pete Batard 307c5490de added missing calling convention for callbacks in dpfp
also whitespaces in dpfp.c
2010-04-18 23:15:33 +01:00
Pete Batard c83b94c78f merge abstraction for POSIX Threads and integration changes (Michael Plante, Peter Stuge)
v1.0.6 release

Darwin: support multiple calls to libusb_init
Credit to Orin Eman for finding this bug.

Darwin: use logging functions
Use usbi_warn, usbi_err, and usbi_info instead of _usbi_log.

Darwin: fix memory leak in process_device
Credit to Mike Colagrosso for finding this bug.

Add internal abstraction for POSIX Threads
This prepares for a Windows backend without dependency on pthreads-w32.

pthread_* is renamed to usbi_* and PTHREAD_* to USBI_*.

A usbi_mutex_static_t and usbi_mutex_static_lock() and _unlock() are
introduced for statically initialized mutexes, since they may be
implemented using other types when pthreads mutexes aren't used.

Move -pthread from libusb/Makefile.am to host-specific AM_CFLAGS in
configure.ac. AM_CFLAGS is already used in Makefile.am.

(Numerous merge conflicts resolved by Michael Plante)

misc fixes to pthreads abstraction
* windows_compat.h should not be directly included (use libusbi.h)
* windows_usb.c still had some references to pthread_mutex_[un]lock

Add libusb_strerror() to get short error message in English from enum
(Merge conflicts resolved by Michael Plante)

Better cleanup on errors, stricter types and some good casts
Avoid various memory leaks in error code paths and remove warnings. Also
add usbi_cond_destroy in os/threads_posix.h because it's used for cleanup
now.

(Merge conflicts resolved by Michael Plante)

Rename all interface parameters to usb_interface or interface_number
(Merge conflicts resolved by Michael Plante)

Add type parameter to the list_for_each_entry() and _safe() macros
(Merge conflicts resolved by Michael Plante)

VA_ARGS workaround for logging with MSVC6
(Merge conflicts resolved by Michael Plante)

Fix context memory leak in libusb_init()
* Now holds default_context_lock for duration of libusb_init
* Doesn't allocate it if not needed

Fix the last MSVC /W3 warning

removal of pthreads from MSVC and mingw
* removed pthread*.lib from linking in msvc6 (2005/8 not yet edited)
* added threads_windows.[ch] to all project files in msvc6
* added usbi_cond_signal to both threading versions, unused
* added native windows threading code, now used

removed redundant time.h includes

removed pthread-win32 informational solution files

updated MSVC 2005/2008 for thread abstraction

fixed DDK build

fixed cygwin's use of POSIX threads

fixed dpfp/dpfp_threaded for MinGW compatibility

config_msvc.h -> msvc/config.h

pthread abstraction for DLL project files

fixed bad reference to thread_windows in 2005 DLL vcproj

cygwin ifdef is not required in threads_windows.h - removed

fixed residuals from previous patches

moved thread source detection into autotool scripts
2010-02-24 11:29:43 +00:00
Daniel Drake 1df713d622 Introduce contexts to the API
Suggested by David Zeuthen. This allows multiple libraries in the same
process to independently use libusb without interfering.
2008-06-26 22:42:59 -05:00
Daniel Drake fec7c84163 Handle hot-unplugging
This involved moving from select() to poll() because there is no way to
distinguish usbfs's POLLERR condition with select().
2008-05-11 20:47:27 +01:00
Daniel Drake 7ac0a405b4 Remove libusb_cancel_transfer_sync
This wasn't a particularly nice API. Cancellation should be handled by
the completion handler.
2008-04-29 12:08:35 +01:00
Daniel Drake 8d809854e2 Rename libusb_poll() to libusb_handle_events() 2008-03-30 22:19:00 +01:00
Daniel Drake 211f80c9f2 Isochronous endpoint I/O
Due to variable-sized structures, this involved changing allocation
mechanism. All transfers must now be allocated and freed through
libusb.

A synchronous function is missing, and I could do with writing a few
more helper functions to simplify things.
2008-03-30 22:17:34 +01:00
Daniel Drake ead09cde68 API documentation
Hopefully mostly complete. Some constants were renamed and move into
enums.
2008-03-20 21:19:45 +00:00
Daniel Drake c0c9432d38 Beginnings of cross-platform abstraction
This also includes a libusb_get_pollfds API change
2008-03-13 12:46:08 +00:00
Daniel Drake de4c5341d1 Add transfer flags 2008-03-10 18:38:15 +00:00
Daniel Drake aae05f688d Simplify libusb_fill_control_transfer()
Transfer length can be inferred from the setup packet.
2008-03-10 11:32:15 +00:00
Daniel Drake 7c5ea95297 get_device fixup
Rename API away from "devh" and fix implementation to match header
2008-03-10 11:29:24 +00:00
Daniel Drake 283ae96c3c Simplify cancellation API
No need to provide the device here.
2008-03-09 16:15:02 +00:00
Daniel Drake ebad1c7968 Rename libusb_dev_handle to libusb_device_handle 2008-03-09 16:12:08 +00:00
Daniel Drake 66348c90ea Separate transfer allocation and submission
Leads to some hefty API changes. Now we're much more similar to the
Linux kernel model.

Problems with dealing with asynchronous control transfers are passed
on to the user, basically you must allocate a buffer, start with the
setup, and put the data after. This won't make much sense until
documented (soon...)
2008-03-09 00:58:09 +00:00
Daniel Drake d21ebe47ce Rework URB API naming
Now refer to everything as "transfers" as consistent with the USB spec
libusb_transfer is now a kind of transfer handle. To reduce confusion
with libusb_bulk_transfer and libusb_control_transfer, those have been
renamed to libusb_{control,bulk}_transfer_request.
2008-03-08 12:58:32 +00:00
Daniel Drake 23f8fb8baf Add convenience function to find and open a device by USB VID+PID
Lots of libusb apps I write are simple test apps not intended to be real
apps. Having a function available to quickly locate my device will be
handy in such situations.
2008-03-06 23:43:57 +00:00
Daniel Drake 9cfdb494fc Rework device discovery API
libusb_find_devices and libusb_get_devices are no more

libusb_get_device_list obtains a list of libusb_device structures for all
known devices in the system.

Each libusb_device now has a reference count, defaulting to 1 on
instantiation. The reference count of 1 refers to the fact that it is
present in the list in this scenario.

Opening a device adds a pointer to the libusb_device structure in the
handle, so that also adds a reference. Closing the device removes that
reference.

The function to free the device list can optionally unref all the devices
inside.

In future we will make the libusb_device instances all "global" so that if
the app calls get_device_list twice it actually gets the same libusb_device
structure references back. This way we can start to track disconnects, and
we can investigate adding a unique "session ID" to each libusb_device, an
identifier guaranteed to be unique to that device until reboot.
2008-03-06 23:25:20 +00:00
Daniel Drake 637a8d7ff8 Remove timers and signalfd
Instead of timers, add a mechanism for informing the parent app when the
next timeout is due to happen, so that it can call us at that time.

As we no longer use signals, signalfd has also been removed.
2008-01-30 13:19:10 +00:00
Daniel Drake e3ce855ace Fix dpfp example compilation 2008-01-26 17:26:40 +00:00
Daniel Drake de53d972ed Rename some _devh_ functions
Decided against naming functions in this style based on advice from
Tim Roberts. Still not really sure about devh naming in general.
2008-01-04 01:17:06 +00:00
Daniel Drake 132d84bf8a Use "transfer" instead of "msg"
Based on a discussion with Tim Roberts.
2008-01-04 01:13:25 +00:00
Daniel Drake dbb3fd871e API renaming: remove fpi and usb_ stuff
fpi changed to usbi.

We should not expose structures with prefix "usb_" in the public
namespace as it is quite likely there will be some conflict somewhere.
Instead, using "libusb_" should be safer.
2008-01-04 00:54:57 +00:00
Daniel Drake e9364d7215 Rename to libusb-1.0
I've taken over the libusb project, and what was previously known as fpusb
will eventually be released as libusb-1.0.
2008-01-04 00:40:49 +00:00
Daniel Drake dfac6756fa Don't pass ctrl_msg/bulk_msg structures through async paths
These are easiest to construct on the stack, but in the async case it is
likely that the submitting function returns (hence stack is destroyed)
before URB completion.
2007-12-12 23:32:54 +00:00
Daniel Drake b5a7a41108 Rename fpusb_device_handle functions to devh
Prevents confusion with functions that work on fpusb_dev structures.
2007-12-03 22:27:21 +00:00
Daniel Drake 852bba4754 Initial commit
Basic library structure which supports enumerating detected USB devices
2007-12-02 22:54:59 +00:00