diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2017-08-16 22:38:14 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2017-08-16 22:38:14 +0200 |
| commit | 991f507418cb21da6ced14984b19567ade27933a (patch) | |
| tree | db29cd66dcfaed89f1853684fcf37be5c641c4f0 | |
| parent | de3112ba6a92fc56c8861f7deabb7db1c487e775 (diff) | |
| parent | 39c23788696c7f1ff76687bfeac376a919138844 (diff) | |
| download | pcitool-991f507418cb21da6ced14984b19567ade27933a.tar.gz pcitool-991f507418cb21da6ced14984b19567ade27933a.tar.bz2 pcitool-991f507418cb21da6ced14984b19567ade27933a.tar.xz pcitool-991f507418cb21da6ced14984b19567ade27933a.zip | |
Merge minor fixes from camera/pcitool
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | dma/ipe.h | 2 | ||||
| -rw-r--r-- | pcitool.spec.in | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 92ff3b5..4e259bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ project(pcitool C) -set(RELEASE "3") +set(RELEASE "0") set(PCILIB_VERSION "0.2.8") -set(PCILIB_ABI_VERSION "0") +set(PCILIB_ABI_VERSION "2") cmake_minimum_required(VERSION 2.8) #set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH true) @@ -6,7 +6,7 @@ #include "version.h" #define IPEDMA_PAGE_SIZE 4096l /**< page size */ -#define IPEDMA_DMA_PAGES 1024l /**< number of DMA pages in the ring buffer to allocate */ +#define IPEDMA_DMA_PAGES 512l /**< number of DMA pages in the ring buffer to allocate */ #define IPEDMA_DMA_TIMEOUT 100000l /**< us, overrides PCILIB_DMA_TIMEOUT (actual hardware timeout is 50ms according to Lorenzo) */ diff --git a/pcitool.spec.in b/pcitool.spec.in index 645492b..8467519 100644 --- a/pcitool.spec.in +++ b/pcitool.spec.in @@ -18,7 +18,7 @@ Vendor: Institute for Data Processing and Electronics, KIT Packager: Suren A. Chilingaryan <csa@suren.me> Source: ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 URL: http://darksoft.org -BuildRequires: libfastwriter-devel libxml2-devel uthash +BuildRequires: libfastwriter-devel libxml2-devel uthash-devel BuildRequires: python python-devel swig BuildRequires: dkms BuildRequires: doxygen @@ -59,7 +59,7 @@ API exposes 4 API layers. Summary: Development files for pcilib Group: Development/Libraries Requires: libpcilib${PCILIB_ABI_VERSION} = %{version} -Requires: uthash +Requires: uthash-devel %description -n libpcilib-devel Development files for user-space PCI library |