dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Remove the PWM pulse count method. It can't be support on current hardware 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4201 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-12-19 19:35:52 +00:00
parent add995c32e
commit c0424dae99
3 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nuttx/arch/arm/src/stm32/stm32_pwm.c
View File

@ -115,7 +115,6 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev);
static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev);
static int pwm_start(FAR struct pwm_lowerhalf_s *dev, FAR const struct pwm_info_s *info); static int pwm_start(FAR struct pwm_lowerhalf_s *dev, FAR const struct pwm_info_s *info);
static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); static int pwm_stop(FAR struct pwm_lowerhalf_s *dev);
static int pwm_pulsecount(FAR struct pwm_lowerhalf_s *dev, FAR pwm_count_t *count);
static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg);
/**************************************************************************** /****************************************************************************
@ -129,7 +128,6 @@ static const struct pwm_ops_s g_pwmops =
.shutdown = pwm_shutdown, .shutdown = pwm_shutdown,
.start = pwm_start, .start = pwm_start,
.stop = pwm_stop, .stop = pwm_stop,
.pulsecount = pwm_pulsecount,
.ioctl = pwm_ioctl, .ioctl = pwm_ioctl,
}; };
@ -797,27 +795,6 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
return OK; return OK;
} }
/****************************************************************************
* Name: pwm_pulsecount
*
* Description:
* Get the number of pulses generated
*
* Input parameters:
* dev - A reference to the lower half PWM driver state structure
* count - A pointer to the location to return the pulse count
*
* Returned Value:
* Zero on success; a negated errno value on failure
*
****************************************************************************/
static int pwm_pulsecount(FAR struct pwm_lowerhalf_s *dev, FAR pwm_count_t *count)
{
#warning "Missing logic"
return -ENOSYS;
}
/**************************************************************************** /****************************************************************************
* Name: * Name:
* *

13
nuttx/drivers/pwm.c
View File

@ -343,19 +343,6 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
} }
break; break;
/* PWMIOC_GETPULSECOUNT - Return the number of pulses generated.
*
* ioctl argument: A pointer to a pwm_count_t variable that will be used to
* receive the pulse count
*/
case PWMIOC_GETPULSECOUNT:
{
FAR pwm_count_t *count = (FAR pwm_count_t *)((uintptr_t)arg);
ret = lower->ops->pulsecount(lower, count);
}
break;
/* Any unrecognized IOCTL commands might be platform-specific ioctl commands */ /* Any unrecognized IOCTL commands might be platform-specific ioctl commands */
default: default:

23
nuttx/include/nuttx/pwm.h
View File

@ -94,18 +94,12 @@
* PWMIOC_STOP - Stop the pulsed output. * PWMIOC_STOP - Stop the pulsed output.
* *
* ioctl argument: None * ioctl argument: None
*
* PWMIOC_GETPULSECOUNT - Return the number of pulses generated.
*
* ioctl argument: A pointer to a pwm_count_t variable that will be used to
* receive the pulse count
*/ */
#define PWMIOC_SETCHARACTERISTICS _PWMIOC(1) #define PWMIOC_SETCHARACTERISTICS _PWMIOC(1)
#define PWMIOC_GETCHARACTERISTICS _PWMIOC(2) #define PWMIOC_GETCHARACTERISTICS _PWMIOC(2)
#define PWMIOC_START _PWMIOC(3) #define PWMIOC_START _PWMIOC(3)
#define PWMIOC_STOP _PWMIOC(4) #define PWMIOC_STOP _PWMIOC(4)
#define PWMIOC_GETPULSECOUNT _PWMIOC(5)
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
@ -118,19 +112,6 @@ struct pwm_info_s
ub16_t duty; /* Duty of the pulse train, "1" to "0" duration */ ub16_t duty; /* Duty of the pulse train, "1" to "0" duration */
}; };
/* This type is used to return pulse counts */
#ifdef CONFIG_HAVE_LONG_LONG
typedef uint16_t pwm_count_t;
#else
struct pwm_count_s
{
uint32_t ms; /* Most significant 32-bits of the 64-count */
uint32_t ls; /* Least significant 32-bits of the 64-count */
};
typedef struct pwm_count_s pwm_count_t;
#endif
/* This structure is a set a callback functions used to call from the upper- /* This structure is a set a callback functions used to call from the upper-
* half, generic PWM driver into lower-half, platform-specific logic that * half, generic PWM driver into lower-half, platform-specific logic that
* supports the low-level timer outputs. * supports the low-level timer outputs.
@ -161,10 +142,6 @@ struct pwm_ops_s
CODE int (*stop)(FAR struct pwm_lowerhalf_s *dev); CODE int (*stop)(FAR struct pwm_lowerhalf_s *dev);
/* Get the number of pulses generated */
CODE int (*pulsecount)(FAR struct pwm_lowerhalf_s *dev, FAR pwm_count_t *count);
/* Lower-half logic may support platform-specific ioctl commands */ /* Lower-half logic may support platform-specific ioctl commands */
CODE int (*ioctl)(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); CODE int (*ioctl)(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg);