Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion targets/TARGET_STM/TARGET_STM32F4/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_STM/TARGET_STM32F7/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
22 changes: 6 additions & 16 deletions targets/TARGET_STM/TARGET_STM32G0/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,16 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_TX},
{1, 3, DMA_REQUEST_SPI2_TX},
#ifdef DMA2
// For better performance, on devices with DMA2 (STM32G0Bxx/Cxx), put SPI3 on DMA2
{2, 1, DMA_REQUEST_SPI3_TX}
#else
{1, 5, DMA_REQUEST_SPI3_TX}
#endif
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX}
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 2, DMA_REQUEST_SPI1_RX},
{1, 4, DMA_REQUEST_SPI2_RX},
#ifdef DMA2
// For better performance, on devices with DMA2 (STM32G0Bxx/Cxx), put SPI3 on DMA2
{2, 2, DMA_REQUEST_SPI3_RX}
#else
{1, 6, DMA_REQUEST_SPI3_RX}
#endif
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX}
};


Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_STM/TARGET_STM32G4/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32G4/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_TX},
{1, 3, DMA_REQUEST_SPI2_TX},
{1, 5, DMA_REQUEST_SPI3_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX},
#ifdef SPI4
{2, 1, DMA_REQUEST_SPI4_TX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI4_TX}
#endif
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 2, DMA_REQUEST_SPI1_RX},
{1, 4, DMA_REQUEST_SPI2_RX},
{1, 6, DMA_REQUEST_SPI3_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX},
#ifdef SPI4
{2, 2, DMA_REQUEST_SPI4_RX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI4_RX}
#endif
};

/// Mapping from QSPI index to DMA link info
static const DMALinkInfo QSPIDMALinks[] = {
#if defined(QUADSPI)
{1, 7, DMA_REQUEST_QUADSPI },
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_QUADSPI },
#endif
};

Expand Down
6 changes: 4 additions & 2 deletions targets/TARGET_STM/TARGET_STM32H5/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
DMAHandlePointer dmaHandleTX;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand All @@ -118,7 +119,8 @@ struct ospi_s {
PinName sclk;
PinName ssel;
PinName dqs;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
DMAHandlePointer dmaHandleTX;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
28 changes: 14 additions & 14 deletions targets/TARGET_STM/TARGET_STM32H5/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 0, GPDMA1_REQUEST_SPI1_TX},
{1, 2, GPDMA1_REQUEST_SPI2_TX},
{1, 4, GPDMA1_REQUEST_SPI3_TX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI3_TX}
#if defined (SPI4)
,{1, 6, GPDMA1_REQUEST_SPI4_TX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI4_TX}
#endif
#if defined (SPI5)
,{2, 0, GPDMA2_REQUEST_SPI5_TX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_SPI5_TX}
#endif
#if defined (SPI6)
,{2, 2, GPDMA2_REQUEST_SPI6_TX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_SPI6_TX}
#endif
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 1, GPDMA1_REQUEST_SPI1_RX},
{1, 3, GPDMA1_REQUEST_SPI2_RX},
{1, 5, GPDMA1_REQUEST_SPI3_TX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI3_TX}
#if defined (SPI4)
,{1, 7, GPDMA1_REQUEST_SPI4_RX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA1_REQUEST_SPI4_RX}
#endif
#if defined (SPI5)
,{2, 1, GPDMA2_REQUEST_SPI5_RX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_SPI5_RX}
#endif
#if defined (SPI6)
,{2, 3, GPDMA2_REQUEST_SPI6_RX}
,{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_SPI6_RX}
#endif
};

/// Mapping from OSPI index to DMA link info
#ifdef OCTOSPI1
static const DMALinkInfo OSPIDMALinks[] = {
{2, 4, GPDMA2_REQUEST_OCTOSPI1},
{2, 5, GPDMA2_REQUEST_OCTOSPI1},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_OCTOSPI1},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, GPDMA2_REQUEST_OCTOSPI1},
};
#endif

Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_STM/TARGET_STM32H7/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand All @@ -125,7 +125,7 @@ struct ospi_s {
PinName sclk;
PinName ssel;
PinName dqs;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
26 changes: 13 additions & 13 deletions targets/TARGET_STM/TARGET_STM32H7/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,31 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_TX},
{1, 3, DMA_REQUEST_SPI2_TX},
{1, 5, DMA_REQUEST_SPI3_TX},
{1, 7, DMA_REQUEST_SPI4_TX},
{2, 1, DMA_REQUEST_SPI5_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI4_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI5_TX},
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 0, DMA_REQUEST_SPI1_RX},
{1, 2, DMA_REQUEST_SPI2_RX},
{1, 4, DMA_REQUEST_SPI3_RX},
{1, 6, DMA_REQUEST_SPI4_RX},
{2, 0, DMA_REQUEST_SPI5_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI4_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI5_RX},
};

/// Mapping from QSPI/OSPI index to DMA link info
#if defined(OCTOSPI1)
static const DMALinkInfo OSPIDMALinks[] = {
{MDMA_IDX, 0, MDMA_REQUEST_OCTOSPI1_FIFO_TH},
{MDMA_IDX, 1, MDMA_REQUEST_OCTOSPI2_FIFO_TH}
{MDMA_IDX, MBED_ANY_DMA_CHANNEL, MDMA_REQUEST_OCTOSPI1_FIFO_TH},
{MDMA_IDX, MBED_ANY_DMA_CHANNEL, MDMA_REQUEST_OCTOSPI2_FIFO_TH}
};
#else
static const DMALinkInfo QSPIDMALinks[] = {
{MDMA_IDX, 0, MDMA_REQUEST_QUADSPI_FIFO_TH},
{MDMA_IDX, MBED_ANY_DMA_CHANNEL, MDMA_REQUEST_QUADSPI_FIFO_TH},
};
#endif

Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_STM/TARGET_STM32L4/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand All @@ -147,7 +147,7 @@ struct ospi_s {
PinName sclk;
PinName ssel;
PinName dqs;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
16 changes: 8 additions & 8 deletions targets/TARGET_STM/TARGET_STM32L4/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_TX},
{1, 3, DMA_REQUEST_SPI2_TX},
{1, 5, DMA_REQUEST_SPI3_TX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX}
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 2, DMA_REQUEST_SPI1_RX},
{1, 4, DMA_REQUEST_SPI2_RX},
{1, 6, DMA_REQUEST_SPI3_RX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX}
};

/// Mapping from OSPI index to DMA link info
static const DMALinkInfo OSPIDMALinks[] = {
{1, 7, DMA_REQUEST_OCTOSPI1},
{2, 1, DMA_REQUEST_OCTOSPI2},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_OCTOSPI1},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_OCTOSPI2},
};

#else
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_STM/TARGET_STM32L5/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand All @@ -142,7 +142,7 @@ struct ospi_s {
PinName sclk;
PinName ssel;
PinName dqs;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
14 changes: 7 additions & 7 deletions targets/TARGET_STM/TARGET_STM32L5/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_TX},
{1, 3, DMA_REQUEST_SPI2_TX},
{1, 5, DMA_REQUEST_SPI3_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX},
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 2, DMA_REQUEST_SPI1_RX},
{1, 4, DMA_REQUEST_SPI2_RX},
{1, 6, DMA_REQUEST_SPI3_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX},
};

/// Mapping from OSPI index to DMA link info
static const DMALinkInfo OSPIDMALinks[] = {
{1, 7, DMA_REQUEST_OCTOSPI1},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_OCTOSPI1},
};

#endif //MBED_OS_STM_DMA_INFO_H
12 changes: 6 additions & 6 deletions targets/TARGET_STM/TARGET_STM32U0/stm_dma_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@

/// Mapping from SPI index to DMA link info for Tx
static const DMALinkInfo SPITxDMALinks[] = {
{1, 2, DMA_REQUEST_SPI1_TX},
{1, 4, DMA_REQUEST_SPI2_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_TX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_TX},
#if defined (SPI3)
{1, 6, DMA_REQUEST_SPI3_TX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_TX}
#endif
};

/// Mapping from SPI index to DMA link info for Rx
static const DMALinkInfo SPIRxDMALinks[] = {
{1, 1, DMA_REQUEST_SPI1_RX},
{1, 3, DMA_REQUEST_SPI2_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI1_RX},
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI2_RX},
#if defined (SPI3)
{1, 5, DMA_REQUEST_SPI3_RX}
{MBED_ANY_GPDMA_MODULE, MBED_ANY_DMA_CHANNEL, DMA_REQUEST_SPI3_RX}
#endif
};

Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_STM/TARGET_STM32U5/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct qspi_s {
PinName io3;
PinName sclk;
PinName ssel;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand All @@ -142,7 +142,7 @@ struct ospi_s {
PinName sclk;
PinName ssel;
PinName dqs;
bool dmaInitialized;
DMAHandlePointer dmaHandle;
#if MBED_CONF_RTOS_PRESENT
osSemaphoreId_t semaphoreId;
osRtxSemaphore_t semaphoreMem;
Expand Down
Loading