From 097f3b49695f818d53c7b87f0be3f7dabe535f68 Mon Sep 17 00:00:00 2001 From: Przemyslaw Stekiel Date: Mon, 23 Sep 2019 14:37:39 +0200 Subject: [PATCH] Explicit pinmap: Add support for CAN and QSPI --- hal/explicit_pinmap.cpp | 24 ++++++++-- hal/explicit_pinmap.h | 102 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 3 deletions(-) diff --git a/hal/explicit_pinmap.cpp b/hal/explicit_pinmap.cpp index 5c2e532cc6..779ebdecf2 100644 --- a/hal/explicit_pinmap.cpp +++ b/hal/explicit_pinmap.cpp @@ -42,9 +42,6 @@ MBED_WEAK void pwmout_init_direct(pwmout_t *obj, const PinMap *pinmap) #if DEVICE_ANALOGIN MBED_WEAK void analogin_init_direct(analogin_t *obj, const PinMap *pinmap) { - printf("Pin: %d \r\n", pinmap->pin); - //wait_ns(5000); - analogin_init(obj, pinmap->pin); } #endif @@ -75,4 +72,25 @@ MBED_WEAK void serial_set_flow_control_direct(serial_t *obj, FlowControl type, c serial_set_flow_control(obj, type, pinmap->rx_flow_pin, pinmap->tx_flow_pin); } #endif + +#if DEVICE_CAN +MBED_WEAK void can_init_freq_direct(can_t *obj, const can_pinmap_t *pinmap, int hz) +{ + can_init_freq(obj, pinmap->rd_pin, pinmap->td_pin, hz); +} + +MBED_WEAK void can_init_direct(can_t *obj, const can_pinmap_t *pinmap) +{ + can_init(obj, pinmap->rd_pin, pinmap->td_pin); +} + +#endif + +#if DEVICE_QSPI +MBED_WEAK qspi_status_t qspi_init_direct(qspi_t *obj, const qspi_pinmap_t *pinmap, uint32_t hz, uint8_t mode) +{ + return qspi_init(obj, pinmap->data0_pin, pinmap->data1_pin, pinmap->data2_pin, pinmap->data3_pin, pinmap->sclk_pin, pinmap->ssel_pin, hz, mode); +} +#endif + #endif diff --git a/hal/explicit_pinmap.h b/hal/explicit_pinmap.h index 65edc06d5a..9e9d149cd0 100644 --- a/hal/explicit_pinmap.h +++ b/hal/explicit_pinmap.h @@ -24,6 +24,8 @@ #include "analogout_api.h" #include "i2c_api.h" #include "serial_api.h" +#include "qspi_api.h" +#include "can_api.h" #include #if EXPLICIT_PINMAP_READY @@ -196,6 +198,92 @@ MSTD_CONSTEXPR_FN_14 spi_pinmap_t get_spi_pinmap(const PinName mosi, const PinNa } #endif // DEVICE_SPI +#if DEVICE_CAN +MSTD_CONSTEXPR_FN_14 can_pinmap_t get_can_pinmap(const PinName rd, const PinName td) +{ + const PinMap *rd_map = nullptr; + for (const PinMap &pinmap : PINMAP_CAN_RD) { + if (pinmap.pin == rd) { + rd_map = &pinmap; + break; + } + } + + const PinMap *td_map = nullptr; + for (const PinMap &pinmap : PINMAP_CAN_TD) { + if (pinmap.pin == td) { + td_map = &pinmap; + break; + } + } + + if (!rd_map || !td_map || rd_map->peripheral != td_map->peripheral) { + return {(int) NC, NC, (int) NC, NC, (int) NC}; + } + + return {rd_map->peripheral, rd_map->pin, rd_map->function, td_map->pin, td_map->function}; +} +#endif //DEVICE_CAN + +#if DEVICE_QSPI +MSTD_CONSTEXPR_FN_14 qspi_pinmap_t get_qspi_pinmap(const PinName data0, const PinName data1, const PinName data2, const PinName data3, const PinName sclk, const PinName ssel) +{ + const PinMap *data0_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_DATA0) { + if (pinmap.pin == data0) { + data0_map = &pinmap; + break; + } + } + + const PinMap *data1_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_DATA1) { + if (pinmap.pin == data1) { + data1_map = &pinmap; + break; + } + } + + const PinMap *data2_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_DATA2) { + if (pinmap.pin == data2) { + data2_map = &pinmap; + break; + } + } + + const PinMap *data3_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_DATA3) { + if (pinmap.pin == data3) { + data3_map = &pinmap; + break; + } + } + + const PinMap *sclk_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_SCLK) { + if (pinmap.pin == sclk) { + sclk_map = &pinmap; + break; + } + } + + const PinMap *ssel_map = nullptr; + for (const PinMap &pinmap : PINMAP_QSPI_SSEL) { + if (pinmap.pin == ssel) { + ssel_map = &pinmap; + break; + } + } + + if (!data0_map || !data1_map || !data2_map || !data3_map || !sclk_map || ssel_map || data0_map->peripheral != data1_map->peripheral || data0_map->peripheral != data2_map->peripheral || data0_map->peripheral != data3_map->peripheral || data0_map->peripheral != sclk_map->peripheral || data0_map->peripheral != ssel_map->peripheral) { + return {(int) NC, NC, (int) NC, NC, (int) NC, NC, (int) NC, NC, (int) NC}; + } + + return {data0_map->peripheral, data0_map->pin, data0_map->function, data1_map->pin, data1_map->function, data2_map->pin, data2_map->function, data3_map->pin, data3_map->function, sclk_map->pin, sclk_map->function, ssel_map->pin, ssel_map->function}; +} +#endif //DEVICE_QSPI + #else // EXPLICIT_PINMAP_READY #if DEVICE_PWMOUT @@ -247,6 +335,20 @@ MSTD_CONSTEXPR_FN_14 spi_pinmap_t get_spi_pinmap(const PinName mosi, const PinNa } #endif // DEVICE_SERIAL +#if DEVICE_CAN +MSTD_CONSTEXPR_FN_14 can_pinmap_t get_can_pinmap(const PinName rd, const PinName td) +{ + return {(int) NC, rd, (int) NC, td, (int) NC}; +} +#endif //DEVICE_CAN + +#if DEVICE_QSPI +MSTD_CONSTEXPR_FN_14 qspi_pinmap_t get_qspi_pinmap(const PinName data0, const PinName data1, const PinName data2, const PinName data3, const PinName sclk, const PinName ssel) +{ + return {(int) NC, data0, (int) NC, data1, (int) NC, data2, (int) NC, data3, (int) NC, sclk, (int) NC, ssel, (int) NC}; +} +#endif //DEVICE_QSPI + #endif // EXPLICIT_PINMAP_READY #endif // EXPLICIT_PINMAP_H