Subversion Repositories f9daq

diff -x ".*" -x pcicc32.mod.c -x "*.o" -x "*.ko" pcicc32-6.9/driver old/pcicc32-6.9/driver
------------------------------------------------------------------------------------------
diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/askpci.c old/pcicc32-6.9/driver/askpci.c
118c118,119
<   pci_ch->PCI_dev = pci_get_device(pci_ch->vendor_id, pci_ch->device_id, from);
---
>   pci_ch->PCI_dev = pci_find_device(pci_ch->vendor_id, pci_ch->device_id, from);
> 
diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/common.h old/pcicc32-6.9/driver/common.h
58c58,59
< #include <generated/autoconf.h>
---
> 
> #include <linux/autoconf.h>
diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/fops.c old/pcicc32-6.9/driver/fops.c
30c30
< // Revision 1.20 support for kernel version=3.13.0-37-generic 2014/10/19  Rok Pestotnik
---
> //
98d97
< #include <linux/sched.h>
282,306d280
< 
< static long  pcicc32_unlocked_ioctl(struct file *pFile, unsigned int cmd, unsigned long arg){
< long retval=0;
< 
< 
< #if HAVE_UNLOCKED_IOCTL
<     struct mutex  fs_mutex;
<    mutex_init(&fs_mutex);
<    mutex_lock(&fs_mutex);
< #else
<    lock_kernel();
< #endif
< 
< DPRINTK(KERN_DEBUG "%s : pcicc32_unlocked_ioctl(0x%08x), size = %d\n", DEVICE_NAME, cmd, _IOC_SIZE(cmd));
< retval = pcicc32_ioctl(NULL, pFile, cmd,arg);
< 
< #if HAVE_UNLOCKED_IOCTL
<    mutex_unlock(&fs_mutex);
< #else
<    unlock_kernel();
< #endif
< 
< return retval;
< }
< 
335,336d308
< 
< 
462,463c434
<       unlocked_ioctl :   pcicc32_unlocked_ioctl,              /* ioctl */
< //    ioctl:   pcicc32_ioctl,         /* ioctl */
---
>       ioctl:   pcicc32_ioctl,         /* ioctl */
diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/main.c old/pcicc32-6.9/driver/main.c
569,570c569
< 
<   return proc_create_data(DEVICE_NAME, 0, NULL, &pcicc32_fops, NULL) ? 0 : -ENODEV;
---
>   return create_proc_read_entry(DEVICE_NAME, 0, NULL, pcicc32_read_proc, NULL) ? 0 : -ENODEV; 
diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/Makefile old/pcicc32-6.9/driver/Makefile
26a27,51
> # $Log: Makefile,v $
> # Revision 1.9  2005/10/08 13:20:26  klaus
> # added parts to do a persitent installation
> #
> # Revision 1.8  2005/03/11 13:23:26  klaus
> # simple corrections for to use with kernels 2.4.21
> #
> # Revision 1.7  2004/08/12 19:59:19  klaus
> # conversion to kernel-version 2.6, released version 6.0
> #
> # Revision 1.6  2003/05/11 11:13:35  klaus
> # added include-file dependence handling
> #
> # Revision 1.5  2002/04/14 18:25:38  klaus
> # added interrupt handling, driver 4.4. ...3.5.tar.gz
> #
> # Revision 1.4  2002/04/10 18:40:09  klaus
> # compiled and modified on RedHat 7.2
> #
> # Revision 1.3  2001/11/20 20:12:50  klaus
> # included new header and CVS log
> #
> #ERNEL__ -DMODULE -Wall  -D__NO_DEBUG__   -I
> #****************************************************************************
> 
30,31c55,58
< #
< KERNEL_LOCATION =/usr/src/linux-headers-$(shell uname -r)
---
> ### RP 30.9.2008 KERNEL_LOCATION = /usr/src/linux
> KERNEL_LOCATION = /usr/src/kernels/2.6.18-92.1.13.el5-i686/
> KERNEL_LOCATION = /usr/src/linux
> KERNEL_LOCATION = /home/f9daq/linux-2.6.27/debian/build/build-generic
42c69
< HASVERSION_H := $(shell if test -f /usr/include/linux/version.h ; then echo yes ; else echo no; fi )
---
> HASVERSION_H := $(shell if test -f $(KERNEL_LOCATION)/include/linux/version.h ; then echo yes ; else echo no; fi )
50,54c77,82
< 
< VERSION := $(shell cpp -dM -I$(KERNEL_LOCATION)/include $(KERNEL_LOCATION)/include/generated/utsrelease.h \
<             | grep UTS_RELEASE | sed -e 's;[^"]*"\(.*\)";\1;g')
< 
< 
---
> # old VERSION := $(shell uname -r)
> #
> #VERSION := $(shell cpp -dM -I$(KERNEL_LOCATION)/include $(KERNEL_LOCATION)/include/linux/version.h \
> #            | grep UTS_RELEASE | sed -e 's;[^"]*"\(.*\)";\1;g')
> #VERSION :=2.6.22-14-generic
> VERSION :=2.6.27-17-generic
58,60c86,87
< 
< INSTALL_LOCATION = /lib/modules/$(shell uname -r)/kernel/drivers/misc/
< 
---
> #INSTALL_LOCATION = /lib/modules/$(VERSION)/misc
> INSTALL_LOCATION = /lib/modules/2.6.27-17-generic/kernel/drivers/misc/