Details | Last modification | View Log | RSS feed
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 86 | f9daq | 1 | diff -x ".*" -x pcicc32.mod.c -x "*.o" -x "*.ko" pcicc32-6.9/driver old/pcicc32-6.9/driver |
| 2 | ------------------------------------------------------------------------------------------ |
||
| 3 | diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/askpci.c old/pcicc32-6.9/driver/askpci.c |
||
| 4 | 118c118,119 |
||
| 5 | < pci_ch->PCI_dev = pci_get_device(pci_ch->vendor_id, pci_ch->device_id, from); |
||
| 6 | --- |
||
| 7 | > pci_ch->PCI_dev = pci_find_device(pci_ch->vendor_id, pci_ch->device_id, from); |
||
| 8 | > |
||
| 9 | diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/common.h old/pcicc32-6.9/driver/common.h |
||
| 10 | 58c58,59 |
||
| 11 | < #include <generated/autoconf.h> |
||
| 12 | --- |
||
| 13 | > |
||
| 14 | > #include <linux/autoconf.h> |
||
| 15 | diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/fops.c old/pcicc32-6.9/driver/fops.c |
||
| 16 | 30c30 |
||
| 17 | < // Revision 1.20 support for kernel version=3.13.0-37-generic 2014/10/19 Rok Pestotnik |
||
| 18 | --- |
||
| 19 | > // |
||
| 20 | 98d97 |
||
| 21 | < #include <linux/sched.h> |
||
| 22 | 282,306d280 |
||
| 23 | < |
||
| 24 | < static long pcicc32_unlocked_ioctl(struct file *pFile, unsigned int cmd, unsigned long arg){ |
||
| 25 | < long retval=0; |
||
| 26 | < |
||
| 27 | < |
||
| 28 | < #if HAVE_UNLOCKED_IOCTL |
||
| 29 | < struct mutex fs_mutex; |
||
| 30 | < mutex_init(&fs_mutex); |
||
| 31 | < mutex_lock(&fs_mutex); |
||
| 32 | < #else |
||
| 33 | < lock_kernel(); |
||
| 34 | < #endif |
||
| 35 | < |
||
| 36 | < DPRINTK(KERN_DEBUG "%s : pcicc32_unlocked_ioctl(0x%08x), size = %d\n", DEVICE_NAME, cmd, _IOC_SIZE(cmd)); |
||
| 37 | < retval = pcicc32_ioctl(NULL, pFile, cmd,arg); |
||
| 38 | < |
||
| 39 | < #if HAVE_UNLOCKED_IOCTL |
||
| 40 | < mutex_unlock(&fs_mutex); |
||
| 41 | < #else |
||
| 42 | < unlock_kernel(); |
||
| 43 | < #endif |
||
| 44 | < |
||
| 45 | < return retval; |
||
| 46 | < } |
||
| 47 | < |
||
| 48 | 335,336d308 |
||
| 49 | < |
||
| 50 | < |
||
| 51 | 462,463c434 |
||
| 52 | < unlocked_ioctl : pcicc32_unlocked_ioctl, /* ioctl */ |
||
| 53 | < // ioctl: pcicc32_ioctl, /* ioctl */ |
||
| 54 | --- |
||
| 55 | > ioctl: pcicc32_ioctl, /* ioctl */ |
||
| 56 | diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/main.c old/pcicc32-6.9/driver/main.c |
||
| 57 | 569,570c569 |
||
| 58 | < |
||
| 59 | < return proc_create_data(DEVICE_NAME, 0, NULL, &pcicc32_fops, NULL) ? 0 : -ENODEV; |
||
| 60 | --- |
||
| 61 | > return create_proc_read_entry(DEVICE_NAME, 0, NULL, pcicc32_read_proc, NULL) ? 0 : -ENODEV; |
||
| 62 | diff -x '.*' -x pcicc32.mod.c -x '*.o' -x '*.ko' pcicc32-6.9/driver/Makefile old/pcicc32-6.9/driver/Makefile |
||
| 63 | 26a27,51 |
||
| 64 | > # $Log: Makefile,v $ |
||
| 65 | > # Revision 1.9 2005/10/08 13:20:26 klaus |
||
| 66 | > # added parts to do a persitent installation |
||
| 67 | > # |
||
| 68 | > # Revision 1.8 2005/03/11 13:23:26 klaus |
||
| 69 | > # simple corrections for to use with kernels 2.4.21 |
||
| 70 | > # |
||
| 71 | > # Revision 1.7 2004/08/12 19:59:19 klaus |
||
| 72 | > # conversion to kernel-version 2.6, released version 6.0 |
||
| 73 | > # |
||
| 74 | > # Revision 1.6 2003/05/11 11:13:35 klaus |
||
| 75 | > # added include-file dependence handling |
||
| 76 | > # |
||
| 77 | > # Revision 1.5 2002/04/14 18:25:38 klaus |
||
| 78 | > # added interrupt handling, driver 4.4. ...3.5.tar.gz |
||
| 79 | > # |
||
| 80 | > # Revision 1.4 2002/04/10 18:40:09 klaus |
||
| 81 | > # compiled and modified on RedHat 7.2 |
||
| 82 | > # |
||
| 83 | > # Revision 1.3 2001/11/20 20:12:50 klaus |
||
| 84 | > # included new header and CVS log |
||
| 85 | > # |
||
| 86 | > #ERNEL__ -DMODULE -Wall -D__NO_DEBUG__ -I |
||
| 87 | > #**************************************************************************** |
||
| 88 | > |
||
| 89 | 30,31c55,58 |
||
| 90 | < # |
||
| 91 | < KERNEL_LOCATION =/usr/src/linux-headers-$(shell uname -r) |
||
| 92 | --- |
||
| 93 | > ### RP 30.9.2008 KERNEL_LOCATION = /usr/src/linux |
||
| 94 | > KERNEL_LOCATION = /usr/src/kernels/2.6.18-92.1.13.el5-i686/ |
||
| 95 | > KERNEL_LOCATION = /usr/src/linux |
||
| 96 | > KERNEL_LOCATION = /home/f9daq/linux-2.6.27/debian/build/build-generic |
||
| 97 | 42c69 |
||
| 98 | < HASVERSION_H := $(shell if test -f /usr/include/linux/version.h ; then echo yes ; else echo no; fi ) |
||
| 99 | --- |
||
| 100 | > HASVERSION_H := $(shell if test -f $(KERNEL_LOCATION)/include/linux/version.h ; then echo yes ; else echo no; fi ) |
||
| 101 | 50,54c77,82 |
||
| 102 | < |
||
| 103 | < VERSION := $(shell cpp -dM -I$(KERNEL_LOCATION)/include $(KERNEL_LOCATION)/include/generated/utsrelease.h \ |
||
| 104 | < | grep UTS_RELEASE | sed -e 's;[^"]*"\(.*\)";\1;g') |
||
| 105 | < |
||
| 106 | < |
||
| 107 | --- |
||
| 108 | > # old VERSION := $(shell uname -r) |
||
| 109 | > # |
||
| 110 | > #VERSION := $(shell cpp -dM -I$(KERNEL_LOCATION)/include $(KERNEL_LOCATION)/include/linux/version.h \ |
||
| 111 | > # | grep UTS_RELEASE | sed -e 's;[^"]*"\(.*\)";\1;g') |
||
| 112 | > #VERSION :=2.6.22-14-generic |
||
| 113 | > VERSION :=2.6.27-17-generic |
||
| 114 | 58,60c86,87 |
||
| 115 | < |
||
| 116 | < INSTALL_LOCATION = /lib/modules/$(shell uname -r)/kernel/drivers/misc/ |
||
| 117 | < |
||
| 118 | --- |
||
| 119 | > #INSTALL_LOCATION = /lib/modules/$(VERSION)/misc |
||
| 120 | > INSTALL_LOCATION = /lib/modules/2.6.27-17-generic/kernel/drivers/misc/ |