Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9888f54 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[IrDA]: Irport removal - part 1 



This patch removes IrPORT and the old dongle drivers (all off them
have replacement drivers).

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarSamuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d780cd6

drivers/net/irda/Kconfig

+0 −141
Original line number Diff line number Diff line
@@ -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

drivers/net/irda/Makefile

+2 −15
Original line number Diff line number Diff line
@@ -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

drivers/net/irda/irport.c

deleted100644 → 0
+0 −1123

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/net/irda/irport.h

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
/*********************************************************************

 *                

 * 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 */

include/net/irda/irda_device.h

+0 −13
Original line number Diff line number Diff line
@@ -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)

 *