DAC merge and rework, part 2.

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

1 files changed, 54 insertions, 0 deletions

diff --git a/os/hal/src/dac.c b/os/hal/src/dac.c
index b4a659791..a4cb5aa10 100644
--- a/os/hal/src/dac.c
+++ b/os/hal/src/dac.c
@@ -196,6 +196,60 @@ void dacStartConversionI(DACDriver *dacp,
   dac_lld_start_conversion(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
+ *
+ * @api
+ */
+void dacStopConversion(DACDriver *dacp) {
+
+  chDbgCheck(dacp != NULL, "dacStopConversion");
+
+  chSysLock();
+  chDbgAssert((dacp->state == DAC_READY) ||
+              (dacp->state == DAC_ACTIVE),
+              "dacStopConversion(), #1", "invalid state");
+  if (dacp->state != DAC_READY) {
+    adc_lld_stop_conversion(dacp);
+    dacp->grpp  = NULL;
+    dacp->state = DAC_READY;
+    _dac_reset_s(dacp);
+  }
+  chSysUnlock();
+}
+
+/**
+ * @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 dacStopConversionI(DACDriver *dacp) {
+
+  chDbgCheckClassI();
+  chDbgCheck(dacp != NULL, "dacStopConversionI");
+  chDbgAssert((dacp->state == DAC_READY) ||
+              (dacp->state == DAC_ACTIVE) ||
+              (dacp->state == DAC_COMPLETE),
+              "dacStopConversionI(), #1", "invalid state");
+
+  if (dacp->state != DAC_READY) {
+    adc_lld_stop_conversion(dacp);
+    dacp->grpp  = NULL;
+    dacp->state = DAC_READY;
+    _dac_reset_i(dacp);
+  }
+}
+
 #if DAC_USE_WAIT || defined(__DOXYGEN__)
 /**
  * @brief   Performs a DAC conversion.