korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

comedi: Move and rename "8255.h" to <linux/comedi/comedi_8255.h>

Browse Source 
Some of the header files in "drivers/comedi/drivers/" are common enough
to be useful to out-of-tree comedi driver modules.  Using them for
out-of-tree module builds is hampered by the headers being outside the
"include/" directory so it is desirable to move them.

There are about a couple of dozen Comedi device drivers that use the
"comedi_8255" module to add digital I/O subdevices based on the
venerable 8255 Programmable Peripheral Interface chip.  The macros and
declarations to use that module are in the "8255.h" header file in the
comedi "drivers" directory.  Move it into "include/linux/comedi/" and
rename it to "comedi_8255.h" for naming consistency reasons.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20211117120604.117740-4-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2021-11-17 12:06:01 +00:00 committed by Greg Kroah-Hartman
parent 55d0f80ecf
commit 631e272b12
27 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/comedi/drivers/8255.c
View File

@ -41,8 +41,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
static int dev_8255_attach(struct comedi_device *dev,
struct comedi_devconfig *it)

3
drivers/comedi/drivers/8255_pci.c
View File

@ -54,8 +54,7 @@
#include <linux/module.h>
#include <linux/comedi/comedi_pci.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
enum pci_8255_boardid {
BOARD_ADLINK_PCI7224,

2
drivers/comedi/drivers/adv_pci_dio.c
View File

@ -24,8 +24,8 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "8255.h"
#include "comedi_8254.h"
/*

2
drivers/comedi/drivers/aio_aio12_8.c
View File

@ -23,9 +23,9 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include "8255.h"
/*
* Register map

2
drivers/comedi/drivers/amplc_dio200_common.c
View File

@ -13,10 +13,10 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h> /* only for register defines */
#include "amplc_dio200.h"
#include "comedi_8254.h"
#include "8255.h" /* only for register defines */
/* 200 series registers */
#define DIO200_IO_SIZE 0x20

2
drivers/comedi/drivers/amplc_pc236_common.c
View File

@ -12,9 +12,9 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "amplc_pc236.h"
#include "8255.h"
static void pc236_intr_update(struct comedi_device *dev, bool enable)
{

2
drivers/comedi/drivers/amplc_pci230.c
View File

@ -175,9 +175,9 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include "8255.h"
/*
* PCI230 PCI configuration register information

2
drivers/comedi/drivers/cb_pcidas.c
View File

@ -55,9 +55,9 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include "8255.h"
#include "amcc_s5933.h"
#define AI_BUFFER_SIZE 1024 /* max ai fifo size */

2
drivers/comedi/drivers/cb_pcidas64.c
View File

@ -74,8 +74,8 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "8255.h"
#include "plx9080.h"
#define TIMER_BASE 25 /* 40MHz master clock */

3
drivers/comedi/drivers/cb_pcidda.c
View File

@ -28,8 +28,7 @@
#include <linux/module.h>
#include <linux/comedi/comedi_pci.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
#define EEPROM_SIZE 128 /* number of entries in eeprom */
/* maximum number of ao channels for supported boards */

2
drivers/comedi/drivers/cb_pcimdas.c
View File

@ -35,10 +35,10 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include "plx9052.h"
#include "8255.h"
/*
* PCI Bar 1 Register map

3
drivers/comedi/drivers/cb_pcimdda.c
View File

@ -68,8 +68,7 @@
#include <linux/module.h>
#include <linux/comedi/comedi_pci.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
/* device ids of the cards we support -- currently only 1 card supported */
#define PCI_ID_PCIM_DDA06_16 0x0053

3
drivers/comedi/drivers/comedi_8255.c
View File

@ -30,8 +30,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
struct subdev_8255_private {
unsigned long regbase;

2
drivers/comedi/drivers/daqboard2000.c
View File

@ -97,8 +97,8 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedi_pci.h>
#include <linux/comedi/comedi_8255.h>
#include "8255.h"
#include "plx9080.h"
#define DB2K_FIRMWARE "daqboard2000_firmware.bin"

2
drivers/comedi/drivers/das08.c
View File

@ -11,8 +11,8 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "8255.h"
#include "comedi_8254.h"
#include "das08.h"

2
drivers/comedi/drivers/das16.c
View File

@ -64,10 +64,10 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_isadma.h"
#include "comedi_8254.h"
#include "8255.h"
#define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */

2
drivers/comedi/drivers/das16m1.c
View File

@ -43,8 +43,8 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "8255.h"
#include "comedi_8254.h"
/*

3
drivers/comedi/drivers/dmm32at.c
View File

@ -30,8 +30,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
/* Board register addresses */
#define DMM32AT_AI_START_CONV_REG 0x00

2
drivers/comedi/drivers/ni_atmio.c
View File

@ -75,9 +75,9 @@
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include <linux/isapnp.h>
#include <linux/comedi/comedi_8255.h>
#include "ni_stc.h"
#include "8255.h"
/* AT specific setup */
static const struct ni_board_struct ni_boards[] = {

3
drivers/comedi/drivers/ni_atmio16d.c
View File

@ -40,8 +40,7 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
/* Configuration and Status Registers */
#define COM_REG_1 0x00 /* wo 16 */

3
drivers/comedi/drivers/ni_daq_dio24.c
View File

@ -24,8 +24,7 @@
#include <linux/module.h>
#include <linux/comedi/comedi_pcmcia.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
static int dio24_auto_attach(struct comedi_device *dev,
unsigned long context)

2
drivers/comedi/drivers/ni_labpc_common.c
View File

@ -13,9 +13,9 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include "comedi_8254.h"
#include "8255.h"
#include "ni_labpc.h"
#include "ni_labpc_regs.h"
#include "ni_labpc_isadma.h"

2
drivers/comedi/drivers/ni_mio_common.c
View File

@ -43,7 +43,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
#include "mite.h"
/* A timeout count */

2
drivers/comedi/drivers/ni_mio_cs.c
View File

@ -29,9 +29,9 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/comedi/comedi_pcmcia.h>
#include <linux/comedi/comedi_8255.h>
#include "ni_stc.h"
#include "8255.h"
/*
* AT specific setup

3
drivers/comedi/drivers/pcl724.c
View File

@ -26,8 +26,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
struct pcl724_board {
const char *name;

3
drivers/comedi/drivers/pcm3724.c
View File

@ -25,8 +25,7 @@
#include <linux/module.h>
#include <linux/comedi/comedidev.h>
#include "8255.h"
#include <linux/comedi/comedi_8255.h>
/*
* Register I/O Map

8
drivers/comedi/drivers/8255.h → include/linux/comedi/comedi_8255.h
View File

@ -1,14 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* module/8255.h
* Header file for 8255
* comedi_8255.h
* Generic 8255 digital I/O subdevice support
*
* COMEDI - Linux Control and Measurement Device Interface
* Copyright (C) 1998 David A. Schleef <ds@schleef.org>
*/
#ifndef _8255_H
#define _8255_H
#ifndef _COMEDI_8255_H
#define _COMEDI_8255_H
#define I8255_SIZE 0x04