From: Adrian Bunk Date: Sat, 19 Jan 2008 08:01:13 +0000 (-0800) Subject: [IrDA]: Irport removal - part 2 X-Git-Tag: v2.6.25-rc1~1162^2~267 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16b4d60b56b9ec922d91cc11ede0bd59033deae4;p=linux-2.6 [IrDA]: Irport removal - part 2 Signed-off-by: Adrian Bunk Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller --- diff --git a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c deleted file mode 100644 index 756cd44e85..0000000000 --- a/drivers/net/irda/act200l.c +++ /dev/null @@ -1,297 +0,0 @@ -/********************************************************************* - * - * Filename: act200l.c - * Version: 0.8 - * Description: Implementation for the ACTiSYS ACT-IR200L dongle - * Status: Experimental. - * Author: SHIMIZU Takuya - * Created at: Fri Aug 3 17:35:42 2001 - * Modified at: Fri Aug 17 10:22:40 2001 - * Modified by: SHIMIZU Takuya - * - * Copyright (c) 2001 SHIMIZU Takuya, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -static int act200l_reset(struct irda_task *task); -static void act200l_open(dongle_t *self, struct qos_info *qos); -static void act200l_close(dongle_t *self); -static int act200l_change_speed(struct irda_task *task); - -/* Regsiter 0: Control register #1 */ -#define ACT200L_REG0 0x00 -#define ACT200L_TXEN 0x01 /* Enable transmitter */ -#define ACT200L_RXEN 0x02 /* Enable receiver */ - -/* Register 1: Control register #2 */ -#define ACT200L_REG1 0x10 -#define ACT200L_LODB 0x01 /* Load new baud rate count value */ -#define ACT200L_WIDE 0x04 /* Expand the maximum allowable pulse */ - -/* Register 4: Output Power register */ -#define ACT200L_REG4 0x40 -#define ACT200L_OP0 0x01 /* Enable LED1C output */ -#define ACT200L_OP1 0x02 /* Enable LED2C output */ -#define ACT200L_BLKR 0x04 - -/* Register 5: Receive Mode register */ -#define ACT200L_REG5 0x50 -#define ACT200L_RWIDL 0x01 /* fixed 1.6us pulse mode */ - -/* Register 6: Receive Sensitivity register #1 */ -#define ACT200L_REG6 0x60 -#define ACT200L_RS0 0x01 /* receive threshold bit 0 */ -#define ACT200L_RS1 0x02 /* receive threshold bit 1 */ - -/* Register 7: Receive Sensitivity register #2 */ -#define ACT200L_REG7 0x70 -#define ACT200L_ENPOS 0x04 /* Ignore the falling edge */ - -/* Register 8,9: Baud Rate Dvider register #1,#2 */ -#define ACT200L_REG8 0x80 -#define ACT200L_REG9 0x90 - -#define ACT200L_2400 0x5f -#define ACT200L_9600 0x17 -#define ACT200L_19200 0x0b -#define ACT200L_38400 0x05 -#define ACT200L_57600 0x03 -#define ACT200L_115200 0x01 - -/* Register 13: Control register #3 */ -#define ACT200L_REG13 0xd0 -#define ACT200L_SHDW 0x01 /* Enable access to shadow registers */ - -/* Register 15: Status register */ -#define ACT200L_REG15 0xf0 - -/* Register 21: Control register #4 */ -#define ACT200L_REG21 0x50 -#define ACT200L_EXCK 0x02 /* Disable clock output driver */ -#define ACT200L_OSCL 0x04 /* oscillator in low power, medium accuracy mode */ - -static struct dongle_reg dongle = { - .type = IRDA_ACT200L_DONGLE, - .open = act200l_open, - .close = act200l_close, - .reset = act200l_reset, - .change_speed = act200l_change_speed, - .owner = THIS_MODULE, -}; - -static int __init act200l_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit act200l_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void act200l_open(dongle_t *self, struct qos_info *qos) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - /* Power on the dongle */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Set the speeds we can accept */ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - qos->min_turn_time.bits = 0x03; -} - -static void act200l_close(dongle_t *self) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - /* Power off the dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function act200l_change_speed (dev, speed) - * - * Set the speed for the ACTiSYS ACT-IR200L type dongle. - * - */ -static int act200l_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - __u8 control[3]; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - self->speed_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - if (irda_task_execute(self, act200l_reset, NULL, task, - (void *) speed)) - { - /* Dongle need more time to reset */ - irda_task_next_state(task, IRDA_TASK_CHILD_WAIT); - - /* Give reset 1 sec to finish */ - ret = msecs_to_jiffies(1000); - } - break; - case IRDA_TASK_CHILD_WAIT: - IRDA_WARNING("%s(), resetting dongle timed out!\n", - __FUNCTION__); - ret = -1; - break; - case IRDA_TASK_CHILD_DONE: - /* Clear DTR and set RTS to enter command mode */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - - switch (speed) { - case 9600: - default: - control[0] = ACT200L_REG8 | (ACT200L_9600 & 0x0f); - control[1] = ACT200L_REG9 | ((ACT200L_9600 >> 4) & 0x0f); - break; - case 19200: - control[0] = ACT200L_REG8 | (ACT200L_19200 & 0x0f); - control[1] = ACT200L_REG9 | ((ACT200L_19200 >> 4) & 0x0f); - break; - case 38400: - control[0] = ACT200L_REG8 | (ACT200L_38400 & 0x0f); - control[1] = ACT200L_REG9 | ((ACT200L_38400 >> 4) & 0x0f); - break; - case 57600: - control[0] = ACT200L_REG8 | (ACT200L_57600 & 0x0f); - control[1] = ACT200L_REG9 | ((ACT200L_57600 >> 4) & 0x0f); - break; - case 115200: - control[0] = ACT200L_REG8 | (ACT200L_115200 & 0x0f); - control[1] = ACT200L_REG9 | ((ACT200L_115200 >> 4) & 0x0f); - break; - } - control[2] = ACT200L_REG1 | ACT200L_LODB | ACT200L_WIDE; - - /* Write control bytes */ - self->write(self->dev, control, 3); - irda_task_next_state(task, IRDA_TASK_WAIT); - ret = msecs_to_jiffies(5); - break; - case IRDA_TASK_WAIT: - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - ret = -1; - break; - } - return ret; -} - -/* - * Function act200l_reset (driver) - * - * Reset the ACTiSYS ACT-IR200L type dongle. - */ -static int act200l_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u8 control[9] = { - ACT200L_REG15, - ACT200L_REG13 | ACT200L_SHDW, - ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL, - ACT200L_REG13, - ACT200L_REG7 | ACT200L_ENPOS, - ACT200L_REG6 | ACT200L_RS0 | ACT200L_RS1, - ACT200L_REG5 | ACT200L_RWIDL, - ACT200L_REG4 | ACT200L_OP0 | ACT200L_OP1 | ACT200L_BLKR, - ACT200L_REG0 | ACT200L_TXEN | ACT200L_RXEN - }; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - self->reset_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Power on the dongle */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_WAIT1); - ret = msecs_to_jiffies(50); - break; - case IRDA_TASK_WAIT1: - /* Reset the dongle : set RTS low for 25 ms */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - - irda_task_next_state(task, IRDA_TASK_WAIT2); - ret = msecs_to_jiffies(50); - break; - case IRDA_TASK_WAIT2: - /* Clear DTR and set RTS to enter command mode */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - - /* Write control bytes */ - self->write(self->dev, control, 9); - irda_task_next_state(task, IRDA_TASK_WAIT3); - ret = msecs_to_jiffies(15); - break; - case IRDA_TASK_WAIT3: - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - break; - } - return ret; -} - -MODULE_AUTHOR("SHIMIZU Takuya "); -MODULE_DESCRIPTION("ACTiSYS ACT-IR200L dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-10"); /* IRDA_ACT200L_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize ACTiSYS ACT-IR200L module - * - */ -module_init(act200l_init); - -/* - * Function cleanup_module (void) - * - * Cleanup ACTiSYS ACT-IR200L module - * - */ -module_exit(act200l_cleanup); diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c deleted file mode 100644 index ae0b80a568..0000000000 --- a/drivers/net/irda/actisys.c +++ /dev/null @@ -1,288 +0,0 @@ -/********************************************************************* - * - * Filename: actisys.c - * Version: 1.0 - * Description: Implementation for the ACTiSYS IR-220L and IR-220L+ - * dongles - * Status: Beta. - * Authors: Dag Brattli (initially) - * Jean Tourrilhes (new version) - * Created at: Wed Oct 21 20:02:35 1998 - * Modified at: Fri Dec 17 09:10:43 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved. - * Copyright (c) 1999 Jean Tourrilhes - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * Neither Dag Brattli nor University of Tromsø admit liability nor - * provide warranty for any of this software. This material is - * provided "AS-IS" and at no charge. - * - ********************************************************************/ - -/* - * Changelog - * - * 0.8 -> 0.9999 - Jean - * o New initialisation procedure : much safer and correct - * o New procedure the change speed : much faster and simpler - * o Other cleanups & comments - * Thanks to Lichen Wang @ Actisys for his excellent help... - */ - -#include -#include -#include -#include - -#include -#include - -/* - * Define the timing of the pulses we send to the dongle (to reset it, and - * to toggle speeds). Basically, the limit here is the propagation speed of - * the signals through the serial port, the dongle being much faster. Any - * serial port support 115 kb/s, so we are sure that pulses 8.5 us wide can - * go through cleanly . If you are on the wild side, you can try to lower - * this value (Actisys recommended me 2 us, and 0 us work for me on a P233!) - */ -#define MIN_DELAY 10 /* 10 us to be on the conservative side */ - -static int actisys_change_speed(struct irda_task *task); -static int actisys_reset(struct irda_task *task); -static void actisys_open(dongle_t *self, struct qos_info *qos); -static void actisys_close(dongle_t *self); - -/* These are the baudrates supported, in the order available */ -/* Note : the 220L doesn't support 38400, but we will fix that below */ -static __u32 baud_rates[] = { 9600, 19200, 57600, 115200, 38400 }; -#define MAX_SPEEDS 5 - -static struct dongle_reg dongle = { - .type = IRDA_ACTISYS_DONGLE, - .open = actisys_open, - .close = actisys_close, - .reset = actisys_reset, - .change_speed = actisys_change_speed, - .owner = THIS_MODULE, -}; - -static struct dongle_reg dongle_plus = { - .type = IRDA_ACTISYS_PLUS_DONGLE, - .open = actisys_open, - .close = actisys_close, - .reset = actisys_reset, - .change_speed = actisys_change_speed, - .owner = THIS_MODULE, -}; - -/* - * Function actisys_change_speed (task) - * - * There is two model of Actisys dongle we are dealing with, - * the 220L and 220L+. At this point, only irattach knows with - * kind the user has requested (it was an argument on irattach - * command line). - * So, we register a dongle of each sort and let irattach - * pick the right one... - */ -static int __init actisys_init(void) -{ - int ret; - - /* First, register an Actisys 220L dongle */ - ret = irda_device_register_dongle(&dongle); - if (ret < 0) - return ret; - /* Now, register an Actisys 220L+ dongle */ - ret = irda_device_register_dongle(&dongle_plus); - if (ret < 0) { - irda_device_unregister_dongle(&dongle); - return ret; - } - return 0; -} - -static void __exit actisys_cleanup(void) -{ - /* We have to remove both dongles */ - irda_device_unregister_dongle(&dongle); - irda_device_unregister_dongle(&dongle_plus); -} - -static void actisys_open(dongle_t *self, struct qos_info *qos) -{ - /* Power on the dongle */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Set the speeds we can accept */ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - - /* Remove support for 38400 if this is not a 220L+ dongle */ - if (self->issue->type == IRDA_ACTISYS_DONGLE) - qos->baud_rate.bits &= ~IR_38400; - - qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */ -} - -static void actisys_close(dongle_t *self) -{ - /* Power off the dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function actisys_change_speed (task) - * - * Change speed of the ACTiSYS IR-220L and IR-220L+ type IrDA dongles. - * To cycle through the available baud rates, pulse RTS low for a few us. - * - * First, we reset the dongle to always start from a known state. - * Then, we cycle through the speeds by pulsing RTS low and then up. - * The dongle allow us to pulse quite fast, se we can set speed in one go, - * which is must faster ( < 100 us) and less complex than what is found - * in some other dongle drivers... - * Note that even if the new speed is the same as the current speed, - * we reassert the speed. This make sure that things are all right, - * and it's fast anyway... - * By the way, this function will work for both type of dongles, - * because the additional speed is at the end of the sequence... - */ -static int actisys_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; /* Target speed */ - int ret = 0; - int i = 0; - - IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__, speed, - self->speed); - - /* Go to a known state by reseting the dongle */ - - /* Reset the dongle : set DTR low for 10 us */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - udelay(MIN_DELAY); - - /* Go back to normal mode (we are now at 9600 b/s) */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* - * Now, we can set the speed requested. Send RTS pulses until we - * reach the target speed - */ - for (i=0; ispeed = baud_rates[i]; - break; - } - /* Make sure previous pulse is finished */ - udelay(MIN_DELAY); - - /* Set RTS low for 10 us */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - udelay(MIN_DELAY); - - /* Set RTS high for 10 us */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - } - - /* Check if life is sweet... */ - if (i >= MAX_SPEEDS) - ret = -1; /* This should not happen */ - - /* Basta lavoro, on se casse d'ici... */ - irda_task_next_state(task, IRDA_TASK_DONE); - - return ret; -} - -/* - * Function actisys_reset (task) - * - * Reset the Actisys type dongle. Warning, this function must only be - * called with a process context! - * - * We need to do two things in this function : - * o first make sure that the dongle is in a state where it can operate - * o second put the dongle in a know state - * - * The dongle is powered of the RTS and DTR lines. In the dongle, there - * is a big capacitor to accommodate the current spikes. This capacitor - * takes a least 50 ms to be charged. In theory, the Bios set those lines - * up, so by the time we arrive here we should be set. It doesn't hurt - * to be on the conservative side, so we will wait... - * Then, we set the speed to 9600 b/s to get in a known state (see in - * change_speed for details). It is needed because the IrDA stack - * has tried to set the speed immediately after our first return, - * so before we can be sure the dongle is up and running. - */ -static int actisys_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - int ret = 0; - - IRDA_ASSERT(task != NULL, return -1;); - - self->reset_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Set both DTR & RTS to power up the dongle */ - /* In theory redundant with power up in actisys_open() */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep 50 ms to make sure capacitor is charged */ - ret = msecs_to_jiffies(50); - irda_task_next_state(task, IRDA_TASK_WAIT); - break; - case IRDA_TASK_WAIT: - /* Reset the dongle : set DTR low for 10 us */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - udelay(MIN_DELAY); - - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - self->speed = 9600; /* That's the default */ - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - break; - } - return ret; -} - -MODULE_AUTHOR("Dag Brattli - Jean Tourrilhes "); -MODULE_DESCRIPTION("ACTiSYS IR-220L and IR-220L+ dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-2"); /* IRDA_ACTISYS_DONGLE */ -MODULE_ALIAS("irda-dongle-3"); /* IRDA_ACTISYS_PLUS_DONGLE */ - - -/* - * Function init_module (void) - * - * Initialize Actisys module - * - */ -module_init(actisys_init); - -/* - * Function cleanup_module (void) - * - * Cleanup Actisys module - * - */ -module_exit(actisys_cleanup); diff --git a/drivers/net/irda/ep7211_ir.c b/drivers/net/irda/ep7211_ir.c deleted file mode 100644 index 4cba38f7e4..0000000000 --- a/drivers/net/irda/ep7211_ir.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - * IR port driver for the Cirrus Logic EP7211 processor. - * - * Copyright 2001, Blue Mug Inc. All rights reserved. - */ - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */ -#define MAX_DELAY 10000 /* 1 ms */ - -static void ep7211_ir_open(dongle_t *self, struct qos_info *qos); -static void ep7211_ir_close(dongle_t *self); -static int ep7211_ir_change_speed(struct irda_task *task); -static int ep7211_ir_reset(struct irda_task *task); - -static DEFINE_SPINLOCK(ep7211_lock); - -static struct dongle_reg dongle = { - .type = IRDA_EP7211_IR, - .open = ep7211_ir_open, - .close = ep7211_ir_close, - .reset = ep7211_ir_reset, - .change_speed = ep7211_ir_change_speed, - .owner = THIS_MODULE, -}; - -static void ep7211_ir_open(dongle_t *self, struct qos_info *qos) -{ - unsigned int syscon1, flags; - - spin_lock_irqsave(&ep7211_lock, flags); - - /* Turn on the SIR encoder. */ - syscon1 = clps_readl(SYSCON1); - syscon1 |= SYSCON1_SIREN; - clps_writel(syscon1, SYSCON1); - - /* XXX: We should disable modem status interrupts on the first - UART (interrupt #14). */ - - spin_unlock_irqrestore(&ep7211_lock, flags); -} - -static void ep7211_ir_close(dongle_t *self) -{ - unsigned int syscon1, flags; - - spin_lock_irqsave(&ep7211_lock, flags); - - /* Turn off the SIR encoder. */ - syscon1 = clps_readl(SYSCON1); - syscon1 &= ~SYSCON1_SIREN; - clps_writel(syscon1, SYSCON1); - - /* XXX: If we've disabled the modem status interrupts, we should - reset them back to their original state. */ - - spin_unlock_irqrestore(&ep7211_lock, flags); -} - -/* - * Function ep7211_ir_change_speed (task) - * - * Change speed of the EP7211 I/R port. We don't really have to do anything - * for the EP7211 as long as the rate is being changed at the serial port - * level. - */ -static int ep7211_ir_change_speed(struct irda_task *task) -{ - irda_task_next_state(task, IRDA_TASK_DONE); - return 0; -} - -/* - * Function ep7211_ir_reset (task) - * - * Reset the EP7211 I/R. We don't really have to do anything. - * - */ -static int ep7211_ir_reset(struct irda_task *task) -{ - irda_task_next_state(task, IRDA_TASK_DONE); - return 0; -} - -/* - * Function ep7211_ir_init(void) - * - * Initialize EP7211 I/R module - * - */ -static int __init ep7211_ir_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -/* - * Function ep7211_ir_cleanup(void) - * - * Cleanup EP7211 I/R module - * - */ -static void __exit ep7211_ir_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -MODULE_AUTHOR("Jon McClintock "); -MODULE_DESCRIPTION("EP7211 I/R driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-8"); /* IRDA_EP7211_IR */ - -module_init(ep7211_ir_init); -module_exit(ep7211_ir_cleanup); diff --git a/drivers/net/irda/esi.c b/drivers/net/irda/esi.c deleted file mode 100644 index d3a61af640..0000000000 --- a/drivers/net/irda/esi.c +++ /dev/null @@ -1,149 +0,0 @@ -/********************************************************************* - * - * Filename: esi.c - * Version: 1.5 - * Description: Driver for the Extended Systems JetEye PC dongle - * Status: Experimental. - * Author: Dag Brattli - * Created at: Sat Feb 21 18:54:38 1998 - * Modified at: Fri Dec 17 09:14:04 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1999 Dag Brattli, , - * Copyright (c) 1998 Thomas Davis, , - * All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -static void esi_open(dongle_t *self, struct qos_info *qos); -static void esi_close(dongle_t *self); -static int esi_change_speed(struct irda_task *task); -static int esi_reset(struct irda_task *task); - -static struct dongle_reg dongle = { - .type = IRDA_ESI_DONGLE, - .open = esi_open, - .close = esi_close, - .reset = esi_reset, - .change_speed = esi_change_speed, - .owner = THIS_MODULE, -}; - -static int __init esi_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit esi_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void esi_open(dongle_t *self, struct qos_info *qos) -{ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_115200; - qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */ -} - -static void esi_close(dongle_t *dongle) -{ - /* Power off dongle */ - dongle->set_dtr_rts(dongle->dev, FALSE, FALSE); -} - -/* - * Function esi_change_speed (task) - * - * Set the speed for the Extended Systems JetEye PC ESI-9680 type dongle - * - */ -static int esi_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - int dtr, rts; - - switch (speed) { - case 19200: - dtr = TRUE; - rts = FALSE; - break; - case 115200: - dtr = rts = TRUE; - break; - case 9600: - default: - dtr = FALSE; - rts = TRUE; - break; - } - - /* Change speed of dongle */ - self->set_dtr_rts(self->dev, dtr, rts); - self->speed = speed; - - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -/* - * Function esi_reset (task) - * - * Reset dongle; - * - */ -static int esi_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - - self->set_dtr_rts(self->dev, FALSE, FALSE); - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -MODULE_AUTHOR("Dag Brattli "); -MODULE_DESCRIPTION("Extended Systems JetEye PC dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-1"); /* IRDA_ESI_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize ESI module - * - */ -module_init(esi_init); - -/* - * Function cleanup_module (void) - * - * Cleanup ESI module - * - */ -module_exit(esi_cleanup); - diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c deleted file mode 100644 index 1f57391a61..0000000000 --- a/drivers/net/irda/girbil.c +++ /dev/null @@ -1,250 +0,0 @@ -/********************************************************************* - * - * Filename: girbil.c - * Version: 1.2 - * Description: Implementation for the Greenwich GIrBIL dongle - * Status: Experimental. - * Author: Dag Brattli - * Created at: Sat Feb 6 21:02:33 1999 - * Modified at: Fri Dec 17 09:13:20 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1999 Dag Brattli, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * Neither Dag Brattli nor University of Tromsø admit liability nor - * provide warranty for any of this software. This material is - * provided "AS-IS" and at no charge. - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -static int girbil_reset(struct irda_task *task); -static void girbil_open(dongle_t *self, struct qos_info *qos); -static void girbil_close(dongle_t *self); -static int girbil_change_speed(struct irda_task *task); - -/* Control register 1 */ -#define GIRBIL_TXEN 0x01 /* Enable transmitter */ -#define GIRBIL_RXEN 0x02 /* Enable receiver */ -#define GIRBIL_ECAN 0x04 /* Cancel self emmited data */ -#define GIRBIL_ECHO 0x08 /* Echo control characters */ - -/* LED Current Register (0x2) */ -#define GIRBIL_HIGH 0x20 -#define GIRBIL_MEDIUM 0x21 -#define GIRBIL_LOW 0x22 - -/* Baud register (0x3) */ -#define GIRBIL_2400 0x30 -#define GIRBIL_4800 0x31 -#define GIRBIL_9600 0x32 -#define GIRBIL_19200 0x33 -#define GIRBIL_38400 0x34 -#define GIRBIL_57600 0x35 -#define GIRBIL_115200 0x36 - -/* Mode register (0x4) */ -#define GIRBIL_IRDA 0x40 -#define GIRBIL_ASK 0x41 - -/* Control register 2 (0x5) */ -#define GIRBIL_LOAD 0x51 /* Load the new baud rate value */ - -static struct dongle_reg dongle = { - .type = IRDA_GIRBIL_DONGLE, - .open = girbil_open, - .close = girbil_close, - .reset = girbil_reset, - .change_speed = girbil_change_speed, - .owner = THIS_MODULE, -}; - -static int __init girbil_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit girbil_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void girbil_open(dongle_t *self, struct qos_info *qos) -{ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - qos->min_turn_time.bits = 0x03; -} - -static void girbil_close(dongle_t *self) -{ - /* Power off dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function girbil_change_speed (dev, speed) - * - * Set the speed for the Girbil type dongle. - * - */ -static int girbil_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - __u8 control[2]; - int ret = 0; - - self->speed_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Need to reset the dongle and go to 9600 bps before - programming */ - if (irda_task_execute(self, girbil_reset, NULL, task, - (void *) speed)) - { - /* Dongle need more time to reset */ - irda_task_next_state(task, IRDA_TASK_CHILD_WAIT); - - /* Give reset 1 sec to finish */ - ret = msecs_to_jiffies(1000); - } - break; - case IRDA_TASK_CHILD_WAIT: - IRDA_WARNING("%s(), resetting dongle timed out!\n", - __FUNCTION__); - ret = -1; - break; - case IRDA_TASK_CHILD_DONE: - /* Set DTR and Clear RTS to enter command mode */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - - switch (speed) { - case 9600: - default: - control[0] = GIRBIL_9600; - break; - case 19200: - control[0] = GIRBIL_19200; - break; - case 34800: - control[0] = GIRBIL_38400; - break; - case 57600: - control[0] = GIRBIL_57600; - break; - case 115200: - control[0] = GIRBIL_115200; - break; - } - control[1] = GIRBIL_LOAD; - - /* Write control bytes */ - self->write(self->dev, control, 2); - irda_task_next_state(task, IRDA_TASK_WAIT); - ret = msecs_to_jiffies(100); - break; - case IRDA_TASK_WAIT: - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - ret = -1; - break; - } - return ret; -} - -/* - * Function girbil_reset (driver) - * - * This function resets the girbil dongle. - * - * Algorithm: - * 0. set RTS, and wait at least 5 ms - * 1. clear RTS - */ -static int girbil_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u8 control = GIRBIL_TXEN | GIRBIL_RXEN; - int ret = 0; - - self->reset_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Reset dongle */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - irda_task_next_state(task, IRDA_TASK_WAIT1); - /* Sleep at least 5 ms */ - ret = msecs_to_jiffies(20); - break; - case IRDA_TASK_WAIT1: - /* Set DTR and clear RTS to enter command mode */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - irda_task_next_state(task, IRDA_TASK_WAIT2); - ret = msecs_to_jiffies(20); - break; - case IRDA_TASK_WAIT2: - /* Write control byte */ - self->write(self->dev, &control, 1); - irda_task_next_state(task, IRDA_TASK_WAIT3); - ret = msecs_to_jiffies(20); - break; - case IRDA_TASK_WAIT3: - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - break; - } - return ret; -} - -MODULE_AUTHOR("Dag Brattli "); -MODULE_DESCRIPTION("Greenwich GIrBIL dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-4"); /* IRDA_GIRBIL_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize Girbil module - * - */ -module_init(girbil_init); - -/* - * Function cleanup_module (void) - * - * Cleanup Girbil module - * - */ -module_exit(girbil_cleanup); - diff --git a/drivers/net/irda/litelink.c b/drivers/net/irda/litelink.c deleted file mode 100644 index 7db11431d0..0000000000 --- a/drivers/net/irda/litelink.c +++ /dev/null @@ -1,179 +0,0 @@ -/********************************************************************* - * - * Filename: litelink.c - * Version: 1.1 - * Description: Driver for the Parallax LiteLink dongle - * Status: Stable - * Author: Dag Brattli - * Created at: Fri May 7 12:50:33 1999 - * Modified at: Fri Dec 17 09:14:23 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1999 Dag Brattli, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */ -#define MAX_DELAY 10000 /* 1 ms */ - -static void litelink_open(dongle_t *self, struct qos_info *qos); -static void litelink_close(dongle_t *self); -static int litelink_change_speed(struct irda_task *task); -static int litelink_reset(struct irda_task *task); - -/* These are the baudrates supported */ -static __u32 baud_rates[] = { 115200, 57600, 38400, 19200, 9600 }; - -static struct dongle_reg dongle = { - .type = IRDA_LITELINK_DONGLE, - .open = litelink_open, - .close = litelink_close, - .reset = litelink_reset, - .change_speed = litelink_change_speed, - .owner = THIS_MODULE, -}; - -static int __init litelink_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit litelink_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void litelink_open(dongle_t *self, struct qos_info *qos) -{ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */ -} - -static void litelink_close(dongle_t *self) -{ - /* Power off dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function litelink_change_speed (task) - * - * Change speed of the Litelink dongle. To cycle through the available - * baud rates, pulse RTS low for a few ms. - */ -static int litelink_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - int i; - - /* Clear RTS to reset dongle */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* Cycle through avaiable baudrates until we reach the correct one */ - for (i=0; i<5 && baud_rates[i] != speed; i++) { - /* Set DTR, clear RTS */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* Set DTR, Set RTS */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - } - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -/* - * Function litelink_reset (task) - * - * Reset the Litelink type dongle. - * - */ -static int litelink_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - - /* Power on dongle */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* Clear RTS to reset dongle */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* This dongles speed defaults to 115200 bps */ - self->speed = 115200; - - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -MODULE_AUTHOR("Dag Brattli "); -MODULE_DESCRIPTION("Parallax Litelink dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-5"); /* IRDA_LITELINK_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize Litelink module - * - */ -module_init(litelink_init); - -/* - * Function cleanup_module (void) - * - * Cleanup Litelink module - * - */ -module_exit(litelink_cleanup); diff --git a/drivers/net/irda/ma600.c b/drivers/net/irda/ma600.c deleted file mode 100644 index f5e6836667..0000000000 --- a/drivers/net/irda/ma600.c +++ /dev/null @@ -1,354 +0,0 @@ -/********************************************************************* - * - * Filename: ma600.c - * Version: 0.1 - * Description: Implementation of the MA600 dongle - * Status: Experimental. - * Author: Leung <95Etwl@alumni.ee.ust.hk> http://www.engsvr.ust/~eetwl95 - * Created at: Sat Jun 10 20:02:35 2000 - * Modified at: - * Modified by: - * - * Note: very thanks to Mr. Maru Wang for providing - * information on the MA600 dongle - * - * Copyright (c) 2000 Leung, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ********************************************************************/ - -/* define this macro for release version */ -//#define NDEBUG - -#include -#include -#include -#include - -#include -#include - -#ifndef NDEBUG - #undef IRDA_DEBUG - #define IRDA_DEBUG(n, args...) (printk(KERN_DEBUG args)) - - #undef ASSERT - #define ASSERT(expr, func) \ - if(!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n",\ - #expr,__FILE__,__FUNCTION__,__LINE__); \ - func} -#endif - -/* convert hex value to ascii hex */ -static const char hexTbl[] = "0123456789ABCDEF"; - - -static void ma600_open(dongle_t *self, struct qos_info *qos); -static void ma600_close(dongle_t *self); -static int ma600_change_speed(struct irda_task *task); -static int ma600_reset(struct irda_task *task); - -/* control byte for MA600 */ -#define MA600_9600 0x00 -#define MA600_19200 0x01 -#define MA600_38400 0x02 -#define MA600_57600 0x03 -#define MA600_115200 0x04 -#define MA600_DEV_ID1 0x05 -#define MA600_DEV_ID2 0x06 -#define MA600_2400 0x08 - -static struct dongle_reg dongle = { - .type = IRDA_MA600_DONGLE, - .open = ma600_open, - .close = ma600_close, - .reset = ma600_reset, - .change_speed = ma600_change_speed, - .owner = THIS_MODULE, -}; - -static int __init ma600_init(void) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - return irda_device_register_dongle(&dongle); -} - -static void __exit ma600_cleanup(void) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - irda_device_unregister_dongle(&dongle); -} - -/* - Power on: - (0) Clear RTS and DTR for 1 second - (1) Set RTS and DTR for 1 second - (2) 9600 bps now - Note: assume RTS, DTR are clear before -*/ -static void ma600_open(dongle_t *self, struct qos_info *qos) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - - qos->baud_rate.bits &= IR_2400|IR_9600|IR_19200|IR_38400 - |IR_57600|IR_115200; - qos->min_turn_time.bits = 0x01; /* Needs at least 1 ms */ - irda_qos_bits_to_value(qos); - - //self->set_dtr_rts(self->dev, FALSE, FALSE); - // should wait 1 second - - self->set_dtr_rts(self->dev, TRUE, TRUE); - // should wait 1 second -} - -static void ma600_close(dongle_t *self) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - - /* Power off dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -static __u8 get_control_byte(__u32 speed) -{ - __u8 byte; - - switch (speed) { - default: - case 115200: - byte = MA600_115200; - break; - case 57600: - byte = MA600_57600; - break; - case 38400: - byte = MA600_38400; - break; - case 19200: - byte = MA600_19200; - break; - case 9600: - byte = MA600_9600; - break; - case 2400: - byte = MA600_2400; - break; - } - - return byte; -} - -/* - * Function ma600_change_speed (dev, state, speed) - * - * Set the speed for the MA600 type dongle. Warning, this - * function must be called with a process context! - * - * Algorithm - * 1. Reset - * 2. clear RTS, set DTR and wait for 1ms - * 3. send Control Byte to the MA600 through TXD to set new baud rate - * wait until the stop bit of Control Byte is sent (for 9600 baud rate, - * it takes about 10 msec) - * 4. set RTS, set DTR (return to NORMAL Operation) - * 5. wait at least 10 ms, new setting (baud rate, etc) takes effect here - * after - */ -static int ma600_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - static __u8 byte; - __u8 byte_echo; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - - ASSERT(task != NULL, return -1;); - - if (self->speed_task && self->speed_task != task) { - IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__); - return msecs_to_jiffies(10); - } else { - self->speed_task = task; - } - - switch (task->state) { - case IRDA_TASK_INIT: - case IRDA_TASK_CHILD_INIT: - /* - * Need to reset the dongle and go to 9600 bps before - * programming - */ - if (irda_task_execute(self, ma600_reset, NULL, task, - (void *) speed)) { - /* Dongle need more time to reset */ - irda_task_next_state(task, IRDA_TASK_CHILD_WAIT); - - /* give 1 second to finish */ - ret = msecs_to_jiffies(1000); - } else { - irda_task_next_state(task, IRDA_TASK_CHILD_DONE); - } - break; - - case IRDA_TASK_CHILD_WAIT: - IRDA_WARNING("%s(), resetting dongle timed out!\n", - __FUNCTION__); - ret = -1; - break; - - case IRDA_TASK_CHILD_DONE: - /* Set DTR, Clear RTS */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - - ret = msecs_to_jiffies(1); /* Sleep 1 ms */ - irda_task_next_state(task, IRDA_TASK_WAIT); - break; - - case IRDA_TASK_WAIT: - speed = (__u32) task->param; - byte = get_control_byte(speed); - - /* Write control byte */ - self->write(self->dev, &byte, sizeof(byte)); - - irda_task_next_state(task, IRDA_TASK_WAIT1); - - /* Wait at least 10 ms */ - ret = msecs_to_jiffies(15); - break; - - case IRDA_TASK_WAIT1: - /* Read control byte echo */ - self->read(self->dev, &byte_echo, sizeof(byte_echo)); - - if(byte != byte_echo) { - /* if control byte != echo, I don't know what to do */ - printk(KERN_WARNING "%s() control byte written != read!\n", __FUNCTION__); - printk(KERN_WARNING "control byte = 0x%c%c\n", - hexTbl[(byte>>4)&0x0f], hexTbl[byte&0x0f]); - printk(KERN_WARNING "byte echo = 0x%c%c\n", - hexTbl[(byte_echo>>4) & 0x0f], - hexTbl[byte_echo & 0x0f]); - #ifndef NDEBUG - } else { - IRDA_DEBUG(2, "%s() control byte write read OK\n", __FUNCTION__); - #endif - } - - /* Set DTR, Set RTS */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_WAIT2); - - /* Wait at least 10 ms */ - ret = msecs_to_jiffies(10); - break; - - case IRDA_TASK_WAIT2: - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - break; - - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - ret = -1; - break; - } - return ret; -} - -/* - * Function ma600_reset (driver) - * - * This function resets the ma600 dongle. Warning, this function - * must be called with a process context!! - * - * Algorithm: - * 0. DTR=0, RTS=1 and wait 10 ms - * 1. DTR=1, RTS=1 and wait 10 ms - * 2. 9600 bps now - */ -int ma600_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__); - - ASSERT(task != NULL, return -1;); - - if (self->reset_task && self->reset_task != task) { - IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__); - return msecs_to_jiffies(10); - } else - self->reset_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Clear DTR and Set RTS */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - irda_task_next_state(task, IRDA_TASK_WAIT1); - ret = msecs_to_jiffies(10); /* Sleep 10 ms */ - break; - case IRDA_TASK_WAIT1: - /* Set DTR and RTS */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - irda_task_next_state(task, IRDA_TASK_WAIT2); - ret = msecs_to_jiffies(10); /* Sleep 10 ms */ - break; - case IRDA_TASK_WAIT2: - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - } - return ret; -} - -MODULE_AUTHOR("Leung <95Etwl@alumni.ee.ust.hk> http://www.engsvr.ust/~eetwl95"); -MODULE_DESCRIPTION("MA600 dongle driver version 0.1"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-11"); /* IRDA_MA600_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize MA600 module - * - */ -module_init(ma600_init); - -/* - * Function cleanup_module (void) - * - * Cleanup MA600 module - * - */ -module_exit(ma600_cleanup); - diff --git a/drivers/net/irda/mcp2120.c b/drivers/net/irda/mcp2120.c deleted file mode 100644 index 5e6199eeef..0000000000 --- a/drivers/net/irda/mcp2120.c +++ /dev/null @@ -1,240 +0,0 @@ -/********************************************************************* - * - * - * Filename: mcp2120.c - * Version: 1.0 - * Description: Implementation for the MCP2120 (Microchip) - * Status: Experimental. - * Author: Felix Tang (tangf@eyetap.org) - * Created at: Sun Mar 31 19:32:12 EST 2002 - * Based on code by: Dag Brattli - * - * Copyright (c) 2002 Felix Tang, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -static int mcp2120_reset(struct irda_task *task); -static void mcp2120_open(dongle_t *self, struct qos_info *qos); -static void mcp2120_close(dongle_t *self); -static int mcp2120_change_speed(struct irda_task *task); - -#define MCP2120_9600 0x87 -#define MCP2120_19200 0x8B -#define MCP2120_38400 0x85 -#define MCP2120_57600 0x83 -#define MCP2120_115200 0x81 - -#define MCP2120_COMMIT 0x11 - -static struct dongle_reg dongle = { - .type = IRDA_MCP2120_DONGLE, - .open = mcp2120_open, - .close = mcp2120_close, - .reset = mcp2120_reset, - .change_speed = mcp2120_change_speed, - .owner = THIS_MODULE, -}; - -static int __init mcp2120_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit mcp2120_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void mcp2120_open(dongle_t *self, struct qos_info *qos) -{ - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - qos->min_turn_time.bits = 0x01; -} - -static void mcp2120_close(dongle_t *self) -{ - /* Power off dongle */ - /* reset and inhibit mcp2120 */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - //self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function mcp2120_change_speed (dev, speed) - * - * Set the speed for the MCP2120. - * - */ -static int mcp2120_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - __u8 control[2]; - int ret = 0; - - self->speed_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - /* Need to reset the dongle and go to 9600 bps before - programming */ - //printk("Dmcp2120_change_speed irda_task_init\n"); - if (irda_task_execute(self, mcp2120_reset, NULL, task, - (void *) speed)) - { - /* Dongle need more time to reset */ - irda_task_next_state(task, IRDA_TASK_CHILD_WAIT); - - /* Give reset 1 sec to finish */ - ret = msecs_to_jiffies(1000); - } - break; - case IRDA_TASK_CHILD_WAIT: - IRDA_WARNING("%s(), resetting dongle timed out!\n", - __FUNCTION__); - ret = -1; - break; - case IRDA_TASK_CHILD_DONE: - /* Set DTR to enter command mode */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - udelay(500); - - switch (speed) { - case 9600: - default: - control[0] = MCP2120_9600; - //printk("mcp2120 9600\n"); - break; - case 19200: - control[0] = MCP2120_19200; - //printk("mcp2120 19200\n"); - break; - case 34800: - control[0] = MCP2120_38400; - //printk("mcp2120 38400\n"); - break; - case 57600: - control[0] = MCP2120_57600; - //printk("mcp2120 57600\n"); - break; - case 115200: - control[0] = MCP2120_115200; - //printk("mcp2120 115200\n"); - break; - } - control[1] = MCP2120_COMMIT; - - /* Write control bytes */ - self->write(self->dev, control, 2); - - irda_task_next_state(task, IRDA_TASK_WAIT); - ret = msecs_to_jiffies(100); - //printk("mcp2120_change_speed irda_child_done\n"); - break; - case IRDA_TASK_WAIT: - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, FALSE, FALSE); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - //printk("mcp2120_change_speed irda_task_wait\n"); - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - ret = -1; - break; - } - return ret; -} - -/* - * Function mcp2120_reset (driver) - * - * This function resets the mcp2120 dongle. - * - * Info: -set RTS to reset mcp2120 - * -set DTR to set mcp2120 software command mode - * -mcp2120 defaults to 9600 baud after reset - * - * Algorithm: - * 0. Set RTS to reset mcp2120. - * 1. Clear RTS and wait for device reset timer of 30 ms (max). - * - */ - - -static int mcp2120_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - int ret = 0; - - self->reset_task = task; - - switch (task->state) { - case IRDA_TASK_INIT: - //printk("mcp2120_reset irda_task_init\n"); - /* Reset dongle by setting RTS*/ - self->set_dtr_rts(self->dev, TRUE, TRUE); - irda_task_next_state(task, IRDA_TASK_WAIT1); - ret = msecs_to_jiffies(50); - break; - case IRDA_TASK_WAIT1: - //printk("mcp2120_reset irda_task_wait1\n"); - /* clear RTS and wait for at least 30 ms. */ - self->set_dtr_rts(self->dev, FALSE, FALSE); - irda_task_next_state(task, IRDA_TASK_WAIT2); - ret = msecs_to_jiffies(50); - break; - case IRDA_TASK_WAIT2: - //printk("mcp2120_reset irda_task_wait2\n"); - /* Go back to normal mode */ - self->set_dtr_rts(self->dev, FALSE, FALSE); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - break; - } - return ret; -} - -MODULE_AUTHOR("Felix Tang "); -MODULE_DESCRIPTION("Microchip MCP2120"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-9"); /* IRDA_MCP2120_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize MCP2120 module - * - */ -module_init(mcp2120_init); - -/* - * Function cleanup_module (void) - * - * Cleanup MCP2120 module - * - */ -module_exit(mcp2120_cleanup); diff --git a/drivers/net/irda/old_belkin.c b/drivers/net/irda/old_belkin.c deleted file mode 100644 index 26f81fd283..0000000000 --- a/drivers/net/irda/old_belkin.c +++ /dev/null @@ -1,164 +0,0 @@ -/********************************************************************* - * - * Filename: old_belkin.c - * Version: 1.1 - * Description: Driver for the Belkin (old) SmartBeam dongle - * Status: Experimental... - * Author: Jean Tourrilhes - * Created at: 22/11/99 - * Modified at: Fri Dec 17 09:13:32 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1999 Jean Tourrilhes, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -/* - * Belkin is selling a dongle called the SmartBeam. - * In fact, there is two hardware version of this dongle, of course with - * the same name and looking the exactly same (grrr...). - * I guess that I've got the old one, because inside I don't have - * a jumper for IrDA/ASK... - * - * As far as I can make it from info on their web site, the old dongle - * support only 9600 b/s, which make our life much simpler as far as - * the driver is concerned, but you might not like it very much ;-) - * The new SmartBeam does 115 kb/s, and I've not tested it... - * - * Belkin claim that the correct driver for the old dongle (in Windows) - * is the generic Parallax 9500a driver, but the Linux LiteLink driver - * fails for me (probably because Linux-IrDA doesn't rate fallback), - * so I created this really dumb driver... - * - * In fact, this driver doesn't do much. The only thing it does is to - * prevent Linux-IrDA to use any other speed than 9600 b/s ;-) This - * driver is called "old_belkin" so that when the new SmartBeam is supported - * its driver can be called "belkin" instead of "new_belkin". - * - * Note : this driver was written without any info/help from Belkin, - * so a lot of info here might be totally wrong. Blame me ;-) - */ - -/* Let's guess */ -#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */ - -static void old_belkin_open(dongle_t *self, struct qos_info *qos); -static void old_belkin_close(dongle_t *self); -static int old_belkin_change_speed(struct irda_task *task); -static int old_belkin_reset(struct irda_task *task); - -/* These are the baudrates supported */ -/* static __u32 baud_rates[] = { 9600 }; */ - -static struct dongle_reg dongle = { - .type = IRDA_OLD_BELKIN_DONGLE, - .open = old_belkin_open, - .close = old_belkin_close, - .reset = old_belkin_reset, - .change_speed = old_belkin_change_speed, - .owner = THIS_MODULE, -}; - -static int __init old_belkin_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit old_belkin_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void old_belkin_open(dongle_t *self, struct qos_info *qos) -{ - /* Not too fast, please... */ - qos->baud_rate.bits &= IR_9600; - /* Needs at least 10 ms (totally wild guess, can do probably better) */ - qos->min_turn_time.bits = 0x01; -} - -static void old_belkin_close(dongle_t *self) -{ - /* Power off dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); -} - -/* - * Function old_belkin_change_speed (task) - * - * With only one speed available, not much to do... - */ -static int old_belkin_change_speed(struct irda_task *task) -{ - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -/* - * Function old_belkin_reset (task) - * - * Reset the Old-Belkin type dongle. - * - */ -static int old_belkin_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - - /* Power on dongle */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Sleep a minimum of 15 us */ - udelay(MIN_DELAY); - - /* This dongles speed "defaults" to 9600 bps ;-) */ - self->speed = 9600; - - irda_task_next_state(task, IRDA_TASK_DONE); - - return 0; -} - -MODULE_AUTHOR("Jean Tourrilhes "); -MODULE_DESCRIPTION("Belkin (old) SmartBeam dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-7"); /* IRDA_OLD_BELKIN_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize Old-Belkin module - * - */ -module_init(old_belkin_init); - -/* - * Function cleanup_module (void) - * - * Cleanup Old-Belkin module - * - */ -module_exit(old_belkin_cleanup); diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c deleted file mode 100644 index 9bfd2441ad..0000000000 --- a/drivers/net/irda/tekram.c +++ /dev/null @@ -1,282 +0,0 @@ -/********************************************************************* - * - * Filename: tekram.c - * Version: 1.2 - * Description: Implementation of the Tekram IrMate IR-210B dongle - * Status: Experimental. - * Author: Dag Brattli - * Created at: Wed Oct 21 20:02:35 1998 - * Modified at: Fri Dec 17 09:13:09 1999 - * Modified by: Dag Brattli - * - * Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * Neither Dag Brattli nor University of Tromsø admit liability nor - * provide warranty for any of this software. This material is - * provided "AS-IS" and at no charge. - * - ********************************************************************/ - -#include -#include -#include -#include - -#include -#include - -static void tekram_open(dongle_t *self, struct qos_info *qos); -static void tekram_close(dongle_t *self); -static int tekram_change_speed(struct irda_task *task); -static int tekram_reset(struct irda_task *task); - -#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_reg dongle = { - .type = IRDA_TEKRAM_DONGLE, - .open = tekram_open, - .close = tekram_close, - .reset = tekram_reset, - .change_speed = tekram_change_speed, - .owner = THIS_MODULE, -}; - -static int __init tekram_init(void) -{ - return irda_device_register_dongle(&dongle); -} - -static void __exit tekram_cleanup(void) -{ - irda_device_unregister_dongle(&dongle); -} - -static void tekram_open(dongle_t *self, struct qos_info *qos) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; - qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */ - irda_qos_bits_to_value(qos); -} - -static void tekram_close(dongle_t *self) -{ - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - /* Power off dongle */ - self->set_dtr_rts(self->dev, FALSE, FALSE); - - if (self->reset_task) - irda_task_delete(self->reset_task); - if (self->speed_task) - irda_task_delete(self->speed_task); -} - -/* - * Function tekram_change_speed (dev, state, speed) - * - * Set the speed for the Tekram IRMate 210 type dongle. Warning, this - * function must be called with a process context! - * - * Algorithm - * 1. clear DTR - * 2. set RTS, and wait at least 7 us - * 3. send Control Byte to the IR-210 through TXD to set new baud rate - * wait until the stop bit of Control Byte is sent (for 9600 baud rate, - * it takes about 100 msec) - * 5. clear RTS (return to NORMAL Operation) - * 6. wait at least 50 us, new setting (baud rate, etc) takes effect here - * after - */ -static int tekram_change_speed(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - __u32 speed = (__u32) task->param; - __u8 byte; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - IRDA_ASSERT(task != NULL, return -1;); - - if (self->speed_task && self->speed_task != task) { - IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ ); - return msecs_to_jiffies(10); - } else - self->speed_task = task; - - switch (speed) { - default: - case 9600: - byte = TEKRAM_PW|TEKRAM_9600; - break; - case 19200: - byte = TEKRAM_PW|TEKRAM_19200; - break; - case 38400: - byte = TEKRAM_PW|TEKRAM_38400; - break; - case 57600: - byte = TEKRAM_PW|TEKRAM_57600; - break; - case 115200: - byte = TEKRAM_115200; - break; - } - - switch (task->state) { - case IRDA_TASK_INIT: - case IRDA_TASK_CHILD_INIT: - /* - * Need to reset the dongle and go to 9600 bps before - * programming - */ - if (irda_task_execute(self, tekram_reset, NULL, task, - (void *) speed)) - { - /* Dongle need more time to reset */ - irda_task_next_state(task, IRDA_TASK_CHILD_WAIT); - - /* Give reset 1 sec to finish */ - ret = msecs_to_jiffies(1000); - } else - irda_task_next_state(task, IRDA_TASK_CHILD_DONE); - break; - case IRDA_TASK_CHILD_WAIT: - IRDA_WARNING("%s(), resetting dongle timed out!\n", - __FUNCTION__); - ret = -1; - break; - case IRDA_TASK_CHILD_DONE: - /* Set DTR, Clear RTS */ - self->set_dtr_rts(self->dev, TRUE, FALSE); - - /* Wait at least 7us */ - udelay(14); - - /* Write control byte */ - self->write(self->dev, &byte, 1); - - irda_task_next_state(task, IRDA_TASK_WAIT); - - /* Wait at least 100 ms */ - ret = msecs_to_jiffies(150); - break; - case IRDA_TASK_WAIT: - /* Set DTR, Set RTS */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->speed_task = NULL; - ret = -1; - break; - } - return ret; -} - -/* - * Function tekram_reset (driver) - * - * This function resets the tekram dongle. Warning, this function - * must be called with a process context!! - * - * Algorithm: - * 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 - */ -int tekram_reset(struct irda_task *task) -{ - dongle_t *self = (dongle_t *) task->instance; - int ret = 0; - - IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - - IRDA_ASSERT(task != NULL, return -1;); - - if (self->reset_task && self->reset_task != task) { - IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ ); - return msecs_to_jiffies(10); - } else - self->reset_task = task; - - /* Power off dongle */ - //self->set_dtr_rts(self->dev, FALSE, FALSE); - self->set_dtr_rts(self->dev, TRUE, TRUE); - - switch (task->state) { - case IRDA_TASK_INIT: - irda_task_next_state(task, IRDA_TASK_WAIT1); - - /* Sleep 50 ms */ - ret = msecs_to_jiffies(50); - break; - case IRDA_TASK_WAIT1: - /* Clear DTR, Set RTS */ - self->set_dtr_rts(self->dev, FALSE, TRUE); - - irda_task_next_state(task, IRDA_TASK_WAIT2); - - /* Should sleep 1 ms */ - ret = msecs_to_jiffies(1); - break; - case IRDA_TASK_WAIT2: - /* Set DTR, Set RTS */ - self->set_dtr_rts(self->dev, TRUE, TRUE); - - /* Wait at least 50 us */ - udelay(75); - - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - break; - default: - IRDA_ERROR("%s(), unknown state %d\n", - __FUNCTION__, task->state); - irda_task_next_state(task, IRDA_TASK_DONE); - self->reset_task = NULL; - ret = -1; - } - return ret; -} - -MODULE_AUTHOR("Dag Brattli "); -MODULE_DESCRIPTION("Tekram IrMate IR-210B dongle driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("irda-dongle-0"); /* IRDA_TEKRAM_DONGLE */ - -/* - * Function init_module (void) - * - * Initialize Tekram module - * - */ -module_init(tekram_init); - -/* - * Function cleanup_module (void) - * - * Cleanup Tekram module - * - */ -module_exit(tekram_cleanup);