Merge ALICE HLT changes.

Author: oTTer-Chief

Makefile

@@ -1,5 +1,5 @@
 DEBUG=true
-IPATH=/opt/pda
+IPATH=/usr
 
 all:
 	find . -iname 'build_*' -exec make -C {} \;
@@ -33,26 +33,29 @@ dist: rpm
 
 rpm: tarball
 	./package/rpm/configure --version --prefix=$(IPATH)
-	cp pda-`cat VERSION`.tar.gz package/rpm/
+	cp libpda-`cat VERSION`.tar.gz package/rpm/
 	make -C package/rpm/
-	cp ${HOME}/rpmbuild/RPMS/x86_64/pda-*.rpm .
+	cp ${HOME}/rpmbuild/RPMS/x86_64/libpda-`cat VERSION`*.rpm .
+	make -C patches/linux_uio rpm
+	cp ${HOME}/rpmbuild/RPMS/x86_64/pda_kadapter-`uname -r`*.rpm .
 
 tarball: mrproper
-	rm -rf pda-`cat VERSION`.tar.gz
-	tar -cf pda-`cat VERSION`.tar *
+	rm -rf libpda-`cat VERSION`.tar.gz
+	tar -cf libpda-`cat VERSION`.tar *
 	mkdir dist
-	tar -xf pda-`cat VERSION`.tar -C dist/
-	rm -rf dist/pda.cbp dist/pda.layout
+	tar -xf libpda-`cat VERSION`.tar -C dist/
+	rm -rf dist/libpda.cbp dist/libpda.layout
 	-find ./dist -name '.svn' -exec rm -rf {} \; >> /dev/null
-	rm -rf pda-`cat VERSION`.tar
-	mv dist pda-`cat VERSION`
-	tar -cf pda-`cat VERSION`.tar pda-`cat VERSION`
-	gzip pda-`cat VERSION`.tar
-	rm -rf pda-`cat VERSION`
+	rm -rf libpda-`cat VERSION`.tar
+	mv dist libpda-`cat VERSION`
+	tar -cf libpda-`cat VERSION`.tar libpda-`cat VERSION`
+	gzip libpda-`cat VERSION`.tar
+	rm -rf libpda-`cat VERSION`
 
 mrproper: clean
 	$(MAKE) PATH=$(PWD)/opt/bin/:$(PATH) -C ./test/ clean
 	-rm -rf ./package/rpm/pda.spec
+	-rm -rf patches/linux_uio/pda_kadapter.spec
 	-rm -rf build_*
 	-rm -rf opt
 	-rm -rf dist
@@ -63,7 +66,8 @@ mrproper: clean
 
 clean:
 	find . -iname 'build_*' -exec make -C {} clean \;
-	rm -rf pda*.tar.gz pda*.rpm
+	rm -rf libpda*.tar.gz libpda*.rpm package/rpm/*.tar.gz
+	rm -rf pda_kadapter*.rpm
 
 count: mrproper
 	wc -l `find . -iname '*.c' && find . -iname '*.h' && find . -iname '*.inc'`	

package/rpm/pda.template

@@ -1,7 +1,8 @@
-%define inst_prefix /opt
+%define inst_prefix /usr
+%define debug_package %{nil}
 
 Summary:            A library to access PCIe devices from userspace
-Name:               pda
+Name:               libpda
 Version:            99.99.99
 Release:            0
 License:            BSD
@@ -20,16 +21,19 @@ latency and high throughput PCIe devices from the userspace.
 %setup -q
 
 %build
-%configure --prefix=%{inst_prefix}
+./configure --prefix=$RPM_BUILD_ROOT/%{_prefix}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT/%{inst_prefix}/
 
+%post
+/sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
-%{inst_prefix}/bin/*
-%{inst_prefix}/include/*
-%{inst_prefix}/lib/*
-%{inst_prefix}/share/*
+%{_bindir}/*
+%{_prefix}/lib/*
+%{_includedir}/*
+%{_datarootdir}/*

patches/linux_uio/Makefile

@@ -1,5 +1,5 @@
 KDIR    := /lib/modules/$(shell uname -r)/build
-VERSION := $(shell cat uio_pci_dma.h | grep UIO_PCI_DMA_VERSION | cut -d\" -f2)
+VERSION := $(shell uname -r)-$(shell cat uio_pci_dma.h | grep UIO_PCI_DMA_VERSION | cut -d\" -f2)
 
 all: prepare
 	KDIR=$(KDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) make -C build/

patches/linux_uio/pda_kadapter.template

@@ -1,5 +1,7 @@
+%define debug_package %{nil}
+
 Summary:            Kernel adapter for the PDA library
-Name:               pda_kadapter
+Name:               pda_kadapter-%(uname -r)
 Version:            99.99.99
 Release:            0
 License:            BSD

patches/linux_uio/uio_pci_dma.c

@@ -314,7 +314,6 @@ probe
     dma_device->info.name      = DRIVER_NAME;
     dma_device->info.version   = UIO_PCI_DMA_VERSION;
     dma_device->info.irq       = pci_device->irq;
-    dma_device->info.irq_flags = IRQF_SHARED;
     dma_device->info.handler   = irqhandler;
     dma_device->info.irq_flags = msi_enabled ? 0 : IRQF_SHARED;
 
@@ -482,6 +481,7 @@ remove(struct pci_dev *pci_device)
 
 
 static DEFINE_PCI_DEVICE_TABLE(id_table) = {
+    {PCI_DEVICE(0x10dc, 0x01a0) }, /* C-RORC PCI ID as registered at CERN */
     {PCI_DEVICE(0x10dc, 0xbeaf) }, /* FLIB intermediate PCI ID */
     { 0, }
 };