From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E2BF18F75E for ; Fri, 28 Jun 2013 16:09:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E3026274B6 for ; Fri, 28 Jun 2013 16:09:41 +0000 (UTC) Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s6XEkWqfm0si for ; Fri, 28 Jun 2013 16:09:40 +0000 (UTC) Received: from mail.mev.co.uk (mail.mev.co.uk [62.49.15.74]) by silver.osuosl.org (Postfix) with ESMTP id 8796820157 for ; Fri, 28 Jun 2013 16:09:40 +0000 (UTC) From: Ian Abbott Subject: [PATCH 00/12] staging: comedi: ni_labpc: split out ISA DMA support Date: Fri, 28 Jun 2013 17:09:16 +0100 Message-Id: <1372435768-7428-1-git-send-email-abbotti@mev.co.uk> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman , Ian Abbott , Bernd Porr , H Hartley Sweeten The "ni_labpc" module is a common module for the "ni_labpc_cs" and "ni_labpc_pci" modules. It is also a comedi driver for National Instruments Lab-PC ISA boards if the `COMEDI_NI_LABPC_ISA` option is enabled. In that case, the module may include code to handle ISA DMA transfers if the `ISA_DMA_API` and `VIRT_TO_BUS` options are also enabled. Move the ISA DMA handling code into a new module "ni_labpc_isadma" which is only built if the `COMEDI_NI_LABPC_ISA`, `ISA_DMA_API` and `VIRT_TO_BUS` options are enabled. This allows a bunch of `#ifdef`s to be removed. 01) staging: comedi: ni_labpc: fix possible double-free of dma_buffer 02) staging: comedi: ni_labpc: don't clear cmd3 bits explicitly in labpc_ai_cmd() 03) staging: comedi: ni_labpc_isadma: new module for ISA DMA support 04) staging: comedi: ni_labpc: migrate DMA channel init & free 05) staging: comedi: ni_labpc_isadma: add labpc_have_dma_chan() 06) staging: comedi: ni_labpc: use labpc_have_dma_chan() 07) staging: comedi: ni_labpc: move register defs to new file 08) staging: comedi: ni_labpc: migrate DMA transfer set-up 09) staging: comedi: ni_labpc: migrate labpc_drain_dma() 10) staging: comedi: ni_labpc: migrate DMA status handling 11) staging: comedi: ni_labpc: tidy up after DMA code migration 12) staging: comedi: COMEDI_NI_LABPC_ISA no longer depends on VIRT_TO_BUS drivers/staging/comedi/Kconfig | 5 +- drivers/staging/comedi/drivers/Makefile | 1 + drivers/staging/comedi/drivers/ni_labpc.c | 279 ++--------------------- drivers/staging/comedi/drivers/ni_labpc_isadma.c | 226 ++++++++++++++++++ drivers/staging/comedi/drivers/ni_labpc_isadma.h | 57 +++++ drivers/staging/comedi/drivers/ni_labpc_regs.h | 75 ++++++ 6 files changed, 387 insertions(+), 256 deletions(-) _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel