patch-2.3.16 linux/drivers/net/irda/w83977af_ir.c

• Lines: 72
• Date: Mon Aug 30 10:23:14 1999
• Orig file: v2.3.15/linux/drivers/net/irda/w83977af_ir.c
• Orig date: Wed Aug 18 11:38:51 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/net/irda/w83977af_ir.c linux/drivers/net/irda/w83977af_ir.c
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Paul VanderSpek
  * Created at:    Wed Nov  4 11:46:16 1998
- * Modified at:   Fri May 21 22:18:19 1999
+ * Modified at:   Wed Aug 11 09:27:54 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>
@@ -90,7 +90,7 @@
 static int  w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev);
 static int  w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size);
 static void w83977af_dma_write(struct irda_device *idev, int iobase);
-static void w83977af_change_speed(struct irda_device *idev, int baud);
+static void w83977af_change_speed(struct irda_device *idev, __u32 speed);
 static void w83977af_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static void w83977af_wait_until_sent(struct irda_device *idev);
 static int  w83977af_is_receiving(struct irda_device *idev);
@@ -376,7 +376,7 @@
  *    Change the speed of the device
  *
  */
-void w83977af_change_speed(struct irda_device *idev, int speed)
+void w83977af_change_speed(struct irda_device *idev, __u32 speed)
 {
 	int ir_mode = HCR_SIR;
 	int iobase; 
@@ -1203,11 +1203,6 @@
 		return -EAGAIN;
 	}
 		
-	/* Ready to play! */
-	dev->tbusy = 0;
-	dev->interrupt = 0;
-	dev->start = 1;
-
 	/* Save current set */
 	set = inb(iobase+SSR);
 
@@ -1222,6 +1217,9 @@
 	/* Restore bank register */
 	outb(set, iobase+SSR);
 
+	/* Ready to play! */
+	irda_device_net_open(dev);
+
 	MOD_INC_USE_COUNT;
 
 	return 0;
@@ -1240,18 +1238,18 @@
 	__u8 set;
 
 	DEBUG(0, __FUNCTION__ "()\n");
-	
-	/* Stop device */
-	dev->tbusy = 1;
-	dev->start = 0;
 
 	ASSERT(dev != NULL, return -1;);
+	
 	idev = (struct irda_device *) dev->priv;
 	
 	ASSERT(idev != NULL, return 0;);
 	ASSERT(idev->magic == IRDA_DEVICE_MAGIC, return 0;);
 	
 	iobase = idev->io.iobase;
+
+	/* Stop device */
+	irda_device_net_close(dev);
 
 	disable_dma(idev->io.dma);