diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-02 23:15:46 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-02 23:15:46 -0700 |
| commit | 7352c95037fa57d37dd7adc4c2ea6935006b56c8 (patch) | |
| tree | af0e2a3cbb42db9296ddbfe18e4d5eb7efc27de6 /host/lib/transport/CMakeLists.txt | |
| parent | 00cd6018405b57a0982b0ce103ff858c646ee18c (diff) | |
| download | uhd-7352c95037fa57d37dd7adc4c2ea6935006b56c8.tar.gz uhd-7352c95037fa57d37dd7adc4c2ea6935006b56c8.tar.bz2 uhd-7352c95037fa57d37dd7adc4c2ea6935006b56c8.zip | |
uhd: reworked the zero copy interface
- recv buffers have a release call
- safe make function for recv buffers (buff + release callback)
- send buffer commits now have a void return
- safe make function for send buffers (buff + commit callback)
The reason for the void return from commit is that ssize_t num_bytes was never returning anything of use.
That is for all of the zero copy implementations so far, commit cannot really error (being asynchronous).
libusb zero copy impl was reworked to support the new interface.
USRP1 io_impl with the psuedo managed buffer was replaced with safe_make.
Also, usrp1 io_impl was simplified greatly due to commit returning void now.
UDP zero copy asio was disabled (in this commit, until its reworked).
Phony send and recv interfaces were removed completely.
Diffstat (limited to 'host/lib/transport/CMakeLists.txt')
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index 61616d077..2be2c89ec 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -36,6 +36,8 @@ IF(LIBUSB_FOUND) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/transport/msvc) ENDIF(MSVC) SET(HAVE_USB_SUPPORT TRUE) +ELSE(LIBUSB_FOUND) + #TODO dummy usb ENDIF(LIBUSB_FOUND) IF(HAVE_USB_SUPPORT) @@ -99,7 +101,7 @@ SET_SOURCE_FILES_PROPERTIES( LIBUHD_APPEND_SOURCES( ${CMAKE_SOURCE_DIR}/lib/transport/if_addrs.cpp ${CMAKE_SOURCE_DIR}/lib/transport/udp_simple.cpp - ${CMAKE_SOURCE_DIR}/lib/transport/udp_zero_copy_asio.cpp + #${CMAKE_SOURCE_DIR}/lib/transport/udp_zero_copy_asio.cpp ${CMAKE_SOURCE_DIR}/lib/transport/vrt_packet_handler.hpp ${CMAKE_SOURCE_DIR}/lib/transport/zero_copy.cpp ) |