git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3381 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 21 insertions, 9 deletions

diff --git a/os/hal/platforms/STM32F1xx/adc_lld.h b/os/hal/platforms/STM32F1xx/adc_lld.h
index 1d1052f50..e3a327afa 100644
--- a/os/hal/platforms/STM32F1xx/adc_lld.h
+++ b/os/hal/platforms/STM32F1xx/adc_lld.h
@@ -108,15 +108,6 @@
 #define STM32_ADC_ADC1_IRQ_PRIORITY         5

 #endif

 

-/**

- * @brief   ADC DMA error hook.

- * @note    The default action for DMA errors is a system halt because DMA

- *          error can only happen because programming errors.

- */

-#if !defined(STM32_ADC_DMA_ERROR_HOOK) || defined(__DOXYGEN__)

-#define STM32_ADC_DMA_ERROR_HOOK(adcp)      chSysHalt()

-#endif

-

 /*===========================================================================*/

 /* Derived constants and error checks.                                       */

 /*===========================================================================*/

@@ -148,6 +139,15 @@ typedef uint16_t adcsample_t;
 typedef uint16_t adc_channels_num_t;

 

 /**

+ * @brief   Possible ADC failure causes.

+ * @note    Error codes are architecture dependent and should not relied

+ *          upon.

+ */

+typedef enum {

+  ADC_ERR_DMAFAILURE = 0                    /**< DMA operations failure.    */

+} adcerror_t;

+

+/**

  * @brief   Type of a structure representing an ADC driver.

  */

 typedef struct ADCDriver ADCDriver;

@@ -163,6 +163,14 @@ typedef struct ADCDriver ADCDriver;
 typedef void (*adccallback_t)(ADCDriver *adcp, adcsample_t *buffer, size_t n);

 

 /**

+ * @brief   ADC error callback type.

+ *

+ * @param[in] adcp      pointer to the @p ADCDriver object triggering the

+ *                      callback

+ */

+typedef void (*adcerrorcallback_t)(ADCDriver *adcp, adcerror_t err);

+

+/**

  * @brief   Conversion group configuration structure.

  * @details This implementation-dependent structure describes a conversion

  *          operation.

@@ -183,6 +191,10 @@ typedef struct {
    * @brief   Callback function associated to the group or @p NULL.

    */

   adccallback_t             end_cb;

+  /**

+   * @brief   Error callback or @p NULL.

+   */

+  adcerrorcallback_t        error_cb;

   /* End of the mandatory fields.*/

   /**

    * @brief   ADC CR1 register initialization data.