From daa24a9dc76ae117682539931bdd8bbe2a9187e4 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sat, 18 Oct 2003 14:13:20 +0000 Subject: [PATCH] get rid of underscores in my byte swapping calls --- comedi/drivers/adl_pci9118.c | 2 +- comedi/drivers/das16.c | 2 +- comedi/drivers/gsc_hpdi.c | 14 +++++++------- comedi/drivers/ni_mio_common.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c index 7bfe1249..0f10e966 100644 --- a/comedi/drivers/adl_pci9118.c +++ b/comedi/drivers/adl_pci9118.c @@ -519,7 +519,7 @@ static void pci9118_ai_munge(comedi_device *dev, comedi_subdevice *s, void *data for (i = 0; i < num_samples; i++) { if(devpriv->usedma) - array[i] = __be16_to_cpu(array[i]); + array[i] = be16_to_cpu(array[i]); if (devpriv->ai16bits) { array[i] ^= 0x8000; } else { diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c index 254d8f62..9b09a997 100644 --- a/comedi/drivers/das16.c +++ b/comedi/drivers/das16.c @@ -1726,7 +1726,7 @@ static void das16_ai_munge(comedi_device *dev, comedi_subdevice *s, void *array, for(i = 0; i < num_samples; i++) { - data[i] = __le16_to_cpu(data[i]); + data[i] = le16_to_cpu(data[i]); if( thisboard->ai_nbits == 12 ) { data[i] = (data[i] >> 4) & 0xfff; diff --git a/comedi/drivers/gsc_hpdi.c b/comedi/drivers/gsc_hpdi.c index 3183ae75..5281ef48 100644 --- a/comedi/drivers/gsc_hpdi.c +++ b/comedi/drivers/gsc_hpdi.c @@ -498,11 +498,11 @@ static int setup_dma_descriptors( comedi_device *dev, unsigned int transfer_size for( i = 0; i < NUM_DMA_DESCRIPTORS && buffer_index < NUM_DMA_BUFFERS; i++ ) { - priv(dev)->dma_desc[ i ].pci_start_addr = __cpu_to_le32(priv(dev)->dio_buffer_phys_addr[ buffer_index ] + + priv(dev)->dma_desc[ i ].pci_start_addr = cpu_to_le32(priv(dev)->dio_buffer_phys_addr[ buffer_index ] + buffer_offset); - priv(dev)->dma_desc[ i ].local_start_addr = __cpu_to_le32(FIFO_REG); - priv(dev)->dma_desc[ i ].transfer_size = __cpu_to_le32(transfer_size); - priv(dev)->dma_desc[ i ].next = __cpu_to_le32(( priv(dev)->dma_desc_phys_addr + + priv(dev)->dma_desc[ i ].local_start_addr = cpu_to_le32(FIFO_REG); + priv(dev)->dma_desc[ i ].transfer_size = cpu_to_le32(transfer_size); + priv(dev)->dma_desc[ i ].next = cpu_to_le32(( priv(dev)->dma_desc_phys_addr + ( i + 1 ) * sizeof( priv(dev)->dma_desc[ 0 ] ) ) | next_bits); priv(dev)->desc_dio_buffer[ i ] = priv(dev)->dio_buffer[ buffer_index ] + @@ -523,7 +523,7 @@ static int setup_dma_descriptors( comedi_device *dev, unsigned int transfer_size priv(dev)->num_dma_descriptors = i; // fix last descriptor to point back to first priv(dev)->dma_desc[ i - 1 ].next = - __cpu_to_le32(priv(dev)->dma_desc_phys_addr | next_bits); + cpu_to_le32(priv(dev)->dma_desc_phys_addr | next_bits); DEBUG_PRINT(" desc %i next fixup 0x%lx\n", i - 1, (unsigned long) priv(dev)->dma_desc[ i - 1 ].next ); @@ -883,8 +883,8 @@ static void drain_dma_buffers(comedi_device *dev, unsigned int channel) // loop until we have read all the full buffers j = 0; for(next_transfer_addr = readl(pci_addr_reg); - (next_transfer_addr < __le32_to_cpu(priv(dev)->dma_desc[ priv(dev)->dma_desc_index ].pci_start_addr) || - next_transfer_addr >= __le32_to_cpu(priv(dev)->dma_desc[ priv(dev)->dma_desc_index ].pci_start_addr) + + (next_transfer_addr < le32_to_cpu(priv(dev)->dma_desc[ priv(dev)->dma_desc_index ].pci_start_addr) || + next_transfer_addr >= le32_to_cpu(priv(dev)->dma_desc[ priv(dev)->dma_desc_index ].pci_start_addr) + priv(dev)->block_size ) && j < priv(dev)->num_dma_descriptors; j++ ) diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index ba0c07eb..8bb8cec7 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -992,7 +992,7 @@ static void ni_ai_munge(comedi_device *dev, comedi_subdevice *s, for(i = 0; i < length; i++) { #ifdef PCIDMA - array[i] = __le16_to_cpu(array[i]); + array[i] = le16_to_cpu(array[i]); #endif array[i] += devpriv->ai_offset[ chan_index ]; chan_index++; @@ -1954,7 +1954,7 @@ static void ni_ao_munge(comedi_device *dev, comedi_subdevice *s, if(boardtype.ao_unipolar == 0 || (range & 1) == 0 ) array[i] -= offset; #ifdef PCIDMA - array[i] = __cpu_to_le16( array[i] ); + array[i] = cpu_to_le16( array[i] ); #endif chan_index++; chan_index %= async->cmd.chanlist_len; -- 2.26.2