diff options
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 58e58a32e93d..1b2bbd56f6ef 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -88,6 +88,8 @@ struct comedi_subdevice { struct device *class_dev; int minor; + + unsigned int *readback; }; struct comedi_buf_page { @@ -267,11 +269,6 @@ struct comedi_device { void (*close)(struct comedi_device *dev); }; -static inline const void *comedi_board(const struct comedi_device *dev) -{ - return dev->board_ptr; -} - /* * function prototypes */ @@ -429,6 +426,11 @@ void comedi_buf_memcpy_to(struct comedi_subdevice *s, unsigned int offset, const void *source, unsigned int num_bytes); void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset, void *destination, unsigned int num_bytes); +unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, + const void *data, + unsigned int num_bytes); +unsigned int comedi_read_array_from_buffer(struct comedi_subdevice *s, + void *data, unsigned int num_bytes); /* drivers.c - general comedi driver functions */ @@ -440,14 +442,24 @@ int comedi_timeout(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned long context), unsigned long context); +unsigned int comedi_handle_events(struct comedi_device *dev, + struct comedi_subdevice *s); + int comedi_dio_insn_config(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *data, unsigned int mask); unsigned int comedi_dio_update_state(struct comedi_subdevice *, unsigned int *data); +unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s); +void comedi_inc_scan_progress(struct comedi_subdevice *s, + unsigned int num_bytes); void *comedi_alloc_devpriv(struct comedi_device *, size_t); int comedi_alloc_subdevices(struct comedi_device *, int); +int comedi_alloc_subdev_readback(struct comedi_subdevice *); + +int comedi_readback_insn_read(struct comedi_device *, struct comedi_subdevice *, + struct comedi_insn *, unsigned int *data); int comedi_load_firmware(struct comedi_device *, struct device *, const char *name, @@ -503,6 +515,7 @@ struct pci_dev *comedi_to_pci_dev(struct comedi_device *); int comedi_pci_enable(struct comedi_device *); void comedi_pci_disable(struct comedi_device *); +void comedi_pci_detach(struct comedi_device *); int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *, unsigned long context); @@ -547,6 +560,10 @@ static inline void comedi_pci_disable(struct comedi_device *dev) { } +static inline void comedi_pci_detach(struct comedi_device *dev) +{ +} + #endif /* CONFIG_COMEDI_PCI_DRIVERS */ #ifdef CONFIG_COMEDI_PCMCIA_DRIVERS |