forked from luck/tmp_suning_uos_patched
[IrDA]: Irport removal - part 1
This patch removes IrPORT and the old dongle drivers (all off them have replacement drivers). Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Adrian Bunk
David S. Miller
parent
5d780cd658
commit
e9888f5498
|
|
@ -190,147 +190,6 @@ config KS959_DONGLE
|
|||
To compile it as a module, choose M here: the module will be called
|
||||
ks959-sir.
|
||||
|
||||
comment "Old SIR device drivers"
|
||||
|
||||
config IRPORT_SIR
|
||||
tristate "IrPORT (IrDA serial driver)"
|
||||
depends on IRDA && BROKEN_ON_SMP
|
||||
---help---
|
||||
Say Y here if you want to build support for the IrPORT IrDA device
|
||||
driver. To compile it as a module, choose M here: the module will be
|
||||
called irport. IrPORT can be used instead of IrTTY and sometimes
|
||||
this can be better. One example is if your IrDA port does not
|
||||
have echo-canceling, which will work OK with IrPORT since this
|
||||
driver is working in half-duplex mode only. You don't need to use
|
||||
irattach with IrPORT, but you just insert it the same way as FIR
|
||||
drivers (insmod irport io=0x3e8 irq=11). Notice that IrPORT is a
|
||||
SIR device driver which means that speed is limited to 115200 bps.
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
comment "Old Serial dongle support"
|
||||
|
||||
config DONGLE_OLD
|
||||
bool "Old Serial dongle support"
|
||||
depends on IRPORT_SIR && BROKEN_ON_SMP
|
||||
help
|
||||
Say Y here if you have an infrared device that connects to your
|
||||
computer's serial port. These devices are called dongles. Then say Y
|
||||
or M to the driver for your particular dongle below.
|
||||
|
||||
Note that the answer to this question won't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about serial dongles.
|
||||
|
||||
config ESI_DONGLE_OLD
|
||||
tristate "ESI JetEye PC dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Extended Systems
|
||||
JetEye PC dongle. To compile it as a module, choose M here. The ESI
|
||||
dongle attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be used by IrTTY. To activate support for ESI
|
||||
dongles you will have to start irattach like this:
|
||||
"irattach -d esi".
|
||||
|
||||
config ACTISYS_DONGLE_OLD
|
||||
tristate "ACTiSYS IR-220L and IR220L+ dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the ACTiSYS IR-220L and
|
||||
IR220L+ dongles. To compile it as a module, choose M here. The
|
||||
ACTiSYS dongles attaches to the normal 9-pin serial port connector,
|
||||
and can currently only be used by IrTTY. To activate support for
|
||||
ACTiSYS dongles you will have to start irattach like this:
|
||||
"irattach -d actisys" or "irattach -d actisys+".
|
||||
|
||||
config TEKRAM_DONGLE_OLD
|
||||
tristate "Tekram IrMate 210B dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Tekram IrMate 210B
|
||||
dongle. To compile it as a module, choose M here. The Tekram dongle
|
||||
attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be used by IrTTY. To activate support for Tekram
|
||||
dongles you will have to start irattach like this:
|
||||
"irattach -d tekram".
|
||||
|
||||
config GIRBIL_DONGLE_OLD
|
||||
tristate "Greenwich GIrBIL dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Greenwich GIrBIL
|
||||
dongle. To compile it as a module, choose M here. The Greenwich
|
||||
dongle attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be used by IrTTY. To activate support for Greenwich
|
||||
dongles you will have to insert "irattach -d girbil" in the
|
||||
/etc/irda/drivers script.
|
||||
|
||||
config LITELINK_DONGLE_OLD
|
||||
tristate "Parallax LiteLink dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Parallax Litelink
|
||||
dongle. To compile it as a module, choose M here. The Parallax
|
||||
dongle attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be used by IrTTY. To activate support for Parallax
|
||||
dongles you will have to start irattach like this:
|
||||
"irattach -d litelink".
|
||||
|
||||
config MCP2120_DONGLE_OLD
|
||||
tristate "Microchip MCP2120"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Microchip MCP2120
|
||||
dongle. To compile it as a module, choose M here. The MCP2120 dongle
|
||||
attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be used by IrTTY. To activate support for MCP2120
|
||||
dongles you will have to insert "irattach -d mcp2120" in the
|
||||
/etc/irda/drivers script.
|
||||
|
||||
You must build this dongle yourself. For more information see:
|
||||
<http://www.eyetap.org/~tangf/irda_sir_linux.html>
|
||||
|
||||
config OLD_BELKIN_DONGLE_OLD
|
||||
tristate "Old Belkin dongle"
|
||||
depends on DONGLE_OLD && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the Adaptec Airport 1000
|
||||
and 2000 dongles. To compile it as a module, choose M here: the module
|
||||
will be called old_belkin. Some information is contained in the
|
||||
comments at the top of <file:drivers/net/irda/old_belkin.c>.
|
||||
|
||||
config ACT200L_DONGLE_OLD
|
||||
tristate "ACTiSYS IR-200L dongle (EXPERIMENTAL)"
|
||||
depends on DONGLE_OLD && EXPERIMENTAL && IRDA
|
||||
help
|
||||
Say Y here if you want to build support for the ACTiSYS IR-200L
|
||||
dongle. To compile it as a module, choose M here. The ACTiSYS
|
||||
IR-200L dongle attaches to the normal 9-pin serial port connector,
|
||||
and can currently only be used by IrTTY. To activate support for
|
||||
ACTiSYS IR-200L dongles you will have to start irattach like this:
|
||||
"irattach -d act200l".
|
||||
|
||||
config MA600_DONGLE_OLD
|
||||
tristate "Mobile Action MA600 dongle (EXPERIMENTAL)"
|
||||
depends on DONGLE_OLD && EXPERIMENTAL && IRDA
|
||||
---help---
|
||||
Say Y here if you want to build support for the Mobile Action MA600
|
||||
dongle. To compile it as a module, choose M here. The MA600 dongle
|
||||
attaches to the normal 9-pin serial port connector, and can
|
||||
currently only be tested on IrCOMM. To activate support for MA600
|
||||
dongles you will have to insert "irattach -d ma600" in the
|
||||
/etc/irda/drivers script. Note: irutils 0.9.15 requires no
|
||||
modification. irutils 0.9.9 needs modification. For more
|
||||
information, download the following tar gzip file.
|
||||
|
||||
There is a pre-compiled module on
|
||||
<http://engsvr.ust.hk/~eetwl95/ma600.html>
|
||||
|
||||
config EP7211_IR
|
||||
tristate "EP7211 I/R support"
|
||||
depends on DONGLE_OLD && ARCH_EP7211 && IRDA
|
||||
|
||||
comment "FIR device drivers"
|
||||
|
||||
config USB_IRDA
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
# Rewritten to use lists instead of if-statements.
|
||||
#
|
||||
|
||||
# Old SIR drivers
|
||||
obj-$(CONFIG_IRPORT_SIR) += irport.o
|
||||
# FIR drivers
|
||||
obj-$(CONFIG_USB_IRDA) += irda-usb.o
|
||||
obj-$(CONFIG_SIGMATEL_FIR) += stir4200.o
|
||||
|
|
@ -20,21 +18,10 @@ obj-$(CONFIG_VLSI_FIR) += vlsi_ir.o
|
|||
obj-$(CONFIG_VIA_FIR) += via-ircc.o
|
||||
obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o
|
||||
obj-$(CONFIG_MCS_FIR) += mcs7780.o
|
||||
# Old dongle drivers for old SIR drivers
|
||||
obj-$(CONFIG_ESI_DONGLE_OLD) += esi.o
|
||||
obj-$(CONFIG_TEKRAM_DONGLE_OLD) += tekram.o
|
||||
obj-$(CONFIG_ACTISYS_DONGLE_OLD) += actisys.o
|
||||
obj-$(CONFIG_GIRBIL_DONGLE_OLD) += girbil.o
|
||||
obj-$(CONFIG_LITELINK_DONGLE_OLD) += litelink.o
|
||||
obj-$(CONFIG_OLD_BELKIN_DONGLE_OLD) += old_belkin.o
|
||||
obj-$(CONFIG_MCP2120_DONGLE_OLD) += mcp2120.o
|
||||
obj-$(CONFIG_ACT200L_DONGLE_OLD) += act200l.o
|
||||
obj-$(CONFIG_MA600_DONGLE_OLD) += ma600.o
|
||||
obj-$(CONFIG_EP7211_IR) += ep7211_ir.o
|
||||
obj-$(CONFIG_AU1000_FIR) += au1k_ir.o
|
||||
# New SIR drivers
|
||||
# SIR drivers
|
||||
obj-$(CONFIG_IRTTY_SIR) += irtty-sir.o sir-dev.o
|
||||
# New dongles drivers for new SIR drivers
|
||||
# dongle drivers for SIR drivers
|
||||
obj-$(CONFIG_ESI_DONGLE) += esi-sir.o
|
||||
obj-$(CONFIG_TEKRAM_DONGLE) += tekram-sir.o
|
||||
obj-$(CONFIG_ACTISYS_DONGLE) += actisys-sir.o
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,80 +0,0 @@
|
|||
/*********************************************************************
|
||||
*
|
||||
* Filename: irport.h
|
||||
* Version: 0.1
|
||||
* Description: Serial driver for IrDA
|
||||
* Status: Experimental.
|
||||
* Author: Dag Brattli <dagb@cs.uit.no>
|
||||
* Created at: Sun Aug 3 13:49:59 1997
|
||||
* Modified at: Fri Jan 14 10:21:10 2000
|
||||
* Modified by: Dag Brattli <dagb@cs.uit.no>
|
||||
*
|
||||
* Copyright (c) 1997, 1998-2000 Dag Brattli <dagb@cs.uit.no>
|
||||
* 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.
|
||||
*
|
||||
********************************************************************/
|
||||
|
||||
#ifndef IRPORT_H
|
||||
#define IRPORT_H
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#include <net/irda/irda_device.h>
|
||||
|
||||
#define SPEED_DEFAULT 9600
|
||||
#define SPEED_MAX 115200
|
||||
|
||||
/*
|
||||
* These are the supported serial types.
|
||||
*/
|
||||
#define PORT_UNKNOWN 0
|
||||
#define PORT_8250 1
|
||||
#define PORT_16450 2
|
||||
#define PORT_16550 3
|
||||
#define PORT_16550A 4
|
||||
#define PORT_CIRRUS 5
|
||||
#define PORT_16650 6
|
||||
#define PORT_MAX 6
|
||||
|
||||
#define FRAME_MAX_SIZE 2048
|
||||
|
||||
struct irport_cb {
|
||||
struct net_device *netdev; /* Yes! we are some kind of netdevice */
|
||||
struct net_device_stats stats;
|
||||
|
||||
struct irlap_cb *irlap; /* The link layer we are attached to */
|
||||
|
||||
chipio_t io; /* IrDA controller information */
|
||||
iobuff_t tx_buff; /* Transmit buffer */
|
||||
iobuff_t rx_buff; /* Receive buffer */
|
||||
|
||||
struct qos_info qos; /* QoS capabilities for this device */
|
||||
dongle_t *dongle; /* Dongle driver */
|
||||
|
||||
__u32 flags; /* Interface flags */
|
||||
__u32 new_speed;
|
||||
int mode;
|
||||
int index; /* Instance index */
|
||||
int transmitting; /* Are we transmitting ? */
|
||||
|
||||
spinlock_t lock; /* For serializing operations */
|
||||
|
||||
/* For piggyback drivers */
|
||||
void *priv;
|
||||
void (*change_speed)(void *priv, __u32 speed);
|
||||
irq_handler_t interrupt;
|
||||
};
|
||||
|
||||
#endif /* IRPORT_H */
|
||||
|
|
@ -228,21 +228,8 @@ static inline int irda_device_txqueue_empty(const struct net_device *dev)
|
|||
int irda_device_set_raw_mode(struct net_device* self, int status);
|
||||
struct net_device *alloc_irdadev(int sizeof_priv);
|
||||
|
||||
/* Dongle interface */
|
||||
void irda_device_unregister_dongle(struct dongle_reg *dongle);
|
||||
int irda_device_register_dongle(struct dongle_reg *dongle);
|
||||
dongle_t *irda_device_dongle_init(struct net_device *dev, int type);
|
||||
int irda_device_dongle_cleanup(dongle_t *dongle);
|
||||
|
||||
void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode);
|
||||
|
||||
void irda_task_delete(struct irda_task *task);
|
||||
struct irda_task *irda_task_execute(void *instance,
|
||||
IRDA_TASK_CALLBACK function,
|
||||
IRDA_TASK_CALLBACK finished,
|
||||
struct irda_task *parent, void *param);
|
||||
void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state);
|
||||
|
||||
/*
|
||||
* Function irda_get_mtt (skb)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -57,20 +57,6 @@ static void __irda_task_delete(struct irda_task *task);
|
|||
static hashbin_t *dongles = NULL;
|
||||
static hashbin_t *tasks = NULL;
|
||||
|
||||
#ifdef CONFIG_IRDA_DEBUG
|
||||
static const char *task_state[] = {
|
||||
"IRDA_TASK_INIT",
|
||||
"IRDA_TASK_DONE",
|
||||
"IRDA_TASK_WAIT",
|
||||
"IRDA_TASK_WAIT1",
|
||||
"IRDA_TASK_WAIT2",
|
||||
"IRDA_TASK_WAIT3",
|
||||
"IRDA_TASK_CHILD_INIT",
|
||||
"IRDA_TASK_CHILD_WAIT",
|
||||
"IRDA_TASK_CHILD_DONE",
|
||||
};
|
||||
#endif /* CONFIG_IRDA_DEBUG */
|
||||
|
||||
static void irda_task_timer_expired(void *data);
|
||||
|
||||
int __init irda_device_init( void)
|
||||
|
|
@ -176,14 +162,6 @@ int irda_device_is_receiving(struct net_device *dev)
|
|||
return req.ifr_receiving;
|
||||
}
|
||||
|
||||
void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state)
|
||||
{
|
||||
IRDA_DEBUG(2, "%s(), state = %s\n", __FUNCTION__, task_state[state]);
|
||||
|
||||
task->state = state;
|
||||
}
|
||||
EXPORT_SYMBOL(irda_task_next_state);
|
||||
|
||||
static void __irda_task_delete(struct irda_task *task)
|
||||
{
|
||||
del_timer(&task->timer);
|
||||
|
|
@ -191,14 +169,13 @@ static void __irda_task_delete(struct irda_task *task)
|
|||
kfree(task);
|
||||
}
|
||||
|
||||
void irda_task_delete(struct irda_task *task)
|
||||
static void irda_task_delete(struct irda_task *task)
|
||||
{
|
||||
/* Unregister task */
|
||||
hashbin_remove(tasks, (long) task, NULL);
|
||||
|
||||
__irda_task_delete(task);
|
||||
}
|
||||
EXPORT_SYMBOL(irda_task_delete);
|
||||
|
||||
/*
|
||||
* Function irda_task_kick (task)
|
||||
|
|
@ -271,51 +248,6 @@ static int irda_task_kick(struct irda_task *task)
|
|||
return finished;
|
||||
}
|
||||
|
||||
/*
|
||||
* Function irda_task_execute (instance, function, finished)
|
||||
*
|
||||
* This function registers and tries to execute tasks that may take some
|
||||
* time to complete. We do it this hairy way since we may have been
|
||||
* called from interrupt context, so it's not possible to use
|
||||
* schedule_timeout()
|
||||
* Two important notes :
|
||||
* o Make sure you irda_task_delete(task); in case you delete the
|
||||
* calling instance.
|
||||
* o No real need to lock when calling this function, but you may
|
||||
* want to lock within the task handler.
|
||||
* Jean II
|
||||
*/
|
||||
struct irda_task *irda_task_execute(void *instance,
|
||||
IRDA_TASK_CALLBACK function,
|
||||
IRDA_TASK_CALLBACK finished,
|
||||
struct irda_task *parent, void *param)
|
||||
{
|
||||
struct irda_task *task;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
|
||||
|
||||
task = kmalloc(sizeof(struct irda_task), GFP_ATOMIC);
|
||||
if (!task)
|
||||
return NULL;
|
||||
|
||||
task->state = IRDA_TASK_INIT;
|
||||
task->instance = instance;
|
||||
task->function = function;
|
||||
task->finished = finished;
|
||||
task->parent = parent;
|
||||
task->param = param;
|
||||
task->magic = IRDA_TASK_MAGIC;
|
||||
|
||||
init_timer(&task->timer);
|
||||
|
||||
/* Register task */
|
||||
hashbin_insert(tasks, (irda_queue_t *) task, (long) task, NULL);
|
||||
|
||||
/* No time to waste, so lets get going! */
|
||||
return irda_task_kick(task) ? NULL : task;
|
||||
}
|
||||
EXPORT_SYMBOL(irda_task_execute);
|
||||
|
||||
/*
|
||||
* Function irda_task_timer_expired (data)
|
||||
*
|
||||
|
|
@ -364,105 +296,6 @@ struct net_device *alloc_irdadev(int sizeof_priv)
|
|||
}
|
||||
EXPORT_SYMBOL(alloc_irdadev);
|
||||
|
||||
/*
|
||||
* Function irda_device_init_dongle (self, type, qos)
|
||||
*
|
||||
* Initialize attached dongle.
|
||||
*
|
||||
* Important : request_module require us to call this function with
|
||||
* a process context and irq enabled. - Jean II
|
||||
*/
|
||||
dongle_t *irda_device_dongle_init(struct net_device *dev, int type)
|
||||
{
|
||||
struct dongle_reg *reg;
|
||||
dongle_t *dongle = kzalloc(sizeof(dongle_t), GFP_KERNEL);
|
||||
|
||||
might_sleep();
|
||||
|
||||
spin_lock(&dongles->hb_spinlock);
|
||||
reg = hashbin_find(dongles, type, NULL);
|
||||
|
||||
#ifdef CONFIG_KMOD
|
||||
/* Try to load the module needed */
|
||||
if (!reg && capable(CAP_SYS_MODULE)) {
|
||||
spin_unlock(&dongles->hb_spinlock);
|
||||
|
||||
request_module("irda-dongle-%d", type);
|
||||
|
||||
spin_lock(&dongles->hb_spinlock);
|
||||
reg = hashbin_find(dongles, type, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!reg || !try_module_get(reg->owner) ) {
|
||||
IRDA_ERROR("IrDA: Unable to find requested dongle type %x\n",
|
||||
type);
|
||||
kfree(dongle);
|
||||
dongle = NULL;
|
||||
}
|
||||
if (dongle) {
|
||||
/* Bind the registration info to this particular instance */
|
||||
dongle->issue = reg;
|
||||
dongle->dev = dev;
|
||||
}
|
||||
spin_unlock(&dongles->hb_spinlock);
|
||||
return dongle;
|
||||
}
|
||||
EXPORT_SYMBOL(irda_device_dongle_init);
|
||||
|
||||
/*
|
||||
* Function irda_device_dongle_cleanup (dongle)
|
||||
*/
|
||||
int irda_device_dongle_cleanup(dongle_t *dongle)
|
||||
{
|
||||
IRDA_ASSERT(dongle != NULL, return -1;);
|
||||
|
||||
dongle->issue->close(dongle);
|
||||
module_put(dongle->issue->owner);
|
||||
kfree(dongle);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(irda_device_dongle_cleanup);
|
||||
|
||||
/*
|
||||
* Function irda_device_register_dongle (dongle)
|
||||
*/
|
||||
int irda_device_register_dongle(struct dongle_reg *new)
|
||||
{
|
||||
spin_lock(&dongles->hb_spinlock);
|
||||
/* Check if this dongle has been registered before */
|
||||
if (hashbin_find(dongles, new->type, NULL)) {
|
||||
IRDA_MESSAGE("%s: Dongle type %x already registered\n",
|
||||
__FUNCTION__, new->type);
|
||||
} else {
|
||||
/* Insert IrDA dongle into hashbin */
|
||||
hashbin_insert(dongles, (irda_queue_t *) new, new->type, NULL);
|
||||
}
|
||||
spin_unlock(&dongles->hb_spinlock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(irda_device_register_dongle);
|
||||
|
||||
/*
|
||||
* Function irda_device_unregister_dongle (dongle)
|
||||
*
|
||||
* Unregister dongle, and remove dongle from list of registered dongles
|
||||
*
|
||||
*/
|
||||
void irda_device_unregister_dongle(struct dongle_reg *dongle)
|
||||
{
|
||||
struct dongle *node;
|
||||
|
||||
spin_lock(&dongles->hb_spinlock);
|
||||
node = hashbin_remove(dongles, dongle->type, NULL);
|
||||
if (!node)
|
||||
IRDA_ERROR("%s: dongle not found!\n", __FUNCTION__);
|
||||
spin_unlock(&dongles->hb_spinlock);
|
||||
}
|
||||
EXPORT_SYMBOL(irda_device_unregister_dongle);
|
||||
|
||||
#ifdef CONFIG_ISA_DMA_API
|
||||
/*
|
||||
* Function setup_dma (idev, buffer, count, mode)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user