Commit fe7a4f5b authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

comedi: Move "comedi_isadma.h" to <linux/comedi/comedi_isadma.h>



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 half a dozen or so Comedi device drivers that use the
"comedi_isadma" module to add ISA DMA support.  The macros and
declarations to use that module are in the "comedi_isadma.h" header file
in the comedi "drivers" directory.  Move it into
"include/linux/comedi/".

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20211117120604.117740-6-abbotti@mev.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44fb7aff
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@
#include <linux/dma-mapping.h>
#include <asm/dma.h>
#include <linux/comedi/comedidev.h>

#include "comedi_isadma.h"
#include <linux/comedi/comedi_isadma.h>

/**
 * comedi_isadma_program - program and enable an ISA DMA transfer
+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8255.h>
#include <linux/comedi/comedi_8254.h>

#include "comedi_isadma.h"
#include <linux/comedi/comedi_isadma.h>

#define DAS16_DMA_SIZE 0xff00	/*  size in bytes of allocated dma buffer */

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>

#include "comedi_isadma.h"
#include <linux/comedi/comedi_isadma.h>

/* misc. defines */
#define DAS1800_SIZE           16	/* uses 16 io addresses */
+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/comedi/comedidev.h>

#include "comedi_isadma.h"
#include <linux/comedi/comedi_isadma.h>

/*
 * Register map
+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@
#include <linux/io.h>
#include <linux/comedi/comedidev.h>
#include <linux/comedi/comedi_8254.h>

#include "comedi_isadma.h"
#include <linux/comedi/comedi_isadma.h>

#define A2150_DMA_BUFFER_SIZE	0xff00	/*  size in bytes of dma buffer */

Loading