History

comedi: Move "comedi_8254.h" to <linux/comedi/comedi_8254.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 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/".

Ian Abbott committed 4 years ago

Commit 44fb7af1 parent 631e27228 files · +27 −38Browse files

Unified · Split

28 files
  1. drivers/comedi/drivers/adl_pci9111.c +1 −1
  2. drivers/comedi/drivers/adl_pci9118.c +1 −1
  3. drivers/comedi/drivers/adv_pci1710.c +1 −1
  4. drivers/comedi/drivers/adv_pci_dio.c +1 −2
  5. drivers/comedi/drivers/aio_aio12_8.c +1 −2
  6. drivers/comedi/drivers/amplc_dio200_common.c +1 −1
  7. drivers/comedi/drivers/amplc_pci224.c +1 −2
  8. drivers/comedi/drivers/amplc_pci230.c +1 −2
  9. drivers/comedi/drivers/cb_das16_cs.c +1 −2
  10. drivers/comedi/drivers/cb_pcidas.c +1 −1
  11. drivers/comedi/drivers/cb_pcimdas.c +1 −1
  12. drivers/comedi/drivers/comedi_8254.c +1 −2
  13. drivers/comedi/drivers/das08.c +1 −1
  14. drivers/comedi/drivers/das16.c +1 −1
  15. drivers/comedi/drivers/das16m1.c +1 −2
  16. drivers/comedi/drivers/das1800.c +1 −1
  17. drivers/comedi/drivers/das6402.c +1 −2
  18. drivers/comedi/drivers/das800.c +1 −2
  19. drivers/comedi/drivers/me4000.c +1 −1
  20. drivers/comedi/drivers/ni_at_a2150.c +1 −1
  21. drivers/comedi/drivers/ni_at_ao.c +1 −2
  22. drivers/comedi/drivers/ni_labpc_common.c +1 −1
  23. drivers/comedi/drivers/pcl711.c +1 −2
  24. drivers/comedi/drivers/pcl812.c +1 −1
  25. drivers/comedi/drivers/pcl816.c +1 −1
  26. drivers/comedi/drivers/pcl818.c +1 −1
  27. drivers/comedi/drivers/rtd520.c +1 −1
  28. include/linux/comedi/comedi_8254.h +0 −0
drivers/comedi/drivers/adl_pci9111.c+1−1
@@ -43,9 +43,9 @@ · 42 unmodified lines
4343 #include <linux/delay.h>
4444 #include <linux/interrupt.h>
4545 #include <linux/comedi/comedi_pci.h>
46+#include <linux/comedi/comedi_8254.h>
4647
4748 #include "plx9052.h"
48−#include "comedi_8254.h"
4949
5050 #define PCI9111_FIFO_HALF_SIZE 512
5151
drivers/comedi/drivers/adl_pci9118.c+1−1
@@ -79,9 +79,9 @@ · 78 unmodified lines
7979 #include <linux/interrupt.h>
8080 #include <linux/io.h>
8181 #include <linux/comedi/comedi_pci.h>
82+#include <linux/comedi/comedi_8254.h>
8283
8384 #include "amcc_s5933.h"
84−#include "comedi_8254.h"
8585
8686 /*
8787 * PCI BAR2 Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1710.c+1−1
@@ -31,8 +31,8 @@ · 30 unmodified lines
3131 #include <linux/module.h>
3232 #include <linux/interrupt.h>
3333 #include <linux/comedi/comedi_pci.h>
34+#include <linux/comedi/comedi_8254.h>
3435
35−#include "comedi_8254.h"
3636 #include "amcc_s5933.h"
3737
3838 /*
drivers/comedi/drivers/adv_pci_dio.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
2525 #include <linux/delay.h>
2626 #include <linux/comedi/comedi_pci.h>
2727 #include <linux/comedi/comedi_8255.h>
28−
29−#include "comedi_8254.h"
28+#include <linux/comedi/comedi_8254.h>
3029
3130 /*
3231 * Register offset definitions
drivers/comedi/drivers/aio_aio12_8.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424 #include <linux/module.h>
2525 #include <linux/comedi/comedidev.h>
2626 #include <linux/comedi/comedi_8255.h>
27−
28−#include "comedi_8254.h"
27+#include <linux/comedi/comedi_8254.h>
2928
3029 /*
3130 * Register map
drivers/comedi/drivers/amplc_dio200_common.c+1−1
@@ -14,9 +14,9 @@ · 13 unmodified lines
1414 #include <linux/interrupt.h>
1515 #include <linux/comedi/comedidev.h>
1616 #include <linux/comedi/comedi_8255.h> /* only for register defines */
17+#include <linux/comedi/comedi_8254.h>
1718
1819 #include "amplc_dio200.h"
19−#include "comedi_8254.h"
2020
2121 /* 200 series registers */
2222 #define DIO200_IO_SIZE 0x20
drivers/comedi/drivers/amplc_pci224.c+1−2
@@ -97,8 +97,7 @@ · 96 unmodified lines
9797 #include <linux/interrupt.h>
9898 #include <linux/slab.h>
9999 #include <linux/comedi/comedi_pci.h>
100−
101−#include "comedi_8254.h"
100+#include <linux/comedi/comedi_8254.h>
102101
103102 /*
104103 * PCI224/234 i/o space 1 (PCIBAR2) registers.
drivers/comedi/drivers/amplc_pci230.c+1−2
@@ -176,8 +176,7 @@ · 175 unmodified lines
176176 #include <linux/interrupt.h>
177177 #include <linux/comedi/comedi_pci.h>
178178 #include <linux/comedi/comedi_8255.h>
179−
180−#include "comedi_8254.h"
179+#include <linux/comedi/comedi_8254.h>
181180
182181 /*
183182 * PCI230 PCI configuration register information
drivers/comedi/drivers/cb_das16_cs.c+1−2
@@ -28,8 +28,7 @@ · 27 unmodified lines
2828 #include <linux/interrupt.h>
2929 #include <linux/delay.h>
3030 #include <linux/comedi/comedi_pcmcia.h>
31−
32−#include "comedi_8254.h"
31+#include <linux/comedi/comedi_8254.h>
3332
3433 /*
3534 * Register I/O map
drivers/comedi/drivers/cb_pcidas.c+1−1
@@ -56,8 +56,8 @@ · 55 unmodified lines
5656 #include <linux/interrupt.h>
5757 #include <linux/comedi/comedi_pci.h>
5858 #include <linux/comedi/comedi_8255.h>
59+#include <linux/comedi/comedi_8254.h>
5960
60−#include "comedi_8254.h"
6161 #include "amcc_s5933.h"
6262
6363 #define AI_BUFFER_SIZE 1024 /* max ai fifo size */
drivers/comedi/drivers/cb_pcimdas.c+1−1
@@ -36,8 +36,8 @@ · 35 unmodified lines
3636 #include <linux/interrupt.h>
3737 #include <linux/comedi/comedi_pci.h>
3838 #include <linux/comedi/comedi_8255.h>
39+#include <linux/comedi/comedi_8254.h>
3940
40−#include "comedi_8254.h"
4141 #include "plx9052.h"
4242
4343 /*
drivers/comedi/drivers/comedi_8254.c+1−2
@@ -117,8 +117,7 @@ · 116 unmodified lines
117117 #include <linux/slab.h>
118118 #include <linux/io.h>
119119 #include <linux/comedi/comedidev.h>
120−
121−#include "comedi_8254.h"
120+#include <linux/comedi/comedi_8254.h>
122121
123122 static unsigned int __i8254_read(struct comedi_8254 *i8254, unsigned int reg)
124123 {
drivers/comedi/drivers/das08.c+1−1
@@ -12,8 +12,8 @@ · 11 unmodified lines
1212 #include <linux/module.h>
1313 #include <linux/comedi/comedidev.h>
1414 #include <linux/comedi/comedi_8255.h>
15+#include <linux/comedi/comedi_8254.h>
1516
16−#include "comedi_8254.h"
1717 #include "das08.h"
1818
1919 /*
drivers/comedi/drivers/das16.c+1−1
@@ -65,9 +65,9 @@ · 64 unmodified lines
6565 #include <linux/interrupt.h>
6666 #include <linux/comedi/comedidev.h>
6767 #include <linux/comedi/comedi_8255.h>
68+#include <linux/comedi/comedi_8254.h>
6869
6970 #include "comedi_isadma.h"
70−#include "comedi_8254.h"
7171
7272 #define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */
7373
drivers/comedi/drivers/das16m1.c+1−2
@@ -44,8 +44,7 @@ · 43 unmodified lines
4444 #include <linux/interrupt.h>
4545 #include <linux/comedi/comedidev.h>
4646 #include <linux/comedi/comedi_8255.h>
47−
48−#include "comedi_8254.h"
47+#include <linux/comedi/comedi_8254.h>
4948
5049 /*
5150 * Register map (dev->iobase)
drivers/comedi/drivers/das1800.c+1−1
@@ -74,9 +74,9 @@ · 73 unmodified lines
7474 #include <linux/slab.h>
7575 #include <linux/io.h>
7676 #include <linux/comedi/comedidev.h>
77+#include <linux/comedi/comedi_8254.h>
7778
7879 #include "comedi_isadma.h"
79−#include "comedi_8254.h"
8080
8181 /* misc. defines */
8282 #define DAS1800_SIZE 16 /* uses 16 io addresses */
drivers/comedi/drivers/das6402.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
2525 #include <linux/module.h>
2626 #include <linux/interrupt.h>
2727 #include <linux/comedi/comedidev.h>
28−
29−#include "comedi_8254.h"
28+#include <linux/comedi/comedi_8254.h>
3029
3130 /*
3231 * Register I/O map
drivers/comedi/drivers/das800.c+1−2
@@ -47,8 +47,7 @@ · 46 unmodified lines
4747 #include <linux/interrupt.h>
4848 #include <linux/delay.h>
4949 #include <linux/comedi/comedidev.h>
50−
51−#include "comedi_8254.h"
50+#include <linux/comedi/comedi_8254.h>
5251
5352 #define N_CHAN_AI 8 /* number of analog input channels */
5453
drivers/comedi/drivers/me4000.c+1−1
@@ -33,8 +33,8 @@ · 32 unmodified lines
3333 #include <linux/delay.h>
3434 #include <linux/interrupt.h>
3535 #include <linux/comedi/comedi_pci.h>
36+#include <linux/comedi/comedi_8254.h>
3637
37−#include "comedi_8254.h"
3838 #include "plx9052.h"
3939
4040 #define ME4000_FIRMWARE "me4000_firmware.bin"
drivers/comedi/drivers/ni_at_a2150.c+1−1
@@ -40,9 +40,9 @@ · 39 unmodified lines
4040 #include <linux/slab.h>
4141 #include <linux/io.h>
4242 #include <linux/comedi/comedidev.h>
43+#include <linux/comedi/comedi_8254.h>
4344
4445 #include "comedi_isadma.h"
45−#include "comedi_8254.h"
4646
4747 #define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */
4848
drivers/comedi/drivers/ni_at_ao.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
2626
2727 #include <linux/module.h>
2828 #include <linux/comedi/comedidev.h>
29−
30−#include "comedi_8254.h"
29+#include <linux/comedi/comedi_8254.h>
3130
3231 /*
3332 * Register map
drivers/comedi/drivers/ni_labpc_common.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 #include <linux/slab.h>
1515 #include <linux/comedi/comedidev.h>
1616 #include <linux/comedi/comedi_8255.h>
17+#include <linux/comedi/comedi_8254.h>
1718
18−#include "comedi_8254.h"
1919 #include "ni_labpc.h"
2020 #include "ni_labpc_regs.h"
2121 #include "ni_labpc_isadma.h"
drivers/comedi/drivers/pcl711.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
3030 #include <linux/delay.h>
3131 #include <linux/interrupt.h>
3232 #include <linux/comedi/comedidev.h>
33−
34−#include "comedi_8254.h"
33+#include <linux/comedi/comedi_8254.h>
3534
3635 /*
3736 * I/O port register map
drivers/comedi/drivers/pcl812.c+1−1
@@ -115,9 +115,9 @@ · 114 unmodified lines
115115 #include <linux/delay.h>
116116 #include <linux/io.h>
117117 #include <linux/comedi/comedidev.h>
118+#include <linux/comedi/comedi_8254.h>
118119
119120 #include "comedi_isadma.h"
120−#include "comedi_8254.h"
121121
122122 /*
123123 * Register I/O map
drivers/comedi/drivers/pcl816.c+1−1
@@ -36,9 +36,9 @@ · 35 unmodified lines
3636 #include <linux/io.h>
3737 #include <linux/interrupt.h>
3838 #include <linux/comedi/comedidev.h>
39+#include <linux/comedi/comedi_8254.h>
3940
4041 #include "comedi_isadma.h"
41−#include "comedi_8254.h"
4242
4343 /*
4444 * Register I/O map
drivers/comedi/drivers/pcl818.c+1−1
@@ -98,9 +98,9 @@ · 97 unmodified lines
9898 #include <linux/io.h>
9999 #include <linux/interrupt.h>
100100 #include <linux/comedi/comedidev.h>
101+#include <linux/comedi/comedi_8254.h>
101102
102103 #include "comedi_isadma.h"
103−#include "comedi_8254.h"
104104
105105 /*
106106 * Register I/O map
drivers/comedi/drivers/rtd520.c+1−1
@@ -86,8 +86,8 @@ · 85 unmodified lines
8686 #include <linux/delay.h>
8787 #include <linux/interrupt.h>
8888 #include <linux/comedi/comedi_pci.h>
89+#include <linux/comedi/comedi_8254.h>
8990
90−#include "comedi_8254.h"
9191 #include "plx9080.h"
9292
9393 /*
include/linux/comedi/comedi_8254.hrenamed from drivers/comedi/drivers/comedi_8254.h+0−0

File renamed without changes.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t