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
43#include <linux/delay.h>43#include <linux/delay.h>
44#include <linux/interrupt.h>44#include <linux/interrupt.h>
45#include <linux/comedi/comedi_pci.h>45#include <linux/comedi/comedi_pci.h>
46#include <linux/comedi/comedi_8254.h>
46 47
47#include "plx9052.h"48#include "plx9052.h"
48#include "comedi_8254.h"
49 49
50#define PCI9111_FIFO_HALF_SIZE 51250#define PCI9111_FIFO_HALF_SIZE 512
51 51
drivers/comedi/drivers/adl_pci9118.c+1−1
@@ -79,9 +79,9 @@ · 78 unmodified lines
79#include <linux/interrupt.h>79#include <linux/interrupt.h>
80#include <linux/io.h>80#include <linux/io.h>
81#include <linux/comedi/comedi_pci.h>81#include <linux/comedi/comedi_pci.h>
82#include <linux/comedi/comedi_8254.h>
82 83
83#include "amcc_s5933.h"84#include "amcc_s5933.h"
84#include "comedi_8254.h"
85 85
86/*86/*
87 * PCI BAR2 Register map (dev->iobase)87 * PCI BAR2 Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1710.c+1−1
@@ -31,8 +31,8 @@ · 30 unmodified lines
31#include <linux/module.h>31#include <linux/module.h>
32#include <linux/interrupt.h>32#include <linux/interrupt.h>
33#include <linux/comedi/comedi_pci.h>33#include <linux/comedi/comedi_pci.h>
34#include <linux/comedi/comedi_8254.h>
34 35
35#include "comedi_8254.h"
36#include "amcc_s5933.h"36#include "amcc_s5933.h"
37 37
38/*38/*
drivers/comedi/drivers/adv_pci_dio.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
25#include <linux/delay.h>25#include <linux/delay.h>
26#include <linux/comedi/comedi_pci.h>26#include <linux/comedi/comedi_pci.h>
27#include <linux/comedi/comedi_8255.h>27#include <linux/comedi/comedi_8255.h>
28 28#include <linux/comedi/comedi_8254.h>
29#include "comedi_8254.h"
30 29
31/*30/*
32 * Register offset definitions31 * Register offset definitions
drivers/comedi/drivers/aio_aio12_8.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
24#include <linux/module.h>24#include <linux/module.h>
25#include <linux/comedi/comedidev.h>25#include <linux/comedi/comedidev.h>
26#include <linux/comedi/comedi_8255.h>26#include <linux/comedi/comedi_8255.h>
27 27#include <linux/comedi/comedi_8254.h>
28#include "comedi_8254.h"
29 28
30/*29/*
31 * Register map30 * Register map
drivers/comedi/drivers/amplc_dio200_common.c+1−1
@@ -14,9 +14,9 @@ · 13 unmodified lines
14#include <linux/interrupt.h>14#include <linux/interrupt.h>
15#include <linux/comedi/comedidev.h>15#include <linux/comedi/comedidev.h>
16#include <linux/comedi/comedi_8255.h> /* only for register defines */16#include <linux/comedi/comedi_8255.h> /* only for register defines */
17#include <linux/comedi/comedi_8254.h>
17 18
18#include "amplc_dio200.h"19#include "amplc_dio200.h"
19#include "comedi_8254.h"
20 20
21/* 200 series registers */21/* 200 series registers */
22#define DIO200_IO_SIZE 0x2022#define DIO200_IO_SIZE 0x20
drivers/comedi/drivers/amplc_pci224.c+1−2
@@ -97,8 +97,7 @@ · 96 unmodified lines
97#include <linux/interrupt.h>97#include <linux/interrupt.h>
98#include <linux/slab.h>98#include <linux/slab.h>
99#include <linux/comedi/comedi_pci.h>99#include <linux/comedi/comedi_pci.h>
100 100#include <linux/comedi/comedi_8254.h>
101#include "comedi_8254.h"
102 101
103/*102/*
104 * PCI224/234 i/o space 1 (PCIBAR2) registers.103 * PCI224/234 i/o space 1 (PCIBAR2) registers.
drivers/comedi/drivers/amplc_pci230.c+1−2
@@ -176,8 +176,7 @@ · 175 unmodified lines
176#include <linux/interrupt.h>176#include <linux/interrupt.h>
177#include <linux/comedi/comedi_pci.h>177#include <linux/comedi/comedi_pci.h>
178#include <linux/comedi/comedi_8255.h>178#include <linux/comedi/comedi_8255.h>
179 179#include <linux/comedi/comedi_8254.h>
180#include "comedi_8254.h"
181 180
182/*181/*
183 * PCI230 PCI configuration register information182 * PCI230 PCI configuration register information
drivers/comedi/drivers/cb_das16_cs.c+1−2
@@ -28,8 +28,7 @@ · 27 unmodified lines
28#include <linux/interrupt.h>28#include <linux/interrupt.h>
29#include <linux/delay.h>29#include <linux/delay.h>
30#include <linux/comedi/comedi_pcmcia.h>30#include <linux/comedi/comedi_pcmcia.h>
31 31#include <linux/comedi/comedi_8254.h>
32#include "comedi_8254.h"
33 32
34/*33/*
35 * Register I/O map34 * Register I/O map
drivers/comedi/drivers/cb_pcidas.c+1−1
@@ -56,8 +56,8 @@ · 55 unmodified lines
56#include <linux/interrupt.h>56#include <linux/interrupt.h>
57#include <linux/comedi/comedi_pci.h>57#include <linux/comedi/comedi_pci.h>
58#include <linux/comedi/comedi_8255.h>58#include <linux/comedi/comedi_8255.h>
59#include <linux/comedi/comedi_8254.h>
59 60
60#include "comedi_8254.h"
61#include "amcc_s5933.h"61#include "amcc_s5933.h"
62 62
63#define AI_BUFFER_SIZE 1024 /* max ai fifo size */63#define AI_BUFFER_SIZE 1024 /* max ai fifo size */
drivers/comedi/drivers/cb_pcimdas.c+1−1
@@ -36,8 +36,8 @@ · 35 unmodified lines
36#include <linux/interrupt.h>36#include <linux/interrupt.h>
37#include <linux/comedi/comedi_pci.h>37#include <linux/comedi/comedi_pci.h>
38#include <linux/comedi/comedi_8255.h>38#include <linux/comedi/comedi_8255.h>
39#include <linux/comedi/comedi_8254.h>
39 40
40#include "comedi_8254.h"
41#include "plx9052.h"41#include "plx9052.h"
42 42
43/*43/*
drivers/comedi/drivers/comedi_8254.c+1−2
@@ -117,8 +117,7 @@ · 116 unmodified lines
117#include <linux/slab.h>117#include <linux/slab.h>
118#include <linux/io.h>118#include <linux/io.h>
119#include <linux/comedi/comedidev.h>119#include <linux/comedi/comedidev.h>
120 120#include <linux/comedi/comedi_8254.h>
121#include "comedi_8254.h"
122 121
123static unsigned int __i8254_read(struct comedi_8254 *i8254, unsigned int reg)122static unsigned int __i8254_read(struct comedi_8254 *i8254, unsigned int reg)
124{123{
drivers/comedi/drivers/das08.c+1−1
@@ -12,8 +12,8 @@ · 11 unmodified lines
12#include <linux/module.h>12#include <linux/module.h>
13#include <linux/comedi/comedidev.h>13#include <linux/comedi/comedidev.h>
14#include <linux/comedi/comedi_8255.h>14#include <linux/comedi/comedi_8255.h>
15#include <linux/comedi/comedi_8254.h>
15 16
16#include "comedi_8254.h"
17#include "das08.h"17#include "das08.h"
18 18
19/*19/*
drivers/comedi/drivers/das16.c+1−1
@@ -65,9 +65,9 @@ · 64 unmodified lines
65#include <linux/interrupt.h>65#include <linux/interrupt.h>
66#include <linux/comedi/comedidev.h>66#include <linux/comedi/comedidev.h>
67#include <linux/comedi/comedi_8255.h>67#include <linux/comedi/comedi_8255.h>
68#include <linux/comedi/comedi_8254.h>
68 69
69#include "comedi_isadma.h"70#include "comedi_isadma.h"
70#include "comedi_8254.h"
71 71
72#define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */72#define DAS16_DMA_SIZE 0xff00 /* size in bytes of allocated dma buffer */
73 73
drivers/comedi/drivers/das16m1.c+1−2
@@ -44,8 +44,7 @@ · 43 unmodified lines
44#include <linux/interrupt.h>44#include <linux/interrupt.h>
45#include <linux/comedi/comedidev.h>45#include <linux/comedi/comedidev.h>
46#include <linux/comedi/comedi_8255.h>46#include <linux/comedi/comedi_8255.h>
47 47#include <linux/comedi/comedi_8254.h>
48#include "comedi_8254.h"
49 48
50/*49/*
51 * Register map (dev->iobase)50 * Register map (dev->iobase)
drivers/comedi/drivers/das1800.c+1−1
@@ -74,9 +74,9 @@ · 73 unmodified lines
74#include <linux/slab.h>74#include <linux/slab.h>
75#include <linux/io.h>75#include <linux/io.h>
76#include <linux/comedi/comedidev.h>76#include <linux/comedi/comedidev.h>
77#include <linux/comedi/comedi_8254.h>
77 78
78#include "comedi_isadma.h"79#include "comedi_isadma.h"
79#include "comedi_8254.h"
80 80
81/* misc. defines */81/* misc. defines */
82#define DAS1800_SIZE 16 /* uses 16 io addresses */82#define DAS1800_SIZE 16 /* uses 16 io addresses */
drivers/comedi/drivers/das6402.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
25#include <linux/module.h>25#include <linux/module.h>
26#include <linux/interrupt.h>26#include <linux/interrupt.h>
27#include <linux/comedi/comedidev.h>27#include <linux/comedi/comedidev.h>
28 28#include <linux/comedi/comedi_8254.h>
29#include "comedi_8254.h"
30 29
31/*30/*
32 * Register I/O map31 * Register I/O map
drivers/comedi/drivers/das800.c+1−2
@@ -47,8 +47,7 @@ · 46 unmodified lines
47#include <linux/interrupt.h>47#include <linux/interrupt.h>
48#include <linux/delay.h>48#include <linux/delay.h>
49#include <linux/comedi/comedidev.h>49#include <linux/comedi/comedidev.h>
50 50#include <linux/comedi/comedi_8254.h>
51#include "comedi_8254.h"
52 51
53#define N_CHAN_AI 8 /* number of analog input channels */52#define N_CHAN_AI 8 /* number of analog input channels */
54 53
drivers/comedi/drivers/me4000.c+1−1
@@ -33,8 +33,8 @@ · 32 unmodified lines
33#include <linux/delay.h>33#include <linux/delay.h>
34#include <linux/interrupt.h>34#include <linux/interrupt.h>
35#include <linux/comedi/comedi_pci.h>35#include <linux/comedi/comedi_pci.h>
36#include <linux/comedi/comedi_8254.h>
36 37
37#include "comedi_8254.h"
38#include "plx9052.h"38#include "plx9052.h"
39 39
40#define ME4000_FIRMWARE "me4000_firmware.bin"40#define ME4000_FIRMWARE "me4000_firmware.bin"
drivers/comedi/drivers/ni_at_a2150.c+1−1
@@ -40,9 +40,9 @@ · 39 unmodified lines
40#include <linux/slab.h>40#include <linux/slab.h>
41#include <linux/io.h>41#include <linux/io.h>
42#include <linux/comedi/comedidev.h>42#include <linux/comedi/comedidev.h>
43#include <linux/comedi/comedi_8254.h>
43 44
44#include "comedi_isadma.h"45#include "comedi_isadma.h"
45#include "comedi_8254.h"
46 46
47#define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */47#define A2150_DMA_BUFFER_SIZE 0xff00 /* size in bytes of dma buffer */
48 48
drivers/comedi/drivers/ni_at_ao.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
26 26
27#include <linux/module.h>27#include <linux/module.h>
28#include <linux/comedi/comedidev.h>28#include <linux/comedi/comedidev.h>
29 29#include <linux/comedi/comedi_8254.h>
30#include "comedi_8254.h"
31 30
32/*31/*
33 * Register map32 * Register map
drivers/comedi/drivers/ni_labpc_common.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
14#include <linux/slab.h>14#include <linux/slab.h>
15#include <linux/comedi/comedidev.h>15#include <linux/comedi/comedidev.h>
16#include <linux/comedi/comedi_8255.h>16#include <linux/comedi/comedi_8255.h>
17#include <linux/comedi/comedi_8254.h>
17 18
18#include "comedi_8254.h"
19#include "ni_labpc.h"19#include "ni_labpc.h"
20#include "ni_labpc_regs.h"20#include "ni_labpc_regs.h"
21#include "ni_labpc_isadma.h"21#include "ni_labpc_isadma.h"
drivers/comedi/drivers/pcl711.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
30#include <linux/delay.h>30#include <linux/delay.h>
31#include <linux/interrupt.h>31#include <linux/interrupt.h>
32#include <linux/comedi/comedidev.h>32#include <linux/comedi/comedidev.h>
33 33#include <linux/comedi/comedi_8254.h>
34#include "comedi_8254.h"
35 34
36/*35/*
37 * I/O port register map36 * I/O port register map
drivers/comedi/drivers/pcl812.c+1−1
@@ -115,9 +115,9 @@ · 114 unmodified lines
115#include <linux/delay.h>115#include <linux/delay.h>
116#include <linux/io.h>116#include <linux/io.h>
117#include <linux/comedi/comedidev.h>117#include <linux/comedi/comedidev.h>
118#include <linux/comedi/comedi_8254.h>
118 119
119#include "comedi_isadma.h"120#include "comedi_isadma.h"
120#include "comedi_8254.h"
121 121
122/*122/*
123 * Register I/O map123 * Register I/O map
drivers/comedi/drivers/pcl816.c+1−1
@@ -36,9 +36,9 @@ · 35 unmodified lines
36#include <linux/io.h>36#include <linux/io.h>
37#include <linux/interrupt.h>37#include <linux/interrupt.h>
38#include <linux/comedi/comedidev.h>38#include <linux/comedi/comedidev.h>
39#include <linux/comedi/comedi_8254.h>
39 40
40#include "comedi_isadma.h"41#include "comedi_isadma.h"
41#include "comedi_8254.h"
42 42
43/*43/*
44 * Register I/O map44 * Register I/O map
drivers/comedi/drivers/pcl818.c+1−1
@@ -98,9 +98,9 @@ · 97 unmodified lines
98#include <linux/io.h>98#include <linux/io.h>
99#include <linux/interrupt.h>99#include <linux/interrupt.h>
100#include <linux/comedi/comedidev.h>100#include <linux/comedi/comedidev.h>
101#include <linux/comedi/comedi_8254.h>
101 102
102#include "comedi_isadma.h"103#include "comedi_isadma.h"
103#include "comedi_8254.h"
104 104
105/*105/*
106 * Register I/O map106 * Register I/O map
drivers/comedi/drivers/rtd520.c+1−1
@@ -86,8 +86,8 @@ · 85 unmodified lines
86#include <linux/delay.h>86#include <linux/delay.h>
87#include <linux/interrupt.h>87#include <linux/interrupt.h>
88#include <linux/comedi/comedi_pci.h>88#include <linux/comedi/comedi_pci.h>
89#include <linux/comedi/comedi_8254.h>
89 90
90#include "comedi_8254.h"
91#include "plx9080.h"91#include "plx9080.h"
92 92
93/*93/*
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