X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/76d3b76ac7a3757fd794a688888c0c21db6c284a..05dd2640c82d97d88f0bcab5344630f24212836b:/lincan/src/i82527.c

diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index eb89220..caed3d9 100644
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -1,11 +1,36 @@
-/* i82527.c
- * Linux CAN-bus device driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * 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: i82527.c - Intel i82527 CAN controller 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>             */
+/* 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"
@@ -596,13 +621,16 @@ void i82527_irq_update_filter(struct canchip_t *chip, struct msgobj_t *obj)
 
 		i82527_pre_read_config(chip, obj);
 
-		CANMSG("i82527_irq_update_filter: obj at 0x%08lx\n",obj->obj_base_addr);
+		CANMSG("i82527_irq_update_filter: obj at 0x%08lx\n",
+			can_ioptr2ulong(obj->obj_base_addr));
 	}
 }
 
 
-void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
+int i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 {
+	int job_done=0;
+
 	while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 
 		if(can_msgobj_test_and_clear_fl(obj,TX_REQUEST)) {
@@ -616,6 +644,8 @@ void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 			}
 		}
 
+		job_done=1;
+
 		mb();
 
 		can_msgobj_clear_fl(obj,TX_LOCK);
@@ -625,6 +655,8 @@ void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 			continue;
 		break;
 	}
+
+	return job_done;
 }
 
 int i82527_irq_handler(int irq, struct canchip_t *chip)
@@ -679,7 +711,17 @@ int i82527_irq_handler(int irq, struct canchip_t *chip)
 			can_msgobj_set_fl(obj,TX_REQUEST);
 			
 			/* calls i82527_irq_write_handler synchronized with other invocations */
-			i82527_irq_sync_activities(chip, obj);
+			if(i82527_irq_sync_activities(chip, obj)<=0){
+				/* The interrupt has to be cleared anyway */
+				canobj_write_reg(chip,obj,(MVAL_UNC|TXIE_UNC|RXIE_UNC|INTPD_RES),iMSGCTL0);
+
+				/* 
+				 * Rerun for case, that parallel activity on SMP or fully-preemptive
+				 * kernel result in preparation and finished sending of message
+				 * between above if and canobj_write_reg.
+				 */
+				i82527_irq_sync_activities(chip, obj);
+			}
 		}
 		else {