diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-11-18 19:53:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 16:52:22 -0500 |
commit | cc92fca7bad65adee79c241a72082bacbfec6c3e (patch) | |
tree | 0b86bdc0cc1ee6793c740cf276444d31279cf2f0 /drivers/staging/comedi | |
parent | 4274ea02d728f3732433782919b32895555df3ca (diff) |
Staging: comedi: usbdux: remove typedef
Remove the typedef in the usbdux driver.
Cc: Bernd Porr <BerndPorr@f2s.com>
Cc: David Schleef <ds@schleef.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 99 |
1 files changed, 50 insertions, 49 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index ac9f34d45de..c3f2d9f12cf 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c | |||
@@ -235,7 +235,7 @@ static const comedi_lrange range_usbdux_ao_range = { 2, { | |||
235 | * This is the structure which holds all the data of | 235 | * This is the structure which holds all the data of |
236 | * this driver one sub device just now: A/D | 236 | * this driver one sub device just now: A/D |
237 | */ | 237 | */ |
238 | typedef struct { | 238 | struct usbduxsub { |
239 | /* attached? */ | 239 | /* attached? */ |
240 | int attached; | 240 | int attached; |
241 | /* is it associated with a subdevice? */ | 241 | /* is it associated with a subdevice? */ |
@@ -295,7 +295,7 @@ typedef struct { | |||
295 | /* commands */ | 295 | /* commands */ |
296 | int8_t *dux_commands; | 296 | int8_t *dux_commands; |
297 | struct semaphore sem; | 297 | struct semaphore sem; |
298 | } usbduxsub_t; | 298 | }; |
299 | 299 | ||
300 | /* | 300 | /* |
301 | * The pointer to the private usb-data of the driver is also the private data | 301 | * The pointer to the private usb-data of the driver is also the private data |
@@ -304,7 +304,7 @@ typedef struct { | |||
304 | * _before_ any comedi command is issued. The usb subsystem must be initialised | 304 | * _before_ any comedi command is issued. The usb subsystem must be initialised |
305 | * before comedi can access it. | 305 | * before comedi can access it. |
306 | */ | 306 | */ |
307 | static usbduxsub_t usbduxsub[NUMUSBDUX]; | 307 | static struct usbduxsub usbduxsub[NUMUSBDUX]; |
308 | 308 | ||
309 | static DECLARE_MUTEX(start_stop_sem); | 309 | static DECLARE_MUTEX(start_stop_sem); |
310 | 310 | ||
@@ -312,7 +312,7 @@ static DECLARE_MUTEX(start_stop_sem); | |||
312 | * Stops the data acquision | 312 | * Stops the data acquision |
313 | * It should be safe to call this function from any context | 313 | * It should be safe to call this function from any context |
314 | */ | 314 | */ |
315 | static int usbduxsub_unlink_InURBs(usbduxsub_t *usbduxsub_tmp) | 315 | static int usbduxsub_unlink_InURBs(struct usbduxsub *usbduxsub_tmp) |
316 | { | 316 | { |
317 | int i = 0; | 317 | int i = 0; |
318 | int err = 0; | 318 | int err = 0; |
@@ -337,7 +337,7 @@ static int usbduxsub_unlink_InURBs(usbduxsub_t *usbduxsub_tmp) | |||
337 | * Is called from within this driver from both the | 337 | * Is called from within this driver from both the |
338 | * interrupt context and from comedi | 338 | * interrupt context and from comedi |
339 | */ | 339 | */ |
340 | static int usbdux_ai_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | 340 | static int usbdux_ai_stop(struct usbduxsub *this_usbduxsub, int do_unlink) |
341 | { | 341 | { |
342 | int ret = 0; | 342 | int ret = 0; |
343 | 343 | ||
@@ -364,7 +364,7 @@ static int usbdux_ai_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | |||
364 | */ | 364 | */ |
365 | static int usbdux_ai_cancel(comedi_device *dev, comedi_subdevice *s) | 365 | static int usbdux_ai_cancel(comedi_device *dev, comedi_subdevice *s) |
366 | { | 366 | { |
367 | usbduxsub_t *this_usbduxsub; | 367 | struct usbduxsub *this_usbduxsub; |
368 | int res = 0; | 368 | int res = 0; |
369 | 369 | ||
370 | /* force unlink of all urbs */ | 370 | /* force unlink of all urbs */ |
@@ -390,13 +390,13 @@ static int usbdux_ai_cancel(comedi_device *dev, comedi_subdevice *s) | |||
390 | static void usbduxsub_ai_IsocIrq(struct urb *urb) | 390 | static void usbduxsub_ai_IsocIrq(struct urb *urb) |
391 | { | 391 | { |
392 | int i, err, n; | 392 | int i, err, n; |
393 | usbduxsub_t *this_usbduxsub; | 393 | struct usbduxsub *this_usbduxsub; |
394 | comedi_device *this_comedidev; | 394 | comedi_device *this_comedidev; |
395 | comedi_subdevice *s; | 395 | comedi_subdevice *s; |
396 | 396 | ||
397 | /* the context variable points to the subdevice */ | 397 | /* the context variable points to the subdevice */ |
398 | this_comedidev = urb->context; | 398 | this_comedidev = urb->context; |
399 | /* the private structure of the subdevice is usbduxsub_t */ | 399 | /* the private structure of the subdevice is struct usbduxsub */ |
400 | this_usbduxsub = this_comedidev->private; | 400 | this_usbduxsub = this_comedidev->private; |
401 | /* subdevice which is the AD converter */ | 401 | /* subdevice which is the AD converter */ |
402 | s = this_comedidev->subdevices + SUBDEV_AD; | 402 | s = this_comedidev->subdevices + SUBDEV_AD; |
@@ -522,7 +522,7 @@ static void usbduxsub_ai_IsocIrq(struct urb *urb) | |||
522 | comedi_event(this_usbduxsub->comedidev, s); | 522 | comedi_event(this_usbduxsub->comedidev, s); |
523 | } | 523 | } |
524 | 524 | ||
525 | static int usbduxsub_unlink_OutURBs(usbduxsub_t *usbduxsub_tmp) | 525 | static int usbduxsub_unlink_OutURBs(struct usbduxsub *usbduxsub_tmp) |
526 | { | 526 | { |
527 | int i = 0; | 527 | int i = 0; |
528 | int err = 0; | 528 | int err = 0; |
@@ -543,7 +543,7 @@ static int usbduxsub_unlink_OutURBs(usbduxsub_t *usbduxsub_tmp) | |||
543 | /* This will cancel a running acquisition operation | 543 | /* This will cancel a running acquisition operation |
544 | * in any context. | 544 | * in any context. |
545 | */ | 545 | */ |
546 | static int usbdux_ao_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | 546 | static int usbdux_ao_stop(struct usbduxsub *this_usbduxsub, int do_unlink) |
547 | { | 547 | { |
548 | int ret = 0; | 548 | int ret = 0; |
549 | 549 | ||
@@ -562,7 +562,7 @@ static int usbdux_ao_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | |||
562 | /* force unlink, is called by comedi */ | 562 | /* force unlink, is called by comedi */ |
563 | static int usbdux_ao_cancel(comedi_device *dev, comedi_subdevice *s) | 563 | static int usbdux_ao_cancel(comedi_device *dev, comedi_subdevice *s) |
564 | { | 564 | { |
565 | usbduxsub_t *this_usbduxsub = dev->private; | 565 | struct usbduxsub *this_usbduxsub = dev->private; |
566 | int res = 0; | 566 | int res = 0; |
567 | 567 | ||
568 | if (!this_usbduxsub) | 568 | if (!this_usbduxsub) |
@@ -584,13 +584,13 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) | |||
584 | { | 584 | { |
585 | int i, ret; | 585 | int i, ret; |
586 | int8_t *datap; | 586 | int8_t *datap; |
587 | usbduxsub_t *this_usbduxsub; | 587 | struct usbduxsub *this_usbduxsub; |
588 | comedi_device *this_comedidev; | 588 | comedi_device *this_comedidev; |
589 | comedi_subdevice *s; | 589 | comedi_subdevice *s; |
590 | 590 | ||
591 | /* the context variable points to the subdevice */ | 591 | /* the context variable points to the subdevice */ |
592 | this_comedidev = urb->context; | 592 | this_comedidev = urb->context; |
593 | /* the private structure of the subdevice is usbduxsub_t */ | 593 | /* the private structure of the subdevice is struct usbduxsub */ |
594 | this_usbduxsub = this_comedidev->private; | 594 | this_usbduxsub = this_comedidev->private; |
595 | 595 | ||
596 | s = this_comedidev->subdevices + SUBDEV_DA; | 596 | s = this_comedidev->subdevices + SUBDEV_DA; |
@@ -714,7 +714,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) | |||
714 | } | 714 | } |
715 | } | 715 | } |
716 | 716 | ||
717 | static int usbduxsub_start(usbduxsub_t *usbduxsub) | 717 | static int usbduxsub_start(struct usbduxsub *usbduxsub) |
718 | { | 718 | { |
719 | int errcode = 0; | 719 | int errcode = 0; |
720 | uint8_t local_transfer_buffer[16]; | 720 | uint8_t local_transfer_buffer[16]; |
@@ -748,7 +748,7 @@ static int usbduxsub_start(usbduxsub_t *usbduxsub) | |||
748 | return 0; | 748 | return 0; |
749 | } | 749 | } |
750 | 750 | ||
751 | static int usbduxsub_stop(usbduxsub_t *usbduxsub) | 751 | static int usbduxsub_stop(struct usbduxsub *usbduxsub) |
752 | { | 752 | { |
753 | int errcode = 0; | 753 | int errcode = 0; |
754 | 754 | ||
@@ -780,7 +780,7 @@ static int usbduxsub_stop(usbduxsub_t *usbduxsub) | |||
780 | return 0; | 780 | return 0; |
781 | } | 781 | } |
782 | 782 | ||
783 | static int usbduxsub_upload(usbduxsub_t *usbduxsub, | 783 | static int usbduxsub_upload(struct usbduxsub *usbduxsub, |
784 | uint8_t *local_transfer_buffer, | 784 | uint8_t *local_transfer_buffer, |
785 | unsigned int startAddr, unsigned int len) | 785 | unsigned int startAddr, unsigned int len) |
786 | { | 786 | { |
@@ -823,7 +823,7 @@ static int usbduxsub_upload(usbduxsub_t *usbduxsub, | |||
823 | return 0; | 823 | return 0; |
824 | } | 824 | } |
825 | 825 | ||
826 | static int firmwareUpload(usbduxsub_t *usbduxsub, uint8_t *firmwareBinary, | 826 | static int firmwareUpload(struct usbduxsub *usbduxsub, uint8_t *firmwareBinary, |
827 | int sizeFirmware) | 827 | int sizeFirmware) |
828 | { | 828 | { |
829 | int ret; | 829 | int ret; |
@@ -852,7 +852,7 @@ static int firmwareUpload(usbduxsub_t *usbduxsub, uint8_t *firmwareBinary, | |||
852 | return 0; | 852 | return 0; |
853 | } | 853 | } |
854 | 854 | ||
855 | static int usbduxsub_submit_InURBs(usbduxsub_t *usbduxsub) | 855 | static int usbduxsub_submit_InURBs(struct usbduxsub *usbduxsub) |
856 | { | 856 | { |
857 | int i, errFlag; | 857 | int i, errFlag; |
858 | 858 | ||
@@ -884,7 +884,7 @@ static int usbduxsub_submit_InURBs(usbduxsub_t *usbduxsub) | |||
884 | return 0; | 884 | return 0; |
885 | } | 885 | } |
886 | 886 | ||
887 | static int usbduxsub_submit_OutURBs(usbduxsub_t *usbduxsub) | 887 | static int usbduxsub_submit_OutURBs(struct usbduxsub *usbduxsub) |
888 | { | 888 | { |
889 | int i, errFlag; | 889 | int i, errFlag; |
890 | 890 | ||
@@ -915,7 +915,7 @@ static int usbdux_ai_cmdtest(comedi_device *dev, comedi_subdevice *s, | |||
915 | { | 915 | { |
916 | int err = 0, tmp, i; | 916 | int err = 0, tmp, i; |
917 | unsigned int tmpTimer; | 917 | unsigned int tmpTimer; |
918 | usbduxsub_t *this_usbduxsub = dev->private; | 918 | struct usbduxsub *this_usbduxsub = dev->private; |
919 | 919 | ||
920 | if (!(this_usbduxsub->probed)) | 920 | if (!(this_usbduxsub->probed)) |
921 | return -ENODEV; | 921 | return -ENODEV; |
@@ -1075,7 +1075,7 @@ static int8_t create_adc_command(unsigned int chan, int range) | |||
1075 | #define SENDPWMON 7 | 1075 | #define SENDPWMON 7 |
1076 | #define SENDPWMOFF 8 | 1076 | #define SENDPWMOFF 8 |
1077 | 1077 | ||
1078 | static int send_dux_commands(usbduxsub_t *this_usbduxsub, int cmd_type) | 1078 | static int send_dux_commands(struct usbduxsub *this_usbduxsub, int cmd_type) |
1079 | { | 1079 | { |
1080 | int result, nsent; | 1080 | int result, nsent; |
1081 | 1081 | ||
@@ -1099,7 +1099,7 @@ static int send_dux_commands(usbduxsub_t *this_usbduxsub, int cmd_type) | |||
1099 | return result; | 1099 | return result; |
1100 | } | 1100 | } |
1101 | 1101 | ||
1102 | static int receive_dux_commands(usbduxsub_t *this_usbduxsub, int command) | 1102 | static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command) |
1103 | { | 1103 | { |
1104 | int result = (-EFAULT); | 1104 | int result = (-EFAULT); |
1105 | int nrec; | 1105 | int nrec; |
@@ -1132,7 +1132,7 @@ static int usbdux_ai_inttrig(comedi_device *dev, comedi_subdevice *s, | |||
1132 | unsigned int trignum) | 1132 | unsigned int trignum) |
1133 | { | 1133 | { |
1134 | int ret; | 1134 | int ret; |
1135 | usbduxsub_t *this_usbduxsub = dev->private; | 1135 | struct usbduxsub *this_usbduxsub = dev->private; |
1136 | if (!this_usbduxsub) | 1136 | if (!this_usbduxsub) |
1137 | return -EFAULT; | 1137 | return -EFAULT; |
1138 | 1138 | ||
@@ -1177,7 +1177,7 @@ static int usbdux_ai_cmd(comedi_device *dev, comedi_subdevice *s) | |||
1177 | comedi_cmd *cmd = &s->async->cmd; | 1177 | comedi_cmd *cmd = &s->async->cmd; |
1178 | unsigned int chan, range; | 1178 | unsigned int chan, range; |
1179 | int i, ret; | 1179 | int i, ret; |
1180 | usbduxsub_t *this_usbduxsub = dev->private; | 1180 | struct usbduxsub *this_usbduxsub = dev->private; |
1181 | int result; | 1181 | int result; |
1182 | 1182 | ||
1183 | if (!this_usbduxsub) | 1183 | if (!this_usbduxsub) |
@@ -1295,7 +1295,7 @@ static int usbdux_ai_insn_read(comedi_device *dev, comedi_subdevice *s, | |||
1295 | lsampl_t one = 0; | 1295 | lsampl_t one = 0; |
1296 | int chan, range; | 1296 | int chan, range; |
1297 | int err; | 1297 | int err; |
1298 | usbduxsub_t *this_usbduxsub = dev->private; | 1298 | struct usbduxsub *this_usbduxsub = dev->private; |
1299 | 1299 | ||
1300 | if (!this_usbduxsub) | 1300 | if (!this_usbduxsub) |
1301 | return 0; | 1301 | return 0; |
@@ -1354,7 +1354,7 @@ static int usbdux_ao_insn_read(comedi_device *dev, comedi_subdevice *s, | |||
1354 | { | 1354 | { |
1355 | int i; | 1355 | int i; |
1356 | int chan = CR_CHAN(insn->chanspec); | 1356 | int chan = CR_CHAN(insn->chanspec); |
1357 | usbduxsub_t *this_usbduxsub = dev->private; | 1357 | struct usbduxsub *this_usbduxsub = dev->private; |
1358 | 1358 | ||
1359 | if (!this_usbduxsub) | 1359 | if (!this_usbduxsub) |
1360 | return -EFAULT; | 1360 | return -EFAULT; |
@@ -1376,7 +1376,7 @@ static int usbdux_ao_insn_write(comedi_device *dev, comedi_subdevice *s, | |||
1376 | { | 1376 | { |
1377 | int i, err; | 1377 | int i, err; |
1378 | int chan = CR_CHAN(insn->chanspec); | 1378 | int chan = CR_CHAN(insn->chanspec); |
1379 | usbduxsub_t *this_usbduxsub = dev->private; | 1379 | struct usbduxsub *this_usbduxsub = dev->private; |
1380 | 1380 | ||
1381 | if (!this_usbduxsub) | 1381 | if (!this_usbduxsub) |
1382 | return -EFAULT; | 1382 | return -EFAULT; |
@@ -1425,7 +1425,7 @@ static int usbdux_ao_inttrig(comedi_device *dev, comedi_subdevice *s, | |||
1425 | unsigned int trignum) | 1425 | unsigned int trignum) |
1426 | { | 1426 | { |
1427 | int ret; | 1427 | int ret; |
1428 | usbduxsub_t *this_usbduxsub = dev->private; | 1428 | struct usbduxsub *this_usbduxsub = dev->private; |
1429 | 1429 | ||
1430 | if (!this_usbduxsub) | 1430 | if (!this_usbduxsub) |
1431 | return -EFAULT; | 1431 | return -EFAULT; |
@@ -1466,7 +1466,7 @@ static int usbdux_ao_cmdtest(comedi_device *dev, comedi_subdevice *s, | |||
1466 | comedi_cmd *cmd) | 1466 | comedi_cmd *cmd) |
1467 | { | 1467 | { |
1468 | int err = 0, tmp; | 1468 | int err = 0, tmp; |
1469 | usbduxsub_t *this_usbduxsub = dev->private; | 1469 | struct usbduxsub *this_usbduxsub = dev->private; |
1470 | 1470 | ||
1471 | if (!this_usbduxsub) | 1471 | if (!this_usbduxsub) |
1472 | return -EFAULT; | 1472 | return -EFAULT; |
@@ -1606,7 +1606,7 @@ static int usbdux_ao_cmd(comedi_device *dev, comedi_subdevice *s) | |||
1606 | comedi_cmd *cmd = &s->async->cmd; | 1606 | comedi_cmd *cmd = &s->async->cmd; |
1607 | unsigned int chan, gain; | 1607 | unsigned int chan, gain; |
1608 | int i, ret; | 1608 | int i, ret; |
1609 | usbduxsub_t *this_usbduxsub = dev->private; | 1609 | struct usbduxsub *this_usbduxsub = dev->private; |
1610 | 1610 | ||
1611 | if (!this_usbduxsub) | 1611 | if (!this_usbduxsub) |
1612 | return -EFAULT; | 1612 | return -EFAULT; |
@@ -1744,7 +1744,7 @@ static int usbdux_dio_insn_bits(comedi_device *dev, comedi_subdevice *s, | |||
1744 | comedi_insn *insn, lsampl_t *data) | 1744 | comedi_insn *insn, lsampl_t *data) |
1745 | { | 1745 | { |
1746 | 1746 | ||
1747 | usbduxsub_t *this_usbduxsub = dev->private; | 1747 | struct usbduxsub *this_usbduxsub = dev->private; |
1748 | int err; | 1748 | int err; |
1749 | 1749 | ||
1750 | if (!this_usbduxsub) | 1750 | if (!this_usbduxsub) |
@@ -1790,7 +1790,7 @@ static int usbdux_dio_insn_bits(comedi_device *dev, comedi_subdevice *s, | |||
1790 | static int usbdux_counter_read(comedi_device *dev, comedi_subdevice *s, | 1790 | static int usbdux_counter_read(comedi_device *dev, comedi_subdevice *s, |
1791 | comedi_insn *insn, lsampl_t *data) | 1791 | comedi_insn *insn, lsampl_t *data) |
1792 | { | 1792 | { |
1793 | usbduxsub_t *this_usbduxsub = dev->private; | 1793 | struct usbduxsub *this_usbduxsub = dev->private; |
1794 | int chan = insn->chanspec; | 1794 | int chan = insn->chanspec; |
1795 | int err; | 1795 | int err; |
1796 | 1796 | ||
@@ -1824,7 +1824,7 @@ static int usbdux_counter_read(comedi_device *dev, comedi_subdevice *s, | |||
1824 | static int usbdux_counter_write(comedi_device *dev, comedi_subdevice *s, | 1824 | static int usbdux_counter_write(comedi_device *dev, comedi_subdevice *s, |
1825 | comedi_insn *insn, lsampl_t *data) | 1825 | comedi_insn *insn, lsampl_t *data) |
1826 | { | 1826 | { |
1827 | usbduxsub_t *this_usbduxsub = dev->private; | 1827 | struct usbduxsub *this_usbduxsub = dev->private; |
1828 | int err; | 1828 | int err; |
1829 | 1829 | ||
1830 | if (!this_usbduxsub) | 1830 | if (!this_usbduxsub) |
@@ -1861,7 +1861,7 @@ static int usbdux_counter_config(comedi_device *dev, comedi_subdevice *s, | |||
1861 | /***********************************/ | 1861 | /***********************************/ |
1862 | /* PWM */ | 1862 | /* PWM */ |
1863 | 1863 | ||
1864 | static int usbduxsub_unlink_PwmURBs(usbduxsub_t *usbduxsub_tmp) | 1864 | static int usbduxsub_unlink_PwmURBs(struct usbduxsub *usbduxsub_tmp) |
1865 | { | 1865 | { |
1866 | int err = 0; | 1866 | int err = 0; |
1867 | 1867 | ||
@@ -1877,7 +1877,7 @@ static int usbduxsub_unlink_PwmURBs(usbduxsub_t *usbduxsub_tmp) | |||
1877 | /* This cancels a running acquisition operation | 1877 | /* This cancels a running acquisition operation |
1878 | * in any context. | 1878 | * in any context. |
1879 | */ | 1879 | */ |
1880 | static int usbdux_pwm_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | 1880 | static int usbdux_pwm_stop(struct usbduxsub *this_usbduxsub, int do_unlink) |
1881 | { | 1881 | { |
1882 | int ret = 0; | 1882 | int ret = 0; |
1883 | 1883 | ||
@@ -1897,7 +1897,7 @@ static int usbdux_pwm_stop(usbduxsub_t *this_usbduxsub, int do_unlink) | |||
1897 | /* force unlink - is called by comedi */ | 1897 | /* force unlink - is called by comedi */ |
1898 | static int usbdux_pwm_cancel(comedi_device *dev, comedi_subdevice *s) | 1898 | static int usbdux_pwm_cancel(comedi_device *dev, comedi_subdevice *s) |
1899 | { | 1899 | { |
1900 | usbduxsub_t *this_usbduxsub = dev->private; | 1900 | struct usbduxsub *this_usbduxsub = dev->private; |
1901 | int res = 0; | 1901 | int res = 0; |
1902 | 1902 | ||
1903 | /* unlink only if it is really running */ | 1903 | /* unlink only if it is really running */ |
@@ -1916,7 +1916,7 @@ static int usbdux_pwm_cancel(comedi_device *dev, comedi_subdevice *s) | |||
1916 | static void usbduxsub_pwm_irq(struct urb *urb) | 1916 | static void usbduxsub_pwm_irq(struct urb *urb) |
1917 | { | 1917 | { |
1918 | int ret; | 1918 | int ret; |
1919 | usbduxsub_t *this_usbduxsub; | 1919 | struct usbduxsub *this_usbduxsub; |
1920 | comedi_device *this_comedidev; | 1920 | comedi_device *this_comedidev; |
1921 | comedi_subdevice *s; | 1921 | comedi_subdevice *s; |
1922 | 1922 | ||
@@ -1924,7 +1924,7 @@ static void usbduxsub_pwm_irq(struct urb *urb) | |||
1924 | 1924 | ||
1925 | /* the context variable points to the subdevice */ | 1925 | /* the context variable points to the subdevice */ |
1926 | this_comedidev = urb->context; | 1926 | this_comedidev = urb->context; |
1927 | /* the private structure of the subdevice is usbduxsub_t */ | 1927 | /* the private structure of the subdevice is struct usbduxsub */ |
1928 | this_usbduxsub = this_comedidev->private; | 1928 | this_usbduxsub = this_comedidev->private; |
1929 | 1929 | ||
1930 | s = this_comedidev->subdevices + SUBDEV_DA; | 1930 | s = this_comedidev->subdevices + SUBDEV_DA; |
@@ -1982,7 +1982,7 @@ static void usbduxsub_pwm_irq(struct urb *urb) | |||
1982 | } | 1982 | } |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | static int usbduxsub_submit_PwmURBs(usbduxsub_t *usbduxsub) | 1985 | static int usbduxsub_submit_PwmURBs(struct usbduxsub *usbduxsub) |
1986 | { | 1986 | { |
1987 | int errFlag; | 1987 | int errFlag; |
1988 | 1988 | ||
@@ -2011,7 +2011,7 @@ static int usbduxsub_submit_PwmURBs(usbduxsub_t *usbduxsub) | |||
2011 | static int usbdux_pwm_period(comedi_device *dev, comedi_subdevice *s, | 2011 | static int usbdux_pwm_period(comedi_device *dev, comedi_subdevice *s, |
2012 | lsampl_t period) | 2012 | lsampl_t period) |
2013 | { | 2013 | { |
2014 | usbduxsub_t *this_usbduxsub = dev->private; | 2014 | struct usbduxsub *this_usbduxsub = dev->private; |
2015 | int fx2delay = 255; | 2015 | int fx2delay = 255; |
2016 | 2016 | ||
2017 | if (period < MIN_PWM_PERIOD) { | 2017 | if (period < MIN_PWM_PERIOD) { |
@@ -2039,7 +2039,7 @@ static int usbdux_pwm_period(comedi_device *dev, comedi_subdevice *s, | |||
2039 | static int usbdux_pwm_start(comedi_device *dev, comedi_subdevice *s) | 2039 | static int usbdux_pwm_start(comedi_device *dev, comedi_subdevice *s) |
2040 | { | 2040 | { |
2041 | int ret, i; | 2041 | int ret, i; |
2042 | usbduxsub_t *this_usbduxsub = dev->private; | 2042 | struct usbduxsub *this_usbduxsub = dev->private; |
2043 | 2043 | ||
2044 | dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: %s\n", | 2044 | dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: %s\n", |
2045 | dev->minor, __func__); | 2045 | dev->minor, __func__); |
@@ -2071,7 +2071,7 @@ static int usbdux_pwm_start(comedi_device *dev, comedi_subdevice *s) | |||
2071 | static int usbdux_pwm_pattern(comedi_device *dev, comedi_subdevice *s, | 2071 | static int usbdux_pwm_pattern(comedi_device *dev, comedi_subdevice *s, |
2072 | int channel, lsampl_t value, lsampl_t sign) | 2072 | int channel, lsampl_t value, lsampl_t sign) |
2073 | { | 2073 | { |
2074 | usbduxsub_t *this_usbduxsub = dev->private; | 2074 | struct usbduxsub *this_usbduxsub = dev->private; |
2075 | int i, szbuf; | 2075 | int i, szbuf; |
2076 | char *pBuf; | 2076 | char *pBuf; |
2077 | char pwm_mask; | 2077 | char pwm_mask; |
@@ -2112,7 +2112,7 @@ static int usbdux_pwm_pattern(comedi_device *dev, comedi_subdevice *s, | |||
2112 | static int usbdux_pwm_write(comedi_device *dev, comedi_subdevice *s, | 2112 | static int usbdux_pwm_write(comedi_device *dev, comedi_subdevice *s, |
2113 | comedi_insn *insn, lsampl_t *data) | 2113 | comedi_insn *insn, lsampl_t *data) |
2114 | { | 2114 | { |
2115 | usbduxsub_t *this_usbduxsub = dev->private; | 2115 | struct usbduxsub *this_usbduxsub = dev->private; |
2116 | 2116 | ||
2117 | if (!this_usbduxsub) | 2117 | if (!this_usbduxsub) |
2118 | return -EFAULT; | 2118 | return -EFAULT; |
@@ -2145,7 +2145,7 @@ static int usbdux_pwm_read(comedi_device *x1, comedi_subdevice *x2, | |||
2145 | static int usbdux_pwm_config(comedi_device *dev, comedi_subdevice *s, | 2145 | static int usbdux_pwm_config(comedi_device *dev, comedi_subdevice *s, |
2146 | comedi_insn *insn, lsampl_t *data) | 2146 | comedi_insn *insn, lsampl_t *data) |
2147 | { | 2147 | { |
2148 | usbduxsub_t *this_usbduxsub = dev->private; | 2148 | struct usbduxsub *this_usbduxsub = dev->private; |
2149 | switch (data[0]) { | 2149 | switch (data[0]) { |
2150 | case INSN_CONFIG_ARM: | 2150 | case INSN_CONFIG_ARM: |
2151 | /* switch it on */ | 2151 | /* switch it on */ |
@@ -2196,7 +2196,7 @@ static int usbdux_pwm_config(comedi_device *dev, comedi_subdevice *s, | |||
2196 | /* end of PWM */ | 2196 | /* end of PWM */ |
2197 | /*****************************************************************/ | 2197 | /*****************************************************************/ |
2198 | 2198 | ||
2199 | static void tidy_up(usbduxsub_t *usbduxsub_tmp) | 2199 | static void tidy_up(struct usbduxsub *usbduxsub_tmp) |
2200 | { | 2200 | { |
2201 | int i; | 2201 | int i; |
2202 | 2202 | ||
@@ -2293,7 +2293,8 @@ static unsigned hex2unsigned(char *h) | |||
2293 | #define FIRMWARE_MAX_LEN 0x2000 | 2293 | #define FIRMWARE_MAX_LEN 0x2000 |
2294 | 2294 | ||
2295 | /* taken from David Brownell's fxload and adjusted for this driver */ | 2295 | /* taken from David Brownell's fxload and adjusted for this driver */ |
2296 | static int read_firmware(usbduxsub_t *usbduxsub, void *firmwarePtr, long size) | 2296 | static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, |
2297 | long size) | ||
2297 | { | 2298 | { |
2298 | struct device *dev = &usbduxsub->interface->dev; | 2299 | struct device *dev = &usbduxsub->interface->dev; |
2299 | int i = 0; | 2300 | int i = 0; |
@@ -2645,7 +2646,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf, | |||
2645 | 2646 | ||
2646 | static void usbduxsub_disconnect(struct usb_interface *intf) | 2647 | static void usbduxsub_disconnect(struct usb_interface *intf) |
2647 | { | 2648 | { |
2648 | usbduxsub_t *usbduxsub_tmp = usb_get_intfdata(intf); | 2649 | struct usbduxsub *usbduxsub_tmp = usb_get_intfdata(intf); |
2649 | struct usb_device *udev = interface_to_usbdev(intf); | 2650 | struct usb_device *udev = interface_to_usbdev(intf); |
2650 | 2651 | ||
2651 | if (!usbduxsub_tmp) { | 2652 | if (!usbduxsub_tmp) { |
@@ -2672,7 +2673,7 @@ static int usbdux_attach(comedi_device *dev, comedi_devconfig *it) | |||
2672 | int ret; | 2673 | int ret; |
2673 | int index; | 2674 | int index; |
2674 | int i; | 2675 | int i; |
2675 | usbduxsub_t *udev; | 2676 | struct usbduxsub *udev; |
2676 | 2677 | ||
2677 | comedi_subdevice *s = NULL; | 2678 | comedi_subdevice *s = NULL; |
2678 | dev->private = NULL; | 2679 | dev->private = NULL; |
@@ -2836,7 +2837,7 @@ static int usbdux_attach(comedi_device *dev, comedi_devconfig *it) | |||
2836 | 2837 | ||
2837 | static int usbdux_detach(comedi_device *dev) | 2838 | static int usbdux_detach(comedi_device *dev) |
2838 | { | 2839 | { |
2839 | usbduxsub_t *usbduxsub_tmp; | 2840 | struct usbduxsub *usbduxsub_tmp; |
2840 | 2841 | ||
2841 | if (!dev) { | 2842 | if (!dev) { |
2842 | printk(KERN_ERR | 2843 | printk(KERN_ERR |