Fixed bugs 3039890, 3041117, 3041414.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.0.x@2120 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
1186555441
commit
5ff5f548f8
|
@ -392,7 +392,7 @@ void pwm_lld_stop(PWMDriver *pwmp) {
|
||||||
RCC->APB1ENR &= ~RCC_APB1ENR_TIM3EN;
|
RCC->APB1ENR &= ~RCC_APB1ENR_TIM3EN;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if USE_STM32_PWM2
|
#if USE_STM32_PWM4
|
||||||
if (&PWMD4 == pwmp) {
|
if (&PWMD4 == pwmp) {
|
||||||
NVICDisableVector(TIM4_IRQn);
|
NVICDisableVector(TIM4_IRQn);
|
||||||
RCC->APB1ENR &= ~RCC_APB1ENR_TIM4EN;
|
RCC->APB1ENR &= ~RCC_APB1ENR_TIM4EN;
|
||||||
|
|
|
@ -121,11 +121,10 @@ void adcStop(ADCDriver *adcp) {
|
||||||
* @brief Starts an ADC conversion.
|
* @brief Starts an ADC conversion.
|
||||||
* @details Starts a conversion operation, there are two kind of conversion
|
* @details Starts a conversion operation, there are two kind of conversion
|
||||||
* modes:
|
* modes:
|
||||||
* - <b>LINEAR</b>, this mode is activated when the @p callback
|
* - <b>LINEAR</b>, in this mode the buffer is filled once and then
|
||||||
* parameter is set to @p NULL, in this mode the buffer is filled
|
* the conversion stops automatically.
|
||||||
* once and then the conversion stops automatically.
|
* - <b>CIRCULAR</b>, in this mode the conversion never stops and
|
||||||
* - <b>CIRCULAR</b>, when a callback function is defined the
|
* the buffer is filled circularly.<br>
|
||||||
* conversion never stops and the buffer is filled circularly.
|
|
||||||
* During the conversion the callback function is invoked when
|
* During the conversion the callback function is invoked when
|
||||||
* the buffer is 50% filled and when the buffer is 100% filled,
|
* the buffer is 50% filled and when the buffer is 100% filled,
|
||||||
* this way is possible to process the conversion stream in real
|
* this way is possible to process the conversion stream in real
|
||||||
|
@ -142,7 +141,8 @@ void adcStop(ADCDriver *adcp) {
|
||||||
* @param[out] samples pointer to the samples buffer
|
* @param[out] samples pointer to the samples buffer
|
||||||
* @param[in] depth buffer depth (matrix rows number). The buffer depth
|
* @param[in] depth buffer depth (matrix rows number). The buffer depth
|
||||||
* must be one or an even number.
|
* must be one or an even number.
|
||||||
* @param[in] callback pointer to the conversion callback function
|
* @param[in] callback pointer to the conversion callback function, this
|
||||||
|
* parameter can be @p NULL if a callback is not required
|
||||||
* @return The operation status.
|
* @return The operation status.
|
||||||
* @retval FALSE the conversion has been started.
|
* @retval FALSE the conversion has been started.
|
||||||
* @retval TRUE the driver is busy, conversion not started.
|
* @retval TRUE the driver is busy, conversion not started.
|
||||||
|
|
|
@ -166,16 +166,14 @@ struct intctx {
|
||||||
* @note @p id can be a function name or a vector number depending on the
|
* @note @p id can be a function name or a vector number depending on the
|
||||||
* port implementation.
|
* port implementation.
|
||||||
*/
|
*/
|
||||||
#define PORT_IRQ_HANDLER(id) \
|
#define PORT_IRQ_HANDLER(id) void id(void)
|
||||||
__attribute__((interrupt("IRQ"))) void id(void)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Fast IRQ handler function declaration.
|
* @brief Fast IRQ handler function declaration.
|
||||||
* @note @p id can be a function name or a vector number depending on the
|
* @note @p id can be a function name or a vector number depending on the
|
||||||
* port implementation.
|
* port implementation.
|
||||||
*/
|
*/
|
||||||
#define PORT_FAST_IRQ_HANDLER(id) \
|
#define PORT_FAST_IRQ_HANDLER(id) void id(void)
|
||||||
__attribute__((interrupt("IRQ"))) void id(void)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Port-related initialization code.
|
* @brief Port-related initialization code.
|
||||||
|
|
|
@ -140,16 +140,14 @@ struct intctx {
|
||||||
* @note @p id can be a function name or a vector number depending on the
|
* @note @p id can be a function name or a vector number depending on the
|
||||||
* port implementation.
|
* port implementation.
|
||||||
*/
|
*/
|
||||||
#define PORT_IRQ_HANDLER(id) \
|
#define PORT_IRQ_HANDLER(id) void id(void)
|
||||||
__attribute__((interrupt("IRQ"))) void id(void)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Fast IRQ handler function declaration.
|
* @brief Fast IRQ handler function declaration.
|
||||||
* @note @p id can be a function name or a vector number depending on the
|
* @note @p id can be a function name or a vector number depending on the
|
||||||
* port implementation.
|
* port implementation.
|
||||||
*/
|
*/
|
||||||
#define PORT_FAST_IRQ_HANDLER(id) \
|
#define PORT_FAST_IRQ_HANDLER(id) void id(void)
|
||||||
__attribute__((interrupt("IRQ"))) void id(void)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Port-related initialization code.
|
* @brief Port-related initialization code.
|
||||||
|
|
Loading…
Reference in New Issue