diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:04:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:55 -0400 |
commit | 0b3fb27fa7b4bf811c31ee66453cda0a6d94aa6c (patch) | |
tree | d74ba05f0b555dff6ec8d0365944eaeb5dc147ab /drivers/staging/comedi | |
parent | 2e561b12e84a5363846669c5e0c070baf4d06a1a (diff) |
Staging: comedi: Remove comedi_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/comedilib.h | 88 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/comedi_bond.c | 6 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/data.c | 8 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/dio.c | 8 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/get.c | 40 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 32 |
6 files changed, 90 insertions, 92 deletions
diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h index fc5fc015726..ab42893562f 100644 --- a/drivers/staging/comedi/comedilib.h +++ b/drivers/staging/comedi/comedilib.h | |||
@@ -36,18 +36,16 @@ | |||
36 | 36 | ||
37 | #ifndef KCOMEDILIB_DEPRECATED | 37 | #ifndef KCOMEDILIB_DEPRECATED |
38 | 38 | ||
39 | typedef void comedi_t; | ||
40 | |||
41 | /* these functions may not be called at real-time priority */ | 39 | /* these functions may not be called at real-time priority */ |
42 | 40 | ||
43 | comedi_t *comedi_open(const char *path); | 41 | void *comedi_open(const char *path); |
44 | int comedi_close(comedi_t *dev); | 42 | int comedi_close(void *dev); |
45 | 43 | ||
46 | /* these functions may be called at any priority, but may fail at | 44 | /* these functions may be called at any priority, but may fail at |
47 | real-time priority */ | 45 | real-time priority */ |
48 | 46 | ||
49 | int comedi_lock(comedi_t *dev, unsigned int subdev); | 47 | int comedi_lock(void *dev, unsigned int subdev); |
50 | int comedi_unlock(comedi_t *dev, unsigned int subdev); | 48 | int comedi_unlock(void *dev, unsigned int subdev); |
51 | 49 | ||
52 | /* these functions may be called at any priority, but you must hold | 50 | /* these functions may be called at any priority, but you must hold |
53 | the lock for the subdevice */ | 51 | the lock for the subdevice */ |
@@ -56,68 +54,68 @@ int comedi_loglevel(int loglevel); | |||
56 | void comedi_perror(const char *s); | 54 | void comedi_perror(const char *s); |
57 | char *comedi_strerror(int errnum); | 55 | char *comedi_strerror(int errnum); |
58 | int comedi_errno(void); | 56 | int comedi_errno(void); |
59 | int comedi_fileno(comedi_t *dev); | 57 | int comedi_fileno(void *dev); |
60 | 58 | ||
61 | int comedi_cancel(comedi_t *dev, unsigned int subdev); | 59 | int comedi_cancel(void *dev, unsigned int subdev); |
62 | int comedi_register_callback(comedi_t *dev, unsigned int subdev, | 60 | int comedi_register_callback(void *dev, unsigned int subdev, |
63 | unsigned int mask, int (*cb) (unsigned int, void *), void *arg); | 61 | unsigned int mask, int (*cb) (unsigned int, void *), void *arg); |
64 | 62 | ||
65 | int comedi_command(comedi_t *dev, comedi_cmd *cmd); | 63 | int comedi_command(void *dev, comedi_cmd *cmd); |
66 | int comedi_command_test(comedi_t *dev, comedi_cmd *cmd); | 64 | int comedi_command_test(void *dev, comedi_cmd *cmd); |
67 | int comedi_trigger(comedi_t *dev, unsigned int subdev, comedi_trig *it); | 65 | int comedi_trigger(void *dev, unsigned int subdev, comedi_trig *it); |
68 | int __comedi_trigger(comedi_t *dev, unsigned int subdev, comedi_trig *it); | 66 | int __comedi_trigger(void *dev, unsigned int subdev, comedi_trig *it); |
69 | int comedi_data_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | 67 | int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, |
70 | unsigned int range, unsigned int aref, lsampl_t data); | 68 | unsigned int range, unsigned int aref, lsampl_t data); |
71 | int comedi_data_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | 69 | int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, |
72 | unsigned int range, unsigned int aref, lsampl_t *data); | 70 | unsigned int range, unsigned int aref, lsampl_t *data); |
73 | int comedi_data_read_hint(comedi_t *dev, unsigned int subdev, | 71 | int comedi_data_read_hint(void *dev, unsigned int subdev, |
74 | unsigned int chan, unsigned int range, unsigned int aref); | 72 | unsigned int chan, unsigned int range, unsigned int aref); |
75 | int comedi_data_read_delayed(comedi_t *dev, unsigned int subdev, | 73 | int comedi_data_read_delayed(void *dev, unsigned int subdev, |
76 | unsigned int chan, unsigned int range, unsigned int aref, | 74 | unsigned int chan, unsigned int range, unsigned int aref, |
77 | lsampl_t *data, unsigned int nano_sec); | 75 | lsampl_t *data, unsigned int nano_sec); |
78 | int comedi_dio_config(comedi_t *dev, unsigned int subdev, unsigned int chan, | 76 | int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, |
79 | unsigned int io); | 77 | unsigned int io); |
80 | int comedi_dio_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | 78 | int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, |
81 | unsigned int *val); | 79 | unsigned int *val); |
82 | int comedi_dio_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | 80 | int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, |
83 | unsigned int val); | 81 | unsigned int val); |
84 | int comedi_dio_bitfield(comedi_t *dev, unsigned int subdev, unsigned int mask, | 82 | int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, |
85 | unsigned int *bits); | 83 | unsigned int *bits); |
86 | int comedi_get_n_subdevices(comedi_t *dev); | 84 | int comedi_get_n_subdevices(void *dev); |
87 | int comedi_get_version_code(comedi_t *dev); | 85 | int comedi_get_version_code(void *dev); |
88 | const char *comedi_get_driver_name(comedi_t *dev); | 86 | const char *comedi_get_driver_name(void *dev); |
89 | const char *comedi_get_board_name(comedi_t *dev); | 87 | const char *comedi_get_board_name(void *dev); |
90 | int comedi_get_subdevice_type(comedi_t *dev, unsigned int subdevice); | 88 | int comedi_get_subdevice_type(void *dev, unsigned int subdevice); |
91 | int comedi_find_subdevice_by_type(comedi_t *dev, int type, unsigned int subd); | 89 | int comedi_find_subdevice_by_type(void *dev, int type, unsigned int subd); |
92 | int comedi_get_n_channels(comedi_t *dev, unsigned int subdevice); | 90 | int comedi_get_n_channels(void *dev, unsigned int subdevice); |
93 | lsampl_t comedi_get_maxdata(comedi_t *dev, unsigned int subdevice, unsigned | 91 | lsampl_t comedi_get_maxdata(void *dev, unsigned int subdevice, unsigned |
94 | int chan); | 92 | int chan); |
95 | int comedi_get_n_ranges(comedi_t *dev, unsigned int subdevice, unsigned int | 93 | int comedi_get_n_ranges(void *dev, unsigned int subdevice, unsigned int |
96 | chan); | 94 | chan); |
97 | int comedi_do_insn(comedi_t *dev, comedi_insn *insn); | 95 | int comedi_do_insn(void *dev, comedi_insn *insn); |
98 | int comedi_poll(comedi_t *dev, unsigned int subdev); | 96 | int comedi_poll(void *dev, unsigned int subdev); |
99 | 97 | ||
100 | /* DEPRECATED functions */ | 98 | /* DEPRECATED functions */ |
101 | int comedi_get_rangetype(comedi_t *dev, unsigned int subdevice, | 99 | int comedi_get_rangetype(void *dev, unsigned int subdevice, |
102 | unsigned int chan); | 100 | unsigned int chan); |
103 | 101 | ||
104 | /* ALPHA functions */ | 102 | /* ALPHA functions */ |
105 | unsigned int comedi_get_subdevice_flags(comedi_t *dev, unsigned int subdevice); | 103 | unsigned int comedi_get_subdevice_flags(void *dev, unsigned int subdevice); |
106 | int comedi_get_len_chanlist(comedi_t *dev, unsigned int subdevice); | 104 | int comedi_get_len_chanlist(void *dev, unsigned int subdevice); |
107 | int comedi_get_krange(comedi_t *dev, unsigned int subdevice, unsigned int | 105 | int comedi_get_krange(void *dev, unsigned int subdevice, unsigned int |
108 | chan, unsigned int range, comedi_krange *krange); | 106 | chan, unsigned int range, comedi_krange *krange); |
109 | unsigned int comedi_get_buf_head_pos(comedi_t *dev, unsigned int subdevice); | 107 | unsigned int comedi_get_buf_head_pos(void *dev, unsigned int subdevice); |
110 | int comedi_set_user_int_count(comedi_t *dev, unsigned int subdevice, | 108 | int comedi_set_user_int_count(void *dev, unsigned int subdevice, |
111 | unsigned int buf_user_count); | 109 | unsigned int buf_user_count); |
112 | int comedi_map(comedi_t *dev, unsigned int subdev, void *ptr); | 110 | int comedi_map(void *dev, unsigned int subdev, void *ptr); |
113 | int comedi_unmap(comedi_t *dev, unsigned int subdev); | 111 | int comedi_unmap(void *dev, unsigned int subdev); |
114 | int comedi_get_buffer_size(comedi_t *dev, unsigned int subdev); | 112 | int comedi_get_buffer_size(void *dev, unsigned int subdev); |
115 | int comedi_mark_buffer_read(comedi_t *dev, unsigned int subdevice, | 113 | int comedi_mark_buffer_read(void *dev, unsigned int subdevice, |
116 | unsigned int num_bytes); | 114 | unsigned int num_bytes); |
117 | int comedi_mark_buffer_written(comedi_t *d, unsigned int subdevice, | 115 | int comedi_mark_buffer_written(void *d, unsigned int subdevice, |
118 | unsigned int num_bytes); | 116 | unsigned int num_bytes); |
119 | int comedi_get_buffer_contents(comedi_t *dev, unsigned int subdevice); | 117 | int comedi_get_buffer_contents(void *dev, unsigned int subdevice); |
120 | int comedi_get_buffer_offset(comedi_t *dev, unsigned int subdevice); | 118 | int comedi_get_buffer_offset(void *dev, unsigned int subdevice); |
121 | 119 | ||
122 | #else | 120 | #else |
123 | 121 | ||
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c index 9e5496f4f1a..09e288904f9 100644 --- a/drivers/staging/comedi/drivers/comedi_bond.c +++ b/drivers/staging/comedi/drivers/comedi_bond.c | |||
@@ -142,7 +142,7 @@ static const struct BondingBoard bondingBoards[] = { | |||
142 | #define thisboard ((const struct BondingBoard *)dev->board_ptr) | 142 | #define thisboard ((const struct BondingBoard *)dev->board_ptr) |
143 | 143 | ||
144 | struct BondedDevice { | 144 | struct BondedDevice { |
145 | comedi_t *dev; | 145 | void *dev; |
146 | unsigned minor; | 146 | unsigned minor; |
147 | unsigned subdev; | 147 | unsigned subdev; |
148 | unsigned subdev_type; | 148 | unsigned subdev_type; |
@@ -397,7 +397,7 @@ static void *Realloc(const void *oldmem, size_t newlen, size_t oldlen) | |||
397 | static int doDevConfig(comedi_device *dev, comedi_devconfig *it) | 397 | static int doDevConfig(comedi_device *dev, comedi_devconfig *it) |
398 | { | 398 | { |
399 | int i; | 399 | int i; |
400 | comedi_t *devs_opened[COMEDI_NUM_BOARD_MINORS]; | 400 | void *devs_opened[COMEDI_NUM_BOARD_MINORS]; |
401 | 401 | ||
402 | memset(devs_opened, 0, sizeof(devs_opened)); | 402 | memset(devs_opened, 0, sizeof(devs_opened)); |
403 | devpriv->name[0] = 0;; | 403 | devpriv->name[0] = 0;; |
@@ -406,7 +406,7 @@ static int doDevConfig(comedi_device *dev, comedi_devconfig *it) | |||
406 | for (i = 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) { | 406 | for (i = 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) { |
407 | char file[] = "/dev/comediXXXXXX"; | 407 | char file[] = "/dev/comediXXXXXX"; |
408 | int minor = it->options[i]; | 408 | int minor = it->options[i]; |
409 | comedi_t *d; | 409 | void *d; |
410 | int sdev = -1, nchans, tmp; | 410 | int sdev = -1, nchans, tmp; |
411 | struct BondedDevice *bdev = NULL; | 411 | struct BondedDevice *bdev = NULL; |
412 | 412 | ||
diff --git a/drivers/staging/comedi/kcomedilib/data.c b/drivers/staging/comedi/kcomedilib/data.c index 4f1a41d5086..f63a506dd8a 100644 --- a/drivers/staging/comedi/kcomedilib/data.c +++ b/drivers/staging/comedi/kcomedilib/data.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #include <linux/string.h> | 28 | #include <linux/string.h> |
29 | 29 | ||
30 | int comedi_data_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | 30 | int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, |
31 | unsigned int range, unsigned int aref, lsampl_t data) | 31 | unsigned int range, unsigned int aref, lsampl_t data) |
32 | { | 32 | { |
33 | comedi_insn insn; | 33 | comedi_insn insn; |
@@ -42,7 +42,7 @@ int comedi_data_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | |||
42 | return comedi_do_insn(dev, &insn); | 42 | return comedi_do_insn(dev, &insn); |
43 | } | 43 | } |
44 | 44 | ||
45 | int comedi_data_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | 45 | int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, |
46 | unsigned int range, unsigned int aref, lsampl_t *data) | 46 | unsigned int range, unsigned int aref, lsampl_t *data) |
47 | { | 47 | { |
48 | comedi_insn insn; | 48 | comedi_insn insn; |
@@ -57,7 +57,7 @@ int comedi_data_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | |||
57 | return comedi_do_insn(dev, &insn); | 57 | return comedi_do_insn(dev, &insn); |
58 | } | 58 | } |
59 | 59 | ||
60 | int comedi_data_read_hint(comedi_t *dev, unsigned int subdev, | 60 | int comedi_data_read_hint(void *dev, unsigned int subdev, |
61 | unsigned int chan, unsigned int range, unsigned int aref) | 61 | unsigned int chan, unsigned int range, unsigned int aref) |
62 | { | 62 | { |
63 | comedi_insn insn; | 63 | comedi_insn insn; |
@@ -73,7 +73,7 @@ int comedi_data_read_hint(comedi_t *dev, unsigned int subdev, | |||
73 | return comedi_do_insn(dev, &insn); | 73 | return comedi_do_insn(dev, &insn); |
74 | } | 74 | } |
75 | 75 | ||
76 | int comedi_data_read_delayed(comedi_t *dev, unsigned int subdev, | 76 | int comedi_data_read_delayed(void *dev, unsigned int subdev, |
77 | unsigned int chan, unsigned int range, unsigned int aref, | 77 | unsigned int chan, unsigned int range, unsigned int aref, |
78 | lsampl_t *data, unsigned int nano_sec) | 78 | lsampl_t *data, unsigned int nano_sec) |
79 | { | 79 | { |
diff --git a/drivers/staging/comedi/kcomedilib/dio.c b/drivers/staging/comedi/kcomedilib/dio.c index 823052776e9..78e63c84072 100644 --- a/drivers/staging/comedi/kcomedilib/dio.c +++ b/drivers/staging/comedi/kcomedilib/dio.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <linux/string.h> | 27 | #include <linux/string.h> |
28 | 28 | ||
29 | int comedi_dio_config(comedi_t *dev, unsigned int subdev, unsigned int chan, | 29 | int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, |
30 | unsigned int io) | 30 | unsigned int io) |
31 | { | 31 | { |
32 | comedi_insn insn; | 32 | comedi_insn insn; |
@@ -41,7 +41,7 @@ int comedi_dio_config(comedi_t *dev, unsigned int subdev, unsigned int chan, | |||
41 | return comedi_do_insn(dev, &insn); | 41 | return comedi_do_insn(dev, &insn); |
42 | } | 42 | } |
43 | 43 | ||
44 | int comedi_dio_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | 44 | int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, |
45 | unsigned int *val) | 45 | unsigned int *val) |
46 | { | 46 | { |
47 | comedi_insn insn; | 47 | comedi_insn insn; |
@@ -56,7 +56,7 @@ int comedi_dio_read(comedi_t *dev, unsigned int subdev, unsigned int chan, | |||
56 | return comedi_do_insn(dev, &insn); | 56 | return comedi_do_insn(dev, &insn); |
57 | } | 57 | } |
58 | 58 | ||
59 | int comedi_dio_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | 59 | int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, |
60 | unsigned int val) | 60 | unsigned int val) |
61 | { | 61 | { |
62 | comedi_insn insn; | 62 | comedi_insn insn; |
@@ -71,7 +71,7 @@ int comedi_dio_write(comedi_t *dev, unsigned int subdev, unsigned int chan, | |||
71 | return comedi_do_insn(dev, &insn); | 71 | return comedi_do_insn(dev, &insn); |
72 | } | 72 | } |
73 | 73 | ||
74 | int comedi_dio_bitfield(comedi_t *dev, unsigned int subdev, unsigned int mask, | 74 | int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, |
75 | unsigned int *bits) | 75 | unsigned int *bits) |
76 | { | 76 | { |
77 | comedi_insn insn; | 77 | comedi_insn insn; |
diff --git a/drivers/staging/comedi/kcomedilib/get.c b/drivers/staging/comedi/kcomedilib/get.c index 36778b30f39..5a69d8cf156 100644 --- a/drivers/staging/comedi/kcomedilib/get.c +++ b/drivers/staging/comedi/kcomedilib/get.c | |||
@@ -26,33 +26,33 @@ | |||
26 | #include "../comedilib.h" | 26 | #include "../comedilib.h" |
27 | #include "../comedidev.h" | 27 | #include "../comedidev.h" |
28 | 28 | ||
29 | int comedi_get_n_subdevices(comedi_t *d) | 29 | int comedi_get_n_subdevices(void *d) |
30 | { | 30 | { |
31 | comedi_device *dev = (comedi_device *) d; | 31 | comedi_device *dev = (comedi_device *) d; |
32 | 32 | ||
33 | return dev->n_subdevices; | 33 | return dev->n_subdevices; |
34 | } | 34 | } |
35 | 35 | ||
36 | int comedi_get_version_code(comedi_t *d) | 36 | int comedi_get_version_code(void *d) |
37 | { | 37 | { |
38 | return COMEDI_VERSION_CODE; | 38 | return COMEDI_VERSION_CODE; |
39 | } | 39 | } |
40 | 40 | ||
41 | const char *comedi_get_driver_name(comedi_t * d) | 41 | const char *comedi_get_driver_name(void * d) |
42 | { | 42 | { |
43 | comedi_device *dev = (comedi_device *) d; | 43 | comedi_device *dev = (comedi_device *) d; |
44 | 44 | ||
45 | return dev->driver->driver_name; | 45 | return dev->driver->driver_name; |
46 | } | 46 | } |
47 | 47 | ||
48 | const char *comedi_get_board_name(comedi_t * d) | 48 | const char *comedi_get_board_name(void * d) |
49 | { | 49 | { |
50 | comedi_device *dev = (comedi_device *) d; | 50 | comedi_device *dev = (comedi_device *) d; |
51 | 51 | ||
52 | return dev->board_name; | 52 | return dev->board_name; |
53 | } | 53 | } |
54 | 54 | ||
55 | int comedi_get_subdevice_type(comedi_t *d, unsigned int subdevice) | 55 | int comedi_get_subdevice_type(void *d, unsigned int subdevice) |
56 | { | 56 | { |
57 | comedi_device *dev = (comedi_device *) d; | 57 | comedi_device *dev = (comedi_device *) d; |
58 | comedi_subdevice *s = dev->subdevices + subdevice; | 58 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -60,7 +60,7 @@ int comedi_get_subdevice_type(comedi_t *d, unsigned int subdevice) | |||
60 | return s->type; | 60 | return s->type; |
61 | } | 61 | } |
62 | 62 | ||
63 | unsigned int comedi_get_subdevice_flags(comedi_t *d, unsigned int subdevice) | 63 | unsigned int comedi_get_subdevice_flags(void *d, unsigned int subdevice) |
64 | { | 64 | { |
65 | comedi_device *dev = (comedi_device *) d; | 65 | comedi_device *dev = (comedi_device *) d; |
66 | comedi_subdevice *s = dev->subdevices + subdevice; | 66 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -68,7 +68,7 @@ unsigned int comedi_get_subdevice_flags(comedi_t *d, unsigned int subdevice) | |||
68 | return s->subdev_flags; | 68 | return s->subdev_flags; |
69 | } | 69 | } |
70 | 70 | ||
71 | int comedi_find_subdevice_by_type(comedi_t *d, int type, unsigned int subd) | 71 | int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd) |
72 | { | 72 | { |
73 | comedi_device *dev = (comedi_device *) d; | 73 | comedi_device *dev = (comedi_device *) d; |
74 | 74 | ||
@@ -82,7 +82,7 @@ int comedi_find_subdevice_by_type(comedi_t *d, int type, unsigned int subd) | |||
82 | return -1; | 82 | return -1; |
83 | } | 83 | } |
84 | 84 | ||
85 | int comedi_get_n_channels(comedi_t *d, unsigned int subdevice) | 85 | int comedi_get_n_channels(void *d, unsigned int subdevice) |
86 | { | 86 | { |
87 | comedi_device *dev = (comedi_device *) d; | 87 | comedi_device *dev = (comedi_device *) d; |
88 | comedi_subdevice *s = dev->subdevices + subdevice; | 88 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -90,7 +90,7 @@ int comedi_get_n_channels(comedi_t *d, unsigned int subdevice) | |||
90 | return s->n_chan; | 90 | return s->n_chan; |
91 | } | 91 | } |
92 | 92 | ||
93 | int comedi_get_len_chanlist(comedi_t *d, unsigned int subdevice) | 93 | int comedi_get_len_chanlist(void *d, unsigned int subdevice) |
94 | { | 94 | { |
95 | comedi_device *dev = (comedi_device *) d; | 95 | comedi_device *dev = (comedi_device *) d; |
96 | comedi_subdevice *s = dev->subdevices + subdevice; | 96 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -98,7 +98,7 @@ int comedi_get_len_chanlist(comedi_t *d, unsigned int subdevice) | |||
98 | return s->len_chanlist; | 98 | return s->len_chanlist; |
99 | } | 99 | } |
100 | 100 | ||
101 | lsampl_t comedi_get_maxdata(comedi_t *d, unsigned int subdevice, | 101 | lsampl_t comedi_get_maxdata(void *d, unsigned int subdevice, |
102 | unsigned int chan) | 102 | unsigned int chan) |
103 | { | 103 | { |
104 | comedi_device *dev = (comedi_device *) d; | 104 | comedi_device *dev = (comedi_device *) d; |
@@ -111,7 +111,7 @@ lsampl_t comedi_get_maxdata(comedi_t *d, unsigned int subdevice, | |||
111 | } | 111 | } |
112 | 112 | ||
113 | #ifdef KCOMEDILIB_DEPRECATED | 113 | #ifdef KCOMEDILIB_DEPRECATED |
114 | int comedi_get_rangetype(comedi_t *d, unsigned int subdevice, | 114 | int comedi_get_rangetype(void *d, unsigned int subdevice, |
115 | unsigned int chan) | 115 | unsigned int chan) |
116 | { | 116 | { |
117 | comedi_device *dev = (comedi_device *) d; | 117 | comedi_device *dev = (comedi_device *) d; |
@@ -130,7 +130,7 @@ int comedi_get_rangetype(comedi_t *d, unsigned int subdevice, | |||
130 | } | 130 | } |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | int comedi_get_n_ranges(comedi_t *d, unsigned int subdevice, unsigned int chan) | 133 | int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan) |
134 | { | 134 | { |
135 | comedi_device *dev = (comedi_device *) d; | 135 | comedi_device *dev = (comedi_device *) d; |
136 | comedi_subdevice *s = dev->subdevices + subdevice; | 136 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -148,7 +148,7 @@ int comedi_get_n_ranges(comedi_t *d, unsigned int subdevice, unsigned int chan) | |||
148 | /* | 148 | /* |
149 | * ALPHA (non-portable) | 149 | * ALPHA (non-portable) |
150 | */ | 150 | */ |
151 | int comedi_get_krange(comedi_t *d, unsigned int subdevice, unsigned int chan, | 151 | int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan, |
152 | unsigned int range, comedi_krange *krange) | 152 | unsigned int range, comedi_krange *krange) |
153 | { | 153 | { |
154 | comedi_device *dev = (comedi_device *) d; | 154 | comedi_device *dev = (comedi_device *) d; |
@@ -171,7 +171,7 @@ int comedi_get_krange(comedi_t *d, unsigned int subdevice, unsigned int chan, | |||
171 | /* | 171 | /* |
172 | * ALPHA (may be renamed) | 172 | * ALPHA (may be renamed) |
173 | */ | 173 | */ |
174 | unsigned int comedi_get_buf_head_pos(comedi_t *d, unsigned int subdevice) | 174 | unsigned int comedi_get_buf_head_pos(void *d, unsigned int subdevice) |
175 | { | 175 | { |
176 | comedi_device *dev = (comedi_device *) d; | 176 | comedi_device *dev = (comedi_device *) d; |
177 | comedi_subdevice *s = dev->subdevices + subdevice; | 177 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -184,7 +184,7 @@ unsigned int comedi_get_buf_head_pos(comedi_t *d, unsigned int subdevice) | |||
184 | return async->buf_write_count; | 184 | return async->buf_write_count; |
185 | } | 185 | } |
186 | 186 | ||
187 | int comedi_get_buffer_contents(comedi_t *d, unsigned int subdevice) | 187 | int comedi_get_buffer_contents(void *d, unsigned int subdevice) |
188 | { | 188 | { |
189 | comedi_device *dev = (comedi_device *) d; | 189 | comedi_device *dev = (comedi_device *) d; |
190 | comedi_subdevice *s = dev->subdevices + subdevice; | 190 | comedi_subdevice *s = dev->subdevices + subdevice; |
@@ -203,7 +203,7 @@ int comedi_get_buffer_contents(comedi_t *d, unsigned int subdevice) | |||
203 | /* | 203 | /* |
204 | * ALPHA | 204 | * ALPHA |
205 | */ | 205 | */ |
206 | int comedi_set_user_int_count(comedi_t *d, unsigned int subdevice, | 206 | int comedi_set_user_int_count(void *d, unsigned int subdevice, |
207 | unsigned int buf_user_count) | 207 | unsigned int buf_user_count) |
208 | { | 208 | { |
209 | comedi_device *dev = (comedi_device *) d; | 209 | comedi_device *dev = (comedi_device *) d; |
@@ -224,7 +224,7 @@ int comedi_set_user_int_count(comedi_t *d, unsigned int subdevice, | |||
224 | return 0; | 224 | return 0; |
225 | } | 225 | } |
226 | 226 | ||
227 | int comedi_mark_buffer_read(comedi_t *d, unsigned int subdevice, | 227 | int comedi_mark_buffer_read(void *d, unsigned int subdevice, |
228 | unsigned int num_bytes) | 228 | unsigned int num_bytes) |
229 | { | 229 | { |
230 | comedi_device *dev = (comedi_device *) d; | 230 | comedi_device *dev = (comedi_device *) d; |
@@ -243,7 +243,7 @@ int comedi_mark_buffer_read(comedi_t *d, unsigned int subdevice, | |||
243 | return 0; | 243 | return 0; |
244 | } | 244 | } |
245 | 245 | ||
246 | int comedi_mark_buffer_written(comedi_t *d, unsigned int subdevice, | 246 | int comedi_mark_buffer_written(void *d, unsigned int subdevice, |
247 | unsigned int num_bytes) | 247 | unsigned int num_bytes) |
248 | { | 248 | { |
249 | comedi_device *dev = (comedi_device *) d; | 249 | comedi_device *dev = (comedi_device *) d; |
@@ -263,7 +263,7 @@ int comedi_mark_buffer_written(comedi_t *d, unsigned int subdevice, | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | int comedi_get_buffer_size(comedi_t *d, unsigned int subdev) | 266 | int comedi_get_buffer_size(void *d, unsigned int subdev) |
267 | { | 267 | { |
268 | comedi_device *dev = (comedi_device *) d; | 268 | comedi_device *dev = (comedi_device *) d; |
269 | comedi_subdevice *s = dev->subdevices + subdev; | 269 | comedi_subdevice *s = dev->subdevices + subdev; |
@@ -278,7 +278,7 @@ int comedi_get_buffer_size(comedi_t *d, unsigned int subdev) | |||
278 | return async->prealloc_bufsz; | 278 | return async->prealloc_bufsz; |
279 | } | 279 | } |
280 | 280 | ||
281 | int comedi_get_buffer_offset(comedi_t *d, unsigned int subdevice) | 281 | int comedi_get_buffer_offset(void *d, unsigned int subdevice) |
282 | { | 282 | { |
283 | comedi_device *dev = (comedi_device *) d; | 283 | comedi_device *dev = (comedi_device *) d; |
284 | comedi_subdevice *s = dev->subdevices + subdevice; | 284 | comedi_subdevice *s = dev->subdevices + subdevice; |
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 7818e391dca..0320a0ce74e 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c | |||
@@ -42,7 +42,7 @@ MODULE_AUTHOR("David Schleef <ds@schleef.org>"); | |||
42 | MODULE_DESCRIPTION("Comedi kernel library"); | 42 | MODULE_DESCRIPTION("Comedi kernel library"); |
43 | MODULE_LICENSE("GPL"); | 43 | MODULE_LICENSE("GPL"); |
44 | 44 | ||
45 | comedi_t *comedi_open(const char *filename) | 45 | void *comedi_open(const char *filename) |
46 | { | 46 | { |
47 | struct comedi_device_file_info *dev_file_info; | 47 | struct comedi_device_file_info *dev_file_info; |
48 | comedi_device *dev; | 48 | comedi_device *dev; |
@@ -67,10 +67,10 @@ comedi_t *comedi_open(const char *filename) | |||
67 | if (!try_module_get(dev->driver->module)) | 67 | if (!try_module_get(dev->driver->module)) |
68 | return NULL; | 68 | return NULL; |
69 | 69 | ||
70 | return (comedi_t *) dev; | 70 | return (void *) dev; |
71 | } | 71 | } |
72 | 72 | ||
73 | comedi_t *comedi_open_old(unsigned int minor) | 73 | void *comedi_open_old(unsigned int minor) |
74 | { | 74 | { |
75 | struct comedi_device_file_info *dev_file_info; | 75 | struct comedi_device_file_info *dev_file_info; |
76 | comedi_device *dev; | 76 | comedi_device *dev; |
@@ -86,10 +86,10 @@ comedi_t *comedi_open_old(unsigned int minor) | |||
86 | if (dev == NULL || !dev->attached) | 86 | if (dev == NULL || !dev->attached) |
87 | return NULL; | 87 | return NULL; |
88 | 88 | ||
89 | return (comedi_t *) dev; | 89 | return (void *) dev; |
90 | } | 90 | } |
91 | 91 | ||
92 | int comedi_close(comedi_t *d) | 92 | int comedi_close(void *d) |
93 | { | 93 | { |
94 | comedi_device *dev = (comedi_device *) d; | 94 | comedi_device *dev = (comedi_device *) d; |
95 | 95 | ||
@@ -113,7 +113,7 @@ char *comedi_strerror(int err) | |||
113 | return "unknown error"; | 113 | return "unknown error"; |
114 | } | 114 | } |
115 | 115 | ||
116 | int comedi_fileno(comedi_t *d) | 116 | int comedi_fileno(void *d) |
117 | { | 117 | { |
118 | comedi_device *dev = (comedi_device *) d; | 118 | comedi_device *dev = (comedi_device *) d; |
119 | 119 | ||
@@ -121,7 +121,7 @@ int comedi_fileno(comedi_t *d) | |||
121 | return dev->minor; | 121 | return dev->minor; |
122 | } | 122 | } |
123 | 123 | ||
124 | int comedi_command(comedi_t *d, comedi_cmd *cmd) | 124 | int comedi_command(void *d, comedi_cmd *cmd) |
125 | { | 125 | { |
126 | comedi_device *dev = (comedi_device *) d; | 126 | comedi_device *dev = (comedi_device *) d; |
127 | comedi_subdevice *s; | 127 | comedi_subdevice *s; |
@@ -161,7 +161,7 @@ int comedi_command(comedi_t *d, comedi_cmd *cmd) | |||
161 | return s->do_cmd(dev, s); | 161 | return s->do_cmd(dev, s); |
162 | } | 162 | } |
163 | 163 | ||
164 | int comedi_command_test(comedi_t *d, comedi_cmd *cmd) | 164 | int comedi_command_test(void *d, comedi_cmd *cmd) |
165 | { | 165 | { |
166 | comedi_device *dev = (comedi_device *) d; | 166 | comedi_device *dev = (comedi_device *) d; |
167 | comedi_subdevice *s; | 167 | comedi_subdevice *s; |
@@ -183,7 +183,7 @@ int comedi_command_test(comedi_t *d, comedi_cmd *cmd) | |||
183 | * COMEDI_INSN | 183 | * COMEDI_INSN |
184 | * perform an instruction | 184 | * perform an instruction |
185 | */ | 185 | */ |
186 | int comedi_do_insn(comedi_t *d, comedi_insn *insn) | 186 | int comedi_do_insn(void *d, comedi_insn *insn) |
187 | { | 187 | { |
188 | comedi_device *dev = (comedi_device *) d; | 188 | comedi_device *dev = (comedi_device *) d; |
189 | comedi_subdevice *s; | 189 | comedi_subdevice *s; |
@@ -324,7 +324,7 @@ int comedi_do_insn(comedi_t *d, comedi_insn *insn) | |||
324 | - lock while subdevice being programmed | 324 | - lock while subdevice being programmed |
325 | 325 | ||
326 | */ | 326 | */ |
327 | int comedi_lock(comedi_t *d, unsigned int subdevice) | 327 | int comedi_lock(void *d, unsigned int subdevice) |
328 | { | 328 | { |
329 | comedi_device *dev = (comedi_device *) d; | 329 | comedi_device *dev = (comedi_device *) d; |
330 | comedi_subdevice *s; | 330 | comedi_subdevice *s; |
@@ -367,7 +367,7 @@ int comedi_lock(comedi_t *d, unsigned int subdevice) | |||
367 | none | 367 | none |
368 | 368 | ||
369 | */ | 369 | */ |
370 | int comedi_unlock(comedi_t *d, unsigned int subdevice) | 370 | int comedi_unlock(void *d, unsigned int subdevice) |
371 | { | 371 | { |
372 | comedi_device *dev = (comedi_device *) d; | 372 | comedi_device *dev = (comedi_device *) d; |
373 | comedi_subdevice *s; | 373 | comedi_subdevice *s; |
@@ -419,7 +419,7 @@ int comedi_unlock(comedi_t *d, unsigned int subdevice) | |||
419 | nothing | 419 | nothing |
420 | 420 | ||
421 | */ | 421 | */ |
422 | int comedi_cancel(comedi_t *d, unsigned int subdevice) | 422 | int comedi_cancel(void *d, unsigned int subdevice) |
423 | { | 423 | { |
424 | comedi_device *dev = (comedi_device *) d; | 424 | comedi_device *dev = (comedi_device *) d; |
425 | comedi_subdevice *s; | 425 | comedi_subdevice *s; |
@@ -464,7 +464,7 @@ int comedi_cancel(comedi_t *d, unsigned int subdevice) | |||
464 | /* | 464 | /* |
465 | registration of callback functions | 465 | registration of callback functions |
466 | */ | 466 | */ |
467 | int comedi_register_callback(comedi_t *d, unsigned int subdevice, | 467 | int comedi_register_callback(void *d, unsigned int subdevice, |
468 | unsigned int mask, int (*cb) (unsigned int, void *), void *arg) | 468 | unsigned int mask, int (*cb) (unsigned int, void *), void *arg) |
469 | { | 469 | { |
470 | comedi_device *dev = (comedi_device *) d; | 470 | comedi_device *dev = (comedi_device *) d; |
@@ -501,7 +501,7 @@ int comedi_register_callback(comedi_t *d, unsigned int subdevice, | |||
501 | return 0; | 501 | return 0; |
502 | } | 502 | } |
503 | 503 | ||
504 | int comedi_poll(comedi_t *d, unsigned int subdevice) | 504 | int comedi_poll(void *d, unsigned int subdevice) |
505 | { | 505 | { |
506 | comedi_device *dev = (comedi_device *) d; | 506 | comedi_device *dev = (comedi_device *) d; |
507 | comedi_subdevice *s = dev->subdevices; | 507 | comedi_subdevice *s = dev->subdevices; |
@@ -528,7 +528,7 @@ int comedi_poll(comedi_t *d, unsigned int subdevice) | |||
528 | } | 528 | } |
529 | 529 | ||
530 | /* WARNING: not portable */ | 530 | /* WARNING: not portable */ |
531 | int comedi_map(comedi_t *d, unsigned int subdevice, void *ptr) | 531 | int comedi_map(void *d, unsigned int subdevice, void *ptr) |
532 | { | 532 | { |
533 | comedi_device *dev = (comedi_device *) d; | 533 | comedi_device *dev = (comedi_device *) d; |
534 | comedi_subdevice *s; | 534 | comedi_subdevice *s; |
@@ -550,7 +550,7 @@ int comedi_map(comedi_t *d, unsigned int subdevice, void *ptr) | |||
550 | } | 550 | } |
551 | 551 | ||
552 | /* WARNING: not portable */ | 552 | /* WARNING: not portable */ |
553 | int comedi_unmap(comedi_t *d, unsigned int subdevice) | 553 | int comedi_unmap(void *d, unsigned int subdevice) |
554 | { | 554 | { |
555 | comedi_device *dev = (comedi_device *) d; | 555 | comedi_device *dev = (comedi_device *) d; |
556 | comedi_subdevice *s; | 556 | comedi_subdevice *s; |