History

comedi: Move the main COMEDI headers

Move the main COMEDI driver headers out of "drivers/comedi/" into new directory "include/linux/comedi/". These are "comedidev.h", "comedilib.h", "comedi_pci.h", "comedi_pcmcia.h", and "comedi_usb.h". Additionally, move the user-space API header "comedi.h" into "include/uapi/linux/" and add "WITH Linux-syscall-note" to its SPDX-License-Identifier. Update the "COMEDI DRIVERS" section of the MAINTAINERS file to account for these changes.

Ian Abbott committed 4 years ago

Commit df0e68c1 parent b4c8062146 files · +150 −252Browse files

Unified · Split

146 files
  1. MAINTAINERS +2 −0
  2. drivers/comedi/comedi_buf.c +1 −2
  3. drivers/comedi/comedi_fops.c +1 −1
  4. drivers/comedi/comedi_pci.c +1 −2
  5. drivers/comedi/comedi_pcmcia.c +1 −2
  6. drivers/comedi/comedi_usb.c +1 −2
  7. drivers/comedi/drivers.c +1 −2
  8. drivers/comedi/drivers/8255.c +1 −1
  9. drivers/comedi/drivers/8255_pci.c +1 −2
  10. drivers/comedi/drivers/addi_apci_1032.c +1 −1
  11. drivers/comedi/drivers/addi_apci_1500.c +1 −1
  12. drivers/comedi/drivers/addi_apci_1516.c +1 −1
  13. drivers/comedi/drivers/addi_apci_1564.c +1 −1
  14. drivers/comedi/drivers/addi_apci_16xx.c +1 −2
  15. drivers/comedi/drivers/addi_apci_2032.c +1 −1
  16. drivers/comedi/drivers/addi_apci_2200.c +1 −1
  17. drivers/comedi/drivers/addi_apci_3120.c +1 −1
  18. drivers/comedi/drivers/addi_apci_3501.c +1 −1
  19. drivers/comedi/drivers/addi_apci_3xxx.c +1 −2
  20. drivers/comedi/drivers/addi_watchdog.c +1 −1
  21. drivers/comedi/drivers/adl_pci6208.c +1 −2
  22. drivers/comedi/drivers/adl_pci7x3x.c +1 −2
  23. drivers/comedi/drivers/adl_pci8164.c +1 −2
  24. drivers/comedi/drivers/adl_pci9111.c +1 −2
  25. drivers/comedi/drivers/adl_pci9118.c +1 −2
  26. drivers/comedi/drivers/adq12b.c +1 −2
  27. drivers/comedi/drivers/adv_pci1710.c +1 −2
  28. drivers/comedi/drivers/adv_pci1720.c +1 −2
  29. drivers/comedi/drivers/adv_pci1723.c +1 −2
  30. drivers/comedi/drivers/adv_pci1724.c +1 −2
  31. drivers/comedi/drivers/adv_pci1760.c +1 −2
  32. drivers/comedi/drivers/adv_pci_dio.c +1 −2
  33. drivers/comedi/drivers/aio_aio12_8.c +1 −1
  34. drivers/comedi/drivers/aio_iiro_16.c +1 −2
  35. drivers/comedi/drivers/amplc_dio200.c +1 −1
  36. drivers/comedi/drivers/amplc_dio200_common.c +1 −2
  37. drivers/comedi/drivers/amplc_dio200_pci.c +1 −2
  38. drivers/comedi/drivers/amplc_pc236.c +1 −2
  39. drivers/comedi/drivers/amplc_pc236_common.c +1 −2
  40. drivers/comedi/drivers/amplc_pc263.c +1 −1
  41. drivers/comedi/drivers/amplc_pci224.c +1 −2
  42. drivers/comedi/drivers/amplc_pci230.c +1 −2
  43. drivers/comedi/drivers/amplc_pci236.c +1 −2
  44. drivers/comedi/drivers/amplc_pci263.c +1 −2
  45. drivers/comedi/drivers/c6xdigio.c +1 −2
  46. drivers/comedi/drivers/cb_das16_cs.c +1 −2
  47. drivers/comedi/drivers/cb_pcidas.c +1 −2
  48. drivers/comedi/drivers/cb_pcidas64.c +1 −2
  49. drivers/comedi/drivers/cb_pcidda.c +1 −2
  50. drivers/comedi/drivers/cb_pcimdas.c +1 −2
  51. drivers/comedi/drivers/cb_pcimdda.c +1 −2
  52. drivers/comedi/drivers/comedi_8254.c +1 −2
  53. drivers/comedi/drivers/comedi_8255.c +1 −1
  54. drivers/comedi/drivers/comedi_bond.c +3 −3
  55. drivers/comedi/drivers/comedi_isadma.c +1 −2
  56. drivers/comedi/drivers/comedi_parport.c +1 −2
  57. drivers/comedi/drivers/comedi_test.c +1 −3
  58. drivers/comedi/drivers/contec_pci_dio.c +1 −2
  59. drivers/comedi/drivers/dac02.c +1 −2
  60. drivers/comedi/drivers/daqboard2000.c +1 −2
  61. drivers/comedi/drivers/das08.c +1 −2
  62. drivers/comedi/drivers/das08_cs.c +1 −2
  63. drivers/comedi/drivers/das08_isa.c +1 −1
  64. drivers/comedi/drivers/das08_pci.c +1 −2
  65. drivers/comedi/drivers/das16.c +1 −2
  66. drivers/comedi/drivers/das16m1.c +1 −1
  67. drivers/comedi/drivers/das1800.c +1 −2
  68. drivers/comedi/drivers/das6402.c +1 −2
  69. drivers/comedi/drivers/das800.c +1 −2
  70. drivers/comedi/drivers/dmm32at.c +1 −1
  71. drivers/comedi/drivers/dt2801.c +1 −1
  72. drivers/comedi/drivers/dt2811.c +1 −2
  73. drivers/comedi/drivers/dt2814.c +1 −2
  74. drivers/comedi/drivers/dt2815.c +1 −2
  75. drivers/comedi/drivers/dt2817.c +1 −1
  76. drivers/comedi/drivers/dt282x.c +1 −2
  77. drivers/comedi/drivers/dt3000.c +1 −2
  78. drivers/comedi/drivers/dt9812.c +1 −2
  79. drivers/comedi/drivers/dyna_pci10xx.c +1 −2
  80. drivers/comedi/drivers/fl512.c +1 −2
  81. drivers/comedi/drivers/gsc_hpdi.c +1 −2
  82. drivers/comedi/drivers/icp_multi.c +1 −2
  83. drivers/comedi/drivers/ii_pci20kc.c +1 −1
  84. drivers/comedi/drivers/jr3_pci.c +1 −2
  85. drivers/comedi/drivers/ke_counter.c +1 −2
  86. drivers/comedi/drivers/me4000.c +1 −2
  87. drivers/comedi/drivers/me_daq.c +1 −2
  88. drivers/comedi/drivers/mf6x4.c +1 −2
  89. drivers/comedi/drivers/mite.c +1 −2
  90. drivers/comedi/drivers/mpc624.c +1 −2
  91. drivers/comedi/drivers/multiq3.c +1 −2
  92. drivers/comedi/drivers/ni_6527.c +1 −2
  93. drivers/comedi/drivers/ni_65xx.c +1 −2
  94. drivers/comedi/drivers/ni_660x.c +1 −2
  95. drivers/comedi/drivers/ni_670x.c +1 −2
  96. drivers/comedi/drivers/ni_at_a2150.c +1 −2
  97. drivers/comedi/drivers/ni_at_ao.c +1 −2
  98. drivers/comedi/drivers/ni_atmio.c +1 −2
  99. drivers/comedi/drivers/ni_atmio16d.c +1 −1
  100. drivers/comedi/drivers/ni_daq_700.c +1 −2
  101. drivers/comedi/drivers/ni_daq_dio24.c +1 −1
  102. drivers/comedi/drivers/ni_labpc.c +1 −2
  103. drivers/comedi/drivers/ni_labpc_common.c +1 −2
  104. drivers/comedi/drivers/ni_labpc_cs.c +1 −2
  105. drivers/comedi/drivers/ni_labpc_isadma.c +1 −2
  106. drivers/comedi/drivers/ni_labpc_pci.c +1 −2
  107. drivers/comedi/drivers/ni_mio_cs.c +1 −1
  108. drivers/comedi/drivers/ni_pcidio.c +1 −2
  109. drivers/comedi/drivers/ni_pcimio.c +1 −3
  110. drivers/comedi/drivers/ni_routes.c +1 −2
  111. drivers/comedi/drivers/ni_routes.h +1 −1
  112. drivers/comedi/drivers/ni_routing/ni_route_values.h +1 −1
  113. drivers/comedi/drivers/ni_tio.h +1 −1
  114. drivers/comedi/drivers/ni_usb6501.c +1 −2
  115. drivers/comedi/drivers/pcl711.c +1 −2
  116. drivers/comedi/drivers/pcl724.c +1 −1
  117. drivers/comedi/drivers/pcl726.c +1 −2
  118. drivers/comedi/drivers/pcl730.c +1 −1
  119. drivers/comedi/drivers/pcl812.c +1 −2
  120. drivers/comedi/drivers/pcl816.c +1 −2
  121. drivers/comedi/drivers/pcl818.c +1 −2
  122. drivers/comedi/drivers/pcm3724.c +1 −1
  123. drivers/comedi/drivers/pcmad.c +1 −1
  124. drivers/comedi/drivers/pcmda12.c +1 −1
  125. drivers/comedi/drivers/pcmmio.c +1 −2
  126. drivers/comedi/drivers/pcmuio.c +1 −2
  127. drivers/comedi/drivers/quatech_daqp_cs.c +1 −2
  128. drivers/comedi/drivers/rtd520.c +1 −2
  129. drivers/comedi/drivers/rti800.c +1 −1
  130. drivers/comedi/drivers/rti802.c +1 −1
  131. drivers/comedi/drivers/s526.c +1 −1
  132. drivers/comedi/drivers/s626.c +1 −2
  133. drivers/comedi/drivers/ssv_dnp.c +1 −1
  134. drivers/comedi/drivers/usbdux.c +1 −2
  135. drivers/comedi/drivers/usbduxfast.c +1 −1
  136. drivers/comedi/drivers/usbduxsigma.c +1 −2
  137. drivers/comedi/drivers/vmk80xx.c +1 −2
  138. drivers/comedi/kcomedilib/kcomedilib_main.c +3 −3
  139. drivers/comedi/proc.c +1 −1
  140. drivers/comedi/range.c +1 −1
  141. include/linux/comedi/comedi_pci.h +1 −2
  142. include/linux/comedi/comedi_pcmcia.h +1 −2
  143. include/linux/comedi/comedi_usb.h +1 −2
  144. include/linux/comedi/comedidev.h +1 −2
  145. include/linux/comedi/comedilib.h +0 −0
  146. include/uapi/linux/comedi.h +1 −1
MAINTAINERS+2−0
@@ -4713,6 +4713,8 @@ M: Ian Abbott <abbotti@mev.co.uk> · 4712 unmodified lines
4713M: H Hartley Sweeten <hsweeten@visionengravers.com>4713M: H Hartley Sweeten <hsweeten@visionengravers.com>
4714S: Odd Fixes4714S: Odd Fixes
4715F: drivers/comedi/4715F: drivers/comedi/
4716F: include/linux/comedi/
4717F: include/uapi/linux/comedi.h
4716 4718
4717COMMON CLK FRAMEWORK4719COMMON CLK FRAMEWORK
4718M: Michael Turquette <mturquette@baylibre.com>4720M: Michael Turquette <mturquette@baylibre.com>
drivers/comedi/comedi_buf.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
9 9
10#include <linux/vmalloc.h>10#include <linux/vmalloc.h>
11#include <linux/slab.h>11#include <linux/slab.h>
12 12#include <linux/comedi/comedidev.h>
13#include "comedidev.h"
14#include "comedi_internal.h"13#include "comedi_internal.h"
15 14
16#ifdef PAGE_KERNEL_NOCACHE15#ifdef PAGE_KERNEL_NOCACHE
drivers/comedi/comedi_fops.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#include <linux/poll.h>23#include <linux/poll.h>
24#include <linux/device.h>24#include <linux/device.h>
25#include <linux/fs.h>25#include <linux/fs.h>
26#include "comedidev.h"26#include <linux/comedi/comedidev.h>
27#include <linux/cdev.h>27#include <linux/cdev.h>
28 28
29#include <linux/io.h>29#include <linux/io.h>
drivers/comedi/comedi_pci.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
9 9
10#include <linux/module.h>10#include <linux/module.h>
11#include <linux/interrupt.h>11#include <linux/interrupt.h>
12 12#include <linux/comedi/comedi_pci.h>
13#include "comedi_pci.h"
14 13
15/**14/**
16 * comedi_to_pci_dev() - Return PCI device attached to COMEDI device15 * comedi_to_pci_dev() - Return PCI device attached to COMEDI device
drivers/comedi/comedi_pcmcia.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
9 9
10#include <linux/module.h>10#include <linux/module.h>
11#include <linux/kernel.h>11#include <linux/kernel.h>
12 12#include <linux/comedi/comedi_pcmcia.h>
13#include "comedi_pcmcia.h"
14 13
15/**14/**
16 * comedi_to_pcmcia_dev() - Return PCMCIA device attached to COMEDI device15 * comedi_to_pcmcia_dev() - Return PCMCIA device attached to COMEDI device
drivers/comedi/comedi_usb.c+1−2
@@ -8,8 +8,7 @@ · 7 unmodified lines
8 */8 */
9 9
10#include <linux/module.h>10#include <linux/module.h>
11 11#include <linux/comedi/comedi_usb.h>
12#include "comedi_usb.h"
13 12
14/**13/**
15 * comedi_to_usb_interface() - Return USB interface attached to COMEDI device14 * comedi_to_usb_interface() - Return USB interface attached to COMEDI device
drivers/comedi/drivers.c+1−2
@@ -17,8 +17,7 @@ · 16 unmodified lines
17#include <linux/dma-direction.h>17#include <linux/dma-direction.h>
18#include <linux/interrupt.h>18#include <linux/interrupt.h>
19#include <linux/firmware.h>19#include <linux/firmware.h>
20 20#include <linux/comedi/comedidev.h>
21#include "comedidev.h"
22#include "comedi_internal.h"21#include "comedi_internal.h"
23 22
24struct comedi_driver *comedi_drivers;23struct comedi_driver *comedi_drivers;
drivers/comedi/drivers/8255.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
40 */40 */
41 41
42#include <linux/module.h>42#include <linux/module.h>
43#include "../comedidev.h"43#include <linux/comedi/comedidev.h>
44 44
45#include "8255.h"45#include "8255.h"
46 46
drivers/comedi/drivers/8255_pci.c+1−2
@@ -53,8 +53,7 @@ · 52 unmodified lines
53 */53 */
54 54
55#include <linux/module.h>55#include <linux/module.h>
56 56#include <linux/comedi/comedi_pci.h>
57#include "../comedi_pci.h"
58 57
59#include "8255.h"58#include "8255.h"
60 59
drivers/comedi/drivers/addi_apci_1032.c+1−1
@@ -63,8 +63,8 @@ · 62 unmodified lines
63 63
64#include <linux/module.h>64#include <linux/module.h>
65#include <linux/interrupt.h>65#include <linux/interrupt.h>
66#include <linux/comedi/comedi_pci.h>
66 67
67#include "../comedi_pci.h"
68#include "amcc_s5933.h"68#include "amcc_s5933.h"
69 69
70/*70/*
drivers/comedi/drivers/addi_apci_1500.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
14 14
15#include <linux/module.h>15#include <linux/module.h>
16#include <linux/interrupt.h>16#include <linux/interrupt.h>
17#include <linux/comedi/comedi_pci.h>
17 18
18#include "../comedi_pci.h"
19#include "amcc_s5933.h"19#include "amcc_s5933.h"
20#include "z8536.h"20#include "z8536.h"
21 21
drivers/comedi/drivers/addi_apci_1516.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
14 */14 */
15 15
16#include <linux/module.h>16#include <linux/module.h>
17#include <linux/comedi/comedi_pci.h>
17 18
18#include "../comedi_pci.h"
19#include "addi_watchdog.h"19#include "addi_watchdog.h"
20 20
21/*21/*
drivers/comedi/drivers/addi_apci_1564.c+1−1
@@ -68,8 +68,8 @@ · 67 unmodified lines
68 68
69#include <linux/module.h>69#include <linux/module.h>
70#include <linux/interrupt.h>70#include <linux/interrupt.h>
71#include <linux/comedi/comedi_pci.h>
71 72
72#include "../comedi_pci.h"
73#include "addi_tcw.h"73#include "addi_tcw.h"
74#include "addi_watchdog.h"74#include "addi_watchdog.h"
75 75
drivers/comedi/drivers/addi_apci_16xx.c+1−2
@@ -14,8 +14,7 @@ · 13 unmodified lines
14 */14 */
15 15
16#include <linux/module.h>16#include <linux/module.h>
17 17#include <linux/comedi/comedi_pci.h>
18#include "../comedi_pci.h"
19 18
20/*19/*
21 * Register I/O map20 * Register I/O map
drivers/comedi/drivers/addi_apci_2032.c+1−1
@@ -16,8 +16,8 @@ · 15 unmodified lines
16#include <linux/module.h>16#include <linux/module.h>
17#include <linux/interrupt.h>17#include <linux/interrupt.h>
18#include <linux/slab.h>18#include <linux/slab.h>
19#include <linux/comedi/comedi_pci.h>
19 20
20#include "../comedi_pci.h"
21#include "addi_watchdog.h"21#include "addi_watchdog.h"
22 22
23/*23/*
drivers/comedi/drivers/addi_apci_2200.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
14 */14 */
15 15
16#include <linux/module.h>16#include <linux/module.h>
17#include <linux/comedi/comedi_pci.h>
17 18
18#include "../comedi_pci.h"
19#include "addi_watchdog.h"19#include "addi_watchdog.h"
20 20
21/*21/*
drivers/comedi/drivers/addi_apci_3120.c+1−1
@@ -14,8 +14,8 @@ · 13 unmodified lines
14 14
15#include <linux/module.h>15#include <linux/module.h>
16#include <linux/interrupt.h>16#include <linux/interrupt.h>
17#include <linux/comedi/comedi_pci.h>
17 18
18#include "../comedi_pci.h"
19#include "amcc_s5933.h"19#include "amcc_s5933.h"
20 20
21/*21/*
drivers/comedi/drivers/addi_apci_3501.c+1−1
@@ -41,8 +41,8 @@ · 40 unmodified lines
41 */41 */
42 42
43#include <linux/module.h>43#include <linux/module.h>
44#include <linux/comedi/comedi_pci.h>
44 45
45#include "../comedi_pci.h"
46#include "amcc_s5933.h"46#include "amcc_s5933.h"
47 47
48/*48/*
drivers/comedi/drivers/addi_apci_3xxx.c+1−2
@@ -15,8 +15,7 @@ · 14 unmodified lines
15 15
16#include <linux/module.h>16#include <linux/module.h>
17#include <linux/interrupt.h>17#include <linux/interrupt.h>
18 18#include <linux/comedi/comedi_pci.h>
19#include "../comedi_pci.h"
20 19
21#define CONV_UNIT_NS BIT(0)20#define CONV_UNIT_NS BIT(0)
22#define CONV_UNIT_US BIT(1)21#define CONV_UNIT_US BIT(1)
drivers/comedi/drivers/addi_watchdog.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
10 */10 */
11 11
12#include <linux/module.h>12#include <linux/module.h>
13#include "../comedidev.h"13#include <linux/comedi/comedidev.h>
14#include "addi_tcw.h"14#include "addi_tcw.h"
15#include "addi_watchdog.h"15#include "addi_watchdog.h"
16 16
drivers/comedi/drivers/adl_pci6208.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
24 24
25#include <linux/module.h>25#include <linux/module.h>
26#include <linux/delay.h>26#include <linux/delay.h>
27 27#include <linux/comedi/comedi_pci.h>
28#include "../comedi_pci.h"
29 28
30/*29/*
31 * PCI-6208/6216-GL register map30 * PCI-6208/6216-GL register map
drivers/comedi/drivers/adl_pci7x3x.c+1−2
@@ -46,8 +46,7 @@ · 45 unmodified lines
46 */46 */
47 47
48#include <linux/module.h>48#include <linux/module.h>
49 49#include <linux/comedi/comedi_pci.h>
50#include "../comedi_pci.h"
51 50
52#include "plx9052.h"51#include "plx9052.h"
53 52
drivers/comedi/drivers/adl_pci8164.c+1−2
@@ -19,8 +19,7 @@ · 18 unmodified lines
19 19
20#include <linux/kernel.h>20#include <linux/kernel.h>
21#include <linux/module.h>21#include <linux/module.h>
22 22#include <linux/comedi/comedi_pci.h>
23#include "../comedi_pci.h"
24 23
25#define PCI8164_AXIS(x) ((x) * 0x08)24#define PCI8164_AXIS(x) ((x) * 0x08)
26#define PCI8164_CMD_MSTS_REG 0x0025#define PCI8164_CMD_MSTS_REG 0x00
drivers/comedi/drivers/adl_pci9111.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
42#include <linux/module.h>42#include <linux/module.h>
43#include <linux/delay.h>43#include <linux/delay.h>
44#include <linux/interrupt.h>44#include <linux/interrupt.h>
45 45#include <linux/comedi/comedi_pci.h>
46#include "../comedi_pci.h"
47 46
48#include "plx9052.h"47#include "plx9052.h"
49#include "comedi_8254.h"48#include "comedi_8254.h"
drivers/comedi/drivers/adl_pci9118.c+1−2
@@ -78,8 +78,7 @@ · 77 unmodified lines
78#include <linux/gfp.h>78#include <linux/gfp.h>
79#include <linux/interrupt.h>79#include <linux/interrupt.h>
80#include <linux/io.h>80#include <linux/io.h>
81 81#include <linux/comedi/comedi_pci.h>
82#include "../comedi_pci.h"
83 82
84#include "amcc_s5933.h"83#include "amcc_s5933.h"
85#include "comedi_8254.h"84#include "comedi_8254.h"
drivers/comedi/drivers/adq12b.c+1−2
@@ -48,8 +48,7 @@ · 47 unmodified lines
48 48
49#include <linux/module.h>49#include <linux/module.h>
50#include <linux/delay.h>50#include <linux/delay.h>
51 51#include <linux/comedi/comedidev.h>
52#include "../comedidev.h"
53 52
54/* address scheme (page 2.17 of the manual) */53/* address scheme (page 2.17 of the manual) */
55#define ADQ12B_CTREG 0x0054#define ADQ12B_CTREG 0x00
drivers/comedi/drivers/adv_pci1710.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include <linux/interrupt.h>32#include <linux/interrupt.h>
33 33#include <linux/comedi/comedi_pci.h>
34#include "../comedi_pci.h"
35 34
36#include "comedi_8254.h"35#include "comedi_8254.h"
37#include "amcc_s5933.h"36#include "amcc_s5933.h"
drivers/comedi/drivers/adv_pci1720.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
42 42
43#include <linux/module.h>43#include <linux/module.h>
44#include <linux/delay.h>44#include <linux/delay.h>
45 45#include <linux/comedi/comedi_pci.h>
46#include "../comedi_pci.h"
47 46
48/*47/*
49 * PCI BAR2 Register map (dev->iobase)48 * PCI BAR2 Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1723.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
32 */32 */
33 33
34#include <linux/module.h>34#include <linux/module.h>
35 35#include <linux/comedi/comedi_pci.h>
36#include "../comedi_pci.h"
37 36
38/*37/*
39 * PCI Bar 2 I/O Register map (dev->iobase)38 * PCI Bar 2 I/O Register map (dev->iobase)
drivers/comedi/drivers/adv_pci1724.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
38 */38 */
39 39
40#include <linux/module.h>40#include <linux/module.h>
41 41#include <linux/comedi/comedi_pci.h>
42#include "../comedi_pci.h"
43 42
44/*43/*
45 * PCI bar 2 Register I/O map (dev->iobase)44 * PCI bar 2 Register I/O map (dev->iobase)
drivers/comedi/drivers/adv_pci1760.c+1−2
@@ -22,8 +22,7 @@ · 21 unmodified lines
22 */22 */
23 23
24#include <linux/module.h>24#include <linux/module.h>
25 25#include <linux/comedi/comedi_pci.h>
26#include "../comedi_pci.h"
27 26
28/*27/*
29 * PCI-1760 Register Map28 * PCI-1760 Register Map
drivers/comedi/drivers/adv_pci_dio.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
23 23
24#include <linux/module.h>24#include <linux/module.h>
25#include <linux/delay.h>25#include <linux/delay.h>
26 26#include <linux/comedi/comedi_pci.h>
27#include "../comedi_pci.h"
28 27
29#include "8255.h"28#include "8255.h"
30#include "comedi_8254.h"29#include "comedi_8254.h"
drivers/comedi/drivers/aio_aio12_8.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22 */22 */
23 23
24#include <linux/module.h>24#include <linux/module.h>
25#include "../comedidev.h"25#include <linux/comedi/comedidev.h>
26 26
27#include "comedi_8254.h"27#include "comedi_8254.h"
28#include "8255.h"28#include "8255.h"
drivers/comedi/drivers/aio_iiro_16.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include <linux/interrupt.h>32#include <linux/interrupt.h>
33 33#include <linux/comedi/comedidev.h>
34#include "../comedidev.h"
35 34
36#define AIO_IIRO_16_RELAY_0_7 0x0035#define AIO_IIRO_16_RELAY_0_7 0x00
37#define AIO_IIRO_16_INPUT_0_7 0x0136#define AIO_IIRO_16_INPUT_0_7 0x01
drivers/comedi/drivers/amplc_dio200.c+1−1
@@ -185,7 +185,7 @@ · 184 unmodified lines
185 */185 */
186 186
187#include <linux/module.h>187#include <linux/module.h>
188#include "../comedidev.h"188#include <linux/comedi/comedidev.h>
189 189
190#include "amplc_dio200.h"190#include "amplc_dio200.h"
191 191
drivers/comedi/drivers/amplc_dio200_common.c+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
12 12
13#include <linux/module.h>13#include <linux/module.h>
14#include <linux/interrupt.h>14#include <linux/interrupt.h>
15 15#include <linux/comedi/comedidev.h>
16#include "../comedidev.h"
17 16
18#include "amplc_dio200.h"17#include "amplc_dio200.h"
19#include "comedi_8254.h"18#include "comedi_8254.h"
drivers/comedi/drivers/amplc_dio200_pci.c+1−2
@@ -214,8 +214,7 @@ · 213 unmodified lines
214 214
215#include <linux/module.h>215#include <linux/module.h>
216#include <linux/interrupt.h>216#include <linux/interrupt.h>
217 217#include <linux/comedi/comedi_pci.h>
218#include "../comedi_pci.h"
219 218
220#include "amplc_dio200.h"219#include "amplc_dio200.h"
221 220
drivers/comedi/drivers/amplc_pc236.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
32 */32 */
33 33
34#include <linux/module.h>34#include <linux/module.h>
35 35#include <linux/comedi/comedidev.h>
36#include "../comedidev.h"
37 36
38#include "amplc_pc236.h"37#include "amplc_pc236.h"
39 38
drivers/comedi/drivers/amplc_pc236_common.c+1−2
@@ -11,8 +11,7 @@ · 10 unmodified lines
11 11
12#include <linux/module.h>12#include <linux/module.h>
13#include <linux/interrupt.h>13#include <linux/interrupt.h>
14 14#include <linux/comedi/comedidev.h>
15#include "../comedidev.h"
16 15
17#include "amplc_pc236.h"16#include "amplc_pc236.h"
18#include "8255.h"17#include "8255.h"
drivers/comedi/drivers/amplc_pc263.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28#include "../comedidev.h"28#include <linux/comedi/comedidev.h>
29 29
30/* PC263 registers */30/* PC263 registers */
31#define PC263_DO_0_7_REG 0x0031#define PC263_DO_0_7_REG 0x00
drivers/comedi/drivers/amplc_pci224.c+1−2
@@ -96,8 +96,7 @@ · 95 unmodified lines
96#include <linux/module.h>96#include <linux/module.h>
97#include <linux/interrupt.h>97#include <linux/interrupt.h>
98#include <linux/slab.h>98#include <linux/slab.h>
99 99#include <linux/comedi/comedi_pci.h>
100#include "../comedi_pci.h"
101 100
102#include "comedi_8254.h"101#include "comedi_8254.h"
103 102
drivers/comedi/drivers/amplc_pci230.c+1−2
@@ -174,8 +174,7 @@ · 173 unmodified lines
174#include <linux/module.h>174#include <linux/module.h>
175#include <linux/delay.h>175#include <linux/delay.h>
176#include <linux/interrupt.h>176#include <linux/interrupt.h>
177 177#include <linux/comedi/comedi_pci.h>
178#include "../comedi_pci.h"
179 178
180#include "comedi_8254.h"179#include "comedi_8254.h"
181#include "8255.h"180#include "8255.h"
drivers/comedi/drivers/amplc_pci236.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
34 34
35#include <linux/module.h>35#include <linux/module.h>
36#include <linux/interrupt.h>36#include <linux/interrupt.h>
37 37#include <linux/comedi/comedi_pci.h>
38#include "../comedi_pci.h"
39 38
40#include "amplc_pc236.h"39#include "amplc_pc236.h"
41#include "plx9052.h"40#include "plx9052.h"
drivers/comedi/drivers/amplc_pci263.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
24 */24 */
25 25
26#include <linux/module.h>26#include <linux/module.h>
27 27#include <linux/comedi/comedi_pci.h>
28#include "../comedi_pci.h"
29 28
30/* PCI263 registers */29/* PCI263 registers */
31#define PCI263_DO_0_7_REG 0x0030#define PCI263_DO_0_7_REG 0x00
drivers/comedi/drivers/c6xdigio.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
30#include <linux/timer.h>30#include <linux/timer.h>
31#include <linux/io.h>31#include <linux/io.h>
32#include <linux/pnp.h>32#include <linux/pnp.h>
33 33#include <linux/comedi/comedidev.h>
34#include "../comedidev.h"
35 34
36/*35/*
37 * Register I/O map36 * Register I/O map
drivers/comedi/drivers/cb_das16_cs.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
27#include <linux/module.h>27#include <linux/module.h>
28#include <linux/interrupt.h>28#include <linux/interrupt.h>
29#include <linux/delay.h>29#include <linux/delay.h>
30 30#include <linux/comedi/comedi_pcmcia.h>
31#include "../comedi_pcmcia.h"
32 31
33#include "comedi_8254.h"32#include "comedi_8254.h"
34 33
drivers/comedi/drivers/cb_pcidas.c+1−2
@@ -54,8 +54,7 @@ · 53 unmodified lines
54#include <linux/module.h>54#include <linux/module.h>
55#include <linux/delay.h>55#include <linux/delay.h>
56#include <linux/interrupt.h>56#include <linux/interrupt.h>
57 57#include <linux/comedi/comedi_pci.h>
58#include "../comedi_pci.h"
59 58
60#include "comedi_8254.h"59#include "comedi_8254.h"
61#include "8255.h"60#include "8255.h"
drivers/comedi/drivers/cb_pcidas64.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
73#include <linux/module.h>73#include <linux/module.h>
74#include <linux/delay.h>74#include <linux/delay.h>
75#include <linux/interrupt.h>75#include <linux/interrupt.h>
76 76#include <linux/comedi/comedi_pci.h>
77#include "../comedi_pci.h"
78 77
79#include "8255.h"78#include "8255.h"
80#include "plx9080.h"79#include "plx9080.h"
drivers/comedi/drivers/cb_pcidda.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
27 */27 */
28 28
29#include <linux/module.h>29#include <linux/module.h>
30 30#include <linux/comedi/comedi_pci.h>
31#include "../comedi_pci.h"
32 31
33#include "8255.h"32#include "8255.h"
34 33
drivers/comedi/drivers/cb_pcimdas.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
34 34
35#include <linux/module.h>35#include <linux/module.h>
36#include <linux/interrupt.h>36#include <linux/interrupt.h>
37 37#include <linux/comedi/comedi_pci.h>
38#include "../comedi_pci.h"
39 38
40#include "comedi_8254.h"39#include "comedi_8254.h"
41#include "plx9052.h"40#include "plx9052.h"
drivers/comedi/drivers/cb_pcimdda.c+1−2
@@ -67,8 +67,7 @@ · 66 unmodified lines
67 */67 */
68 68
69#include <linux/module.h>69#include <linux/module.h>
70 70#include <linux/comedi/comedi_pci.h>
71#include "../comedi_pci.h"
72 71
73#include "8255.h"72#include "8255.h"
74 73
drivers/comedi/drivers/comedi_8254.c+1−2
@@ -116,8 +116,7 @@ · 115 unmodified lines
116#include <linux/module.h>116#include <linux/module.h>
117#include <linux/slab.h>117#include <linux/slab.h>
118#include <linux/io.h>118#include <linux/io.h>
119 119#include <linux/comedi/comedidev.h>
120#include "../comedidev.h"
121 120
122#include "comedi_8254.h"121#include "comedi_8254.h"
123 122
drivers/comedi/drivers/comedi_8255.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include "../comedidev.h"32#include <linux/comedi/comedidev.h>
33 33
34#include "8255.h"34#include "8255.h"
35 35
drivers/comedi/drivers/comedi_bond.c+3−3
@@ -40,9 +40,9 @@ · 39 unmodified lines
40#include <linux/module.h>40#include <linux/module.h>
41#include <linux/string.h>41#include <linux/string.h>
42#include <linux/slab.h>42#include <linux/slab.h>
43#include "../comedi.h"43#include <linux/comedi.h>
44#include "../comedilib.h"44#include <linux/comedi/comedilib.h>
45#include "../comedidev.h"45#include <linux/comedi/comedidev.h>
46 46
47struct bonded_device {47struct bonded_device {
48 struct comedi_device *dev;48 struct comedi_device *dev;
drivers/comedi/drivers/comedi_isadma.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
9#include <linux/delay.h>9#include <linux/delay.h>
10#include <linux/dma-mapping.h>10#include <linux/dma-mapping.h>
11#include <asm/dma.h>11#include <asm/dma.h>
12 12#include <linux/comedi/comedidev.h>
13#include "../comedidev.h"
14 13
15#include "comedi_isadma.h"14#include "comedi_isadma.h"
16 15
drivers/comedi/drivers/comedi_parport.c+1−2
@@ -57,8 +57,7 @@ · 56 unmodified lines
57 57
58#include <linux/module.h>58#include <linux/module.h>
59#include <linux/interrupt.h>59#include <linux/interrupt.h>
60 60#include <linux/comedi/comedidev.h>
61#include "../comedidev.h"
62 61
63/*62/*
64 * Register map63 * Register map
drivers/comedi/drivers/comedi_test.c+1−3
@@ -45,10 +45,8 @@ · 44 unmodified lines
45 */45 */
46 46
47#include <linux/module.h>47#include <linux/module.h>
48#include "../comedidev.h"48#include <linux/comedi/comedidev.h>
49
50#include <asm/div64.h>49#include <asm/div64.h>
51
52#include <linux/timer.h>50#include <linux/timer.h>
53#include <linux/ktime.h>51#include <linux/ktime.h>
54#include <linux/jiffies.h>52#include <linux/jiffies.h>
drivers/comedi/drivers/contec_pci_dio.c+1−2
@@ -18,8 +18,7 @@ · 17 unmodified lines
18 */18 */
19 19
20#include <linux/module.h>20#include <linux/module.h>
21 21#include <linux/comedi/comedi_pci.h>
22#include "../comedi_pci.h"
23 22
24/*23/*
25 * Register map24 * Register map
drivers/comedi/drivers/dac02.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28 28#include <linux/comedi/comedidev.h>
29#include "../comedidev.h"
30 29
31/*30/*
32 * The output range is selected by jumpering pins on the I/O connector.31 * The output range is selected by jumpering pins on the I/O connector.
drivers/comedi/drivers/daqboard2000.c+1−2
@@ -96,8 +96,7 @@ · 95 unmodified lines
96#include <linux/module.h>96#include <linux/module.h>
97#include <linux/delay.h>97#include <linux/delay.h>
98#include <linux/interrupt.h>98#include <linux/interrupt.h>
99 99#include <linux/comedi/comedi_pci.h>
100#include "../comedi_pci.h"
101 100
102#include "8255.h"101#include "8255.h"
103#include "plx9080.h"102#include "plx9080.h"
drivers/comedi/drivers/das08.c+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
10 */10 */
11 11
12#include <linux/module.h>12#include <linux/module.h>
13 13#include <linux/comedi/comedidev.h>
14#include "../comedidev.h"
15 14
16#include "8255.h"15#include "8255.h"
17#include "comedi_8254.h"16#include "comedi_8254.h"
drivers/comedi/drivers/das08_cs.c+1−2
@@ -30,8 +30,7 @@ · 29 unmodified lines
30 */30 */
31 31
32#include <linux/module.h>32#include <linux/module.h>
33 33#include <linux/comedi/comedi_pcmcia.h>
34#include "../comedi_pcmcia.h"
35 34
36#include "das08.h"35#include "das08.h"
37 36
drivers/comedi/drivers/das08_isa.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include "../comedidev.h"32#include <linux/comedi/comedidev.h>
33 33
34#include "das08.h"34#include "das08.h"
35 35
drivers/comedi/drivers/das08_pci.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
23 */23 */
24 24
25#include <linux/module.h>25#include <linux/module.h>
26 26#include <linux/comedi/comedi_pci.h>
27#include "../comedi_pci.h"
28 27
29#include "das08.h"28#include "das08.h"
30 29
drivers/comedi/drivers/das16.c+1−2
@@ -63,8 +63,7 @@ · 62 unmodified lines
63#include <linux/module.h>63#include <linux/module.h>
64#include <linux/slab.h>64#include <linux/slab.h>
65#include <linux/interrupt.h>65#include <linux/interrupt.h>
66 66#include <linux/comedi/comedidev.h>
67#include "../comedidev.h"
68 67
69#include "comedi_isadma.h"68#include "comedi_isadma.h"
70#include "comedi_8254.h"69#include "comedi_8254.h"
drivers/comedi/drivers/das16m1.c+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
42#include <linux/module.h>42#include <linux/module.h>
43#include <linux/slab.h>43#include <linux/slab.h>
44#include <linux/interrupt.h>44#include <linux/interrupt.h>
45#include "../comedidev.h"45#include <linux/comedi/comedidev.h>
46 46
47#include "8255.h"47#include "8255.h"
48#include "comedi_8254.h"48#include "comedi_8254.h"
drivers/comedi/drivers/das1800.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
73#include <linux/interrupt.h>73#include <linux/interrupt.h>
74#include <linux/slab.h>74#include <linux/slab.h>
75#include <linux/io.h>75#include <linux/io.h>
76 76#include <linux/comedi/comedidev.h>
77#include "../comedidev.h"
78 77
79#include "comedi_isadma.h"78#include "comedi_isadma.h"
80#include "comedi_8254.h"79#include "comedi_8254.h"
drivers/comedi/drivers/das6402.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
24 24
25#include <linux/module.h>25#include <linux/module.h>
26#include <linux/interrupt.h>26#include <linux/interrupt.h>
27 27#include <linux/comedi/comedidev.h>
28#include "../comedidev.h"
29 28
30#include "comedi_8254.h"29#include "comedi_8254.h"
31 30
drivers/comedi/drivers/das800.c+1−2
@@ -46,8 +46,7 @@ · 45 unmodified lines
46#include <linux/module.h>46#include <linux/module.h>
47#include <linux/interrupt.h>47#include <linux/interrupt.h>
48#include <linux/delay.h>48#include <linux/delay.h>
49 49#include <linux/comedi/comedidev.h>
50#include "../comedidev.h"
51 50
52#include "comedi_8254.h"51#include "comedi_8254.h"
53 52
drivers/comedi/drivers/dmm32at.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#include <linux/module.h>29#include <linux/module.h>
30#include <linux/delay.h>30#include <linux/delay.h>
31#include <linux/interrupt.h>31#include <linux/interrupt.h>
32#include "../comedidev.h"32#include <linux/comedi/comedidev.h>
33 33
34#include "8255.h"34#include "8255.h"
35 35
drivers/comedi/drivers/dt2801.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
31 */31 */
32 32
33#include <linux/module.h>33#include <linux/module.h>
34#include "../comedidev.h"34#include <linux/comedi/comedidev.h>
35#include <linux/delay.h>35#include <linux/delay.h>
36 36
37#define DT2801_TIMEOUT 100037#define DT2801_TIMEOUT 1000
drivers/comedi/drivers/dt2811.c+1−2
@@ -40,8 +40,7 @@ · 39 unmodified lines
40#include <linux/module.h>40#include <linux/module.h>
41#include <linux/interrupt.h>41#include <linux/interrupt.h>
42#include <linux/delay.h>42#include <linux/delay.h>
43 43#include <linux/comedi/comedidev.h>
44#include "../comedidev.h"
45 44
46/*45/*
47 * Register I/O map46 * Register I/O map
drivers/comedi/drivers/dt2814.c+1−2
@@ -27,8 +27,7 @@ · 26 unmodified lines
27 27
28#include <linux/module.h>28#include <linux/module.h>
29#include <linux/interrupt.h>29#include <linux/interrupt.h>
30#include "../comedidev.h"30#include <linux/comedi/comedidev.h>
31
32#include <linux/delay.h>31#include <linux/delay.h>
33 32
34#define DT2814_CSR 033#define DT2814_CSR 0
drivers/comedi/drivers/dt2815.c+1−2
@@ -43,8 +43,7 @@ · 42 unmodified lines
43 */43 */
44 44
45#include <linux/module.h>45#include <linux/module.h>
46#include "../comedidev.h"46#include <linux/comedi/comedidev.h>
47
48#include <linux/delay.h>47#include <linux/delay.h>
49 48
50#define DT2815_DATA 049#define DT2815_DATA 0
drivers/comedi/drivers/dt2817.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28#include "../comedidev.h"28#include <linux/comedi/comedidev.h>
29 29
30#define DT2817_CR 030#define DT2817_CR 0
31#define DT2817_DATA 131#define DT2817_DATA 1
drivers/comedi/drivers/dt282x.c+1−2
@@ -51,8 +51,7 @@ · 50 unmodified lines
51#include <linux/gfp.h>51#include <linux/gfp.h>
52#include <linux/interrupt.h>52#include <linux/interrupt.h>
53#include <linux/io.h>53#include <linux/io.h>
54 54#include <linux/comedi/comedidev.h>
55#include "../comedidev.h"
56 55
57#include "comedi_isadma.h"56#include "comedi_isadma.h"
58 57
drivers/comedi/drivers/dt3000.c+1−2
@@ -43,8 +43,7 @@ · 42 unmodified lines
43#include <linux/module.h>43#include <linux/module.h>
44#include <linux/delay.h>44#include <linux/delay.h>
45#include <linux/interrupt.h>45#include <linux/interrupt.h>
46 46#include <linux/comedi/comedi_pci.h>
47#include "../comedi_pci.h"
48 47
49/*48/*
50 * PCI BAR0 - dual-ported RAM location definitions (dev->mmio)49 * PCI BAR0 - dual-ported RAM location definitions (dev->mmio)
drivers/comedi/drivers/dt9812.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
34#include <linux/errno.h>34#include <linux/errno.h>
35#include <linux/slab.h>35#include <linux/slab.h>
36#include <linux/uaccess.h>36#include <linux/uaccess.h>
37 37#include <linux/comedi/comedi_usb.h>
38#include "../comedi_usb.h"
39 38
40#define DT9812_DIAGS_BOARD_INFO_ADDR 0xFBFF39#define DT9812_DIAGS_BOARD_INFO_ADDR 0xFBFF
41#define DT9812_MAX_WRITE_CMD_PIPE_SIZE 3240#define DT9812_MAX_WRITE_CMD_PIPE_SIZE 32
drivers/comedi/drivers/dyna_pci10xx.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
26#include <linux/module.h>26#include <linux/module.h>
27#include <linux/delay.h>27#include <linux/delay.h>
28#include <linux/mutex.h>28#include <linux/mutex.h>
29 29#include <linux/comedi/comedi_pci.h>
30#include "../comedi_pci.h"
31 30
32#define READ_TIMEOUT 5031#define READ_TIMEOUT 50
33 32
drivers/comedi/drivers/fl512.c+1−2
@@ -21,8 +21,7 @@ · 20 unmodified lines
21 */21 */
22 22
23#include <linux/module.h>23#include <linux/module.h>
24#include "../comedidev.h"24#include <linux/comedi/comedidev.h>
25
26#include <linux/delay.h>25#include <linux/delay.h>
27 26
28/*27/*
drivers/comedi/drivers/gsc_hpdi.c+1−2
@@ -34,8 +34,7 @@ · 33 unmodified lines
34#include <linux/module.h>34#include <linux/module.h>
35#include <linux/delay.h>35#include <linux/delay.h>
36#include <linux/interrupt.h>36#include <linux/interrupt.h>
37 37#include <linux/comedi/comedi_pci.h>
38#include "../comedi_pci.h"
39 38
40#include "plx9080.h"39#include "plx9080.h"
41 40
drivers/comedi/drivers/icp_multi.c+1−2
@@ -36,8 +36,7 @@ · 35 unmodified lines
36 36
37#include <linux/module.h>37#include <linux/module.h>
38#include <linux/delay.h>38#include <linux/delay.h>
39 39#include <linux/comedi/comedi_pci.h>
40#include "../comedi_pci.h"
41 40
42#define ICP_MULTI_ADC_CSR 0x00 /* R/W: ADC command/status register */41#define ICP_MULTI_ADC_CSR 0x00 /* R/W: ADC command/status register */
43#define ICP_MULTI_ADC_CSR_ST BIT(0) /* Start ADC */42#define ICP_MULTI_ADC_CSR_ST BIT(0) /* Start ADC */
drivers/comedi/drivers/ii_pci20kc.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include <linux/io.h>32#include <linux/io.h>
33#include "../comedidev.h"33#include <linux/comedi/comedidev.h>
34 34
35/*35/*
36 * Register I/O map36 * Register I/O map
drivers/comedi/drivers/jr3_pci.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
35#include <linux/jiffies.h>35#include <linux/jiffies.h>
36#include <linux/slab.h>36#include <linux/slab.h>
37#include <linux/timer.h>37#include <linux/timer.h>
38 38#include <linux/comedi/comedi_pci.h>
39#include "../comedi_pci.h"
40 39
41#include "jr3_pci.h"40#include "jr3_pci.h"
42 41
drivers/comedi/drivers/ke_counter.c+1−2
@@ -19,8 +19,7 @@ · 18 unmodified lines
19 */19 */
20 20
21#include <linux/module.h>21#include <linux/module.h>
22 22#include <linux/comedi/comedi_pci.h>
23#include "../comedi_pci.h"
24 23
25/*24/*
26 * PCI BAR 0 Register I/O map25 * PCI BAR 0 Register I/O map
drivers/comedi/drivers/me4000.c+1−2
@@ -32,8 +32,7 @@ · 31 unmodified lines
32#include <linux/module.h>32#include <linux/module.h>
33#include <linux/delay.h>33#include <linux/delay.h>
34#include <linux/interrupt.h>34#include <linux/interrupt.h>
35 35#include <linux/comedi/comedi_pci.h>
36#include "../comedi_pci.h"
37 36
38#include "comedi_8254.h"37#include "comedi_8254.h"
39#include "plx9052.h"38#include "plx9052.h"
drivers/comedi/drivers/me_daq.c+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
23#include <linux/module.h>23#include <linux/module.h>
24#include <linux/interrupt.h>24#include <linux/interrupt.h>
25#include <linux/sched.h>25#include <linux/sched.h>
26 26#include <linux/comedi/comedi_pci.h>
27#include "../comedi_pci.h"
28 27
29#include "plx9052.h"28#include "plx9052.h"
30 29
drivers/comedi/drivers/mf6x4.c+1−2
@@ -18,8 +18,7 @@ · 17 unmodified lines
18 18
19#include <linux/module.h>19#include <linux/module.h>
20#include <linux/delay.h>20#include <linux/delay.h>
21 21#include <linux/comedi/comedi_pci.h>
22#include "../comedi_pci.h"
23 22
24/* Registers present in BAR0 memory region */23/* Registers present in BAR0 memory region */
25#define MF624_GPIOC_REG 0x5424#define MF624_GPIOC_REG 0x54
drivers/comedi/drivers/mite.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
38#include <linux/module.h>38#include <linux/module.h>
39#include <linux/slab.h>39#include <linux/slab.h>
40#include <linux/log2.h>40#include <linux/log2.h>
41 41#include <linux/comedi/comedi_pci.h>
42#include "../comedi_pci.h"
43 42
44#include "mite.h"43#include "mite.h"
45 44
drivers/comedi/drivers/mpc624.c+1−2
@@ -44,8 +44,7 @@ · 43 unmodified lines
44 */44 */
45 45
46#include <linux/module.h>46#include <linux/module.h>
47#include "../comedidev.h"47#include <linux/comedi/comedidev.h>
48
49#include <linux/delay.h>48#include <linux/delay.h>
50 49
51/* Offsets of different ports */50/* Offsets of different ports */
drivers/comedi/drivers/multiq3.c+1−2
@@ -26,8 +26,7 @@ · 25 unmodified lines
26 */26 */
27 27
28#include <linux/module.h>28#include <linux/module.h>
29 29#include <linux/comedi/comedidev.h>
30#include "../comedidev.h"
31 30
32/*31/*
33 * Register map32 * Register map
drivers/comedi/drivers/ni_6527.c+1−2
@@ -20,8 +20,7 @@ · 19 unmodified lines
20 20
21#include <linux/module.h>21#include <linux/module.h>
22#include <linux/interrupt.h>22#include <linux/interrupt.h>
23 23#include <linux/comedi/comedi_pci.h>
24#include "../comedi_pci.h"
25 24
26/*25/*
27 * PCI BAR1 - Register memory map26 * PCI BAR1 - Register memory map
drivers/comedi/drivers/ni_65xx.c+1−2
@@ -49,8 +49,7 @@ · 48 unmodified lines
49 49
50#include <linux/module.h>50#include <linux/module.h>
51#include <linux/interrupt.h>51#include <linux/interrupt.h>
52 52#include <linux/comedi/comedi_pci.h>
53#include "../comedi_pci.h"
54 53
55/*54/*
56 * PCI BAR1 Register Map55 * PCI BAR1 Register Map
drivers/comedi/drivers/ni_660x.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/interrupt.h>28#include <linux/interrupt.h>
29 29#include <linux/comedi/comedi_pci.h>
30#include "../comedi_pci.h"
31 30
32#include "mite.h"31#include "mite.h"
33#include "ni_tio.h"32#include "ni_tio.h"
drivers/comedi/drivers/ni_670x.c+1−2
@@ -24,8 +24,7 @@ · 23 unmodified lines
24#include <linux/module.h>24#include <linux/module.h>
25#include <linux/interrupt.h>25#include <linux/interrupt.h>
26#include <linux/slab.h>26#include <linux/slab.h>
27 27#include <linux/comedi/comedi_pci.h>
28#include "../comedi_pci.h"
29 28
30#define AO_VALUE_OFFSET 0x0029#define AO_VALUE_OFFSET 0x00
31#define AO_CHAN_OFFSET 0x0c30#define AO_CHAN_OFFSET 0x0c
drivers/comedi/drivers/ni_at_a2150.c+1−2
@@ -39,8 +39,7 @@ · 38 unmodified lines
39#include <linux/interrupt.h>39#include <linux/interrupt.h>
40#include <linux/slab.h>40#include <linux/slab.h>
41#include <linux/io.h>41#include <linux/io.h>
42 42#include <linux/comedi/comedidev.h>
43#include "../comedidev.h"
44 43
45#include "comedi_isadma.h"44#include "comedi_isadma.h"
46#include "comedi_8254.h"45#include "comedi_8254.h"
drivers/comedi/drivers/ni_at_ao.c+1−2
@@ -25,8 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28 28#include <linux/comedi/comedidev.h>
29#include "../comedidev.h"
30 29
31#include "comedi_8254.h"30#include "comedi_8254.h"
32 31
drivers/comedi/drivers/ni_atmio.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
73 73
74#include <linux/module.h>74#include <linux/module.h>
75#include <linux/interrupt.h>75#include <linux/interrupt.h>
76#include "../comedidev.h"76#include <linux/comedi/comedidev.h>
77
78#include <linux/isapnp.h>77#include <linux/isapnp.h>
79 78
80#include "ni_stc.h"79#include "ni_stc.h"
drivers/comedi/drivers/ni_atmio16d.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
39 39
40#include <linux/module.h>40#include <linux/module.h>
41#include <linux/interrupt.h>41#include <linux/interrupt.h>
42#include "../comedidev.h"42#include <linux/comedi/comedidev.h>
43 43
44#include "8255.h"44#include "8255.h"
45 45
drivers/comedi/drivers/ni_daq_700.c+1−2
@@ -41,8 +41,7 @@ · 40 unmodified lines
41#include <linux/module.h>41#include <linux/module.h>
42#include <linux/delay.h>42#include <linux/delay.h>
43#include <linux/interrupt.h>43#include <linux/interrupt.h>
44 44#include <linux/comedi/comedi_pcmcia.h>
45#include "../comedi_pcmcia.h"
46 45
47/* daqcard700 registers */46/* daqcard700 registers */
48#define DIO_W 0x04 /* WO 8bit */47#define DIO_W 0x04 /* WO 8bit */
drivers/comedi/drivers/ni_daq_dio24.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 */23 */
24 24
25#include <linux/module.h>25#include <linux/module.h>
26#include "../comedi_pcmcia.h"26#include <linux/comedi/comedi_pcmcia.h>
27 27
28#include "8255.h"28#include "8255.h"
29 29
drivers/comedi/drivers/ni_labpc.c+1−2
@@ -48,8 +48,7 @@ · 47 unmodified lines
48 */48 */
49 49
50#include <linux/module.h>50#include <linux/module.h>
51 51#include <linux/comedi/comedidev.h>
52#include "../comedidev.h"
53 52
54#include "ni_labpc.h"53#include "ni_labpc.h"
55#include "ni_labpc_isadma.h"54#include "ni_labpc_isadma.h"
drivers/comedi/drivers/ni_labpc_common.c+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
12#include <linux/io.h>12#include <linux/io.h>
13#include <linux/delay.h>13#include <linux/delay.h>
14#include <linux/slab.h>14#include <linux/slab.h>
15 15#include <linux/comedi/comedidev.h>
16#include "../comedidev.h"
17 16
18#include "comedi_8254.h"17#include "comedi_8254.h"
19#include "8255.h"18#include "8255.h"
drivers/comedi/drivers/ni_labpc_cs.c+1−2
@@ -38,8 +38,7 @@ · 37 unmodified lines
38 */38 */
39 39
40#include <linux/module.h>40#include <linux/module.h>
41 41#include <linux/comedi/comedi_pcmcia.h>
42#include "../comedi_pcmcia.h"
43 42
44#include "ni_labpc.h"43#include "ni_labpc.h"
45 44
drivers/comedi/drivers/ni_labpc_isadma.c+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
10 10
11#include <linux/module.h>11#include <linux/module.h>
12#include <linux/slab.h>12#include <linux/slab.h>
13 13#include <linux/comedi/comedidev.h>
14#include "../comedidev.h"
15 14
16#include "comedi_isadma.h"15#include "comedi_isadma.h"
17#include "ni_labpc.h"16#include "ni_labpc.h"
drivers/comedi/drivers/ni_labpc_pci.c+1−2
@@ -22,8 +22,7 @@ · 21 unmodified lines
22 22
23#include <linux/module.h>23#include <linux/module.h>
24#include <linux/interrupt.h>24#include <linux/interrupt.h>
25 25#include <linux/comedi/comedi_pci.h>
26#include "../comedi_pci.h"
27 26
28#include "ni_labpc.h"27#include "ni_labpc.h"
29 28
drivers/comedi/drivers/ni_mio_cs.c+1−1
@@ -28,8 +28,8 @@ · 27 unmodified lines
28 28
29#include <linux/module.h>29#include <linux/module.h>
30#include <linux/delay.h>30#include <linux/delay.h>
31#include <linux/comedi/comedi_pcmcia.h>
31 32
32#include "../comedi_pcmcia.h"
33#include "ni_stc.h"33#include "ni_stc.h"
34#include "8255.h"34#include "8255.h"
35 35
drivers/comedi/drivers/ni_pcidio.c+1−2
@@ -42,8 +42,7 @@ · 41 unmodified lines
42#include <linux/delay.h>42#include <linux/delay.h>
43#include <linux/interrupt.h>43#include <linux/interrupt.h>
44#include <linux/sched.h>44#include <linux/sched.h>
45 45#include <linux/comedi/comedi_pci.h>
46#include "../comedi_pci.h"
47 46
48#include "mite.h"47#include "mite.h"
49 48
drivers/comedi/drivers/ni_pcimio.c+1−3
@@ -94,9 +94,7 @@ · 93 unmodified lines
94 94
95#include <linux/module.h>95#include <linux/module.h>
96#include <linux/delay.h>96#include <linux/delay.h>
97 97#include <linux/comedi/comedi_pci.h>
98#include "../comedi_pci.h"
99
100#include <asm/byteorder.h>98#include <asm/byteorder.h>
101 99
102#include "ni_stc.h"100#include "ni_stc.h"
drivers/comedi/drivers/ni_routes.c+1−2
@@ -21,8 +21,7 @@ · 20 unmodified lines
21#include <linux/slab.h>21#include <linux/slab.h>
22#include <linux/bsearch.h>22#include <linux/bsearch.h>
23#include <linux/sort.h>23#include <linux/sort.h>
24 24#include <linux/comedi.h>
25#include "../comedi.h"
26 25
27#include "ni_routes.h"26#include "ni_routes.h"
28#include "ni_routing/ni_route_values.h"27#include "ni_routing/ni_route_values.h"
drivers/comedi/drivers/ni_routes.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27#include <linux/bitops.h>27#include <linux/bitops.h>
28#endif28#endif
29 29
30#include "../comedi.h"30#include <linux/comedi.h>
31 31
32/**32/**
33 * struct ni_route_set - Set of destinations with a common source.33 * struct ni_route_set - Set of destinations with a common source.
drivers/comedi/drivers/ni_routing/ni_route_values.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20#ifndef _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H20#ifndef _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H
21#define _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H21#define _COMEDI_DRIVERS_NI_ROUTINT_NI_ROUTE_VALUES_H
22 22
23#include "../../comedi.h"23#include <linux/comedi.h>
24#include <linux/types.h>24#include <linux/types.h>
25 25
26/*26/*
drivers/comedi/drivers/ni_tio.h+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
8#ifndef _COMEDI_NI_TIO_H8#ifndef _COMEDI_NI_TIO_H
9#define _COMEDI_NI_TIO_H9#define _COMEDI_NI_TIO_H
10 10
11#include "../comedidev.h"11#include <linux/comedi/comedidev.h>
12 12
13enum ni_gpct_register {13enum ni_gpct_register {
14 NITIO_G0_AUTO_INC,14 NITIO_G0_AUTO_INC,
drivers/comedi/drivers/ni_usb6501.c+1−2
@@ -87,8 +87,7 @@ · 86 unmodified lines
87#include <linux/kernel.h>87#include <linux/kernel.h>
88#include <linux/module.h>88#include <linux/module.h>
89#include <linux/slab.h>89#include <linux/slab.h>
90 90#include <linux/comedi/comedi_usb.h>
91#include "../comedi_usb.h"
92 91
93#define NI6501_TIMEOUT 100092#define NI6501_TIMEOUT 1000
94 93
drivers/comedi/drivers/pcl711.c+1−2
@@ -29,8 +29,7 @@ · 28 unmodified lines
29#include <linux/module.h>29#include <linux/module.h>
30#include <linux/delay.h>30#include <linux/delay.h>
31#include <linux/interrupt.h>31#include <linux/interrupt.h>
32 32#include <linux/comedi/comedidev.h>
33#include "../comedidev.h"
34 33
35#include "comedi_8254.h"34#include "comedi_8254.h"
36 35
drivers/comedi/drivers/pcl724.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28#include "../comedidev.h"28#include <linux/comedi/comedidev.h>
29 29
30#include "8255.h"30#include "8255.h"
31 31
drivers/comedi/drivers/pcl726.c+1−2
@@ -50,8 +50,7 @@ · 49 unmodified lines
50 50
51#include <linux/module.h>51#include <linux/module.h>
52#include <linux/interrupt.h>52#include <linux/interrupt.h>
53 53#include <linux/comedi/comedidev.h>
54#include "../comedidev.h"
55 54
56#define PCL726_AO_MSB_REG(x) (0x00 + ((x) * 2))55#define PCL726_AO_MSB_REG(x) (0x00 + ((x) * 2))
57#define PCL726_AO_LSB_REG(x) (0x01 + ((x) * 2))56#define PCL726_AO_LSB_REG(x) (0x01 + ((x) * 2))
drivers/comedi/drivers/pcl730.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include <linux/module.h>27#include <linux/module.h>
28#include "../comedidev.h"28#include <linux/comedi/comedidev.h>
29 29
30/*30/*
31 * Register map31 * Register map
drivers/comedi/drivers/pcl812.c+1−2
@@ -114,8 +114,7 @@ · 113 unmodified lines
114#include <linux/gfp.h>114#include <linux/gfp.h>
115#include <linux/delay.h>115#include <linux/delay.h>
116#include <linux/io.h>116#include <linux/io.h>
117 117#include <linux/comedi/comedidev.h>
118#include "../comedidev.h"
119 118
120#include "comedi_isadma.h"119#include "comedi_isadma.h"
121#include "comedi_8254.h"120#include "comedi_8254.h"
drivers/comedi/drivers/pcl816.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
35#include <linux/delay.h>35#include <linux/delay.h>
36#include <linux/io.h>36#include <linux/io.h>
37#include <linux/interrupt.h>37#include <linux/interrupt.h>
38 38#include <linux/comedi/comedidev.h>
39#include "../comedidev.h"
40 39
41#include "comedi_isadma.h"40#include "comedi_isadma.h"
42#include "comedi_8254.h"41#include "comedi_8254.h"
drivers/comedi/drivers/pcl818.c+1−2
@@ -97,8 +97,7 @@ · 96 unmodified lines
97#include <linux/delay.h>97#include <linux/delay.h>
98#include <linux/io.h>98#include <linux/io.h>
99#include <linux/interrupt.h>99#include <linux/interrupt.h>
100 100#include <linux/comedi/comedidev.h>
101#include "../comedidev.h"
102 101
103#include "comedi_isadma.h"102#include "comedi_isadma.h"
104#include "comedi_8254.h"103#include "comedi_8254.h"
drivers/comedi/drivers/pcm3724.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 */24 */
25 25
26#include <linux/module.h>26#include <linux/module.h>
27#include "../comedidev.h"27#include <linux/comedi/comedidev.h>
28 28
29#include "8255.h"29#include "8255.h"
30 30
drivers/comedi/drivers/pcmad.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include <linux/module.h>31#include <linux/module.h>
32#include "../comedidev.h"32#include <linux/comedi/comedidev.h>
33 33
34#define PCMAD_STATUS 034#define PCMAD_STATUS 0
35#define PCMAD_LSB 135#define PCMAD_LSB 1
drivers/comedi/drivers/pcmda12.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
40 */40 */
41 41
42#include <linux/module.h>42#include <linux/module.h>
43#include "../comedidev.h"43#include <linux/comedi/comedidev.h>
44 44
45/* AI range is not configurable, it's set by jumpers on the board */45/* AI range is not configurable, it's set by jumpers on the board */
46static const struct comedi_lrange pcmda12_ranges = {46static const struct comedi_lrange pcmda12_ranges = {
drivers/comedi/drivers/pcmmio.c+1−2
@@ -66,8 +66,7 @@ · 65 unmodified lines
66#include <linux/module.h>66#include <linux/module.h>
67#include <linux/interrupt.h>67#include <linux/interrupt.h>
68#include <linux/slab.h>68#include <linux/slab.h>
69 69#include <linux/comedi/comedidev.h>
70#include "../comedidev.h"
71 70
72/*71/*
73 * Register I/O map72 * Register I/O map
drivers/comedi/drivers/pcmuio.c+1−2
@@ -65,8 +65,7 @@ · 64 unmodified lines
65 65
66#include <linux/module.h>66#include <linux/module.h>
67#include <linux/interrupt.h>67#include <linux/interrupt.h>
68 68#include <linux/comedi/comedidev.h>
69#include "../comedidev.h"
70 69
71/*70/*
72 * Register I/O map71 * Register I/O map
drivers/comedi/drivers/quatech_daqp_cs.c+1−2
@@ -41,8 +41,7 @@ · 40 unmodified lines
41 */41 */
42 42
43#include <linux/module.h>43#include <linux/module.h>
44 44#include <linux/comedi/comedi_pcmcia.h>
45#include "../comedi_pcmcia.h"
46 45
47/*46/*
48 * Register I/O map47 * Register I/O map
drivers/comedi/drivers/rtd520.c+1−2
@@ -85,8 +85,7 @@ · 84 unmodified lines
85#include <linux/module.h>85#include <linux/module.h>
86#include <linux/delay.h>86#include <linux/delay.h>
87#include <linux/interrupt.h>87#include <linux/interrupt.h>
88 88#include <linux/comedi/comedi_pci.h>
89#include "../comedi_pci.h"
90 89
91#include "comedi_8254.h"90#include "comedi_8254.h"
92#include "plx9080.h"91#include "plx9080.h"
drivers/comedi/drivers/rti800.c+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
42#include <linux/module.h>42#include <linux/module.h>
43#include <linux/delay.h>43#include <linux/delay.h>
44#include <linux/interrupt.h>44#include <linux/interrupt.h>
45#include "../comedidev.h"45#include <linux/comedi/comedidev.h>
46 46
47/*47/*
48 * Register map48 * Register map
drivers/comedi/drivers/rti802.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22 */22 */
23 23
24#include <linux/module.h>24#include <linux/module.h>
25#include "../comedidev.h"25#include <linux/comedi/comedidev.h>
26 26
27/*27/*
28 * Register I/O map28 * Register I/O map
drivers/comedi/drivers/s526.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 */27 */
28 28
29#include <linux/module.h>29#include <linux/module.h>
30#include "../comedidev.h"30#include <linux/comedi/comedidev.h>
31 31
32/*32/*
33 * Register I/O map33 * Register I/O map
drivers/comedi/drivers/s626.c+1−2
@@ -55,8 +55,7 @@ · 54 unmodified lines
55#include <linux/interrupt.h>55#include <linux/interrupt.h>
56#include <linux/kernel.h>56#include <linux/kernel.h>
57#include <linux/types.h>57#include <linux/types.h>
58 58#include <linux/comedi/comedi_pci.h>
59#include "../comedi_pci.h"
60 59
61#include "s626.h"60#include "s626.h"
62 61
drivers/comedi/drivers/ssv_dnp.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19/* include files ----------------------------------------------------------- */19/* include files ----------------------------------------------------------- */
20 20
21#include <linux/module.h>21#include <linux/module.h>
22#include "../comedidev.h"22#include <linux/comedi/comedidev.h>
23 23
24/* Some global definitions: the registers of the DNP ----------------------- */24/* Some global definitions: the registers of the DNP ----------------------- */
25/* */25/* */
drivers/comedi/drivers/usbdux.c+1−2
@@ -73,8 +73,7 @@ · 72 unmodified lines
73#include <linux/input.h>73#include <linux/input.h>
74#include <linux/fcntl.h>74#include <linux/fcntl.h>
75#include <linux/compiler.h>75#include <linux/compiler.h>
76 76#include <linux/comedi/comedi_usb.h>
77#include "../comedi_usb.h"
78 77
79/* constants for firmware upload and download */78/* constants for firmware upload and download */
80#define USBDUX_FIRMWARE "usbdux_firmware.bin"79#define USBDUX_FIRMWARE "usbdux_firmware.bin"
drivers/comedi/drivers/usbduxfast.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
40#include <linux/input.h>40#include <linux/input.h>
41#include <linux/fcntl.h>41#include <linux/fcntl.h>
42#include <linux/compiler.h>42#include <linux/compiler.h>
43#include "../comedi_usb.h"43#include <linux/comedi/comedi_usb.h>
44 44
45/*45/*
46 * timeout for the USB-transfer46 * timeout for the USB-transfer
drivers/comedi/drivers/usbduxsigma.c+1−2
@@ -40,8 +40,7 @@ · 39 unmodified lines
40#include <linux/fcntl.h>40#include <linux/fcntl.h>
41#include <linux/compiler.h>41#include <linux/compiler.h>
42#include <asm/unaligned.h>42#include <asm/unaligned.h>
43 43#include <linux/comedi/comedi_usb.h>
44#include "../comedi_usb.h"
45 44
46/* timeout for the USB-transfer in ms*/45/* timeout for the USB-transfer in ms*/
47#define BULK_TIMEOUT 100046#define BULK_TIMEOUT 1000
drivers/comedi/drivers/vmk80xx.c+1−2
@@ -35,8 +35,7 @@ · 34 unmodified lines
35#include <linux/slab.h>35#include <linux/slab.h>
36#include <linux/poll.h>36#include <linux/poll.h>
37#include <linux/uaccess.h>37#include <linux/uaccess.h>
38 38#include <linux/comedi/comedi_usb.h>
39#include "../comedi_usb.h"
40 39
41enum {40enum {
42 DEVICE_VMK8055,41 DEVICE_VMK8055,
drivers/comedi/kcomedilib/kcomedilib_main.c+3−3
@@ -16,9 +16,9 @@ · 15 unmodified lines
16#include <linux/mm.h>16#include <linux/mm.h>
17#include <linux/io.h>17#include <linux/io.h>
18 18
19#include "../comedi.h"19#include <linux/comedi.h>
20#include "../comedilib.h"20#include <linux/comedi/comedidev.h>
21#include "../comedidev.h"21#include <linux/comedi/comedilib.h>
22 22
23MODULE_AUTHOR("David Schleef <ds@schleef.org>");23MODULE_AUTHOR("David Schleef <ds@schleef.org>");
24MODULE_DESCRIPTION("Comedi kernel library");24MODULE_DESCRIPTION("Comedi kernel library");
drivers/comedi/proc.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
13 * was cool.13 * was cool.
14 */14 */
15 15
16#include "comedidev.h"16#include <linux/comedi/comedidev.h>
17#include "comedi_internal.h"17#include "comedi_internal.h"
18#include <linux/proc_fs.h>18#include <linux/proc_fs.h>
19#include <linux/seq_file.h>19#include <linux/seq_file.h>
drivers/comedi/range.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
8 */8 */
9 9
10#include <linux/uaccess.h>10#include <linux/uaccess.h>
11#include "comedidev.h"11#include <linux/comedi/comedidev.h>
12#include "comedi_internal.h"12#include "comedi_internal.h"
13 13
14const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };14const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };
include/linux/comedi/comedi_pci.hrenamed from drivers/comedi/comedi_pci.h+1−2
@@ -11,8 +11,7 @@ · 10 unmodified lines
11#define _COMEDI_PCI_H11#define _COMEDI_PCI_H
12 12
13#include <linux/pci.h>13#include <linux/pci.h>
14 14#include <linux/comedi/comedidev.h>
15#include "comedidev.h"
16 15
17/*16/*
18 * PCI Vendor IDs not in <linux/pci_ids.h>17 * PCI Vendor IDs not in <linux/pci_ids.h>
include/linux/comedi/comedi_pcmcia.hrenamed from drivers/comedi/comedi_pcmcia.h+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
12 12
13#include <pcmcia/cistpl.h>13#include <pcmcia/cistpl.h>
14#include <pcmcia/ds.h>14#include <pcmcia/ds.h>
15 15#include <linux/comedi/comedidev.h>
16#include "comedidev.h"
17 16
18struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *dev);17struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *dev);
19 18
include/linux/comedi/comedi_usb.hrenamed from drivers/comedi/comedi_usb.h+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
10#define _COMEDI_USB_H10#define _COMEDI_USB_H
11 11
12#include <linux/usb.h>12#include <linux/usb.h>
13 13#include <linux/comedi/comedidev.h>
14#include "comedidev.h"
15 14
16struct usb_interface *comedi_to_usb_interface(struct comedi_device *dev);15struct usb_interface *comedi_to_usb_interface(struct comedi_device *dev);
17struct usb_device *comedi_to_usb_dev(struct comedi_device *dev);16struct usb_device *comedi_to_usb_dev(struct comedi_device *dev);
include/linux/comedi/comedidev.hrenamed from drivers/comedi/comedidev.h+1−2
@@ -15,8 +15,7 @@ · 14 unmodified lines
15#include <linux/spinlock_types.h>15#include <linux/spinlock_types.h>
16#include <linux/rwsem.h>16#include <linux/rwsem.h>
17#include <linux/kref.h>17#include <linux/kref.h>
18 18#include <linux/comedi.h>
19#include "comedi.h"
20 19
21#define COMEDI_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))20#define COMEDI_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
22#define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, \21#define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, \
include/linux/comedi/comedilib.hrenamed from drivers/comedi/comedilib.h+0−0

File renamed without changes.

include/uapi/linux/comedi.hrenamed from drivers/comedi/comedi.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: LGPL-2.0+ */1/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
2/*2/*
3 * comedi.h3 * comedi.h
4 * header file for COMEDI user API4 * header file for COMEDI user API

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