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

Commit 4a3df154 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_035: remove driver 



According to ADDI-DATA, this board was discontinued last year and they
feel that no further development is needed for this driver. Remove the
driver from comedi to help with the addi-data cleanup.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcbb0c47

drivers/staging/comedi/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -594,14 +594,6 @@ config COMEDI_ADDI_WATCHDOG 
	  boards. This module will be automatically selected when needed. The

	  module will be called addi_watchdog.



config COMEDI_ADDI_APCI_035

	tristate "ADDI-DATA APCI_035 support"

	---help---

	  Enable support for ADDI-DATA APCI_035 cards



	  To compile this driver as a module, choose M here: the module will be

	  called addi_apci_035.



config COMEDI_ADDI_APCI_1032

	tristate "ADDI-DATA APCI_1032 support"

	---help---

drivers/staging/comedi/drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ obj-$(CONFIG_COMEDI_S526) += s526.o 
# Comedi PCI drivers

obj-$(CONFIG_COMEDI_8255_PCI)		+= 8255_pci.o

obj-$(CONFIG_COMEDI_ADDI_WATCHDOG)	+= addi_watchdog.o

obj-$(CONFIG_COMEDI_ADDI_APCI_035)	+= addi_apci_035.o

obj-$(CONFIG_COMEDI_ADDI_APCI_1032)	+= addi_apci_1032.o

obj-$(CONFIG_COMEDI_ADDI_APCI_1500)	+= addi_apci_1500.o

obj-$(CONFIG_COMEDI_ADDI_APCI_1516)	+= addi_apci_1516.o

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c

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

 * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.

 *

 *	ADDI-DATA GmbH

 *	Dieselstrasse 3

 *	D-77833 Ottersweier

 *	Tel: +19(0)7223/9493-0

 *	Fax: +49(0)7223/9493-92

 *	http://www.addi-data.com

 *	info@addi-data.com

 *

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

 */



/* Card Specific information */

#define APCI035_ADDRESS_RANGE		255



/* Timer / Watchdog Related Defines */

#define APCI035_TCW_SYNC_ENABLEDISABLE	0

#define APCI035_TCW_RELOAD_VALUE	4

#define APCI035_TCW_TIMEBASE		8

#define APCI035_TCW_PROG		12

#define APCI035_TCW_TRIG_STATUS		16

#define APCI035_TCW_IRQ			20

#define APCI035_TCW_WARN_TIMEVAL	24

#define APCI035_TCW_WARN_TIMEBASE	28



#define ADDIDATA_TIMER			0

/* #define ADDIDATA_WATCHDOG		1 */



#define APCI035_TW1			0

#define APCI035_TW2			32

#define APCI035_TW3			64

#define APCI035_TW4			96



#define APCI035_AI_OFFSET		0

#define APCI035_TEMP			128

#define APCI035_ALR_SEQ			4

#define APCI035_START_STOP_INDEX	8

#define APCI035_ALR_START_STOP		12

#define APCI035_ALR_IRQ			16

#define APCI035_EOS			20

#define APCI035_CHAN_NO			24

#define APCI035_CHAN_VAL		28

#define APCI035_CONV_TIME_TIME_BASE	36

#define APCI035_RELOAD_CONV_TIME_VAL	32

#define APCI035_DELAY_TIME_TIME_BASE	44

#define APCI035_RELOAD_DELAY_TIME_VAL	40

#define ENABLE_EXT_TRIG			1

#define ENABLE_EXT_GATE			2

#define ENABLE_EXT_TRIG_GATE		3



#define ANALOG_INPUT			0

#define TEMPERATURE			1

#define RESISTANCE			2



#define ADDIDATA_GREATER_THAN_TEST	0

#define ADDIDATA_LESS_THAN_TEST		1



#define APCI035_MAXVOLT			2.5



#define ADDIDATA_UNIPOLAR		1

#define ADDIDATA_BIPOLAR		2



/* ANALOG INPUT RANGE */

static struct comedi_lrange range_apci035_ai = {

	8, {

		BIP_RANGE(10),

		BIP_RANGE(5),

		BIP_RANGE(2),

		BIP_RANGE(1),

		UNI_RANGE(10),

		UNI_RANGE(5),

		UNI_RANGE(2),

		UNI_RANGE(1)

	}

};



static int i_WatchdogNbr;

static int i_Temp;

static int i_Flag = 1;



/*

 * Configures The Timer , Counter or Watchdog

 *

 * data[0] 0 = Configure As Timer, 1 = Configure As Watchdog

 * data[1] Watchdog number

 * data[2] Time base Unit

 * data[3] Reload Value

 * data[4] External Trigger, 1 = Enable, 0 = Disable

 * data[5] External Trigger Level

 *	00 = Trigger Disabled

 *	01 = Trigger Enabled (Low level)

 *	10 = Trigger Enabled (High Level)

 *	11 = Trigger Enabled (High/Low level)

 * data[6] External Gate, 1 = Enable, 0 = Disable

 * data[7] External Gate level

 *	00 = Gate Disabled

 *	01 = Gate Enabled (Low level)

 *	10 = Gate Enabled (High Level)

 * data[8] Warning Relay, 1 = Enable, 0 = Disable

 * data[9] Warning Delay available

 * data[10] Warning Relay Time unit

 * data[11] Warning Relay Time Reload value

 * data[12] Reset Relay, 1 = Enable, 0 = Disable

 * data[13] Interrupt, 1 = Enable, 0 = Disable

 */

static int apci035_timer_config(struct comedi_device *dev,

				struct comedi_subdevice *s,

				struct comedi_insn *insn,

				unsigned int *data)

{

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Status;

	unsigned int ui_Command;

	unsigned int ui_Mode;



	i_Temp = 0;

	devpriv->tsk_Current = current;

	devpriv->b_TimerSelectMode = data[0];

	i_WatchdogNbr = data[1];

	if (data[0] == 0)

		ui_Mode = 2;

	else

		ui_Mode = 0;



	ui_Command = 0;

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Set the reload value */

	outl(data[3], devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 4);



	/* Set the time unit */

	outl(data[2], devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 8);

	if (data[0] == ADDIDATA_TIMER) {



		/* Set the mode :             */

		/* - Disable the hardware     */

		/* - Disable the counter mode */

		/* - Disable the warning      */

		/* - Disable the reset        */

		/* - Enable the timer mode    */

		/* - Set the timer mode       */



		ui_Command =

			(ui_Command & 0xFFF719E2UL) | ui_Mode << 13UL | 0x10UL;



	} else if (data[0] == ADDIDATA_WATCHDOG) {



		/* Set the mode :             */

		/* - Disable the hardware     */

		/* - Disable the counter mode */

		/* - Disable the warning      */

		/* - Disable the reset        */

		/* - Disable the timer mode   */



		ui_Command = ui_Command & 0xFFF819E2UL;



	} else {

		dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");

		return -EINVAL;

	}



	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Disable the hardware trigger */

	ui_Command = ui_Command & 0xFFFFF89FUL;

	if (data[4] == 1) {

		/* Set the hardware trigger level */

		ui_Command = ui_Command | (data[5] << 5);

	}

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Disable the hardware gate */

	ui_Command = ui_Command & 0xFFFFF87FUL;

	if (data[6] == 1) {

		/* Set the hardware gate level */

		ui_Command = ui_Command | (data[7] << 7);

	}

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Disable the hardware output */

	ui_Command = ui_Command & 0xFFFFF9FBUL;



	/* Set the hardware output level */

	ui_Command = ui_Command | (data[8] << 2);

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);

	if (data[9] == 1) {

		/* Set the reload value */

		outl(data[11],

			devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 24);



		/* Set the time unite */

		outl(data[10],

			devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 28);

	}



	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Disable the hardware output */

	ui_Command = ui_Command & 0xFFFFF9F7UL;



	/* Set the hardware output level */

	ui_Command = ui_Command | (data[12] << 3);

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Enable the watchdog interrupt */

	ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	/* Set the interrupt selection */

	ui_Status = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 16);



	ui_Command = (ui_Command & 0xFFFFF9FDUL) | (data[13] << 1);

	outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



	return insn->n;

}



/*

 * Start / Stop The Selected Timer , or Watchdog

 *

 * data[0]

 *	0 - Stop Selected Timer/Watchdog

 *	1 - Start Selected Timer/Watch*dog

 *	2 - Trigger Selected Timer/Watchdog

 *	3 - Stop All Timer/Watchdog

 *	4 - Start All Timer/Watchdog

 *	5 - Trigger All Timer/Watchdog

 */

static int apci035_timer_write(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn,

			       unsigned int *data)

{

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Command;

	int i_Count;



	if (data[0] == 1) {

		ui_Command =

			inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



		/* Start the hardware */

		ui_Command = (ui_Command & 0xFFFFF9FFUL) | 0x1UL;

		outl(ui_Command,

			devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);

	}

	if (data[0] == 2) {

		ui_Command =

			inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);



		/* Set the trigger command */

		ui_Command = (ui_Command & 0xFFFFF9FFUL) | 0x200UL;

		outl(ui_Command,

			devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);

	}



	if (data[0] == 0) {

		/* Stop The Watchdog */

		ui_Command = 0;

		/*

		* ui_Command = inl(devpriv->iobase+((i_WatchdogNbr-1)*32)+12);

		* ui_Command = ui_Command & 0xFFFFF9FEUL;

		*/

		outl(ui_Command,

			devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);

	}

	if (data[0] == 3) {

		/* stop all Watchdogs */

		ui_Command = 0;

		for (i_Count = 1; i_Count <= 4; i_Count++) {

			if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG)

				ui_Command = 0x2UL;

			else

				ui_Command = 0x10UL;



			i_WatchdogNbr = i_Count;

			outl(ui_Command,

				devpriv->iobase + ((i_WatchdogNbr - 1) * 32) +

				0);

		}



	}

	if (data[0] == 4) {

		/* start all Watchdogs */

		ui_Command = 0;

		for (i_Count = 1; i_Count <= 4; i_Count++) {

			if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG)

				ui_Command = 0x1UL;

			else

				ui_Command = 0x8UL;



			i_WatchdogNbr = i_Count;

			outl(ui_Command,

				devpriv->iobase + ((i_WatchdogNbr - 1) * 32) +

				0);

		}

	}

	if (data[0] == 5) {

		/* trigger all Watchdogs */

		ui_Command = 0;

		for (i_Count = 1; i_Count <= 4; i_Count++) {

			if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG)

				ui_Command = 0x4UL;

			else

				ui_Command = 0x20UL;



			i_WatchdogNbr = i_Count;

			outl(ui_Command,

				devpriv->iobase + ((i_WatchdogNbr - 1) * 32) +

				0);

		}

		i_Temp = 1;

	}

	return insn->n;

}



/*

 * Read The Selected Timer , Counter or Watchdog

 *

 * data[0] software trigger status

 * data[1] hardware trigger status

 * data[2] Software clear status

 * data[3] Overflow status

 * data[4] Timer actual value

 */

static int apci035_timer_read(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn,

			      unsigned int *data)

{

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Status;	/*  Status register */



	i_WatchdogNbr = insn->unused[0];



	/* Get the status */

	ui_Status = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 16);



	/* Get the software trigger status */

	data[0] = ((ui_Status >> 1) & 1);



	/* Get the hardware trigger status */

	data[1] = ((ui_Status >> 2) & 1);



	/* Get the software clear status */

	data[2] = ((ui_Status >> 3) & 1);



	/* Get the overflow status */

	data[3] = ((ui_Status >> 0) & 1);

	if (devpriv->b_TimerSelectMode == ADDIDATA_TIMER)

		data[4] = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0);



	return insn->n;

}



/*

 * Configures The Analog Input Subdevice

 *

 * data[0] Warning delay value

 */

static int apci035_ai_config(struct comedi_device *dev,

			     struct comedi_subdevice *s,

			     struct comedi_insn *insn,

			     unsigned int *data)

{

	struct apci035_private *devpriv = dev->private;



	devpriv->tsk_Current = current;

	outl(0x200 | 0, devpriv->iobase + 128 + 0x4);

	outl(0, devpriv->iobase + 128 + 0);



	/* Initialise the warning value */

	outl(0x300 | 0, devpriv->iobase + 128 + 0x4);

	outl((data[0] << 8), devpriv->iobase + 128 + 0);

	outl(0x200000UL, devpriv->iobase + 128 + 12);



	return insn->n;

}



/*

 * Read value of the selected channel

 *

 * data[0] Digital Value Of Input

 */

static int apci035_ai_read(struct comedi_device *dev,

			   struct comedi_subdevice *s,

			   struct comedi_insn *insn,

			   unsigned int *data)

{

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_CommandRegister;



	/*  Set the start */

	ui_CommandRegister = 0x80000;



	/* Write the command register */

	outl(ui_CommandRegister, devpriv->iobase + 128 + 8);



	/* Read the digital value of the input */

	data[0] = inl(devpriv->iobase + 128 + 28);

	return insn->n;

}



static int apci035_reset(struct comedi_device *dev)

{

	struct apci035_private *devpriv = dev->private;

	int i_Count;



	for (i_Count = 1; i_Count <= 4; i_Count++) {

		i_WatchdogNbr = i_Count;



		/* stop all timers */

		outl(0x0, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0);

	}

	outl(0x0, devpriv->iobase + 128 + 12);	/* Disable the warning delay */



	return 0;

}



static irqreturn_t apci035_interrupt(int irq, void *d)

{

	struct comedi_device *dev = d;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_StatusRegister1;

	unsigned int ui_StatusRegister2;

	unsigned int ui_ReadCommand;

	unsigned int ui_ChannelNumber;

	unsigned int ui_DigitalTemperature;



	if (i_Temp == 1) {

		i_WatchdogNbr = i_Flag;

		i_Flag = i_Flag + 1;

	}



	/* Read the interrupt status register of temperature Warning */

	ui_StatusRegister1 = inl(devpriv->iobase + 128 + 16);



	/* Read the interrupt status register for Watchdog/timer */

	ui_StatusRegister2 =

		inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 20);



	/* Test if warning relay interrupt */

	if ((((ui_StatusRegister1) & 0x8) == 0x8)) {



		/* Disable the temperature warning */

		ui_ReadCommand = inl(devpriv->iobase + 128 + 12);

		ui_ReadCommand = ui_ReadCommand & 0xFFDF0000UL;

		outl(ui_ReadCommand, devpriv->iobase + 128 + 12);



		/* Read the channel number */

		ui_ChannelNumber = inl(devpriv->iobase + 128 + 60);



		/* Read the digital temperature value */

		ui_DigitalTemperature = inl(devpriv->iobase + 128 + 60);



		/*  send signal to the sample */

		send_sig(SIGIO, devpriv->tsk_Current, 0);



	} else if ((ui_StatusRegister2 & 0x1) == 0x1) {

		/*  send signal to the sample */

		send_sig(SIGIO, devpriv->tsk_Current, 0);

	}



	return IRQ_HANDLED;

}

drivers/staging/comedi/drivers/addi_apci_035.c

deleted100644 → 0
+0 −129
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/pci.h>

#include <linux/sched.h>

#include <linux/interrupt.h>



#include "../comedidev.h"

#include "comedi_fc.h"

#include "amcc_s5933.h"



struct apci035_private {

	int iobase;

	int i_IobaseAmcc;

	int i_IobaseAddon;

	int i_IobaseReserved;

	unsigned char b_TimerSelectMode;

	struct task_struct *tsk_Current;

};



#define ADDIDATA_WATCHDOG 2	/*  Or shold it be something else */



#include "addi-data/hwdrv_apci035.c"



static int apci035_auto_attach(struct comedi_device *dev,

			       unsigned long context)

{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	struct apci035_private *devpriv;

	struct comedi_subdevice *s;

	unsigned int dw_Dummy;

	int ret;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;



	dev->iobase = pci_resource_start(pcidev, 1);

	devpriv->iobase = dev->iobase;

	devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);

	devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);

	devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);



	if (pcidev->irq > 0) {

		ret = request_irq(pcidev->irq, apci035_interrupt, IRQF_SHARED,

				  dev->board_name, dev);

		if (ret == 0)

			dev->irq = pcidev->irq;

	}



	/*  Set 3 wait stait */

	outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);



	/*  Enable the interrupt for the controller */

	dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);

	outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);



	ret = comedi_alloc_subdevices(dev, 2);

	if (ret)

		return ret;



	/*  Allocate and Initialise AI Subdevice Structures */

	s = &dev->subdevices[0];

	dev->read_subdev = s;

	s->type = COMEDI_SUBD_AI;

	s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;

	s->n_chan = 16;

	s->maxdata = 0xff;

	s->len_chanlist = s->n_chan;

	s->range_table = &range_apci035_ai;

	s->insn_config = apci035_ai_config;

	s->insn_read = apci035_ai_read;



	/*  Allocate and Initialise Timer Subdevice Structures */

	s = &dev->subdevices[1];

	s->type = COMEDI_SUBD_TIMER;

	s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

	s->n_chan = 1;

	s->maxdata = 0;

	s->len_chanlist = 1;

	s->range_table = &range_digital;

	s->insn_write = apci035_timer_write;

	s->insn_read = apci035_timer_read;

	s->insn_config = apci035_timer_config;



	apci035_reset(dev);



	return 0;

}



static void apci035_detach(struct comedi_device *dev)

{

	if (dev->iobase)

		apci035_reset(dev);

	comedi_pci_detach(dev);

}



static struct comedi_driver apci035_driver = {

	.driver_name	= "addi_apci_035",

	.module		= THIS_MODULE,

	.auto_attach	= apci035_auto_attach,

	.detach		= apci035_detach,

};



static int apci035_pci_probe(struct pci_dev *dev,

			     const struct pci_device_id *id)

{

	return comedi_pci_auto_config(dev, &apci035_driver, id->driver_data);

}



static const struct pci_device_id apci035_pci_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, apci035_pci_table);



static struct pci_driver apci035_pci_driver = {

	.name		= "addi_apci_035",

	.id_table	= apci035_pci_table,

	.probe		= apci035_pci_probe,

	.remove		= comedi_pci_auto_unconfig,

};

module_comedi_pci_driver(apci035_driver, apci035_pci_driver);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

MODULE_LICENSE("GPL");