Introduce COMEDI_CB_ERROR_MASK and COMEDI_CB_CANCEL_MASK to clarify the
async-events that indicate errors and cancel an async command.
Use the new defines to tidy up and clarify the code.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg
to avoid exposing them. For aesthetics,
convert the defines to bit shifts to better indicate that they are bitmask
values. Cleanup the documentation.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
conditions and that cancel an async command.
H Hartley Sweeten (2):
staging: comedi: comedidev.h: don't expose COMEDI_CB_* defines to userspace
staging: comedi: comedidev.h: clarify async-event error/cancel detection
drivers/staging/comedi/comedi.h | 11 ---
drivers/staging
The addi_board definition is not only used by the addi_apci_3120 driver.
Introduce a private definition in that driver and remove the global definition
from addi_common.h.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
The subdevices that don't initialize any of the callbacks don't really
exist. Remove the unnecessary initialzation and just set the type to
COMEDI_SUBD_UNUSED.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
Rename this CamelCase member of the boardinfo.
The comedi_device 'board_name' is set to this member during the (*auto_attach)
of the addi-data that still use this boardinfo drivers. For aesthetics, use
the dev-board_name instead of the boardinfo in the drivers.
Signed-off-by: H Hartley Sweeten
and remove the boardinfo access.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff
This member of the boardinfo is used as a flag to determine what PCI BAR
to use for the main 'iobase' used by the driver.
Remove the boardinfo member and refactor the (*auto_attach) of the drivers
to use the correct PCI BAR.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian
This driver only has one boardinfo entry so the subdevice callbacks are
always the same. Remvoe the callbacks from the boardinfo and use them
directly when initializing the subdevices.
Remove all the subdevice callback initialization that would be set to
NULL.
Signed-off-by: H Hartley Sweeten
-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/addi_common.c | 9 -
drivers/staging/comedi/drivers/addi_apci_035.c | 13 ++---
drivers
The subdevices that don't initialize any of the callbacks don't really
exist. Remove the unnecessary initialzation and just set the type to
COMEDI_SUBD_UNUSED.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
the bloat.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers/addi-data/addi_common.c | 192 -
drivers/staging/comedi/drivers/addi_apci_035.c | 180
to be initialized and open code the n_chan and maxdata.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 13 +
1 file changed, 5
The hardware does not have an eeprom so the 's_EeParameters' use is not
necessary. Remove it.
Since the boardinfo only has one entry its not really necessary. Remove
it and initialize the subdevices directly.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo
This source file is no longer included by any of the addi-data drivers.
Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers/addi-data/addi_eeprom.c | 360
Remove all the unused members from the addi_private definition.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/addi_common.h | 16
1
The addi_apci_035 and addi_apci_1500 are the only drivers left that
include this source file. Copy the i_ADDIDATA_InsnReadEeprom() function
from that file to those drivers and remove the addi_common.c file.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo
None of the drivers that still include this header use the subdevice callbacks.
Remove all of them to reduce the bloat.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers
in the drivers and add the
return vaules.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/addi_common.c| 9 -
drivers/staging/comedi/drivers/addi
This driver only has one boardinfo entry so the subdevice callbacks are
always the same. Remvoe the callbacks from the boardinfo and use them
directly when initializing the subdevices.
Remove all the subdevice callback initialization that would be set to
NULL.
Signed-off-by: H Hartley Sweeten
All boardinfo entries have this member set as '4'. Remove the member and
initialize the Digial Input 'n_chan' with 4 directly.
Also, remove the initialization of 'len_chanlist'. This member is only
used with subdevices that support async commands.
Signed-off-by: H Hartley Sweeten hswee
As indicated in the boardinfo, the hardware does not have an eeprom. Remove
the subdevice and support code for it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers
The addi_apci_035 and addi_apci_1500 are the only drivers left that use
this function in addi_common.c. Remove the function an add a private
comedi_driver (*detach) function to those drivers.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg
, adjust the whitespace in the boardinfo declaration.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 13 ++---
1 file changed, 6 insertions
interesting.
Remove the eeprom support code along with the boardinfo and initialize the
subdevices directly.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_035.c
This member of the boardinfo is not used by any of the drivers. Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/addi_common.h | 1 -
1 file
Remove the need to include addi_common.h by introducing a new private
data definition. Only include the members that are actually used by
the driver.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
This header is no longer included by any of the addi-data drivers.
Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers/addi-data/addi_common.h | 52
removes the unneeded
boardinfo from the addi_apci_035 and addi_apci_1500 drivers and trims down
the boardinfo in the addi_apci_3120 driver.
H Hartley Sweeten (34):
staging: comedi: addi_common.c: remove i_ADDI_Detach()
staging: comedi: addi_common.c: remove i_ADDI_Reset()
staging: comedi
Remove the need to include addi_common.h by introducing a new private
data definition. Only include the members that are actually used by
the driver.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
All boardinfo entries have this member set as '4'. Remove the member and
initialize the Digial Output 'n_chan' with 4 directly.
Also, remove the initialization of 'len_chanlist'. This member is only
used with subdevices that support async commands.
Signed-off-by: H Hartley Sweeten hswee
All boardinfo entries have this member set as '16'. This will initialize
the Analog Input 'n_chan' and cause the 'i_NbrAiChannelDiff' member to
never get used. Remove both members and initialize the Analog Input 'n_chan'
with 16 directly.
Signed-off-by: H Hartley Sweeten hswee
Remove the need to include addi_common.h by introducing a new private
data definition. Only include the members that are actually used by
the driver.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Only allocate space for the subdevicess used by the driver. Remove all
the COMEDI_SUBD_UNUSED subdevices.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers
All boardinfo entries have this member set as '16'. This is also the Analog
Input 'n_chan'. For aesthetics, initialize the Analog Input 'len_chanlist'
with s-n_chan and remove the boardinfo member.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc
Only allocate space for the subdevicess used by the driver. Remove all
the COMEDI_SUBD_UNUSED subdevices.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers
The maxdata for a Digital Output subdevice is always '1'. Remove this
incorrect boardinfo.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 5
Factor the urb handling and resubmit out of the analog output urb
completion handler and tidy it up. This allows a common exit path
to be used in the completion handler to stop the async command and
handle the events.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott
Factor the urb handling and resubmit out of the analog input urb
completion handler and tidy it up. This allows a common exit path
to be used in the completion handler to stop the async command and
handle the events.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott
Factor the urb handling and resubmit out of the completion handler and
tidy it up. This allows a common exit path to be used in the completion
handler to stop the async command and handle the events.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc
:
[PATCH 0/2] staging: comedi: tidy up the async event defines
H Hartley Sweeten (5):
staging: comedi: usbdux: introduce usbduxsub_ao_handle_urb()
staging: comedi: usbdux: introduce usbduxsub_ai_handle_urb()
staging: comedi: usbduxfast: introduce usbduxfast_ai_handle_urb()
staging: comedi
Factor the urb handling and resubmit out of the analog input urb
completion handler and tidy it up. This allows a common exit path
to be used in the completion handler to stop the async command and
handle the events.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott
Factor the urb handling and resubmit out of the analog output urb
completion handler and tidy it up. This allows a common exit path
to be used in the completion handler to stop the async command and
handle the events.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott
According to ADDI-DATA, this board was discontinued last year and they
feel that no further development is needed for this driver. Remove the
driver from comedi to help with the addi-data cleanup.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc
-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers
These defines don't add any significant clarity to the driver. Remove them.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 12
registers are incorrect. According
to the ADDI-DATA datasheet the PCI BARs are:
PCI BAR0 - amcc chip registers
PCI BAR1 - main board registers
PCI BAR2 - counter registers
Move the register map defines from the included hwdrv_apci1564.c file to
the main driver source file.
H Hartley Sweeten
' defines to bit-shifts.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 6 --
drivers/staging/comedi/drivers/addi_apci_1564.c
-shift.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci1564.c | 8
drivers/staging/comedi/drivers/addi_apci_1564.c| 23
Move the defines for the register map from the included source file to
the main driver source file.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci1564.c
-chanspec.
Use that instead and remove the private data member.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci1564.c | 24 --
drivers
For aesthetics, rename this member to simply 'amcc'.
Change the type to match the type returned by pci_resource_start().
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi
According to the I/O map information from ADDI-DATA, the counters are accessed
using the base address found in PCI BAR 2 not the one in PCI BAR 1.
Add a new member to the private data for this base address and fix all the
counter I/O.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
According to the I/O map information from ADDI-DATA, the board registers are
accessed using the base address found in PCI BAR 1 not the one in PCI BAR 0.
The PCI BAR 1 address is stored in dev-iobase during the attach. Use that
instead of devpriv-amcc_iobase (PCI BAR 0).
Signed-off-by: H Hartley
This member of the private data is not used by the driver. Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 2 --
1 file changed, 2
An interrupt is required for DMA to work.
Factor out the DMA buffer allocation from the (*auto_attach) and only
allocate the buffers if the interrupt is available.
For aesthetics, also factor the DMA buffer free from the (*detach).
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
For aesthetics, wrap the DMA buffer information in a struct.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 85
More cleanup of the addi_apci_3120 driver.
These apply after:
[PATCH 00/34] staging: comedi: addi-data: remove common code bloat
H Hartley Sweeten (22):
staging: comedi: addi_apci_3120: DMA requires an interrupt
staging: comedi: addi_apci_3120: introduce struct apci3120_dmabuf
staging
The AMCC registers are accessed using the base address devpriv-i_IobaseAmcc
not devpriv-i_IobaseAddon. Fix a couple writes in apci3120_interrupt_dma()
that are using the wrong base address.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg
This member of the private data holds the start address of PCI BAR 2 that is
used to access the AMCC Add-On registers.
Rename this CamelCase member and fix its type.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
For aesthetics, add some white space to the digital input subdevice
initialization.
Remove the subdev_flags SDF_GROUND and SDF_COMMON. These only apply to
analog subdevices.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 32 -
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging
to range_bipolar10 and remove the
munging in apci3120_ao_insn_write().
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 31 ++
drivers
For aesthetics, add some white space to the analog output subdevice
initialization.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 18
The DA_READY bit (0x0001) in the status register needs to be set before the
analog outputs can be updated.
Use comedi_timeout() to prevent a deadlock condition while waiting for the
DA_READY bit to get set.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo
The struct str_AnalogReadInformation is not used in this driver.
Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 17
-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi_apci_3120.c | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/staging
The analog input (*cancel) stops the async command. There is not reason to also
call the board reset function.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/addi
The board registers are accessed using the bse address devpriv-iobase not
devpriv-i_IobaseAmcc. Fix a read in apci3120_interrupt() that is using the
wrong base address.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 61 +++---
drivers/staging/comedi/drivers/addi_apci_3120.c| 4 +-
2 files changed
Move the apci3120_reset() call in the (*auto_attach) to ensure that the board
is reset before hooking up the interrupt.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi
().
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 18 --
1 file changed, 18 deletions(-)
diff --git a/drivers/staging/comedi
The comedi core calls all the subdevice (*cancel) functions before it does
the driver (*detach). There is no reason to call the board reset function
in the (*detach).
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre
Use the comedi_subdevice 'readback' member and the core provided (*insn_read)
function to provide radback of the analog output channels.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers
and bits
in the registers.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 45 ++
drivers/staging/comedi/drivers/addi_apci_3120
registers.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 144 ++---
drivers/staging/comedi/drivers/addi_apci_3120.c| 2 -
2
For aesthetics, add some white space to the digital output subdevice
initialization.
Remove the subdev_flags SDF_GROUND and SDF_COMMON. These only apply to
analog subdevices. Also remove the unnecessary SDF_READABLE subdev_flag.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc
the COMEDI_CB_BLOCK event after
reading the data, those events can be removed from the drivers.
In addition, comedi_inc_scan_progress() will automatically detect the end of
scan and set the COMEDI_CB_EOS event. Those events can also be removed from
the drivers.
Signed-off-by: H Hartley Sweeten hswee
This function is only called by comedi_buf_read_samples(). Absorb it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/comedi_buf.c | 27 ++-
1 file
Use the new generic method to read the analog output samples from the async
buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/amplc_pci224.c | 7 +++
1
.
Remove the exports from comedi_buf_memcpy_{to,from}() and tidy them up a bit.
H Hartley Sweeten (18):
staging: comedi: comedi_buf: introduce comedi_buf_read_samples()
staging: comedi: amplc_pci224: use comedi_buf_read_samples()
staging: comedi: cb_pcidas: introduce cb_pcidas_ao_load_fifo
This inline function is no longer used. Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/comedi_fc.h | 7 ---
1 file changed, 7 deletions(-)
diff
.
Add a check to comedi_buf_read_samples() so that the single sample is read
from the buffer only if there is a full sample in the buffer. This allows
comedi_buf_read_samples() to mimic the action of comedi_buf_get() with the
added benifit of handling the events.
Signed-off-by: H Hartley Sweeten
() to read the analog output samples from
the async buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/cb_pcidas64.c | 79 +---
1 file changed
This function is no longer used. Remove it.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/comedi_buf.c | 14 --
drivers/staging/comedi/comedidev.h | 1 -
2
This parameter is always passed as '0'. Remove the unnecessary parameter.
This allows removing the unnecessary check of the write_ptr overflow.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Introduce a helper function to read the analog output samples from the
async buffer and prep the DMA.
Use comedi_buf_read_samples() to read the analog output samples from
the async buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg
This function is only used internally. Remove the export.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/comedi_buf.c | 6 +++---
drivers/staging/comedi/comedidev.h | 3
This parameter is always passed as '0'. Remove the unnecessary parameter.
This allows removing the unnecessary check of the read_ptr overflow.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Use comedi_buf_read_samples() to get the single samples from the async
buffer. The number of samples in the buffer was validated by the callers
so the error checking can be removed. In addition, the core will set the
COMEDI_CB_BLOCK event so it can also be removed.
Signed-off-by: H Hartley
This function is only used internally. Remove the export.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/comedi_buf.c | 17 +++--
drivers/staging/comedi
Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/amplc_pci230.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers
() read the analog output samples from the async
buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/cb_pcidas.c | 54 --
1 file
Use comedi_buf_read_samples() to read the analog output samples from
the async buffer. That function will set the COMEDI_CB_BLOCK event
when samples are read from the async buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah
This function is only used internally. Remove the export.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/comedi_buf.c | 6 +++---
drivers/staging/comedi/comedidev.h | 3
Use comedi_buf_read_samples() to read the analog output samples from
the async buffer. That function will set the COMEDI_CB_BLOCK event
when samples are read from the async buffer.
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah
Reported by: coverity (CID 142963)
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/ni_65xx.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging
Reported by: coverity (CID 142962)
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/ni_6527.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging
Reported by: coverity (CID 142967)
Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
---
drivers/staging/comedi/drivers/ni_mio_common.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers
.
Remove the exports from comedi_buf_memcpy_{to,from}() and tidy them up a bit.
v2: fix patch 01/18 as suggested by Ian Abbott
fix patch 09/18 as suggested by Ian Abbott
H Hartley Sweeten (18):
staging: comedi: comedi_buf: introduce comedi_buf_read_samples()
staging: comedi
1 - 100 of 4039 matches
Mail list logo
