patch-2.2.7 linux/drivers/net/irda/tekram.c

• Lines: 229
• Date: Sat Apr 24 17:49:37 1999
• Orig file: v2.2.6/linux/drivers/net/irda/tekram.c
• Orig date: Fri Apr 16 14:47:30 1999

diff -u --recursive --new-file v2.2.6/linux/drivers/net/irda/tekram.c linux/drivers/net/irda/tekram.c
@@ -1,12 +1,12 @@
 /*********************************************************************
  *                
  * Filename:      tekram.c
- * Version:       0.5
+ * Version:       1.0
  * Description:   Implementation of the Tekram IrMate IR-210B dongle
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Wed Oct 21 20:02:35 1998
- * Modified at:   Mon Feb 15 14:13:17 1999
+ * Modified at:   Tue Apr 13 16:33:54 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998 Dag Brattli, All Rights Reserved.
@@ -33,16 +33,23 @@
 #include <asm/uaccess.h>
 
 #include <net/irda/irda.h>
-#include <net/irda/irmod.h>
 #include <net/irda/irda_device.h>
 #include <net/irda/irtty.h>
 #include <net/irda/dongle.h>
 
-static void tekram_reset( struct irda_device *dev, int unused);
-static void tekram_open( struct irda_device *dev, int type);
-static void tekram_close( struct irda_device *dev);
-static void tekram_change_speed( struct irda_device *dev, int baud);
-static void tekram_init_qos( struct irda_device *idev, struct qos_info *qos);
+static void tekram_reset(struct irda_device *dev, int unused);
+static void tekram_open(struct irda_device *dev, int type);
+static void tekram_close(struct irda_device *dev);
+static void tekram_change_speed(struct irda_device *dev, int baud);
+static void tekram_init_qos(struct irda_device *idev, struct qos_info *qos);
+
+#define TEKRAM_115200 0x00
+#define TEKRAM_57600  0x01
+#define TEKRAM_38400  0x02
+#define TEKRAM_19200  0x03
+#define TEKRAM_9600   0x04
+
+#define TEKRAM_PW 0x10 /* Pulse select bit */
 
 static struct dongle dongle = {
 	TEKRAM_DONGLE,
@@ -53,9 +60,9 @@
 	tekram_init_qos,
 };
 
-__initfunc(void tekram_init(void))
+__initfunc(int tekram_init(void))
 {
-	irtty_register_dongle( &dongle);
+	return irtty_register_dongle(&dongle);
 }
 
 void tekram_cleanup(void)
@@ -102,17 +109,17 @@
 	int cflag;
 	__u8 byte;
 	
-	DEBUG( 4, __FUNCTION__ "()\n");
+	DEBUG(4, __FUNCTION__ "()\n");
 
-	ASSERT( dev != NULL, return;);
-	ASSERT( dev->magic == IRDA_DEVICE_MAGIC, return;);
+	ASSERT(dev != NULL, return;);
+	ASSERT(dev->magic == IRDA_DEVICE_MAGIC, return;);
 	
 	self = (struct irtty_cb *) dev->priv;
 	
-	ASSERT( self != NULL, return;);
-	ASSERT( self->magic == IRTTY_MAGIC, return;);
+	ASSERT(self != NULL, return;);
+	ASSERT(self->magic == IRTTY_MAGIC, return;);
 	
-	if ( !self->tty)
+	if (!self->tty)
 		return;
 
 	tty = self->tty;
@@ -123,26 +130,27 @@
 	cflag &= ~CBAUD;
 
 	switch (baud) {
-	case 9600:
 	default:
+		/* FALLTHROUGH */
+	case 9600:
 		cflag |= B9600;
-		byte = 4;
+		byte = TEKRAM_PW|TEKRAM_9600;
 		break;
 	case 19200:
 		cflag |= B19200;
-		byte = 3;
+		byte = TEKRAM_PW|TEKRAM_19200;
 		break;
 	case 34800:
 		cflag |= B38400;
-		byte = 2;
+		byte = TEKRAM_PW|TEKRAM_38400;
 		break;
 	case 57600:
 		cflag |= B57600;
-		byte = 1;
+		byte = TEKRAM_PW|TEKRAM_57600;
 		break;
 	case 115200:
 		cflag |= B115200;
-		byte = 0;
+		byte = TEKRAM_PW|TEKRAM_115200;
 		break;
 	}
 
@@ -150,22 +158,22 @@
 	irtty_set_dtr_rts(tty, TRUE, FALSE);
 	
 	/* Wait at least 7us */
-	udelay( 7);
+	udelay(7);
 
 	/* Write control byte */
-	if ( tty->driver.write)
-		tty->driver.write( self->tty, 0, &byte, 1);
+	if (tty->driver.write)
+		tty->driver.write(self->tty, 0, &byte, 1);
 	
 	/* Wait at least 100 ms */
 	current->state = TASK_INTERRUPTIBLE;
-	schedule_timeout( 10);
+	schedule_timeout(MSECS_TO_JIFFIES(100));
         
 	/* Set DTR, Set RTS */
 	irtty_set_dtr_rts(tty, TRUE, TRUE);
 
 	/* Now change the speed of the serial port */
 	tty->termios->c_cflag = cflag;
-	tty->driver.set_termios( tty, &old_termios);	
+	tty->driver.set_termios(tty, &old_termios);	
 }
 
 /*
@@ -175,30 +183,29 @@
  *      must be called with a process context!! 
  *
  *      Algorithm:
- *    	  0. set RTS and DTR, and wait 50 ms 
- *           ( power off the IR-210 )
+ *    	  0. Clear RTS and DTR, and wait 50 ms (power off the IR-210 )
  *        1. clear RTS 
  *        2. set DTR, and wait at least 1 ms 
  *        3. clear DTR to SPACE state, wait at least 50 us for further 
  *         operation
  */
-void tekram_reset( struct irda_device *dev, int unused)
+void tekram_reset(struct irda_device *dev, int unused)
 {
 	struct irtty_cb *self;
 	struct tty_struct *tty;
 
-	DEBUG( 4, __FUNCTION__ "()\n");
+	DEBUG(4, __FUNCTION__ "()\n");
 
-	ASSERT( dev != NULL, return;);
-	ASSERT( dev->magic == IRDA_DEVICE_MAGIC, return;);
+	ASSERT(dev != NULL, return;);
+	ASSERT(dev->magic == IRDA_DEVICE_MAGIC, return;);
 	
 	self = (struct irtty_cb *) dev->priv;
 	
-	ASSERT( self != NULL, return;);
-	ASSERT( self->magic == IRTTY_MAGIC, return;);
+	ASSERT(self != NULL, return;);
+	ASSERT(self->magic == IRTTY_MAGIC, return;);
 
 	tty = self->tty;
-	if ( !tty)
+	if (!tty)
 		return;
 
 	/* Power off dongle */
@@ -206,18 +213,20 @@
 
 	/* Sleep 50 ms */
 	current->state = TASK_INTERRUPTIBLE;
-	schedule_timeout(5);
+	schedule_timeout(MSECS_TO_JIFFIES(50));
 
 	/* Clear DTR, Set RTS */
 	irtty_set_dtr_rts(tty, FALSE, TRUE); 
 
 	/* Should sleep 1 ms, but 10-20 should not do any harm */
 	current->state = TASK_INTERRUPTIBLE;
-	schedule_timeout(2);
+	schedule_timeout(MSECS_TO_JIFFIES(20));
 
 	/* Set DTR, Set RTS */
 	irtty_set_dtr_rts(tty, TRUE, TRUE);
 	
+	udelay(50);
+
 	/* Finished! */
 }
 
@@ -227,10 +236,11 @@
  *    Initialize QoS capabilities
  *
  */
-static void tekram_init_qos( struct irda_device *idev, struct qos_info *qos)
+static void tekram_init_qos(struct irda_device *idev, struct qos_info *qos)
 {
 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
-	qos->min_turn_time.bits &= 0xfe; /* All except 0 ms */
+	qos->min_turn_time.bits &= 0x01; /* Needs at least 10 ms */
+	irda_qos_bits_to_value(qos);
 }
 
 #ifdef MODULE
@@ -246,8 +256,7 @@
  */
 int init_module(void)
 {
-	tekram_init();
-	return(0);
+	return tekram_init();
 }
 
 /*