From: ppisa Date: Wed, 13 Jul 2005 19:44:00 +0000 (+0200) Subject: Merge: Updated for 0.3.1 release X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~49 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/1cccb041a45ca131c014187a028c27167545ab9d?hp=3d786916880d86f7848de2330cd21c99591ae8fe Merge: Updated for 0.3.1 release Merge commit 'remotes/sf-ocera-lincan/master' --- diff --git a/lincan/CREDITS b/lincan/CREDITS index 8597a9a..f8bcb33 100644 --- a/lincan/CREDITS +++ b/lincan/CREDITS @@ -14,7 +14,7 @@ BFAD GmbH http://www.bfad.de/, http://www.getembedded.de/ He provided ETHERNET CAN-PROXY as well. Pavel Pisa, pisa@cmp.felk.cvut.cz -http://cmp.felk.cvut.cz/~pisa, http://www.pikron.com +http://cmp.felk.cvut.cz/~pisa, http://www.pikron.com/ Bugfixes in SJA1000 code. Total rewrite of message handling infrastructure. Addition of the support for more cards and chips. @@ -32,6 +32,11 @@ Michael Moedt xemc@yahoo.com added support for OSCAR SJA1000 based card connected to ARM LH7A400 SoC +Radim Kalas, Unicontrols.cz +http://www.unicontrols.cz/ + contributed support for series of IXXAT iPC-I 165 (PCI) + boards + ======================================== List of companies and subjects who donated hardware to LinCAN project diff --git a/lincan/README b/lincan/README index b5ea341..774de93 100644 --- a/lincan/README +++ b/lincan/README @@ -1,5 +1,5 @@ - Linux CAN Driver (LinCAN) version 0.3 + Linux CAN Driver (LinCAN) version 0.3.1 Pavel Pisa OCERA team member @@ -66,6 +66,9 @@ lincan-0.2.8 possible SMP and HT deadlock fixed, driver can take lincan-0.3 Changed SJA1000 chip IRQ handling. Enhanced VME (Nov 2004) and EMS CPC-PCI support and many other changes. + +lincan-0.3.1 Small improvements, RTR read moved into separate IOCTL, +(Jul 2005) initial support for some boards contributed by users The actual version of driver have been latest tested it with - PC104 Advantech PCM3680 dual channel board on 2.4 RT-Linux enabled kernel @@ -223,6 +226,7 @@ The hw argument can be one of: - unican for Unicontrols PCAN card - unican-pci for Unicontrols PCAN-PCI card - unican-vme for Unicontrols VCAN card +- ipci165 for IXXAT iPC-I 165 (PCI), requires CONFIG_OC_LINCAN_CARD_ipci165=y - ems_cpcpci for EMS CPC-PCI card - pcan_dongle for PEAK's printer port dongle addapter - oscar for SJA1000 based card connected to ARM LH7A400 SoC @@ -250,3 +254,6 @@ options can be one of: There's still a lot of work to do, have a look at the TODO file for more information. +Some boards support is compiled in only, when it is enabled through +config.omk file. It has to be stored in same directory as Makefile.rules +and config.omk-default is located. diff --git a/lincan/include/constants.h b/lincan/include/constants.h index e838a9e..5559da0 100644 --- a/lincan/include/constants.h +++ b/lincan/include/constants.h @@ -19,7 +19,7 @@ /* Version of the driver */ #define CAN_DRV_VER_MAJOR 0 #define CAN_DRV_VER_MINOR 3 -#define CAN_DRV_VER_PATCH 0 +#define CAN_DRV_VER_PATCH 1 #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 */