From m.kozlowski@tuxland.pl Tue Feb 17 18:13:27 2009 From: Mariusz Kozlowski Date: Mon, 16 Feb 2009 21:31:27 +0100 Subject: Staging: comedi: usbduxfast: add comedi debug to Kconfig To: greg@kroah.com Cc: m.kozlowski@tuxland.pl Message-ID: <1234816289-9859-3-git-send-email-m.kozlowski@tuxland.pl> This patch moves CONFIG_COMEDI_DEBUG to Kconfig and cleans up the code as it didn't actually compile with debug enabled. Signed-off-by: Mariusz Kozlowski Cc: Bernd Porr Cc: David Schleef Cc: Frank Mori Hess Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/Kconfig | 7 ++++ drivers/staging/comedi/drivers/usbduxfast.c | 46 +++++++++++++--------------- 2 files changed, 29 insertions(+), 24 deletions(-) --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c @@ -59,10 +59,6 @@ Status: testing #include "comedi_fc.h" #include "../comedidev.h" -// (un)comment this if you want to have debug info. -//#define CONFIG_COMEDI_DEBUG -#undef CONFIG_COMEDI_DEBUG - #define BOARDNAME "usbduxfast" // timeout for the USB-transfer @@ -189,26 +185,29 @@ static DECLARE_MUTEX(start_stop_sem); static int send_dux_commands(usbduxfastsub_t * this_usbduxfastsub, int cmd_type) { - int result, nsent; + int tmp, nsent; + this_usbduxfastsub->dux_commands[0] = cmd_type; + #ifdef CONFIG_COMEDI_DEBUG - int i; - printk("comedi%d: usbduxfast: dux_commands: ", + printk(KERN_DEBUG "comedi%d: usbduxfast: dux_commands: ", this_usbduxfastsub->comedidev->minor); - for (i = 0; i < SIZEOFDUXBUFFER; i++) { - printk(" %02x", this_usbduxfastsub->dux_commands[i]); - } + for (tmp = 0; tmp < SIZEOFDUXBUFFER; tmp++) + printk(" %02x", this_usbduxfastsub->dux_commands[tmp]); printk("\n"); #endif - result = usb_bulk_msg(this_usbduxfastsub->usbdev, + + tmp = usb_bulk_msg(this_usbduxfastsub->usbdev, usb_sndbulkpipe(this_usbduxfastsub->usbdev, CHANNELLISTEP), this_usbduxfastsub->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000); - if (result < 0) { - printk("comedi%d: could not transmit dux_commands to the usb-device, err=%d\n", this_usbduxfastsub->comedidev->minor, result); - } - return result; + if (tmp < 0) + printk(KERN_ERR "comedi%d: could not transmit dux_commands to" + "the usb-device, err=%d\n", + this_usbduxfastsub->comedidev->minor, tmp); + + return tmp; } // Stops the data acquision @@ -548,10 +547,10 @@ int usbduxfastsub_submit_InURBs(usbduxfa SIZEINBUF, usbduxfastsub_ai_Irq, usbduxfastsub->comedidev); #ifdef CONFIG_COMEDI_DEBUG - printk("comedi%d: usbduxfast: submitting in-urb: %x,%x\n", + printk("comedi%d: usbduxfast: submitting in-urb: 0x%p,0x%p\n", usbduxfastsub->comedidev->minor, - (int)(usbduxfastsub->urbIn->context), - (int)(usbduxfastsub->urbIn->dev)); + usbduxfastsub->urbIn->context, + usbduxfastsub->urbIn->dev); #endif errFlag = usb_submit_urb(usbduxfastsub->urbIn, GFP_ATOMIC); if (errFlag) { @@ -826,9 +825,8 @@ static int usbduxfast_ai_cmd(comedi_devi return -EINVAL; } #ifdef CONFIG_COMEDI_DEBUG - printk("comedi%d: usbduxfast: steps=%ld, convert_arg=%u, ai_timer=%u\n", - dev->minor, - steps, cmd->convert_arg, this_usbduxfastsub->ai_timer); + printk("comedi%d: usbduxfast: steps=%ld, convert_arg=%u\n", + dev->minor, steps, cmd->convert_arg); #endif switch (cmd->chanlist_len) { @@ -1211,10 +1209,10 @@ static int usbduxfast_ai_insn_read(comed return err; } #ifdef CONFIG_COMEDI_DEBUG - printk("comedi%d: usbduxfast: submitting in-urb: %x,%x\n", + printk("comedi%d: usbduxfast: submitting in-urb: 0x%p,0x%p\n", usbduxfastsub->comedidev->minor, - (int)(usbduxfastsub->urbIn->context), - (int)(usbduxfastsub->urbIn->dev)); + usbduxfastsub->urbIn->context, + usbduxfastsub->urbIn->dev); #endif for (i = 0; i < PACKETS_TO_IGNORE; i++) { err = usb_bulk_msg(usbduxfastsub->usbdev, --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -6,6 +6,13 @@ config COMEDI Enable support a wide range of data acquision devices for Linux. +config COMEDI_DEBUG + bool "Comedi debugging" + depends on COMEDI != n + help + This is an option for use by developers; most people should + say N here. This enables comedi core and driver debugging. + config COMEDI_RT tristate "Comedi Real-time support" depends on COMEDI && RT