Browse Source

Merge minor fixes from camera/pcitool

Suren A. Chilingaryan 6 years ago
parent
commit
991f507418
3 changed files with 5 additions and 5 deletions
  1. 2 2
      CMakeLists.txt
  2. 1 1
      dma/ipe.h
  3. 2 2
      pcitool.spec.in

+ 2 - 2
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)

+ 1 - 1
dma/ipe.h

@@ -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) */
 

+ 2 - 2
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