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 or so Comedi device drivers that use the "comedi_8254" module to add timers based on the venerable 8254 Programmable Interval Timer chip. The macros and declarations to use that module are in the "comedi_8254.h" header file in the comedi "drivers" directory. Move it into "include/linux/comedi/".
Unified · Split
| @@ -43,9 +43,9 @@ · 42 unmodified lines | ||
| 43 | 43 | #include <linux/delay.h> |
| 44 | 44 | #include <linux/interrupt.h> |
| 45 | 45 | #include <linux/comedi/comedi_pci.h> |
| 46 | +#include <linux/comedi/comedi_8254.h> | |
| 46 | 47 | |
| 47 | 48 | #include "plx9052.h" |
| 48 | −#include "comedi_8254.h" | |
| 49 | 49 | |
| 50 | 50 | #define PCI9111_FIFO_HALF_SIZE 512 |
| 51 | 51 | |
| @@ -79,9 +79,9 @@ · 78 unmodified lines | ||
| 79 | 79 | #include <linux/interrupt.h> |
| 80 | 80 | #include <linux/io.h> |
| 81 | 81 | #include <linux/comedi/comedi_pci.h> |
| 82 | +#include <linux/comedi/comedi_8254.h> | |
| 82 | 83 | |
| 83 | 84 | #include "amcc_s5933.h" |
| 84 | −#include "comedi_8254.h" | |
| 85 | 85 | |
| 86 | 86 | /* |
| 87 | 87 | * PCI BAR2 Register map (dev->iobase) |
| @@ -31,8 +31,8 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/module.h> |
| 32 | 32 | #include <linux/interrupt.h> |
| 33 | 33 | #include <linux/comedi/comedi_pci.h> |
| 34 | +#include <linux/comedi/comedi_8254.h> | |
| 34 | 35 | |
| 35 | −#include "comedi_8254.h" | |
| 36 | 36 | #include "amcc_s5933.h" |
| 37 | 37 | |
| 38 | 38 | /* |
| @@ -25,8 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/delay.h> |
| 26 | 26 | #include <linux/comedi/comedi_pci.h> |
| 27 | 27 | #include <linux/comedi/comedi_8255.h> |
| 28 | − | |
| 29 | −#include "comedi_8254.h" | |
| 28 | +#include <linux/comedi/comedi_8254.h> | |
| 30 | 29 | |
| 31 | 30 | /* |
| 32 | 31 | * Register offset definitions |
| @@ -24,8 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/module.h> |
| 25 | 25 | #include <linux/comedi/comedidev.h> |
| 26 | 26 | #include <linux/comedi/comedi_8255.h> |
| 27 | − | |
| 28 | −#include "comedi_8254.h" | |
| 27 | +#include <linux/comedi/comedi_8254.h> | |
| 29 | 28 | |
| 30 | 29 | /* |
| 31 | 30 | * Register map |
| @@ -14,9 +14,9 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/interrupt.h> |
| 15 | 15 | #include <linux/comedi/comedidev.h> |
| 16 | 16 | #include <linux/comedi/comedi_8255.h> /* only for register defines */ |
| 17 | +#include <linux/comedi/comedi_8254.h> | |
| 17 | 18 | |
| 18 | 19 | #include "amplc_dio200.h" |
| 19 | −#include "comedi_8254.h" | |
| 20 | 20 | |
| 21 | 21 | /* 200 series registers */ |
| 22 | 22 | #define DIO200_IO_SIZE 0x20 |
| @@ -97,8 +97,7 @@ · 96 unmodified lines | ||
| 97 | 97 | #include <linux/interrupt.h> |
| 98 | 98 | #include <linux/slab.h> |
| 99 | 99 | #include <linux/comedi/comedi_pci.h> |
| 100 | − | |
| 101 | −#include "comedi_8254.h" | |
| 100 | +#include <linux/comedi/comedi_8254.h> | |
| 102 | 101 | |
| 103 | 102 | /* |
| 104 | 103 | * PCI224/234 i/o space 1 (PCIBAR2) registers. |
| @@ -176,8 +176,7 @@ · 175 unmodified lines | ||
| 176 | 176 | #include <linux/interrupt.h> |
| 177 | 177 | #include <linux/comedi/comedi_pci.h> |
| 178 | 178 | #include <linux/comedi/comedi_8255.h> |
| 179 | − | |
| 180 | −#include "comedi_8254.h" | |
| 179 | +#include <linux/comedi/comedi_8254.h> | |
| 181 | 180 | |
| 182 | 181 | /* |
| 183 | 182 | * PCI230 PCI configuration register information |
| @@ -28,8 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/interrupt.h> |
| 29 | 29 | #include <linux/delay.h> |
| 30 | 30 | #include <linux/comedi/comedi_pcmcia.h> |
| 31 | − | |
| 32 | −#include "comedi_8254.h" | |
| 31 | +#include <linux/comedi/comedi_8254.h> | |
| 33 | 32 | |
| 34 | 33 | /* |
| 35 | 34 | * Register I/O map |
| @@ -56,8 +56,8 @@ · 55 unmodified lines | ||
| 56 | 56 | #include <linux/interrupt.h> |
| 57 | 57 | #include <linux/comedi/comedi_pci.h> |
| 58 | 58 | #include <linux/comedi/comedi_8255.h> |
| 59 | +#include <linux/comedi/comedi_8254.h> | |
| 59 | 60 | |
| 60 | −#include "comedi_8254.h" | |
| 61 | 61 | #include "amcc_s5933.h" |
| 62 | 62 | |
| 63 | 63 | #define AI_BUFFER_SIZE 1024 /* max ai fifo size */ |
| @@ -36,8 +36,8 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <linux/interrupt.h> |
| 37 | 37 | #include <linux/comedi/comedi_pci.h> |
| 38 | 38 | #include <linux/comedi/comedi_8255.h> |
| 39 | +#include <linux/comedi/comedi_8254.h> | |
| 39 | 40 | |
| 40 | −#include "comedi_8254.h" | |
| 41 | 41 | #include "plx9052.h" |
| 42 | 42 | |
| 43 | 43 | /* |
| @@ -117,8 +117,7 @@ · 116 unmodified lines | ||
| 117 | 117 | #include <linux/slab.h> |
| 118 | 118 | #include <linux/io.h> |
| 119 | 119 | #include <linux/comedi/comedidev.h> |
| 120 | − | |
| 121 | −#include "comedi_8254.h" | |
| 120 | +#include <linux/comedi/comedi_8254.h> | |
| 122 | 121 | |
| 123 | 122 | static unsigned int __i8254_read(struct comedi_8254 *i8254, unsigned int reg) |
| 124 | 123 | { |
| @@ -12,8 +12,8 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <linux/comedi/comedidev.h> |
| 14 | 14 | #include <linux/comedi/comedi_8255.h> |
| 15 | +#include <linux/comedi/comedi_8254.h> | |
| 15 | 16 | |
| 16 | −#include "comedi_8254.h" | |
| 17 | 17 | #include "das08.h" |
| 18 | 18 | |
| 19 | 19 | /* |
| @@ -65,9 +65,9 @@ · 64 unmodified lines | ||
| 65 | 65 | #include <linux/interrupt.h> |
| 66 | 66 | #include <linux/comedi/comedidev.h> |
| 67 | 67 | #include <linux/comedi/comedi_8255.h> |
| 68 | +#include <linux/comedi/comedi_8254.h> | |
| 68 | 69 | |
| 69 | 70 | #include "comedi_isadma.h" |
| 70 | −#include "comedi_8254.h" | |
| 71 | 71 | |
| 72 | 72 | #define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */ |
| 73 | 73 | |
| @@ -44,8 +44,7 @@ · 43 unmodified lines | ||
| 44 | 44 | #include <linux/interrupt.h> |
| 45 | 45 | #include <linux/comedi/comedidev.h> |
| 46 | 46 | #include <linux/comedi/comedi_8255.h> |
| 47 | − | |
| 48 | −#include "comedi_8254.h" | |
| 47 | +#include <linux/comedi/comedi_8254.h> | |
| 49 | 48 | |
| 50 | 49 | /* |
| 51 | 50 | * Register map (dev->iobase) |
| @@ -74,9 +74,9 @@ · 73 unmodified lines | ||
| 74 | 74 | #include <linux/slab.h> |
| 75 | 75 | #include <linux/io.h> |
| 76 | 76 | #include <linux/comedi/comedidev.h> |
| 77 | +#include <linux/comedi/comedi_8254.h> | |
| 77 | 78 | |
| 78 | 79 | #include "comedi_isadma.h" |
| 79 | −#include "comedi_8254.h" | |
| 80 | 80 | |
| 81 | 81 | /* misc. defines */ |
| 82 | 82 | #define DAS1800_SIZE 16 /* uses 16 io addresses */ |
| @@ -25,8 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/interrupt.h> |
| 27 | 27 | #include <linux/comedi/comedidev.h> |
| 28 | − | |
| 29 | −#include "comedi_8254.h" | |
| 28 | +#include <linux/comedi/comedi_8254.h> | |
| 30 | 29 | |
| 31 | 30 | /* |
| 32 | 31 | * Register I/O map |
| @@ -47,8 +47,7 @@ · 46 unmodified lines | ||
| 47 | 47 | #include <linux/interrupt.h> |
| 48 | 48 | #include <linux/delay.h> |
| 49 | 49 | #include <linux/comedi/comedidev.h> |
| 50 | − | |
| 51 | −#include "comedi_8254.h" | |
| 50 | +#include <linux/comedi/comedi_8254.h> | |
| 52 | 51 | |
| 53 | 52 | #define N_CHAN_AI 8 /* number of analog input channels */ |
| 54 | 53 | |
| @@ -33,8 +33,8 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <linux/delay.h> |
| 34 | 34 | #include <linux/interrupt.h> |
| 35 | 35 | #include <linux/comedi/comedi_pci.h> |
| 36 | +#include <linux/comedi/comedi_8254.h> | |
| 36 | 37 | |
| 37 | −#include "comedi_8254.h" | |
| 38 | 38 | #include "plx9052.h" |
| 39 | 39 | |
| 40 | 40 | #define ME4000_FIRMWARE "me4000_firmware.bin" |
| @@ -40,9 +40,9 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <linux/slab.h> |
| 41 | 41 | #include <linux/io.h> |
| 42 | 42 | #include <linux/comedi/comedidev.h> |
| 43 | +#include <linux/comedi/comedi_8254.h> | |
| 43 | 44 | |
| 44 | 45 | #include "comedi_isadma.h" |
| 45 | −#include "comedi_8254.h" | |
| 46 | 46 | |
| 47 | 47 | #define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */ |
| 48 | 48 | |
| @@ -26,8 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <linux/module.h> |
| 28 | 28 | #include <linux/comedi/comedidev.h> |
| 29 | − | |
| 30 | −#include "comedi_8254.h" | |
| 29 | +#include <linux/comedi/comedi_8254.h> | |
| 31 | 30 | |
| 32 | 31 | /* |
| 33 | 32 | * Register map |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/slab.h> |
| 15 | 15 | #include <linux/comedi/comedidev.h> |
| 16 | 16 | #include <linux/comedi/comedi_8255.h> |
| 17 | +#include <linux/comedi/comedi_8254.h> | |
| 17 | 18 | |
| 18 | −#include "comedi_8254.h" | |
| 19 | 19 | #include "ni_labpc.h" |
| 20 | 20 | #include "ni_labpc_regs.h" |
| 21 | 21 | #include "ni_labpc_isadma.h" |
| @@ -30,8 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/delay.h> |
| 31 | 31 | #include <linux/interrupt.h> |
| 32 | 32 | #include <linux/comedi/comedidev.h> |
| 33 | − | |
| 34 | −#include "comedi_8254.h" | |
| 33 | +#include <linux/comedi/comedi_8254.h> | |
| 35 | 34 | |
| 36 | 35 | /* |
| 37 | 36 | * I/O port register map |
| @@ -115,9 +115,9 @@ · 114 unmodified lines | ||
| 115 | 115 | #include <linux/delay.h> |
| 116 | 116 | #include <linux/io.h> |
| 117 | 117 | #include <linux/comedi/comedidev.h> |
| 118 | +#include <linux/comedi/comedi_8254.h> | |
| 118 | 119 | |
| 119 | 120 | #include "comedi_isadma.h" |
| 120 | −#include "comedi_8254.h" | |
| 121 | 121 | |
| 122 | 122 | /* |
| 123 | 123 | * Register I/O map |
| @@ -36,9 +36,9 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <linux/io.h> |
| 37 | 37 | #include <linux/interrupt.h> |
| 38 | 38 | #include <linux/comedi/comedidev.h> |
| 39 | +#include <linux/comedi/comedi_8254.h> | |
| 39 | 40 | |
| 40 | 41 | #include "comedi_isadma.h" |
| 41 | −#include "comedi_8254.h" | |
| 42 | 42 | |
| 43 | 43 | /* |
| 44 | 44 | * Register I/O map |
| @@ -98,9 +98,9 @@ · 97 unmodified lines | ||
| 98 | 98 | #include <linux/io.h> |
| 99 | 99 | #include <linux/interrupt.h> |
| 100 | 100 | #include <linux/comedi/comedidev.h> |
| 101 | +#include <linux/comedi/comedi_8254.h> | |
| 101 | 102 | |
| 102 | 103 | #include "comedi_isadma.h" |
| 103 | −#include "comedi_8254.h" | |
| 104 | 104 | |
| 105 | 105 | /* |
| 106 | 106 | * Register I/O map |
| @@ -86,8 +86,8 @@ · 85 unmodified lines | ||
| 86 | 86 | #include <linux/delay.h> |
| 87 | 87 | #include <linux/interrupt.h> |
| 88 | 88 | #include <linux/comedi/comedi_pci.h> |
| 89 | +#include <linux/comedi/comedi_8254.h> | |
| 89 | 90 | |
| 90 | −#include "comedi_8254.h" | |
| 91 | 91 | #include "plx9080.h" |
| 92 | 92 | |
| 93 | 93 | /* |
File renamed without changes.