summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
Commit message (Collapse)AuthorAgeFilesLines
* Staging: comedi: s626: use subvendor:subdevice ids for SAA7146 boardHerton Ronaldo Krzesinski2009-07-121-15/+20
| | | | | | | | | | | | | | | | | | | | | | | The current s626 comedi driver in staging conflicts with philips SAA7146 media/dvb based cards, because it claims the same vendor:device pci id for all subdevice/subvendor ids. What happens is that for people that have a philips SAA7146 media/dvb based card, s626 if available gets loaded by udev and makes system freeze (https://qa.mandriva.com/show_bug.cgi?id=51445). The s626 driver shouldn't claim all 1131:7146 devices. Fix this by specifying specific known subvendor:subdevice ids in its pci id table list. Also s626_attach is modified to use now pci_get_subsys instead of pci_get_device as reported by Ian Abbott, and now we loop over pci id table entries in case more ids are added in the future. Reference: http://lkml.org/lkml/2009/6/16/552 Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: jr3_pci.c: add required includesAlexander Beregalov2009-07-121-0/+2
| | | | | | | | | | | | | Fix this build errors: jr3_pci.c:739: error: 'jiffies' undeclared jr3_pci.c:748: error: implicit declaration of function 'msecs_to_jiffies' jr3_pci.c:763: error: implicit declaration of function 'add_timer' jr3_pci.c:790: error: implicit declaration of function 'init_timer' jr3_pci.c:951: error: implicit declaration of function 'del_timer_sync' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix build errorsGreg Kroah-Hartman2009-06-191-0/+1
| | | | | | | Some of the comedi drivers need timer.h to build properly, so put it in the comedidev.h file to fix these errors. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: fix operator precedence errorsRoel Kluin2009-06-191-1/+1
| | | | | | | | `!' has a higher precedence than `&' and `|' has a higher precedence than `?' Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: uses udelay, needs delay.hRandy Dunlap2009-06-191-0/+1
| | | | | | | | | | | comedi driver(s) use udelay() so they need to #include delay.h. drivers/staging/comedi/drivers/adq12b.c: In function 'adq12b_ai_rinsn': drivers/staging/comedi/drivers/adq12b.c:328: error: implicit declaration of function 'udelay' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: cb_pcidas.c: Fix build warning (type mismatch)Gerard Lledo2009-06-191-1/+1
| | | | | | | | spin_lock_irqsave expects flags to be unsigned long, not unsigned int. Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: usbdux: buffer overflow error handlingBernd Porr2009-06-192-8/+18
| | | | | | | | | | These changes guarantee that the URBs are not resubmitted in case of a comedi buffer overflow. Otherwise this runs in the background even when the userspace program has terminated. From: Bernd Porr <BerndPorr@f2s.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: Move pcm do_cmdtest function into a single source fileBill Pemberton2009-06-195-202/+124Star
| | | | | | | | | Many of the comedi source code has functions that were created with cut and paste, this moves the do_cmdtest function into a single file. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: Remove MIN macroBill Pemberton2009-06-193-6/+2Star
| | | | | | | | Remove the MIN() macro and instead use the min() provided by kernel.h Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: fix missing parenthesesRoel Kluin2009-06-191-2/+2
| | | | | | | | Add missing parentheses. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: data.c should include delay.hAlexander Beregalov2009-06-191-0/+1
| | | | | | | | | Fix this build error: .../data.c:86: error: implicit declaration of function 'udelay' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: comedi_test.c should include timer.hAlexander Beregalov2009-06-191-0/+1
| | | | | | | | | | | | Fix this build error: .../comedi_test.c:82: error: field timer has incomplete type .../comedi_test.c: In function waveform_ai_interrupt: .../comedi_test.c:188: error: implicit declaration of function mod_timer .../comedi_test.c:188: error: jiffies undeclared (first use in this function) Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: fix pcmcia build breakageGreg Kroah-Hartman2009-06-191-2/+2
| | | | | | | | Add PCCARD dependancy to the PCMCIA drivers to fix build breakage. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Comedi: vmk80xx: Add k8061 supportManuel Gebele2009-06-191-786/+1069
| | | | | | | | | | This patch adds support for the Velleman K8061 USB board http://www.velleman.be/ot/en/product/view/?id=364910 Signed-off-by: Manuel Gebele <forensixs@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: simply read and write functions in adl_pci8164Bill Pemberton2009-06-191-199/+46Star
| | | | | | | | | | There are several read and write functions in adl_pci8164 that are essentially the same thing. They were created with a cut and paste. Change them to use a common function. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: replace for loop with msleep()Bill Pemberton2009-06-192-2/+2
| | | | | | | | Replace 2 attempts to use a for loop as a sleep with a call to msleep(). Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove some RT code that lingeredGreg Kroah-Hartman2009-06-196-42/+24Star
| | | | | | | | | This removes some pieces of RT code that was part of the main code paths. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove RT codeGreg Kroah-Hartman2009-06-1948-1495/+38Star
| | | | | | | | | | | This removes the unused RT code from the comedi subsystem. A lot of drivers needed to then include interrupt.h on their own, as they were picking it up through the comedi_rt.h inclusion. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove comedi-specific wrappersGreg Kroah-Hartman2009-06-1986-1061/+1026Star
| | | | | | | | | | | There are a number of comedi "wrappers" for some RT functions that are about to go away. This patch removes all of the wrapper calls within the comedi drivers and core in order to prepare for removing the RT comedi code. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: convert usbdux* to use firmware_requestBernd Porr2009-06-192-285/+81Star
| | | | | | | | | | | | The firmware is now in the linux-firmware tree, so we can move these two drivers to use the proper request_firmware infrastructure. From: Bernd Porr <BerndPorr@f2s.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: move while to same line as } in do loopsBill Pemberton2009-06-196-45/+25Star
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: comment out useless ifBill Pemberton2009-06-191-2/+4
| | | | | | | This if test doesn't do anything, so comment it out. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: make use of ARRAY_SIZE macroBill Pemberton2009-06-1940-67/+43Star
| | | | | | | | Replace instances of computing number of elements in an array with sizeof(foo)/sizeof(struct footype) with the ARRAY_SIZE macro. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: more fix the way structs are initialized.Bill Pemberton2009-06-192-141/+141
| | | | | | | Change from the foo: bar format to the .foo = bar format. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: more fix "foo * bar" should be "foo *bar"Bill Pemberton2009-06-1917-320/+320
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove space after ampersandBill Pemberton2009-06-1913-68/+68
| | | | | | | Change calses of & foo to &foo as suggested by checkpatch. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: more remove C99 commentsBill Pemberton2009-06-193-39/+39
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix the way structs are initialized.Bill Pemberton2009-06-1991-2674/+2674
| | | | | | | | Change from the foo: bar format to the .foo = bar format. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove parens around return valuesBill Pemberton2009-06-1923-115/+115
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove assignment in conditionalsBill Pemberton2009-06-1957-280/+519
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: non working tests on unsigned cmd->convert_argRoel Kluin2009-06-191-15/+0Star
| | | | | | | | | Remove tests for negative unsigned. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Makefile changesManuel Gebele2009-06-191-1/+3
| | | | | | | | | | this patch will sort the 'Comedi USB drivers' section in the staging/comedi/drivers/Makefile in alphabetical order, and add the vmk80xx.c driver to the build. From: Manuel Gebele <forensixs@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: vmk80xx.c: get the driver to build properlyGreg Kroah-Hartman2009-06-191-22/+20Star
| | | | | | | | | There have been changes in the comedi core, this fixes the vmk80xx.c driver to work properly with them, so it now will build properly. Cc: Manuel Gebele <forensixs@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: add vmk80xx USB driverManuel Gebele2009-06-191-0/+1118
| | | | | | | | | | | | | | | | | | | | | | | | | The k80xx module was completely revised again. The update contains the following new main features: - support for digital input - support for digital output - support for pulse counters - support up to 16 boards (by the way, the windows driver and the k8055 library (libk8055) has support for only 4 boards) The driver can now manage all features what the board has to offer: - analog input/output - digital input/output - pulse counters (read, reset, set debounce time) I've also fixed some mistaken in the drivers source code/logic. By testing all of the driver features i got no errors or something else. The driver works fine.... From: Manuel Gebele <forensixs@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Comedi: change space indentation to tabsBill Pemberton2009-06-1927-310/+314
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging Comedi: fix spacing around parensBill Pemberton2009-06-1922-75/+75
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Add spaces after commasBill Pemberton2009-06-1917-64/+64
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix "foo * bar" should be "foo *bar"Bill Pemberton2009-06-19130-2577/+2577
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove dupilcated #includeHuang Weiyi2009-06-191-4/+0Star
| | | | | | | | Remove dupilcated #include in drivers/staging/comedi/drivers/8253.h. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: replace __FUNCTION__ usagesAlessio Igor Bogani2009-06-195-28/+28
| | | | | | | | __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Alessio Igor Bogani <abogani@texware.it> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: jr3_pci: Use struct device from pci_dev for firmware loading.Frank Mori Hess2009-06-191-49/+35Star
| | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Added sysfs attribute files for setting and querying ↵Frank Mori Hess2009-06-191-39/+379
| | | | | | | subdevice buffer sizes. Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: amplc_pc236: Corrected documentation.Ian Abbott2009-06-191-2/+2
| | | | | | | | Interrupt is triggered by rising edge on port C bit 3 (not bit 7). From: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Undo stupid commit made 3 months agoIan Abbott2009-06-191-0/+2
| | | | | | | | | | | Undo stupid commit made 3 months ago : "Fix redefinition of macro comedi_rt_task_context_t". It wasn't being redefined, it was being defined for RTLinux. From: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Work around malformed RTAI_VERSION_CODE.Ian Abbott2009-06-191-0/+21
| | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Comedi: ni_600x: Added support for comedi_poll.Frank Mori Hess2009-06-191-0/+19
| | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: pcl818: Tidy up AI command after channel dropout or similar ↵Ian Abbott2009-06-191-23/+28
| | | | | | | | | | error. It was causing subsequent commands to fail with -EBUSY. From: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: pcl818: Fix option handling for FIFO mode (hopefully!).Ian Abbott2009-06-191-20/+27
| | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fixed Kconfig option for COMEDI_PCMCIA_DRIVERSFrank Mori Hess2009-06-191-1/+1
| | | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: set PCI and PCMCIA definesGreg Kroah-Hartman2009-06-191-0/+13
| | | | | | | | | | The comedi drivers are looking for CONFIG_COMEDI_PCI and CONFIG_COMEDI_PCMCIA, not the current config items. This creates a define so that things build properly when these options are selected. Long term goal is to fix up the drivers to not need any defines. Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-19 07:16:35 +0200