Updated SAMA drivers (still incomplete)

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12543 110e8d01-0319-4d1e-a829-52ad28d1bb01

1 files changed, 6 insertions, 6 deletions

diff --git a/os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.h b/os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.h
index 7918d834d..4e3ccf089 100644
--- a/os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.h
+++ b/os/hal/ports/SAMA/LLD/DMAv1/sama_xdmac.h
@@ -146,11 +146,11 @@ typedef struct {
 /**

  * @brief   Returns the number of transfers to be performed.

  * @note    This function can be invoked in both ISR or thread context.

- * @pre     The channel must have been allocated using @p dmaChannelAllocate().

- * @post    After use the channel can be released using @p dmaChannelRelease().

+ * @pre     The stream must have been allocated using @p dmaChannelAllocate().

+ * @post    After use the stream can be released using @p dmaChannelRelease().

  *

- * @param[in] dmachp     pointer to a @p sama_dma_channel_t structure

- * @return               The number of transfers to be performed.

+ * @param[in] dmachp       pointer to a @p sama_dma_channel_t structure

+ * @return              The number of transfers to be performed.

  *

  * @special

  */

@@ -214,7 +214,7 @@ typedef struct {
  * @special

  */

 #define dmaChannelEnable(dmachp) {                                      \

-  (dmachp)->xdmac->XDMAC_GE |= (XDMAC_GE_EN0 << ((dmachp)->chid));      \

+  (dmachp)->xdmac->XDMAC_GE = (XDMAC_GE_EN0 << ((dmachp)->chid));       \

 }

 

 /**

@@ -229,7 +229,7 @@ typedef struct {
  * @special

  */

 #define dmaChannelDisable(dmachp) {                                               \

-  (dmachp)->xdmac->XDMAC_GD |= XDMAC_GD_DI0 << ((dmachp)->chid);                  \

+  (dmachp)->xdmac->XDMAC_GD = XDMAC_GD_DI0 << ((dmachp)->chid);                   \

   while ((((dmachp)->xdmac->XDMAC_GS) & (XDMAC_GS_ST0 << (dmachp)->chid)) == 1) { \

     ;                                                                             \

   }                                                                               \