From 726aa34df0f109856484df20dc9a4c1a3dd6a642 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Thu, 15 Apr 2021 13:19:25 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14191
 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

---
 os/hal/ports/RP/LLD/DMAv1/rp_dma.c |  8 ++++----
 os/hal/ports/RP/LLD/DMAv1/rp_dma.h | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/os/hal/ports/RP/LLD/DMAv1/rp_dma.c b/os/hal/ports/RP/LLD/DMAv1/rp_dma.c
index a814e1414..e30d340dd 100644
--- a/os/hal/ports/RP/LLD/DMAv1/rp_dma.c
+++ b/os/hal/ports/RP/LLD/DMAv1/rp_dma.c
@@ -78,7 +78,7 @@ void dmaInit(void) {
  *
  * @iclass
  */
-const rp_dma_channel_t *dmaStreamAllocI(uint32_t id,
+const rp_dma_channel_t *dmaChannelAllocI(uint32_t id,
                                         rp_dmaisr_t func,
                                         void *param) {
 }
@@ -100,7 +100,7 @@ const rp_dma_channel_t *dmaStreamAllocI(uint32_t id,
  *
  * @api
  */
-const rp_dma_channel_t *dmaStreamAlloc(uint32_t id,
+const rp_dma_channel_t *dmaChannelAlloc(uint32_t id,
                                          uint32_t priority,
                                          rp_dmaisr_t func,
                                          void *param) {
@@ -113,7 +113,7 @@ const rp_dma_channel_t *dmaStreamAlloc(uint32_t id,
  *
  * @iclass
  */
-void dmaStreamFreeI(const rp_dma_channel_t *dmachp) {
+void dmaChannelFreeI(const rp_dma_channel_t *dmachp) {
 }
 
 /**
@@ -123,7 +123,7 @@ void dmaStreamFreeI(const rp_dma_channel_t *dmachp) {
  *
  * @api
  */
-void dmaStreamFree(const rp_dma_channel_t *dmachp) {
+void dmaChannelFree(const rp_dma_channel_t *dmachp) {
 }
 
 /**
diff --git a/os/hal/ports/RP/LLD/DMAv1/rp_dma.h b/os/hal/ports/RP/LLD/DMAv1/rp_dma.h
index 17612afe7..28403628a 100644
--- a/os/hal/ports/RP/LLD/DMAv1/rp_dma.h
+++ b/os/hal/ports/RP/LLD/DMAv1/rp_dma.h
@@ -46,7 +46,7 @@
                                          ((id) <= (RP_DMA_CHANNELS + 1U)))
 
 /**
- * @name    Special stream identifiers
+ * @name    Special channel identifiers
  * @{
  */
 #define RP_DMA_STREAM_ID_ANY            RP_DMA_CHANNELS
@@ -74,7 +74,7 @@
 typedef void (*rp_dmaisr_t)(void *p, uint32_t flags);
 
 /**
- * @brief   RP DMA stream descriptor structure.
+ * @brief   RP DMA channel descriptor structure.
  */
 typedef struct {
   DMA_TypeDef           *dma;           /**< @brief Associated DMA.         */
@@ -95,21 +95,21 @@ typedef struct {
 /*===========================================================================*/
 
 #if !defined(__DOXYGEN__)
-extern const stm32_dma_stream_t _stm32_dma_streams[STM32_DMA_STREAMS];
+extern const rp_dma_channel_t __rp_dma_channels[RP_DMA_CHANNELS];
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
   void dmaInit(void);
-  const rp_dma_channel_t *dmaStreamAllocI(uint32_t id,
+  const rp_dma_channel_t *dmaChannelAllocI(uint32_t id,
                                           rp_dmaisr_t func,
                                           void *param);
-  const rp_dma_channel_t *dmaStreamAlloc(uint32_t id,
+  const rp_dma_channel_t *dmaChannelAlloc(uint32_t id,
                                          rp_dmaisr_t func,
                                          void *param);
-  void dmaStreamFreeI(const rp_dma_channel_t *dmachp);
-  void dmaStreamFree(const rp_dma_channel_t *dmachp);
+  void dmaChannelFreeI(const rp_dma_channel_t *dmachp);
+  void dmaChannelFree(const rp_dma_channel_t *dmachp);
   void dmaServeInterrupt(const rp_dma_channel_t *dmachp);
 #ifdef __cplusplus
 }