X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c6d6f58c34e1b6a4c03d1e86d1abf48eeb6f5624..074e90ee2a9a0a573bc987097650e9c1ec233337:/lincan/src/select.c

diff --git a/lincan/src/select.c b/lincan/src/select.c
index 79d97fc..704aaf4 100644
--- a/lincan/src/select.c
+++ b/lincan/src/select.c
@@ -1,11 +1,36 @@
-/* select.c
- * Header file for the Linux CAN-bus driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * Added by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
- */
+/**************************************************************************/
+/* File: select.c - systemcall to wait for new messages and free Tx slots */
+/*                                                                        */
+/* 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"
@@ -20,9 +45,7 @@ unsigned int can_poll(struct file *file, poll_table *wait)
 	struct canque_ends_t *qends;
 	struct msgobj_t *obj;
         unsigned int mask = 0;
-	unsigned long flags;
 	struct canque_edge_t *edge;
-	struct list_head *entry;
 	int full=0;
 	int i;
 
@@ -30,7 +53,7 @@ unsigned int can_poll(struct file *file, poll_table *wait)
 		CANMSG("can_close: bad canuser magic\n");
 		return -ENODEV;
 	}
-	
+
 	obj = canuser->msgobj;
 	qends = canuser->qends;
 
@@ -45,13 +68,10 @@ unsigned int can_poll(struct file *file, poll_table *wait)
         if ((file->f_mode & FMODE_WRITE) && !(file->f_flags & O_SYNC)) {
                 poll_wait(file, &qends->endinfo.fileinfo.writeq, wait);
 
-		spin_lock_irqsave(&qends->ends_lock, flags);
-		list_for_each(entry,&qends->inlist){
-			edge=list_entry(entry,struct canque_edge_t,inpeers);
+		canque_for_each_inedge(qends, edge) {
 			if(canque_fifo_test_fl(&edge->fifo,FULL))
 				full=1;
 		}
-		spin_unlock_irqrestore(&qends->ends_lock, flags);
 
 		if(!full)
 			mask |= POLLOUT | POLLWRNORM;
@@ -60,13 +80,10 @@ unsigned int can_poll(struct file *file, poll_table *wait)
         if ((file->f_mode & FMODE_WRITE) && (file->f_flags & O_SYNC)) {
                 poll_wait(file, &qends->endinfo.fileinfo.emptyq, wait);
 
-		spin_lock_irqsave(&qends->ends_lock, flags);
-		list_for_each(entry,&qends->inlist){
-			edge=list_entry(entry,struct canque_edge_t,inpeers);
+		canque_for_each_inedge(qends, edge) {
 			if(!canque_fifo_test_fl(&edge->fifo,EMPTY))
 				full=1;
 		}
-		spin_unlock_irqrestore(&qends->ends_lock, flags);
 
 		if(!full)
 			mask |= POLLOUT | POLLWRNORM;