Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 11:59:58 +03:00
Code Issues Wiki Activity

Rename MOSI and MISO to SDO and SDI (#12469)

Browse source 
Rename MOSI/MISO
This commit is contained in:
Mark Haslinghuis 2023-03-07 18:33:48 +01:00 • committed by GitHub
parent 4d7092d215
commit ee2ee56eba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
375 changed files with 2131 additions and 2131 deletions
Download patch file Download diff file Expand all files Collapse all files

108
src/main/drivers/stm32/dma_reqmap_mcu.c
View file

@ -68,26 +68,26 @@ typedef struct dmaTimerMapping_s {
#define DMA_REQUEST_UART3_RX DMA_REQUEST_USART3_RX
#define DMA_REQUEST_UART3_TX DMA_REQUEST_USART3_TX
// Resolve our preference for MOSI/MISO rather than TX/RX
#define DMA_REQUEST_SPI1_MOSI DMA_REQUEST_SPI1_TX
#define DMA_REQUEST_SPI1_MISO DMA_REQUEST_SPI1_RX
#define DMA_REQUEST_SPI2_MOSI DMA_REQUEST_SPI2_TX
#define DMA_REQUEST_SPI2_MISO DMA_REQUEST_SPI2_RX
#define DMA_REQUEST_SPI3_MOSI DMA_REQUEST_SPI3_TX
#define DMA_REQUEST_SPI3_MISO DMA_REQUEST_SPI3_RX
#define DMA_REQUEST_SPI4_MOSI DMA_REQUEST_SPI4_TX
#define DMA_REQUEST_SPI4_MISO DMA_REQUEST_SPI4_RX
// Resolve our preference for SDO/SDI rather than TX/RX
#define DMA_REQUEST_SPI1_SDO DMA_REQUEST_SPI1_TX
#define DMA_REQUEST_SPI1_SDI DMA_REQUEST_SPI1_RX
#define DMA_REQUEST_SPI2_SDO DMA_REQUEST_SPI2_TX
#define DMA_REQUEST_SPI2_SDI DMA_REQUEST_SPI2_RX
#define DMA_REQUEST_SPI3_SDO DMA_REQUEST_SPI3_TX
#define DMA_REQUEST_SPI3_SDI DMA_REQUEST_SPI3_RX
#define DMA_REQUEST_SPI4_SDO DMA_REQUEST_SPI4_TX
#define DMA_REQUEST_SPI4_SDI DMA_REQUEST_SPI4_RX
static const dmaPeripheralMapping_t dmaPeripheralMapping[] = {
#ifdef USE_SPI
REQMAP_DIR(SPI, 1, MOSI),
REQMAP_DIR(SPI, 1, MISO),
REQMAP_DIR(SPI, 2, MOSI),
REQMAP_DIR(SPI, 2, MISO),
REQMAP_DIR(SPI, 3, MOSI),
REQMAP_DIR(SPI, 3, MISO),
REQMAP_DIR(SPI, 4, MOSI),
REQMAP_DIR(SPI, 4, MISO),
REQMAP_DIR(SPI, 1, SDO),
REQMAP_DIR(SPI, 1, SDI),
REQMAP_DIR(SPI, 2, SDO),
REQMAP_DIR(SPI, 2, SDI),
REQMAP_DIR(SPI, 3, SDO),
REQMAP_DIR(SPI, 3, SDI),
REQMAP_DIR(SPI, 4, SDO),
REQMAP_DIR(SPI, 4, SDI),
#endif // USE_SPI
#ifdef USE_ADC
@ -220,32 +220,32 @@ static dmaChannelSpec_t dmaChannelSpec[MAX_PERIPHERAL_DMA_OPTIONS] = {
#define DMA_REQUEST_UART10_RX DMA_REQUEST_USART10_RX
#define DMA_REQUEST_UART10_TX DMA_REQUEST_USART10_TX
// Resolve our preference for MOSI/MISO rather than TX/RX
#define DMA_REQUEST_SPI1_MOSI DMA_REQUEST_SPI1_TX
#define DMA_REQUEST_SPI1_MISO DMA_REQUEST_SPI1_RX
#define DMA_REQUEST_SPI2_MOSI DMA_REQUEST_SPI2_TX
#define DMA_REQUEST_SPI2_MISO DMA_REQUEST_SPI2_RX
#define DMA_REQUEST_SPI3_MOSI DMA_REQUEST_SPI3_TX
#define DMA_REQUEST_SPI3_MISO DMA_REQUEST_SPI3_RX
#define DMA_REQUEST_SPI4_MOSI DMA_REQUEST_SPI4_TX
#define DMA_REQUEST_SPI4_MISO DMA_REQUEST_SPI4_RX
#define DMA_REQUEST_SPI5_MOSI DMA_REQUEST_SPI5_TX
#define DMA_REQUEST_SPI5_MISO DMA_REQUEST_SPI5_RX
// Resolve our preference for SDO/SDI rather than TX/RX
#define DMA_REQUEST_SPI1_SDO DMA_REQUEST_SPI1_TX
#define DMA_REQUEST_SPI1_SDI DMA_REQUEST_SPI1_RX
#define DMA_REQUEST_SPI2_SDO DMA_REQUEST_SPI2_TX
#define DMA_REQUEST_SPI2_SDI DMA_REQUEST_SPI2_RX
#define DMA_REQUEST_SPI3_SDO DMA_REQUEST_SPI3_TX
#define DMA_REQUEST_SPI3_SDI DMA_REQUEST_SPI3_RX
#define DMA_REQUEST_SPI4_SDO DMA_REQUEST_SPI4_TX
#define DMA_REQUEST_SPI4_SDI DMA_REQUEST_SPI4_RX
#define DMA_REQUEST_SPI5_SDO DMA_REQUEST_SPI5_TX
#define DMA_REQUEST_SPI5_SDI DMA_REQUEST_SPI5_RX
static const dmaPeripheralMapping_t dmaPeripheralMapping[] = {
#ifdef USE_SPI
REQMAP_DIR(SPI, 1, MOSI),
REQMAP_DIR(SPI, 1, MISO),
REQMAP_DIR(SPI, 2, MOSI),
REQMAP_DIR(SPI, 2, MISO),
REQMAP_DIR(SPI, 3, MOSI),
REQMAP_DIR(SPI, 3, MISO),
REQMAP_DIR(SPI, 4, MOSI),
REQMAP_DIR(SPI, 4, MISO),
REQMAP_DIR(SPI, 5, MOSI), // Not available in smaller packages
REQMAP_DIR(SPI, 5, MISO), // ditto
// REQMAP_DIR(SPI, 6, MOSI), // SPI6 is on BDMA (todo)
// REQMAP_DIR(SPI, 6, MOSI), // ditto
REQMAP_DIR(SPI, 1, SDO),
REQMAP_DIR(SPI, 1, SDI),
REQMAP_DIR(SPI, 2, SDO),
REQMAP_DIR(SPI, 2, SDI),
REQMAP_DIR(SPI, 3, SDO),
REQMAP_DIR(SPI, 3, SDI),
REQMAP_DIR(SPI, 4, SDO),
REQMAP_DIR(SPI, 4, SDI),
REQMAP_DIR(SPI, 5, SDO), // Not available in smaller packages
REQMAP_DIR(SPI, 5, SDI), // ditto
// REQMAP_DIR(SPI, 6, SDO), // SPI6 is on BDMA (todo)
// REQMAP_DIR(SPI, 6, SDO), // ditto
#endif // USE_SPI
#ifdef USE_ADC
@ -377,28 +377,28 @@ static const dmaPeripheralMapping_t dmaPeripheralMapping[] = {
#ifdef USE_SPI
// Everything including F405 and F446
#if defined(STM32F745xx) || defined(STM32F746xx) || defined(STM32F765xx)
{ DMA_PERIPH_SPI_MOSI, SPIDEV_1, { DMA(2, 5, 3), DMA(2, 3, 3) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_1, { DMA(2, 2, 3), DMA(2, 0, 3) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_1, { DMA(2, 5, 3), DMA(2, 3, 3) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_1, { DMA(2, 2, 3), DMA(2, 0, 3) } },
#else
{ DMA_PERIPH_SPI_MOSI, SPIDEV_1, { DMA(2, 3, 3), DMA(2, 5, 3) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_1, { DMA(2, 0, 3), DMA(2, 2, 3) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_1, { DMA(2, 3, 3), DMA(2, 5, 3) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_1, { DMA(2, 0, 3), DMA(2, 2, 3) } },
#endif
{ DMA_PERIPH_SPI_MOSI, SPIDEV_2, { DMA(1, 4, 0) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_2, { DMA(1, 3, 0) } },
{ DMA_PERIPH_SPI_MOSI, SPIDEV_3, { DMA(1, 5, 0), DMA(1, 7, 0) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_3, { DMA(1, 0, 0), DMA(1, 2, 0) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_2, { DMA(1, 4, 0) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_2, { DMA(1, 3, 0) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_3, { DMA(1, 5, 0), DMA(1, 7, 0) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_3, { DMA(1, 0, 0), DMA(1, 2, 0) } },
#if defined(STM32F411xE) || defined(STM32F745xx) || defined(STM32F746xx) || defined(STM32F765xx) || defined(STM32F722xx)
{ DMA_PERIPH_SPI_MOSI, SPIDEV_4, { DMA(2, 1, 4), DMA(2, 4, 5) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_4, { DMA(2, 0, 4), DMA(2, 3, 5) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_4, { DMA(2, 1, 4), DMA(2, 4, 5) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_4, { DMA(2, 0, 4), DMA(2, 3, 5) } },
#ifdef USE_EXTENDED_SPI_DEVICE
{ DMA_PERIPH_SPI_MOSI, SPIDEV_5, { DMA(2, 6, 7) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_5, { DMA(2, 5, 7) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_5, { DMA(2, 6, 7) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_5, { DMA(2, 5, 7) } },
#if !defined(STM32F722xx)
{ DMA_PERIPH_SPI_MOSI, SPIDEV_6, { DMA(2, 5, 1) } },
{ DMA_PERIPH_SPI_MISO, SPIDEV_6, { DMA(2, 6, 1) } },
{ DMA_PERIPH_SPI_SDO, SPIDEV_6, { DMA(2, 5, 1) } },
{ DMA_PERIPH_SPI_SDI, SPIDEV_6, { DMA(2, 6, 1) } },
#endif
#endif // USE_EXTENDED_SPI_DEVICE
#endif