From: ppisa Date: Sun, 1 Mar 2009 10:42:35 +0000 (+0100) Subject: Merge commit 'sf-ocera-lincan/master' X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/6236aafe41e4d802499433b9bcf11db9e2c6492e?hp=f419961de4a8e818c602b0642492ce76dd5bf979 Merge commit 'sf-ocera-lincan/master' --- diff --git a/lincan/README b/lincan/README index 0c89a19..b6944ae 100644 --- a/lincan/README +++ b/lincan/README @@ -1,5 +1,5 @@ - Linux CAN Driver (LinCAN) version 0.3.3 + Linux CAN Driver (LinCAN) version 0.3.4 Pavel Pisa OCERA team member Real-time Systems Laboratory @@ -82,7 +82,9 @@ lincan-0.3.3 Some more fixes of SJA1000 buss-of recovery, tested up to 2.6.17 (rc4). Minimal chip info in /proc/can. Support for NSI CAN PCI contributed by Eric Pennamen. - +lincan-0.3.4 Some more fixes of SJA1000 buss-of recovery, +(March 2009) Many enhancements and fixes. Tested up to 2.6.28 Linux kernel. + The actual version of driver have been latest tested it with - PC104 Advantech PCM3680 dual channel board on 2.4 RT-Linux enabled kernel - PiKRON ISA card on 2.4.and 2.6 Linux kernels diff --git a/lincan/include/constants.h b/lincan/include/constants.h index 6c9b80a..82383c2 100644 --- a/lincan/include/constants.h +++ b/lincan/include/constants.h @@ -44,7 +44,7 @@ /* Version of the driver */ #define CAN_DRV_VER_MAJOR 0 #define CAN_DRV_VER_MINOR 3 -#define CAN_DRV_VER_PATCH 3 +#define CAN_DRV_VER_PATCH 4 #define CAN_DRV_VER ((CAN_DRV_VER_MAJOR<<16) | (CAN_DRV_VER_MINOR<<8) | CAN_DRV_VER_PATCH) /* Default driver major number, see /usr/src/linux/Documentation/devices.txt */ diff --git a/lincan/src/main.c b/lincan/src/main.c index 6463147..df2e84c 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -369,9 +369,11 @@ int init_module(void) this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */ this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); - #else /* >= 2.6.26 */ + #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); - #endif /* >= 2.6.26 */ + #else /* >= 2.6.28 */ + this_dev=device_create(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); + #endif /* >= 2.6.28 */ if(IS_ERR(this_dev)){ CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor); #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)