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

5 files changed, 388 insertions, 3 deletions

diff --git a/os/hal/ports/STM32/LLD/DACv1/dac_lld.h b/os/hal/ports/STM32/LLD/DACv1/dac_lld.h
index 6bd8568ee..de21bda63 100644
--- a/os/hal/ports/STM32/LLD/DACv1/dac_lld.h
+++ b/os/hal/ports/STM32/LLD/DACv1/dac_lld.h
@@ -25,8 +25,6 @@
 #ifndef _DAC_LLD_H_

 #define _DAC_LLD_H_

 

-#include "stm32_tim.h"

-

 #if HAL_USE_DAC || defined(__DOXYGEN__)

 

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

@@ -150,7 +148,8 @@
 #if !defined(STM32_DAC_DAC2_CH2_DMA_PRIORITY) || defined(__DOXYGEN__)

 #define STM32_DAC_DAC2_CH2_DMA_PRIORITY     2

 #endif

-

+/** @} */

+ 

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

 /* Derived constants and error checks.                                       */

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

diff --git a/os/hal/templates/dac_lld.c b/os/hal/templates/dac_lld.c
new file mode 100644
index 000000000..69633354d
--- /dev/null
+++ b/os/hal/templates/dac_lld.c
@@ -0,0 +1,170 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 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.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    dac_lld.c

+ * @brief   PLATFORM DAC subsystem low level driver source.

+ *

+ * @addtogroup DAC

+ * @{

+ */

+

+#include "hal.h"

+

+#if (HAL_USE_DAC == TRUE) || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Driver local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported variables.                                                */

+/*===========================================================================*/

+

+/** @brief DAC1 driver identifier.*/

+#if (PLATFORM_DAC_USE_DAC1 == TRUE) || defined(__DOXYGEN__)

+DACDriver DACD1;

+#endif

+

+/*===========================================================================*/

+/* Driver local variables.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local functions.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver interrupt handlers.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported functions.                                                */

+/*===========================================================================*/

+

+/**

+ * @brief   Low level DAC driver initialization.

+ *

+ * @notapi

+ */

+void dac_lld_init(void) {

+

+#if PLATFORM_DAC_USE_DAC1 == TRUE

+  dacObjectInit(&DACD1);

+#endif

+}

+

+/**

+ * @brief   Configures and activates the DAC peripheral.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object

+ *

+ * @notapi

+ */

+void dac_lld_start(DACDriver *dacp) {

+

+  /* If the driver is in DAC_STOP state then a full initialization is

+     required.*/

+  if (dacp->state == DAC_STOP) {

+    /* Enabling the clock source.*/

+#if PLATFORM_DAC_USE_DAC1 == TRUE

+    if (&DACD1 == dacp) {

+

+    }

+#endif

+  }

+}

+

+/**

+ * @brief   Deactivates the DAC peripheral.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object

+ *

+ * @notapi

+ */

+void dac_lld_stop(DACDriver *dacp) {

+

+  /* If in ready state then disables the DAC clock.*/

+  if (dacp->state == DAC_READY) {

+

+    /* Disabling DAC.*/

+    dacp->params->dac->CR &= dacp->params->regmask;

+

+#if PLATFORM_DAC_USE_DAC1 == TRUE

+    if (&DACD1 == dacp) {

+

+    }

+#endif

+  }

+}

+

+/**

+ * @brief   Outputs a value directly on a DAC channel.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object

+ * @param[in] channel   DAC channel number

+ * @param[in] sample    value to be output

+ *

+ * @api

+ */

+void dac_lld_put_channel(DACDriver *dacp,

+                         dacchannel_t channel,

+                         dacsample_t sample) {

+

+  (void)dacp;

+  (void)channel;

+  (void)sample;

+}

+

+/**

+ * @brief   Starts a DAC conversion.

+ * @details Starts an asynchronous conversion operation.

+ * @note    In @p DAC_DHRM_8BIT_RIGHT mode the parameters passed to the

+ *          callback are wrong because two samples are packed in a single

+ *          dacsample_t element. This will not be corrected, do not rely

+ *          on those parameters.

+ * @note    In @p DAC_DHRM_8BIT_RIGHT_DUAL mode two samples are treated

+ *          as a single 16 bits sample and packed into a single dacsample_t

+ *          element. The num_channels must be set to one in the group

+ *          conversion configuration structure.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object

+ *

+ * @notapi

+ */

+void dac_lld_start_conversion(DACDriver *dacp) {

+

+  (void)dacp;

+}

+

+/**

+ * @brief   Stops an ongoing conversion.

+ * @details This function stops the currently ongoing conversion and returns

+ *          the driver in the @p DAC_READY state. If there was no conversion

+ *          being processed then the function does nothing.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object

+ *

+ * @iclass

+ */

+void dac_lld_stop_conversion(DACDriver *dacp) {

+

+  (void)dacp;

+}

+

+#endif /* HAL_USE_DAC == TRUE */

+

+/** @} */

diff --git a/os/hal/templates/dac_lld.h b/os/hal/templates/dac_lld.h
new file mode 100644
index 000000000..5d437fffd
--- /dev/null
+++ b/os/hal/templates/dac_lld.h
@@ -0,0 +1,211 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 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.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    dac_lld.h

+ * @brief   PLATFORM DAC subsystem low level driver header.

+ *

+ * @addtogroup DAC

+ * @{

+ */

+

+#ifndef _DAC_LLD_H_

+#define _DAC_LLD_H_

+

+#if HAL_USE_DAC || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

+/**

+ * @brief   Maximum number of DAC channels per unit.

+ */

+#define DAC_MAX_CHANNELS                    2

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/**

+ * @name    Configuration options

+ * @{

+ */

+/**

+ * @brief   DAC1 CH1 driver enable switch.

+ * @details If set to @p TRUE the support for DAC1 channel 1 is included.

+ * @note    The default is @p FALSE.

+ */

+#if !defined(PLATFORM_DAC_USE_DAC1) || defined(__DOXYGEN__)

+#define PLATFORM_DAC_USE_DAC1               FALSE

+#endif

+/** @} */

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief   Type of a DAC channel index.

+ */

+typedef uint32_t dacchannel_t;

+

+/**

+ * @brief   Type of a structure representing an DAC driver.

+ */

+typedef struct DACDriver DACDriver;

+

+/**

+ * @brief   Type representing a DAC sample.

+ */

+typedef uint16_t dacsample_t;

+

+/**

+ * @brief   Possible DAC failure causes.

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

+ *          upon.

+ */

+typedef enum {

+  DAC_ERR_DMAFAILURE = 0,                   /**< DMA operations failure.    */

+  DAC_ERR_UNDERFLOW = 1                     /**< DAC overflow condition.    */

+} dacerror_t;

+

+/**

+ * @brief   DAC notification callback type.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object triggering the

+ * @param[in] buffer    pointer to the next semi-buffer to be filled

+ * @param[in] n         number of buffer rows available starting from @p buffer

+ *                      callback

+ */

+typedef void (*daccallback_t)(DACDriver *dacp,

+                              const dacsample_t *buffer,

+                              size_t n);

+

+/**

+ * @brief   ADC error callback type.

+ *

+ * @param[in] dacp      pointer to the @p DACDriver object triggering the

+ *                      callback

+ * @param[in] err       ADC error code

+ */

+typedef void (*dacerrorcallback_t)(DACDriver *dacp, dacerror_t err);

+

+/**

+ * @brief   DAC Conversion group structure.

+ */

+typedef struct {

+  /**

+   * @brief   Number of DAC channels.

+   */

+  uint32_t                  num_channels;

+  /**

+   * @brief   Operation complete callback or @p NULL.

+   */

+  daccallback_t             end_cb;

+  /**

+   * @brief   Error handling callback or @p NULL.

+   */

+  dacerrorcallback_t        error_cb;

+  /* End of the mandatory fields.*/

+} DACConversionGroup;

+

+/**

+ * @brief   Driver configuration structure.

+ */

+typedef struct {

+  /* End of the mandatory fields.*/

+  uint32_t                  dummy;

+} DACConfig;

+

+/**

+ * @brief   Structure representing a DAC driver.

+ */

+struct DACDriver {

+  /**

+   * @brief   Driver state.

+   */

+  dacstate_t                state;

+  /**

+   * @brief   Conversion group.

+   */

+  const DACConversionGroup  *grpp;

+  /**

+   * @brief   Samples buffer pointer.

+   */

+  const dacsample_t         *samples;

+  /**

+   * @brief   Samples buffer size.

+   */

+  uint16_t                  depth;

+  /**

+   * @brief   Current configuration data.

+   */

+  const DACConfig           *config;

+#if DAC_USE_WAIT || defined(__DOXYGEN__)

+  /**

+   * @brief   Waiting thread.

+   */

+  thread_reference_t        thread;

+#endif /* DAC_USE_WAIT */

+#if DAC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

+  /**

+   * @brief   Mutex protecting the bus.

+   */

+  mutex_t                   mutex;

+#endif /* DAC_USE_MUTUAL_EXCLUSION */

+#if defined(DAC_DRIVER_EXT_FIELDS)

+  DAC_DRIVER_EXT_FIELDS

+#endif

+  /* End of the mandatory fields.*/

+};

+

+/*===========================================================================*/

+/* Driver macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#if PLATFORM_DAC_USE_DAC1 && !defined(__DOXYGEN__)

+extern DACDriver DACD1;

+#endif

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void dac_lld_init(void);

+  void dac_lld_start(DACDriver *dacp);

+  void dac_lld_stop(DACDriver *dacp);

+  void dac_lld_put_channel(DACDriver *dacp,

+                           dacchannel_t channel,

+                           dacsample_t sample);

+  void dac_lld_start_conversion(DACDriver *dacp);

+  void dac_lld_stop_conversion(DACDriver *dacp);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* HAL_USE_DAC */

+

+#endif /* _DAC_LLD_H_ */

+

+/** @} */

diff --git a/os/hal/templates/platform.mk b/os/hal/templates/platform.mk
index 80624fa14..19c7e6d42 100644
--- a/os/hal/templates/platform.mk
+++ b/os/hal/templates/platform.mk
@@ -2,6 +2,7 @@
 PLATFORMSRC = ${CHIBIOS}/os/hal/templates/hal_lld.c \

               ${CHIBIOS}/os/hal/templates/adc_lld.c \

               ${CHIBIOS}/os/hal/templates/can_lld.c \

+              ${CHIBIOS}/os/hal/templates/dac_lld.c \

               ${CHIBIOS}/os/hal/templates/ext_lld.c \

               ${CHIBIOS}/os/hal/templates/gpt_lld.c \

  			  ${CHIBIOS}/os/hal/templates/i2c_lld.c \

diff --git a/readme.txt b/readme.txt
index ea0afb799..f9d7ae22f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -73,6 +73,10 @@
 *** Releases and Change Log                                               ***

 *****************************************************************************

 

+*** 3.0.0p5 ***

+- HAL: Added DAC support to all STM32 sub-platforms, added another demo for

+       the STM32F3xx.

+

 *** 3.0.0p4 ***

 - BLD: New "smart build" mode added to makefiles, now only used files are

        compiled.