From 785e5d308364be7146546338d5e44bfa8ccf6d3d Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Fri, 28 Mar 2008 14:07:45 +0000 Subject: [PATCH] Changed INSN_GET_PWM_STATUS to INSN_CONFIG_GET_PWM_STATUS. --- comedi/drivers/usbdux.c | 2 +- include/linux/comedi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c index f2ecc6c1..3c352e41 100644 --- a/comedi/drivers/usbdux.c +++ b/comedi/drivers/usbdux.c @@ -2184,7 +2184,7 @@ static int usbdux_pwm_config(comedi_device * dev, comedi_subdevice * s, dev->minor); #endif return usbdux_pwm_cancel(dev, s); - case INSN_GET_PWM_STATUS: + case INSN_CONFIG_GET_PWM_STATUS: // to check if the USB transmission has failed or in case // PWM was limited to n cycles to check if it has terminated data[1] = this_usbduxsub->pwm_cmd_running; diff --git a/include/linux/comedi.h b/include/linux/comedi.h index d0e3d571..ca9496a6 100644 --- a/include/linux/comedi.h +++ b/include/linux/comedi.h @@ -264,7 +264,7 @@ extern "C" { /* PWM */ INSN_CONFIG_PWM_SET_PERIOD = 5000, /* sets frequency */ INSN_CONFIG_PWM_GET_PERIOD = 5001, /* gets frequency */ - INSN_GET_PWM_STATUS = 5002, /* is it running? */ + INSN_CONFIG_GET_PWM_STATUS = 5002, /* is it running? */ INSN_CONFIG_PWM_SET_H_BRIDGE = 5003, /* sets H bridge: duty cycle and sign bit for a relay at the same time*/ INSN_CONFIG_PWM_GET_H_BRIDGE = 5004 /* gets H bridge data: duty cycle and the sign bit */ }; @@ -837,7 +837,7 @@ CR_INVERT to change polarity. */ AMPLC_DIO_CLK_1KHZ, /* 1 kHz internal clock */ AMPLC_DIO_CLK_OUTNM1, /* output of preceding counter channel (for channel 0, preceding counter - channel is channel 2 on preceding + channel is channel 2 on preceding counter subdevice, for first counter subdevice, preceding counter subdevice is the last counter -- 2.26.2