patch-2.3.35 linux/drivers/net/irda/irtty.c

• Lines: 144
• Date: Tue Dec 21 10:17:31 1999
• Orig file: v2.3.34/linux/drivers/net/irda/irtty.c
• Orig date: Tue Nov 23 22:42:20 1999

diff -u --recursive --new-file v2.3.34/linux/drivers/net/irda/irtty.c linux/drivers/net/irda/irtty.c
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Dec  9 21:18:38 1997
- * Modified at:   Tue Nov 16 02:50:37 1999
+ * Modified at:   Thu Dec 16 09:37:47 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * Sources:       slip.c by Laurence Culhane,   <loz@holmes.demon.co.uk>
  *                          Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
@@ -42,7 +42,6 @@
 #include <net/irda/irda_device.h>
 
 static hashbin_t *irtty = NULL;
-
 static struct tty_ldisc irda_ldisc;
 
 static int qos_mtt_bits = 0x03;      /* 5 ms or more */
@@ -186,7 +185,7 @@
 		tty->ldisc.flush_buffer(tty);
 	
 	self->magic = IRTTY_MAGIC;
-	self->rx_buff.state = OUTSIDE_FRAME;
+	self->mode = IRDA_IRLAP;
 
 	/* 
 	 *  Initialize QoS capabilities, we fill in all the stuff that
@@ -206,7 +205,7 @@
 	/* Specify how much memory we want */
 	self->rx_buff.truesize = 4000; 
 	self->tx_buff.truesize = 4000;
-	
+
 	/* Allocate memory if needed */
 	if (self->rx_buff.truesize > 0) {
 		self->rx_buff.head = (__u8 *) kmalloc(self->rx_buff.truesize,
@@ -225,8 +224,6 @@
 		memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 	}
 	
-      	self->magic = IRTTY_MAGIC;
-
 	self->rx_buff.in_frame = FALSE;
 	self->rx_buff.state = OUTSIDE_FRAME;
 	self->tx_buff.data = self->tx_buff.head;
@@ -284,18 +281,24 @@
 	tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
 	tty->disc_data = 0;
 	
-	/* We are not using any dongle anymore! */
-	if (self->dongle)
-		irda_device_dongle_cleanup(self->dongle);
-	self->dongle = NULL;
-
 	/* Remove netdevice */
 	if (self->netdev) {
 		rtnl_lock();
 		unregister_netdevice(self->netdev);
 		rtnl_unlock();
+		/* Must free the old-style 2.2.x device */
+		kfree(self->netdev);
 	}
 	
+	/* We are not using any dongle anymore! */
+	if (self->dongle)
+		irda_device_dongle_cleanup(self->dongle);
+	self->dongle = NULL;
+
+	/* Remove speed changing task if any */
+	if (self->task)
+		irda_task_delete(self->task);
+
 	self->tty = NULL;
 	self->magic = 0;
 	
@@ -404,9 +407,15 @@
 	IRDA_DEBUG(2, __FUNCTION__ "(), <%ld>\n", jiffies); 
 
 	self = (struct irtty_cb *) task->instance;
-
 	ASSERT(self != NULL, return -1;);
 
+	/* Check if busy */
+	if (self->task && self->task != task) {
+		IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n");
+		return MSECS_TO_JIFFIES(10);
+	} else
+		self->task = task;
+
 	switch (task->state) {
 	case IRDA_TASK_INIT:
 		/* 
@@ -459,10 +468,12 @@
 		__irtty_change_speed(self, speed);
 		
 		irda_task_next_state(task, IRDA_TASK_DONE);
+		self->task = NULL;
 		break;
 	default:
 		ERROR(__FUNCTION__ "(), unknown state %d\n", task->state);
 		irda_task_next_state(task, IRDA_TASK_DONE);
+		self->task = NULL;
 		ret = -1;
 		break;
 	}	
@@ -551,6 +562,11 @@
 {
 	struct irtty_cb *self = (struct irtty_cb *) tty->disc_data;
 
+	if (!self || !self->netdev) {
+		IRDA_DEBUG(0, __FUNCTION__ "(), not ready yet!\n");
+		return;
+	}
+
 	/* Read the characters out of the buffer */
  	while (count--) {
 		/* 
@@ -631,7 +647,7 @@
 	/* Check if we need to change the speed */
 	if ((speed = irda_get_speed(skb)) != self->io.speed)
 		self->new_speed = speed;
-	
+
 	/* Init tx buffer*/
 	self->tx_buff.data = self->tx_buff.head;
 	
@@ -768,7 +784,7 @@
 	set_fs(get_ds());
 	
 	if (tty->driver.ioctl(tty, NULL, TIOCMSET, (unsigned long) &arg)) { 
-		ERROR(__FUNCTION__ "(), error doing ioctl!\n");
+		IRDA_DEBUG(2, __FUNCTION__ "(), error doing ioctl!\n");
 	}
 	set_fs(fs);
 
@@ -987,6 +1003,9 @@
 		break;
 	case SIOCSDTRRTS:
 		irtty_set_dtr_rts(dev, irq->ifr_dtr, irq->ifr_rts);
+		break;
+	case SIOCSMODE:
+		irtty_set_mode(dev, irq->ifr_mode);
 		break;
 	default:
 		ret = -EOPNOTSUPP;