Merge: Version and README updated to LinCAN version 3.3.

Merge commit 'remotes/sf-ocera-lincan/master'

diff --git a/lincan/README b/lincan/README
index d0b07e88a43c63aaee8f6eec4c2a953423a504ea..00f876856526a91d13e3f64e170ca793909a79d6 100644 (file)
--- a/lincan/README
+++ b/lincan/README
@@ -1,5 +1,5 @@
 
-               Linux CAN Driver (LinCAN) version 0.3.2
+               Linux CAN Driver (LinCAN) version 0.3.3
                Pavel Pisa <pisa@cmp.felk.cvut.cz>
                        OCERA team member <http://www.ocera.org>
                        Real-time Systems Laboratory <http://rtlab.felk.cvut.cz/>
@@ -77,6 +77,11 @@ lincan-0.3.2 Improvements in SJA1000 error handling and reporting,
                kernel compatibility. Support for MX1_DIS1 extension
                board for PiMX1 ARM based BCC.
 
+lincan-0.3.3   Some more fixes of SJA1000 buss-of recovery,
+(May 2006)     i82527 IRQ stuck problem fixed (reported by Terence Soh),
+               tested up to 2.6.17 (rc4). Minimal chip info in /proc/can.
+               Support for NSI CAN PCI contributed by Eric Pennamen.
+
                
 The actual version of driver have been latest tested it with
   - PC104 Advantech PCM3680 dual channel board on 2.4 RT-Linux enabled kernel
@@ -114,7 +119,7 @@ from OCERA CVS repository at SourceForge
   
 Web access into CVS
 
-  http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ocera/ocera/components/comm/can/lincan/
+  http://ocera.cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ocera/ocera/components/comm/can/lincan/
 
 Experimental directory at maintainer's (Pavel Pisa's) pages 
 
@@ -167,8 +172,8 @@ COMPILATION from CVS sources without full OCERA tree
 ---------------------------------------------------------------------------
 Obtaining CVS sources of the CAN components only
 ---------------------------------------------------------------------------
-  cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ocera login
-  cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ocera co
+  cvs -d:pserver:anonymous@ocera.cvs.sourceforge.net:/cvsroot/ocera login
+  cvs -z3 -d:pserver:anonymous@ocera.cvs.sourceforge.net:/cvsroot/ocera co
          ocera/components/comm/can
 
 ---------------------------------------------------------------------------
@@ -239,6 +244,7 @@ The hw argument can be one of:
 - pcican-s, for the PCIcan-Q PCI card by KVASER (1x SJA1000)
 - smartcan for i82527 based card with indexed access
 - nsican, for the CAN104 PC/104 card by NSI
+- nsicanpci, for NSI CAN PCI card (2xi82527)
 - cc104, for the CAN104 PC/104 card by Contemporary Controls
 - aim104, for the AIM104CAN PC/104 card by Arcom Control Systems
 - pc-i03, for the PC-I03 ISA card by IXXAT

diff --git a/lincan/include/constants.h b/lincan/include/constants.h
index 80c280b5f017d1fe9c954839726c928dd7219c5f..8ba9ba465179e836ea45cd7dc1b4a5435bd33d39 100644 (file)
--- 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 2
+#define CAN_DRV_VER_PATCH 3
 #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 */