X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/370c7e5246521a2daa0bb7f49ec599908214c047..05dd2640c82d97d88f0bcab5344630f24212836b:/lincan/src/sja1000p.c

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index 7b5a96a..66fad59 100644
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -1,13 +1,37 @@
-/* sja1000.c
- * Linux CAN-bus device driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * Changed for PeliCan mode SJA1000 by Tomasz Motylewski (BFAD GmbH)
- * T.Motylewski@bfad.de
- * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.3  17 Jun 2004
- */
+/**************************************************************************/
+/* File: sja1000p.c - Philips/NXP SJA1000 chip PeliCanCAN mode support    */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Copyright (C) 2004-2005 Tomasz Motylewski (BFAD GmbH)                  */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
@@ -767,7 +791,8 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 
 		/* (irq_register & sjaIR_TI) */
 		/*	old variant using SJAIR, collides with intended use with irq_accept */
-		if ((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) {
+		if (((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING))||
+		    (can_msgobj_test_fl(obj,TX_REQUEST))) {
 			DEBUGMSG("sja1000_irq_handler: TI or TX_PENDING and TBS\n");
 			obj->ret = 0;
 			can_msgobj_set_fl(obj,TX_REQUEST);
@@ -816,11 +841,15 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 		}
 
 		irq_register=can_read_reg(chip,SJAIR);
-	
+
 		status=can_read_reg(chip,SJASR);
 
-	} while((irq_register & (sjaIR_BEI|sjaIR_EPI|sjaIR_DOI|sjaIR_EI|sjaIR_TI|sjaIR_RI)) ||
-	        ((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) ||
+		if(((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) ||
+		   (irq_register & sjaIR_TI))
+			 can_msgobj_set_fl(obj,TX_REQUEST);
+
+	} while((irq_register & (sjaIR_BEI|sjaIR_EPI|sjaIR_DOI|sjaIR_EI|sjaIR_RI)) ||
+	        (can_msgobj_test_fl(obj,TX_REQUEST) && !can_msgobj_test_fl(obj,TX_LOCK)) ||
 		(status & sjaSR_RBS));
 
 	return CANCHIP_IRQ_HANDLED;