forked from Minki/linux
Staging: comedi: Remove DMABUF typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
9aa5339ac1
commit
4753d235e7
@ -144,8 +144,8 @@ struct s626_private {
|
|||||||
uint16_t CounterIntEnabs;
|
uint16_t CounterIntEnabs;
|
||||||
/* Counter interrupt enable mask for MISC2 register. */
|
/* Counter interrupt enable mask for MISC2 register. */
|
||||||
uint8_t AdcItems; /* Number of items in ADC poll list. */
|
uint8_t AdcItems; /* Number of items in ADC poll list. */
|
||||||
DMABUF RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */
|
struct bufferDMA RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */
|
||||||
DMABUF ANABuf;
|
struct bufferDMA ANABuf;
|
||||||
/* DMA buffer used to receive ADC data and hold DAC data. */
|
/* DMA buffer used to receive ADC data and hold DAC data. */
|
||||||
uint32_t *pDacWBuf;
|
uint32_t *pDacWBuf;
|
||||||
/* Pointer to logical adrs of DMA buffer used to hold DAC data. */
|
/* Pointer to logical adrs of DMA buffer used to hold DAC data. */
|
||||||
@ -275,7 +275,7 @@ static uint16_t DEBIread(struct comedi_device *dev, uint16_t addr);
|
|||||||
static void DEBIwrite(struct comedi_device *dev, uint16_t addr, uint16_t wdata);
|
static void DEBIwrite(struct comedi_device *dev, uint16_t addr, uint16_t wdata);
|
||||||
static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask,
|
static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask,
|
||||||
uint16_t wdata);
|
uint16_t wdata);
|
||||||
static void CloseDMAB(struct comedi_device *dev, DMABUF *pdma, size_t bsize);
|
static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma, size_t bsize);
|
||||||
|
|
||||||
/* COUNTER OBJECT ------------------------------------------------ */
|
/* COUNTER OBJECT ------------------------------------------------ */
|
||||||
struct enc_private {
|
struct enc_private {
|
||||||
@ -2733,7 +2733,7 @@ static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask,
|
|||||||
DEBItransfer(dev); /* Execute the DEBI Write transfer. */
|
DEBItransfer(dev); /* Execute the DEBI Write transfer. */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CloseDMAB(struct comedi_device *dev, DMABUF *pdma, size_t bsize)
|
static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma, size_t bsize)
|
||||||
{
|
{
|
||||||
void *vbptr;
|
void *vbptr;
|
||||||
dma_addr_t vpptr;
|
dma_addr_t vpptr;
|
||||||
|
@ -739,8 +739,8 @@
|
|||||||
/* unsigned int enc; */
|
/* unsigned int enc; */
|
||||||
/* }CallCounter; */
|
/* }CallCounter; */
|
||||||
|
|
||||||
typedef struct bufferDMA {
|
struct bufferDMA {
|
||||||
dma_addr_t PhysicalBase;
|
dma_addr_t PhysicalBase;
|
||||||
void *LogicalBase;
|
void *LogicalBase;
|
||||||
uint32_t DMAHandle;
|
uint32_t DMAHandle;
|
||||||
} DMABUF;
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user