From 099fc179cc2ce75fd43ed6c5524aea4ca5d77ea0 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 2 Nov 2014 10:06:54 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7456
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/templates/adc_lld.h | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'os/hal/templates/adc_lld.h')

diff --git a/os/hal/templates/adc_lld.h b/os/hal/templates/adc_lld.h
index c7b4ca9cf..1ee25bf48 100644
--- a/os/hal/templates/adc_lld.h
+++ b/os/hal/templates/adc_lld.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+    ChibiOS/HAL - Copyright (C) 2006-2014 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 */
 
 /**
- * @file    templates/adc_lld.h
- * @brief   ADC Driver subsystem low level driver header template.
+ * @file    PLATFORMF/adc_lld.h
+ * @brief   PLATFORMF ADC subsystem low level driver header.
  *
  * @addtogroup ADC
  * @{
@@ -45,7 +45,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(PLATFORM_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define PLATFORM_ADC_USE_ADC1               FALSE
+#define PLATFORM_ADC_USE_ADC1                  FALSE
 #endif
 /** @} */
 
@@ -74,7 +74,8 @@ typedef uint16_t adc_channels_num_t;
  */
 typedef enum {
   ADC_ERR_DMAFAILURE = 0,                   /**< DMA operations failure.    */
-  ADC_ERR_OVERFLOW = 1                      /**< ADC overflow condition.    */
+  ADC_ERR_OVERFLOW = 1,                     /**< ADC overflow condition.    */
+  ADC_ERR_AWD = 2                           /**< Analog watchdog triggered. */
 } adcerror_t;
 
 /**
@@ -105,14 +106,15 @@ typedef void (*adcerrorcallback_t)(ADCDriver *adcp, adcerror_t err);
  * @brief   Conversion group configuration structure.
  * @details This implementation-dependent structure describes a conversion
  *          operation.
- * @note    Implementations may extend this structure to contain more,
- *          architecture dependent, fields.
+ * @note    The use of this configuration structure requires knowledge of
+ *          PLATFORM ADC cell registers interface, please refer to the PLATFORM
+ *          reference manual for details.
  */
 typedef struct {
   /**
    * @brief   Enables the circular buffer mode for the group.
    */
-  bool_t                    circular;
+  bool                      circular;
   /**
    * @brief   Number of the analog channels belonging to the conversion group.
    */
@@ -141,40 +143,36 @@ typedef struct {
  */
 struct ADCDriver {
   /**
-   * @brief   Driver state.
+   * @brief Driver state.
    */
   adcstate_t                state;
   /**
-   * @brief   Current configuration data.
+   * @brief Current configuration data.
    */
   const ADCConfig           *config;
   /**
-   * @brief   Current samples buffer pointer or @p NULL.
+   * @brief Current samples buffer pointer or @p NULL.
    */
   adcsample_t               *samples;
   /**
-   * @brief   Current samples buffer depth or @p 0.
+   * @brief Current samples buffer depth or @p 0.
    */
   size_t                    depth;
   /**
-   * @brief   Current conversion group pointer or @p NULL.
+   * @brief Current conversion group pointer or @p NULL.
    */
   const ADCConversionGroup  *grpp;
 #if ADC_USE_WAIT || defined(__DOXYGEN__)
   /**
-   * @brief   Waiting thread.
+   * @brief Waiting thread.
    */
-  Thread                    *thread;
+  thread_reference_t        thread;
 #endif
 #if ADC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
-#if CH_USE_MUTEXES || defined(__DOXYGEN__)
   /**
-   * @brief   Mutex protecting the peripheral.
+   * @brief Mutex protecting the peripheral.
    */
-  Mutex                     mutex;
-#elif CH_USE_SEMAPHORES
-  Semaphore                 semaphore;
-#endif
+  mutex_t                   mutex;
 #endif /* ADC_USE_MUTUAL_EXCLUSION */
 #if defined(ADC_DRIVER_EXT_FIELDS)
   ADC_DRIVER_EXT_FIELDS
-- 
cgit v1.2.3