diff options
Diffstat (limited to 'os/hal')
| -rwxr-xr-x | os/hal/dox/qspi.dox | 26 | ||||
| -rw-r--r-- | os/hal/hal.mk | 4 | ||||
| -rw-r--r-- | os/hal/include/hal.h | 5 | ||||
| -rw-r--r-- | os/hal/include/hal_qspi.h | 321 | ||||
| -rw-r--r-- | os/hal/lib/peripherals/flash/hal_jesd216_flash.c | 368 | ||||
| -rw-r--r-- | os/hal/lib/peripherals/flash/hal_jesd216_flash.h | 221 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk | 4 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c | 352 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.h | 281 | ||||
| -rw-r--r-- | os/hal/src/hal.c | 3 | ||||
| -rw-r--r-- | os/hal/src/hal_qspi.c | 392 | ||||
| -rw-r--r-- | os/hal/templates/hal_qspi_lld.c | 208 | ||||
| -rw-r--r-- | os/hal/templates/hal_qspi_lld.h | 158 | ||||
| -rw-r--r-- | os/hal/templates/platform.mk | 4 |
14 files changed, 0 insertions, 2347 deletions
diff --git a/os/hal/dox/qspi.dox b/os/hal/dox/qspi.dox deleted file mode 100755 index 486d6a1b5..000000000 --- a/os/hal/dox/qspi.dox +++ /dev/null @@ -1,26 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @defgroup QSPI QSPI Driver
- * @brief Generic QSPI Driver
- * @details This module defines an abstract interface for a Quad SPI
- * communication interface.
- * @pre In order to use the QSPI driver the @p HAL_USE_QSPI option
- * must be enabled in @p halconf.h.
- *
- * @ingroup HAL_NORMAL_DRIVERS
- */
diff --git a/os/hal/hal.mk b/os/hal/hal.mk index bd3ec0132..991a0c2df 100644 --- a/os/hal/hal.mk +++ b/os/hal/hal.mk @@ -53,9 +53,6 @@ endif ifneq ($(findstring HAL_USE_PWM TRUE,$(HALCONF)),)
HALSRC += $(CHIBIOS)/os/hal/src/hal_pwm.c
endif
-ifneq ($(findstring HAL_USE_QSPI TRUE,$(HALCONF)),)
-HALSRC += $(CHIBIOS)/os/hal/src/hal_qspi.c
-endif
ifneq ($(findstring HAL_USE_RTC TRUE,$(HALCONF)),)
HALSRC += $(CHIBIOS)/os/hal/src/hal_rtc.c
endif
@@ -107,7 +104,6 @@ HALSRC = $(CHIBIOS)/os/hal/src/hal.c \ $(CHIBIOS)/os/hal/src/hal_mmc_spi.c \
$(CHIBIOS)/os/hal/src/hal_pal.c \
$(CHIBIOS)/os/hal/src/hal_pwm.c \
- $(CHIBIOS)/os/hal/src/hal_qspi.c \
$(CHIBIOS)/os/hal/src/hal_rtc.c \
$(CHIBIOS)/os/hal/src/hal_sdc.c \
$(CHIBIOS)/os/hal/src/hal_serial.c \
diff --git a/os/hal/include/hal.h b/os/hal/include/hal.h index b0f828144..9ed5a0612 100644 --- a/os/hal/include/hal.h +++ b/os/hal/include/hal.h @@ -78,10 +78,6 @@ #define HAL_USE_PWM FALSE
#endif
-#if !defined(HAL_USE_QSPI)
-#define HAL_USE_QSPI FALSE
-#endif
-
#if !defined(HAL_USE_RTC)
#define HAL_USE_RTC FALSE
#endif
@@ -150,7 +146,6 @@ #include "hal_icu.h"
#include "hal_mac.h"
#include "hal_pwm.h"
-#include "hal_qspi.h"
#include "hal_rtc.h"
#include "hal_serial.h"
#include "hal_sdc.h"
diff --git a/os/hal/include/hal_qspi.h b/os/hal/include/hal_qspi.h deleted file mode 100644 index 0fe8c223f..000000000 --- a/os/hal/include/hal_qspi.h +++ /dev/null @@ -1,321 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_qspi.h
- * @brief QSPI Driver macros and structures.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#ifndef HAL_QSPI_H
-#define HAL_QSPI_H
-
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver constants. */
-/*===========================================================================*/
-
-/**
- * @name Transfer options
- * @{
- */
-#define QSPI_CFG_CMD_MASK (0xFFLU << 0LU)
-#define QSPI_CFG_CMD(n) ((n) << 0LU)
-#define QSPI_CFG_CMD_MODE_MASK (3LU << 8LU)
-#define QSPI_CFG_CMD_MODE_NONE (0LU << 8LU)
-#define QSPI_CFG_CMD_MODE_ONE_LINE (1LU << 8LU)
-#define QSPI_CFG_CMD_MODE_TWO_LINES (2LU << 8LU)
-#define QSPI_CFG_CMD_MODE_FOUR_LINES (3LU << 8LU)
-#define QSPI_CFG_ADDR_MODE_MASK (3LU << 10LU)
-#define QSPI_CFG_ADDR_MODE_NONE (0LU << 10LU)
-#define QSPI_CFG_ADDR_MODE_ONE_LINE (1LU << 10LU)
-#define QSPI_CFG_ADDR_MODE_TWO_LINES (2LU << 10LU)
-#define QSPI_CFG_ADDR_MODE_FOUR_LINES (3LU << 10LU)
-#define QSPI_CFG_ADDR_SIZE_MASK (3LU << 12LU)
-#define QSPI_CFG_ADDR_SIZE_8 (0LU << 12LU)
-#define QSPI_CFG_ADDR_SIZE_16 (1LU << 12LU)
-#define QSPI_CFG_ADDR_SIZE_24 (2LU << 12LU)
-#define QSPI_CFG_ADDR_SIZE_32 (3LU << 12LU)
-#define QSPI_CFG_ALT_MODE_MASK (3LU << 14LU)
-#define QSPI_CFG_ALT_MODE_NONE (0LU << 14LU)
-#define QSPI_CFG_ALT_MODE_ONE_LINE (1LU << 14LU)
-#define QSPI_CFG_ALT_MODE_TWO_LINES (2LU << 14LU)
-#define QSPI_CFG_ALT_MODE_FOUR_LINES (3LU << 14LU)
-#define QSPI_CFG_ALT_SIZE_MASK (3LU << 16LU)
-#define QSPI_CFG_ALT_SIZE_8 (0LU << 16LU)
-
-#define QSPI_CFG_ALT_SIZE_16 (1LU << 16LU)
-#define QSPI_CFG_ALT_SIZE_24 (2LU << 16LU)
-#define QSPI_CFG_ALT_SIZE_32 (3LU << 16LU)
-#define QSPI_CFG_DUMMY_CYCLES_MASK (0x1FLU << 18LU)
-#define QSPI_CFG_DUMMY_CYCLES(n) ((n) << 18LU)
-#define QSPI_CFG_DATA_MODE_MASK (3LU << 24LU)
-#define QSPI_CFG_DATA_MODE_NONE (0LU << 24LU)
-#define QSPI_CFG_DATA_MODE_ONE_LINE (1LU << 24LU)
-#define QSPI_CFG_DATA_MODE_TWO_LINES (2LU << 24LU)
-#define QSPI_CFG_DATA_MODE_FOUR_LINES (3LU << 24LU)
-#define QSPI_CFG_SIOO (1LU << 28LU)
-#define QSPI_CFG_DDRM (1LU << 31LU)
-/** @} */
-
-/*===========================================================================*/
-/* Driver pre-compile time settings. */
-/*===========================================================================*/
-
-/**
- * @name QSPI configuration options
- * @{
- */
-/**
- * @brief Enables synchronous APIs.
- * @note Disabling this option saves both code and data space.
- */
-#if !defined(QSPI_USE_WAIT) || defined(__DOXYGEN__)
-#define QSPI_USE_WAIT TRUE
-#endif
-
-/**
- * @brief Enables the @p qspiAcquireBus() and @p qspiReleaseBus() APIs.
- * @note Disabling this option saves both code and data space.
- */
-#if !defined(QSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define QSPI_USE_MUTUAL_EXCLUSION TRUE
-#endif
-/** @} */
-
-/*===========================================================================*/
-/* Derived constants and error checks. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver data structures and types. */
-/*===========================================================================*/
-
-/**
- * @brief Driver state machine possible states.
- */
-typedef enum {
- QSPI_UNINIT = 0, /**< Not initialized. */
- QSPI_STOP = 1, /**< Stopped. */
- QSPI_READY = 2, /**< Ready. */
- QSPI_ACTIVE = 3, /**< Exchanging data. */
- QSPI_COMPLETE = 4, /**< Asynchronous operation complete. */
- QSPI_MEMMAP = 5 /**< In memory mapped mode. */
-} qspistate_t;
-
-/**
- * @brief Type of a QSPI command descriptor.
- */
-typedef struct {
- uint32_t cfg;
- uint32_t addr;
- uint32_t alt;
-} qspi_command_t;
-
-#include "hal_qspi_lld.h"
-
-#if !defined(QSPI_SUPPORTS_MEMMAP)
-#error "low level does not define QSPI_SUPPORTS_MEMMAP"
-#endif
-
-/*===========================================================================*/
-/* Driver macros. */
-/*===========================================================================*/
-
-/**
- * @name Macro Functions
- * @{
- */
-/**
- * @brief Sends a command without data phase.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- *
- * @iclass
- */
-#define qspiStartCommandI(qspip, cmdp) { \
- osalDbgAssert(((cmdp)->cfg & QSPI_CFG_DATA_MODE_MASK) == \
- QSPI_CFG_DATA_MODE_NONE, \
- "data mode specified"); \
- (qspip)->state = QSPI_ACTIVE; \
- qspi_lld_command(qspip, cmdp); \
-}
-
-/**
- * @brief Sends data over the QSPI bus.
- * @details This asynchronous function starts a transmit operation.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send or zero if no data phase
- * @param[in] txbuf the pointer to the transmit buffer
- *
- * @iclass
- */
-#define qspiStartSendI(qspip, cmdp, n, txbuf) { \
- osalDbgAssert(((cmdp)->cfg & QSPI_CFG_DATA_MODE_MASK) != \
- QSPI_CFG_DATA_MODE_NONE, \
- "data mode required"); \
- (qspip)->state = QSPI_ACTIVE; \
- qspi_lld_send(qspip, cmdp, n, txbuf); \
-}
-
-/**
- * @brief Receives data from the QSPI bus.
- * @details This asynchronous function starts a receive operation.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to receive or zero if no data phase
- * @param[out] rxbuf the pointer to the receive buffer
- *
- * @iclass
- */
-#define qspiStartReceiveI(qspip, cmdp, n, rxbuf) { \
- osalDbgAssert(((cmdp)->cfg & QSPI_CFG_DATA_MODE_MASK) != \
- QSPI_CFG_DATA_MODE_NONE, \
- "data mode required"); \
- (qspip)->state = QSPI_ACTIVE; \
- qspi_lld_receive(qspip, cmdp, n, rxbuf); \
-}
-
-#if (QSPI_SUPPORTS_MEMMAP == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Maps in memory space a QSPI flash device.
- * @pre The memory flash device must be initialized appropriately
- * before mapping it in memory space.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[out] addrp pointer to the memory start address of the mapped
- * flash or @p NULL
- *
- * @iclass
- */
-#define qspiMapFlashI(qspip, cmdp, addrp) \
- qspi_lld_map_flash(qspip, cmdp, addrp)
-
-/**
- * @brief Maps in memory space a QSPI flash device.
- * @post The memory flash device must be re-initialized for normal
- * commands exchange.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @iclass
- */
-#define qspiUnmapFlashI(qspip) \
- qspi_lld_unmap_flash(qspip)
-#endif /* QSPI_SUPPORTS_MEMMAP == TRUE */
-/** @} */
-
-/**
- * @name Low level driver helper macros
- * @{
- */
-#if (QSPI_USE_WAIT == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Wakes up the waiting thread.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-#define _qspi_wakeup_isr(qspip) { \
- osalSysLockFromISR(); \
- osalThreadResumeI(&(qspip)->thread, MSG_OK); \
- osalSysUnlockFromISR(); \
-}
-#else /* !QSPI_USE_WAIT */
-#define _qspi_wakeup_isr(qspip)
-#endif /* !QSPI_USE_WAIT */
-
-/**
- * @brief Common ISR code.
- * @details This code handles the portable part of the ISR code:
- * - Callback invocation.
- * - Waiting thread wakeup, if any.
- * - Driver state transitions.
- * .
- * @note This macro is meant to be used in the low level drivers
- * implementation only.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-#define _qspi_isr_code(qspip) { \
- if ((qspip)->config->end_cb) { \
- (qspip)->state = QSPI_COMPLETE; \
- (qspip)->config->end_cb(qspip); \
- if ((qspip)->state == QSPI_COMPLETE) \
- (qspip)->state = QSPI_READY; \
- } \
- else \
- (qspip)->state = QSPI_READY; \
- _qspi_wakeup_isr(qspip); \
-}
-/** @} */
-
-/*===========================================================================*/
-/* External declarations. */
-/*===========================================================================*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void qspiInit(void);
- void qspiObjectInit(QSPIDriver *qspip);
- void qspiStart(QSPIDriver *qspip, const QSPIConfig *config);
- void qspiStop(QSPIDriver *qspip);
- void qspiStartCommand(QSPIDriver *qspip, const qspi_command_t *cmdp);
- void qspiStartSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf);
- void qspiStartReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf);
-#if QSPI_USE_WAIT == TRUE
- void qspiCommand(QSPIDriver *qspip, const qspi_command_t *cmdp);
- void qspiSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf);
- void qspiReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf);
-#endif
-#if QSPI_SUPPORTS_MEMMAP == TRUE
-void qspiMapFlash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp);
-void qspiUnmapFlash(QSPIDriver *qspip);
-#endif
-#if QSPI_USE_MUTUAL_EXCLUSION == TRUE
- void qspiAcquireBus(QSPIDriver *qspip);
- void qspiReleaseBus(QSPIDriver *qspip);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HAL_USE_QSPI == TRUE */
-
-#endif /* HAL_QSPI_H */
-
-/** @} */
diff --git a/os/hal/lib/peripherals/flash/hal_jesd216_flash.c b/os/hal/lib/peripherals/flash/hal_jesd216_flash.c deleted file mode 100644 index b26b50740..000000000 --- a/os/hal/lib/peripherals/flash/hal_jesd216_flash.c +++ /dev/null @@ -1,368 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_jesd216_flash.c
- * @brief JESD216 compliant flash driver class code.
- *
- * @addtogroup HAL_JESD216_FLASH
- * @{
- */
-
-#include "hal.h"
-
-#include "hal_jesd216_flash.h"
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables and types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-void jesd216_start(BUSDriver *busp, const BUSConfig *config) {
-
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_SPI
- spiStart(busp, config);
-#else
- qspiStart(busp, config);
-#endif
-}
-
-void jesd216_stop(BUSDriver *busp) {
-
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_SPI
- spiStop(busp);
-#else
- qspiStop(busp);
-#endif
-}
-
-void jesd216_cmd(BUSDriver *busp, uint32_t cmd) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES;
-#endif
- mode.addr = 0U;
- mode.alt = 0U;
- qspiCommand(busp, &mode);
-#else
- uint8_t buf[1];
-
- spiSelect(busp);
- buf[0] = cmd;
- spiSend(busp, 1, buf);
- spiUnselect(busp);
-#endif
-}
-
-void jesd216_cmd_receive(BUSDriver *busp,
- uint32_t cmd,
- size_t n,
- uint8_t *p) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_DATA_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_DATA_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_DATA_MODE_FOUR_LINES;
-
-#endif
- mode.addr = 0U;
- mode.alt = 0U;
- qspiReceive(busp, &mode, n, p);
-#else
- uint8_t buf[1];
-
- spiSelect(busp);
- buf[0] = cmd;
- spiSend(busp, 1, buf);
- spiReceive(busp, n, p);
- spiUnselect(busp);
-#endif
-}
-
-void jesd216_cmd_send(BUSDriver *busp,
- uint32_t cmd,
- size_t n,
- const uint8_t *p) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_DATA_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_DATA_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_DATA_MODE_FOUR_LINES;
-
-#endif
- mode.addr = 0U;
- mode.alt = 0U;
- qspiSend(busp, &mode, n, p);
-#else
- uint8_t buf[1];
-
- spiSelect(busp);
- buf[0] = cmd;
- spiSend(busp, 1, buf);
- spiSend(busp, n, p);
- spiUnselect(busp);
-#endif
-}
-
-void jesd216_cmd_addr(BUSDriver *busp,
- uint32_t cmd,
- flash_offset_t offset) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_ADDR_MODE_ONE_LINE |
- QSPI_CFG_ADDR_SIZE_24;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_ADDR_MODE_TWO_LINES |
- QSPI_CFG_ADDR_SIZE_24;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_ADDR_MODE_FOUR_LINES |
- QSPI_CFG_ADDR_SIZE_24;
-
-#endif
- mode.addr = offset;
- mode.alt = 0U;
- qspiCommand(busp, &mode);
-#else
- uint8_t buf[4];
-
- spiSelect(busp);
- buf[0] = cmd;
- buf[1] = (uint8_t)(offset >> 16);
- buf[2] = (uint8_t)(offset >> 8);
- buf[3] = (uint8_t)(offset >> 0);
- spiSend(busp, 4, buf);
- spiUnselect(busp);
-#endif
-}
-
-void jesd216_cmd_addr_send(BUSDriver *busp,
- uint32_t cmd,
- flash_offset_t offset,
- size_t n,
- const uint8_t *p) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd & 0xFFU) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_ADDR_MODE_ONE_LINE |
- QSPI_CFG_DATA_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_ADDR_MODE_TWO_LINES |
- QSPI_CFG_DATA_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_ADDR_MODE_FOUR_LINES |
- QSPI_CFG_DATA_MODE_FOUR_LINES;
-#endif
-
- /* Handling 32 bits addressing.*/
- if ((cmd & JESD216_CMD_EXTENDED_ADDRESSING) == 0) {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_24;
- }
- else {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_32;
- }
-
- mode.addr = offset;
- mode.alt = 0U;
- qspiSend(busp, &mode, n, p);
-#else
- uint8_t buf[4];
-
- spiSelect(busp);
- buf[0] = cmd;
- buf[1] = (uint8_t)(offset >> 16);
- buf[2] = (uint8_t)(offset >> 8);
- buf[3] = (uint8_t)(offset >> 0);
- spiSend(busp, 4, buf);
- spiSend(busp, n, p);
- spiUnselect(busp);
-#endif
-}
-
-void jesd216_cmd_addr_receive(BUSDriver *busp,
- uint32_t cmd,
- flash_offset_t offset,
- size_t n,
- uint8_t *p) {
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd & 0xFFU) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_ADDR_MODE_ONE_LINE |
- QSPI_CFG_DATA_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_ADDR_MODE_TWO_LINES |
- QSPI_CFG_ADDR_SIZE_24 |
- QSPI_CFG_DATA_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_ADDR_MODE_FOUR_LINES |
- QSPI_CFG_DATA_MODE_FOUR_LINES;
-#endif
-
- /* Handling 32 bits addressing.*/
- if ((cmd & JESD216_CMD_EXTENDED_ADDRESSING) == 0) {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_24;
- }
- else {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_32;
- }
-
- mode.addr = offset;
- mode.alt = 0U;
- qspiReceive(busp, &mode, n, p);
-#else
- uint8_t buf[4];
-
- spiSelect(busp);
- buf[0] = cmd;
- buf[1] = (uint8_t)(offset >> 16);
- buf[2] = (uint8_t)(offset >> 8);
- buf[3] = (uint8_t)(offset >> 0);
- spiSend(busp, 4, buf);
- spiReceive(busp, n, p);
- spiUnselect(busp);
-#endif
-}
-
-#if (JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) || defined(__DOXYGEN__)
-void jesd216_cmd_addr_dummy_receive(BUSDriver *busp,
- uint32_t cmd,
- flash_offset_t offset,
- uint8_t dummy,
- size_t n,
- uint8_t *p) {
- qspi_command_t mode;
-
- mode.cfg = QSPI_CFG_CMD(cmd & 0xFFU) |
-#if JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI1L
- QSPI_CFG_CMD_MODE_ONE_LINE |
- QSPI_CFG_ADDR_MODE_ONE_LINE |
- QSPI_CFG_DUMMY_CYCLES(dummy) |
- QSPI_CFG_DATA_MODE_ONE_LINE;
-#elif JESD216_BUS_MODE == JESD216_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_ADDR_MODE_TWO_LINES |
- QSPI_CFG_DUMMY_CYCLES(dummy) |
- QSPI_CFG_DATA_MODE_TWO_LINES;
-#else
- QSPI_CFG_CMD_MODE_FOUR_LINES |
- QSPI_CFG_ADDR_MODE_FOUR_LINES |
- QSPI_CFG_DUMMY_CYCLES(dummy) |
- QSPI_CFG_DATA_MODE_FOUR_LINES;
-#endif
-
- /* Handling 32 bits addressing.*/
- if ((cmd & JESD216_CMD_EXTENDED_ADDRESSING) == 0) {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_24;
- }
- else {
- mode .cfg |= QSPI_CFG_ADDR_SIZE_32;
- }
-
- mode.addr = offset;
- mode.alt = 0U;
- qspiReceive(busp, &mode, n, p);
-}
-#endif /* JESD216_BUS_MODE != JESD216_BUS_MODE_SPI */
-
-#if ((JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) && \
- (JESD216_SHARED_BUS == TRUE)) || defined(__DOXYGEN__)
-void jesd216_bus_acquire(BUSDriver *busp, const BUSConfig *config) {
-
- (void)config;
-
- qspiAcquireBus(busp);
- if (busp->config != config) {
- qspiStart(busp, config);
- }
-}
-
-void jesd216_bus_release(BUSDriver *busp) {
-
- qspiReleaseBus(busp);
-}
-#elif (JESD216_BUS_MODE == JESD216_BUS_MODE_SPI) && \
- (JESD216_SHARED_BUS == TRUE)
-void jesd216_bus_acquire(BUSDriver *busp, const BUSConfig *config) {
-
- spiAcquireBus(busp);
- if (busp->config != config) {
- spiStart(busp, config);
- }
-}
-
-void jesd216_bus_release(BUSDriver *busp) {
-
- spiReleaseBus(busp);
-}
-#else
-#define jesd216_bus_acquire(busp)
-#define jesd216_bus_release(busp)
-#endif
-
-/** @} */
diff --git a/os/hal/lib/peripherals/flash/hal_jesd216_flash.h b/os/hal/lib/peripherals/flash/hal_jesd216_flash.h deleted file mode 100644 index 2fc6287c9..000000000 --- a/os/hal/lib/peripherals/flash/hal_jesd216_flash.h +++ /dev/null @@ -1,221 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_jesd216_flash.h
- * @brief JESD216 compliant flash driver class header.
- *
- * @addtogroup HAL_JESD216_FLASH
- * @{
- */
-
-#ifndef HAL_JESD216_FLASH_H
-#define HAL_JESD216_FLASH_H
-
-#include "hal_flash.h"
-
-/*===========================================================================*/
-/* Driver constants. */
-/*===========================================================================*/
-
-/**
- * @name Common command codes
- * @{
- */
-#define JESD216_CMD_READ_ID 0x9FU
-#define JESD216_CMD_READ 0x03U
-#define JESD216_CMD_WRITE_ENABLE 0x06U
-#define JESD216_CMD_WRITE_DISABLE 0x04U
-#define JESD216_CMD_READ_STATUS_REGISTER 0x05U
-#define JESD216_CMD_WRITE_STATUS_REGISTER 0x01U
-#define JESD216_CMD_PAGE_PROGRAM 0x02U
-#define JESD216_CMD_ERASE_4K 0x20U
-#define JESD216_CMD_ERASE_BULK 0xC7U
-#define JESD216_CMD_PROGRAM_ERASE_RESUME 0x7AU
-#define JESD216_CMD_PROGRAM_ERASE_SUSPEND 0x75U
-#define JESD216_CMD_READ_OTP_ARRAY 0x4BU
-#define JESD216_CMD_PROGRAM_OTP_ARRAY 0x42U
-/** @} */
-
-/**
- * @name Command options
- * @{
- */
-#define JESD216_CMD_EXTENDED_ADDRESSING 0x80000000U
-/** @} */
-
-/**
- * @name Bus interface.
- * @{
- */
-#define JESD216_BUS_MODE_SPI 0U
-#define JESD216_BUS_MODE_QSPI1L 1U
-#define JESD216_BUS_MODE_QSPI2L 2U
-#define JESD216_BUS_MODE_QSPI4L 4U
-/** @} */
-
-/*===========================================================================*/
-/* Driver pre-compile time settings. */
-/*===========================================================================*/
-
-/**
- * @name Configuration options
- * @{
- */
-/**
- * @brief Physical transport interface.
- */
-#if !defined(JESD216_BUS_MODE) || defined(__DOXYGEN__)
-#define JESD216_BUS_MODE JESD216_BUS_MODE_QSPI4L
-#endif
-
-/**
- * @brief Shared bus switch.
- * @details If set to @p TRUE the device acquires bus ownership
- * on each transaction.
- * @note Requires @p SPI_USE_MUTUAL_EXCLUSION or
- * @p SPI_USE_MUTUAL_EXCLUSION.
- */
-#if !defined(JESD216_SHARED_BUS) || defined(__DOXYGEN__)
-#define JESD216_SHARED_BUS TRUE
-#endif
-/** @} */
-
-/*===========================================================================*/
-/* Derived constants and error checks. */
-/*===========================================================================*/
-
-#if (JESD216_BUS_MODE == JESD216_BUS_MODE_SPI) && (HAL_USE_SPI == FALSE)
-#error "JESD216_BUS_MODE_SPI requires HAL_USE_SPI"
-#endif
-
-#if (JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) && (HAL_USE_QSPI == FALSE)
-#error "JESD216_BUS_MODE_QSPIxL requires HAL_USE_QSPI"
-#endif
-
-#if (JESD216_BUS_MODE == JESD216_BUS_MODE_SPI) && \
- (JESD216_SHARED_BUS == TRUE) && \
- (SPI_USE_MUTUAL_EXCLUSION == FALSE)
-#error "JESD216_SHARED_SPI requires SPI_USE_MUTUAL_EXCLUSION"
-#endif
-
-#if (JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) && \
- (JESD216_BUS_MODE != JESD216_BUS_MODE_QSPI1L) && \
- (JESD216_BUS_MODE != JESD216_BUS_MODE_QSPI2L) && \
- (JESD216_BUS_MODE != JESD216_BUS_MODE_QSPI4L)
-#error "invalid JESD216_BUS_MODE selected"
-#endif
-
-/*===========================================================================*/
-/* Driver data structures and types. */
-/*===========================================================================*/
-
-#if (JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) || defined(__DOXYGEN__)
-#define BUSConfig QSPIConfig
-#define BUSDriver QSPIDriver
-#else
-#define BUSConfig SPIConfig
-#define BUSDriver SPIDriver
-#endif
-
-#define _jesd216_config \
- BUSDriver *busp; \
- const BUSConfig *buscfg;
-
-/**
- * @brief @p JESD215Flash specific methods.
- */
-#define _jesd216_flash_methods_alone \
- /* Read SFDP.*/ \
- flash_error_t (*read_sfdp)(void *instance, \
- flash_offset_t offset, \
- size_t n, \
- uint8_t *rp);
-
-/**
- * @brief @p JESD215Flash specific methods with inherited ones.
- */
-#define _jesd216_flash_methods \
- _base_flash_methods \
- _jesd216_flash_methods_alone
-
-/**
- * @brief @p JESD215Flash virtual methods table.
- */
-struct JESD215FlashVMT {
- _jesd216_flash_methods
-};
-
-/**
- * @brief @p JESD215Flash specific data.
- */
-#define _jesd216_flash_data \
- _base_flash_data
-
-/**
- * @brief Base flash class.
- */
-typedef struct {
- /** @brief Virtual Methods Table.*/
- const struct JESD215FlashVMT *vmt;
- _jesd216_flash_data
-} JESD215Flash;
-
-/*===========================================================================*/
-/* Driver macros. */
-/*===========================================================================*/
-
-/**
- * @name Macro Functions (BaseFlash)
- * @{
- */
-/** @} */
-
-/*===========================================================================*/
-/* External declarations. */
-/*===========================================================================*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void jesd216_start(BUSDriver *busp, const BUSConfig *config);
- void jesd216_stop(BUSDriver *busp);
- void jesd216_cmd(BUSDriver *busp, uint32_t cmd);
- void jesd216_cmd_receive(BUSDriver *busp, uint32_t cmd,
- size_t n, uint8_t *p);
- void jesd216_cmd_send(BUSDriver *busp, uint32_t cmd,
- size_t n, const uint8_t *p);
- void jesd216_cmd_addr(BUSDriver *busp, uint32_t cmd, flash_offset_t offset);
- void jesd216_cmd_addr_send(BUSDriver *busp, uint32_t cmd,
- flash_offset_t offset, size_t n, const uint8_t *p);
- void jesd216_cmd_addr_receive(BUSDriver *busp, uint32_t cmd,
- flash_offset_t offset, size_t n, uint8_t *p);
-#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI
- void jesd216_cmd_addr_dummy_receive(BUSDriver *busp, uint32_t cmd,
- flash_offset_t offset, uint8_t dummy,
- size_t n, uint8_t *p);
-#endif /* JESD216_BUS_MODE != JESD216_BUS_MODE_SPI */
-#if JESD216_SHARED_BUS == TRUE
- void jesd216_bus_acquire(BUSDriver *busp, const BUSConfig *config);
- void jesd216_bus_release(BUSDriver *busp);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HAL_JESD216_FLASH_H */
-
-/** @} */
diff --git a/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk b/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk index 6d58d6bae..e59aec084 100644 --- a/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk +++ b/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk @@ -1,12 +1,8 @@ ifeq ($(USE_SMART_BUILD),yes)
-ifneq ($(findstring HAL_USE_QSPI TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c
-endif
ifneq ($(findstring HAL_USE_WSPI TRUE,$(HALCONF)),)
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_wspi_lld.c
endif
else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_wspi_lld.c
endif
diff --git a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c b/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c deleted file mode 100644 index 7e42b6ffb..000000000 --- a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c +++ /dev/null @@ -1,352 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file QUADSPIv1/hal_qspi_lld.c
- * @brief STM32 QSPI subsystem low level driver source.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#include "hal.h"
-
-#if HAL_USE_QSPI || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-#define QUADSPI1_DMA_CHANNEL \
- STM32_DMA_GETCHANNEL(STM32_QSPI_QUADSPI1_DMA_STREAM, \
- STM32_QUADSPI1_DMA_CHN)
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/** @brief QUADSPI1 driver identifier.*/
-#if STM32_QSPI_USE_QUADSPI1 || defined(__DOXYGEN__)
-QSPIDriver QSPID1;
-#endif
-
-/*===========================================================================*/
-/* Driver local variables and types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/**
- * @brief Shared service routine.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] flags pre-shifted content of the ISR register
- */
-static void qspi_lld_serve_dma_interrupt(QSPIDriver *qspip, uint32_t flags) {
-
- (void)qspip;
- (void)flags;
-
- /* DMA errors handling.*/
-#if defined(STM32_QSPI_DMA_ERROR_HOOK)
- if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0) {
- STM32_QSPI_DMA_ERROR_HOOK(qspip);
- }
-#endif
-}
-
-/**
- * @brief Shared service routine.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- */
-static void qspi_lld_serve_interrupt(QSPIDriver *qspip) {
-
- /* Portable QSPI ISR code defined in the high level driver, note, it is
- a macro.*/
- _qspi_isr_code(qspip);
-
- /* Stop everything, we need to give DMA enough time to complete the ongoing
- operation. Race condition hidden here.*/
- while (dmaStreamGetTransactionSize(qspip->dma) > 0U)
- ;
- dmaStreamDisable(qspip->dma);
-}
-
-/*===========================================================================*/
-/* Driver interrupt handlers. */
-/*===========================================================================*/
-
-#if STM32_QSPI_USE_QUADSPI1 || defined(__DOXYGEN__)
-#if !defined(STM32_QUADSPI1_SUPPRESS_ISR)
-#if !defined(STM32_QUADSPI1_HANDLER)
-#error "STM32_QUADSPI1_HANDLER not defined"
-#endif
-/**
- * @brief STM32_QUADSPI1_HANDLER interrupt handler.
- *
- * @isr
- */
-OSAL_IRQ_HANDLER(STM32_QUADSPI1_HANDLER) {
-
- OSAL_IRQ_PROLOGUE();
-
- QUADSPI->FCR = QUADSPI_FCR_CTEF | QUADSPI_FCR_CTCF |
- QUADSPI_FCR_CSMF | QUADSPI_FCR_CTOF;
-
- qspi_lld_serve_interrupt(&QSPID1);
-
- OSAL_IRQ_EPILOGUE();
-}
-#endif /* !defined(STM32_QUADSPI1_SUPPRESS_ISR) */
-#endif /* STM32_QSPI_USE_QUADSPI1 */
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/**
- * @brief Low level QSPI driver initialization.
- *
- * @notapi
- */
-void qspi_lld_init(void) {
-
-#if STM32_QSPI_USE_QUADSPI1
- qspiObjectInit(&QSPID1);
- QSPID1.qspi = QUADSPI;
- QSPID1.dma = STM32_DMA_STREAM(STM32_QSPI_QUADSPI1_DMA_STREAM);
- QSPID1.dmamode = STM32_DMA_CR_CHSEL(QUADSPI1_DMA_CHANNEL) |
- STM32_DMA_CR_PL(STM32_QSPI_QUADSPI1_DMA_PRIORITY) |
- STM32_DMA_CR_PSIZE_BYTE |
- STM32_DMA_CR_MSIZE_BYTE |
- STM32_DMA_CR_MINC |
- STM32_DMA_CR_DMEIE |
- STM32_DMA_CR_TEIE;
- nvicEnableVector(STM32_QUADSPI1_NUMBER, STM32_QSPI_QUADSPI1_IRQ_PRIORITY);
-#endif
-}
-
-/**
- * @brief Configures and activates the QSPI peripheral.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_start(QSPIDriver *qspip) {
-
- /* If in stopped state then full initialization.*/
- if (qspip->state == QSPI_STOP) {
-#if STM32_QSPI_USE_QUADSPI1
- if (&QSPID1 == qspip) {
- bool b = dmaStreamAllocate(qspip->dma,
- STM32_QSPI_QUADSPI1_DMA_IRQ_PRIORITY,
- (stm32_dmaisr_t)qspi_lld_serve_dma_interrupt,
- (void *)qspip);
- osalDbgAssert(!b, "stream already allocated");
- rccEnableQUADSPI1(true);
- }
-#endif
-
- /* Common initializations.*/
- dmaStreamSetPeripheral(qspip->dma, &qspip->qspi->DR);
- }
-
- /* QSPI setup and enable.*/
- qspip->qspi->DCR = qspip->config->dcr;
- qspip->qspi->CR = ((STM32_QSPI_QUADSPI1_PRESCALER_VALUE - 1U) << 24U) |
- QUADSPI_CR_TCIE | QUADSPI_CR_DMAEN | QUADSPI_CR_EN;
- qspip->qspi->FCR = QUADSPI_FCR_CTEF | QUADSPI_FCR_CTCF |
- QUADSPI_FCR_CSMF | QUADSPI_FCR_CTOF;
-}
-
-/**
- * @brief Deactivates the QSPI peripheral.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_stop(QSPIDriver *qspip) {
-
- /* If in ready state then disables the QUADSPI clock.*/
- if (qspip->state == QSPI_READY) {
-
- /* QSPI disable.*/
- qspip->qspi->CR = 0U;
-
- /* Releasing the DMA.*/
- dmaStreamRelease(qspip->dma);
-
- /* Stopping involved clocks.*/
-#if STM32_QSPI_USE_QUADSPI1
- if (&QSPID1 == qspip) {
- rccDisableQUADSPI1();
- }
-#endif
- }
-}
-
-/**
- * @brief Sends a command without data phase.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmd pointer to the command descriptor
- *
- * @notapi
- */
-void qspi_lld_command(QSPIDriver *qspip, const qspi_command_t *cmdp) {
-
-#if STM32_USE_STM32_D1_WORKAROUND == TRUE
- /* If it is a command without address and alternate phases then the command
- is sent as an alternate byte, the command phase is suppressed.*/
- if ((cmdp->cfg & (QSPI_CFG_ADDR_MODE_MASK | QSPI_CFG_ALT_MODE_MASK)) == 0U) {
- uint32_t cfg;
-
- /* The command mode field is copied in the alternate mode field. All
- other fields are not used in this scenario.*/
- cfg = (cmdp->cfg & QSPI_CFG_CMD_MODE_MASK) << 6U;
-
- qspip->qspi->DLR = 0U;
- qspip->qspi->ABR = cmdp->cfg & QSPI_CFG_CMD_MASK;
- qspip->qspi->CCR = cfg;
- return;
- }
-#endif
- qspip->qspi->DLR = 0U;
- qspip->qspi->ABR = cmdp->alt;
- qspip->qspi->CCR = cmdp->cfg;
- if ((cmdp->cfg & QSPI_CFG_ADDR_MODE_MASK) != QSPI_CFG_ADDR_MODE_NONE) {
- qspip->qspi->AR = cmdp->addr;
- }
-}
-
-/**
- * @brief Sends a command with data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmd pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[in] txbuf the pointer to the transmit buffer
- *
- * @notapi
- */
-void qspi_lld_send(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf) {
-
- dmaStreamSetMemory0(qspip->dma, txbuf);
- dmaStreamSetTransactionSize(qspip->dma, n);
- dmaStreamSetMode(qspip->dma, qspip->dmamode | STM32_DMA_CR_DIR_M2P);
-
- qspip->qspi->DLR = n - 1;
- qspip->qspi->ABR = cmdp->alt;
- qspip->qspi->CCR = cmdp->cfg;
- if ((cmdp->cfg & QSPI_CFG_ADDR_MODE_MASK) != QSPI_CFG_ADDR_MODE_NONE) {
- qspip->qspi->AR = cmdp->addr;
- }
-
- dmaStreamEnable(qspip->dma);
-}
-
-/**
- * @brief Sends a command then receives data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmd pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[out] rxbuf the pointer to the receive buffer
- *
- * @notapi
- */
-void qspi_lld_receive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf) {
-
- dmaStreamSetMemory0(qspip->dma, rxbuf);
- dmaStreamSetTransactionSize(qspip->dma, n);
- dmaStreamSetMode(qspip->dma, qspip->dmamode | STM32_DMA_CR_DIR_P2M);
-
- qspip->qspi->DLR = n - 1;
- qspip->qspi->ABR = cmdp->alt;
- qspip->qspi->CCR = cmdp->cfg | QUADSPI_CCR_FMODE_0;
- if ((cmdp->cfg & QSPI_CFG_ADDR_MODE_MASK) != QSPI_CFG_ADDR_MODE_NONE) {
- qspip->qspi->AR = cmdp->addr;
- }
-
- dmaStreamEnable(qspip->dma);
-}
-
-#if (QSPI_SUPPORTS_MEMMAP == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Maps in memory space a QSPI flash device.
- * @pre The memory flash device must be initialized appropriately
- * before mapping it in memory space.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[out] addrp pointer to the memory start address of the mapped
- * flash or @p NULL
- *
- * @notapi
- */
-void qspi_lld_map_flash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp) {
-
- /* Disabling the DMA request while in memory mapped mode.*/
- qspip->qspi->CR &= ~QUADSPI_CR_DMAEN;
-
- /* Starting memory mapped mode using the passed parameters.*/
- qspip->qspi->DLR = 0;
- qspip->qspi->ABR = 0;
- qspip->qspi->AR = 0;
- qspip->qspi->CCR = cmdp->cfg | QUADSPI_CCR_FMODE_1 | QUADSPI_CCR_FMODE_0;
-
- /* Mapped flash absolute base address.*/
- if (addrp != NULL) {
- *addrp = (uint8_t *)0x90000000;
- }
-}
-
-/**
- * @brief Unmaps from memory space a QSPI flash device.
- * @post The memory flash device must be re-initialized for normal
- * commands exchange.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_unmap_flash(QSPIDriver *qspip) {
-
- /* Aborting memory mapped mode.*/
- qspip->qspi->CR |= QUADSPI_CR_ABORT;
- while ((qspip->qspi->CR & QUADSPI_CR_ABORT) != 0U) {
- }
-
- /* Re-enabling DMA request, we are going back to indirect mode.*/
- qspip->qspi->CR |= QUADSPI_CR_DMAEN;
-}
-#endif /* QSPI_SUPPORTS_MEMMAP == TRUE */
-
-#endif /* HAL_USE_QSPI */
-
-/** @} */
diff --git a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.h b/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.h deleted file mode 100644 index 5276b138f..000000000 --- a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.h +++ /dev/null @@ -1,281 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file QUADSPIv1/hal_qspi_lld.h
- * @brief STM32 QSPI subsystem low level driver header.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#ifndef HAL_QSPI_LLD_H
-#define HAL_QSPI_LLD_H
-
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver constants. */
-/*===========================================================================*/
-
-/**
- * @name QSPI capabilities
- * @{
- */
-#define QSPI_SUPPORTS_MEMMAP TRUE
-/** @} */
-
-/**
- * @name DCR register options
- * @{
- */
-#define STM32_DCR_CK_MODE (1U << 0U)
-#define STM32_DCR_CSHT_MASK (7U << 8U)
-#define STM32_DCR_CSHT(n) ((n) << 8U)
-#define STM32_DCR_FSIZE_MASK (31U << 16U)
-#define STM32_DCR_FSIZE(n) ((n) << 16U)
-/** @} */
-
-/*===========================================================================*/
-/* Driver pre-compile time settings. */
-/*===========================================================================*/
-
-/**
- * @name Configuration options
- * @{
- */
-/**
- * @brief QUADSPI1 driver enable switch.
- * @details If set to @p TRUE the support for QUADSPI1 is included.
- * @note The default is @p FALSE.
- */
-#if !defined(STM32_QSPI_USE_QUADSPI1) || defined(__DOXYGEN__)
-#define STM32_QSPI_USE_QUADSPI1 FALSE
-#endif
-
-/**
- * @brief QUADSPI1 prescaler setting.
- * @note This is the prescaler divider value 1..256. The maximum frequency
- * varies depending on the STM32 model and operating conditions,
- * find the details in the data sheet.
- */
-#if !defined(STM32_QSPI_QUADSPI1_PRESCALER_VALUE) || defined(__DOXYGEN__)
-#define STM32_QSPI_QUADSPI1_PRESCALER_VALUE 1
-#endif
-
-/**
- * @brief QUADSPI1 interrupt priority level setting.
- */
-#if !defined(STM32_QSPI_QUADSPI1_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_QSPI_QUADSPI1_IRQ_PRIORITY 10
-#endif
-
-/**
- * @brief QUADSPI1 DMA priority (0..3|lowest..highest).
- */
-#if !defined(STM32_QSPI_QUADSPI1_DMA_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_QSPI_QUADSPI1_DMA_PRIORITY 1
-#endif
-
-/**
- * @brief QUADSPI1 DMA interrupt priority level setting.
- */
-#if !defined(STM32_QSPI_QUADSPI1_DMA_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_QSPI_QUADSPI1_DMA_IRQ_PRIORITY 10
-#endif
-
-/**
- * @brief QUADSPI DMA error hook.
- */
-#if !defined(STM32_QSPI_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
-#define STM32_QSPI_DMA_ERROR_HOOK(qspip) osalSysHalt("DMA failure")
-#endif
-
-/**
- * @brief Enables a workaround for a STM32L476 QUADSPI errata.
- * @details The document DM00111498 states: "QUADSPI_BK1_IO1 is always an
- * input when the command is sent in dual or quad SPI mode".
- * This workaround makes commands without address or data phases
- * to be sent as alternate bytes.
- */
-#if !defined(STM32_USE_STM32_D1_WORKAROUND) || defined(__DOXYGEN__)
-#define STM32_USE_STM32_D1_WORKAROUND TRUE
-#endif
-/** @} */
-
-/*===========================================================================*/
-/* Derived constants and error checks. */
-/*===========================================================================*/
-
-#if STM32_QSPI_USE_QUADSPI1 && !STM32_HAS_QUADSPI1
-#error "QUADSPI1 not present in the selected device"
-#endif
-
-#if !STM32_QSPI_USE_QUADSPI1
-#error "QSPI driver activated but no QUADSPI peripheral assigned"
-#endif
-
-#if STM32_QSPI_USE_QUADSPI1 && \
- !OSAL_IRQ_IS_VALID_PRIORITY(STM32_QSPI_QUADSPI1_IRQ_PRIORITY)
-#error "Invalid IRQ priority assigned to QUADSPI1"
-#endif
-
-#if STM32_QSPI_USE_QUADSPI1 && \
- !OSAL_IRQ_IS_VALID_PRIORITY(STM32_QSPI_QUADSPI1_DMA_IRQ_PRIORITY)
-#error "Invalid IRQ priority assigned to QUADSPI1 DMA"
-#endif
-
-#if STM32_QSPI_USE_QUADSPI1 && \
- !STM32_DMA_IS_VALID_PRIORITY(STM32_QSPI_QUADSPI1_DMA_PRIORITY)
-#error "Invalid DMA priority assigned to QUADSPI1"
-#endif
-
-#if (STM32_QSPI_QUADSPI1_PRESCALER_VALUE < 1) || \
- (STM32_QSPI_QUADSPI1_PRESCALER_VALUE > 256)
-#error "STM32_QSPI_QUADSPI1_PRESCALER_VALUE not within 1..256"
-#endif
-
-/* The following checks are only required when there is a DMA able to
- reassign streams to different channels.*/
-#if STM32_ADVANCED_DMA
-/* Check on the presence of the DMA streams settings in mcuconf.h.*/
-#if STM32_QSPI_USE_QUADSPI1 && !defined(STM32_QSPI_QUADSPI1_DMA_STREAM)
-#error "QUADSPI1 DMA stream not defined"
-#endif
-
-/* Check on the validity of the assigned DMA channels.*/
-#if STM32_QSPI_USE_QUADSPI1 && \
- !STM32_DMA_IS_VALID_ID(STM32_QSPI_QUADSPI1_DMA_STREAM, STM32_QUADSPI1_DMA_MSK)
-#error "invalid DMA stream associated to QUADSPI1"
-#endif
-#endif /* STM32_ADVANCED_DMA */
-
-#if !defined(STM32_DMA_REQUIRED)
-#define STM32_DMA_REQUIRED
-#endif
-
-/*===========================================================================*/
-/* Driver data structures and types. */
-/*===========================================================================*/
-
-/**
- * @brief Type of a structure representing an QSPI driver.
- */
-typedef struct QSPIDriver QSPIDriver;
-
-/**
- * @brief Type of a QSPI notification callback.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object triggering the
- * callback
- */
-typedef void (*qspicallback_t)(QSPIDriver *qspip);
-
-/**
- * @brief Driver configuration structure.
- */
-typedef struct {
- /**
- * @brief Operation complete callback or @p NULL.
- */
- qspicallback_t end_cb;
- /* End of the mandatory fields.*/
- /**
- * @brief DCR register initialization data.
- */
- uint32_t dcr;
-} QSPIConfig;
-
-/**
- * @brief Structure representing an QSPI driver.
- */
-struct QSPIDriver {
- /**
- * @brief Driver state.
- */
- qspistate_t state;
- /**
- * @brief Current configuration data.
- */
- const QSPIConfig *config;
-#if (QSPI_USE_WAIT == TRUE) || defined(__DOXYGEN__)
- /**
- * @brief Waiting thread.
- */
- thread_reference_t thread;
-#endif /* QSPI_USE_WAIT */
-#if (QSPI_USE_MUTUAL_EXCLUSION == TRUE) || defined(__DOXYGEN__)
- /**
- * @brief Mutex protecting the peripheral.
- */
- mutex_t mutex;
-#endif /* QSPI_USE_MUTUAL_EXCLUSION */
-#if defined(QSPI_DRIVER_EXT_FIELDS)
- QSPI_DRIVER_EXT_FIELDS
-#endif
- /* End of the mandatory fields.*/
- /**
- * @brief Pointer to the QUADSPIx registers block.
- */
- QUADSPI_TypeDef *qspi;
- /**
- * @brief QUADSPI DMA stream.
- */
- const stm32_dma_stream_t *dma;
- /**
- * @brief QUADSPI DMA mode bit mask.
- */
- uint32_t dmamode;
-};
-
-/*===========================================================================*/
-/* Driver macros. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* External declarations. */
-/*===========================================================================*/
-
-#if (STM32_QSPI_USE_QUADSPI1 == TRUE) && !defined(__DOXYGEN__)
-extern QSPIDriver QSPID1;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void qspi_lld_init(void);
- void qspi_lld_start(QSPIDriver *qspip);
- void qspi_lld_stop(QSPIDriver *qspip);
- void qspi_lld_command(QSPIDriver *qspip, const qspi_command_t *cmdp);
- void qspi_lld_send(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf);
- void qspi_lld_receive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf);
-#if QSPI_SUPPORTS_MEMMAP == TRUE
- void qspi_lld_map_flash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp);
- void qspi_lld_unmap_flash(QSPIDriver *qspip);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HAL_USE_QSPI */
-
-#endif /* HAL_QSPI_LLD_H */
-
-/** @} */
diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c index 87788ff6a..604303725 100644 --- a/os/hal/src/hal.c +++ b/os/hal/src/hal.c @@ -101,9 +101,6 @@ void halInit(void) { #if (HAL_USE_PWM == TRUE) || defined(__DOXYGEN__)
pwmInit();
#endif
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
- qspiInit();
-#endif
#if (HAL_USE_SERIAL == TRUE) || defined(__DOXYGEN__)
sdInit();
#endif
diff --git a/os/hal/src/hal_qspi.c b/os/hal/src/hal_qspi.c deleted file mode 100644 index ec7bd32e2..000000000 --- a/os/hal/src/hal_qspi.c +++ /dev/null @@ -1,392 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_qspi.c
- * @brief QSPI Driver code.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#include "hal.h"
-
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables and types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/**
- * @brief QSPI Driver initialization.
- * @note This function is implicitly invoked by @p halInit(), there is
- * no need to explicitly initialize the driver.
- *
- * @init
- */
-void qspiInit(void) {
-
- qspi_lld_init();
-}
-
-/**
- * @brief Initializes the standard part of a @p QSPIDriver structure.
- *
- * @param[out] qspip pointer to the @p QSPIDriver object
- *
- * @init
- */
-void qspiObjectInit(QSPIDriver *qspip) {
-
- qspip->state = QSPI_STOP;
- qspip->config = NULL;
-#if QSPI_USE_WAIT == TRUE
- qspip->thread = NULL;
-#endif
-#if QSPI_USE_MUTUAL_EXCLUSION == TRUE
- osalMutexObjectInit(&qspip->mutex);
-#endif
-#if defined(QSPI_DRIVER_EXT_INIT_HOOK)
- QSPI_DRIVER_EXT_INIT_HOOK(qspip);
-#endif
-}
-
-/**
- * @brief Configures and activates the QSPI peripheral.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] config pointer to the @p QSPIConfig object
- *
- * @api
- */
-void qspiStart(QSPIDriver *qspip, const QSPIConfig *config) {
-
- osalDbgCheck((qspip != NULL) && (config != NULL));
-
- osalSysLock();
-
- osalDbgAssert((qspip->state == QSPI_STOP) || (qspip->state == QSPI_READY),
- "invalid state");
-
- qspip->config = config;
- qspi_lld_start(qspip);
- qspip->state = QSPI_READY;
-
- osalSysUnlock();
-}
-
-/**
- * @brief Deactivates the QSPI peripheral.
- * @note Deactivating the peripheral also enforces a release of the slave
- * select line.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @api
- */
-void qspiStop(QSPIDriver *qspip) {
-
- osalDbgCheck(qspip != NULL);
-
- osalSysLock();
-
- osalDbgAssert((qspip->state == QSPI_STOP) || (qspip->state == QSPI_READY),
- "invalid state");
-
- qspi_lld_stop(qspip);
- qspip->config = NULL;
- qspip->state = QSPI_STOP;
-
- osalSysUnlock();
-}
-
-/**
- * @brief Sends a command without data phase.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- *
- * @api
- */
-void qspiStartCommand(QSPIDriver *qspip, const qspi_command_t *cmdp) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-
- qspiStartCommandI(qspip, cmdp);
-
- osalSysUnlock();
-}
-
-/**
- * @brief Sends a command with data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[in] txbuf the pointer to the transmit buffer
- *
- * @api
- */
-void qspiStartSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((n > 0U) && (txbuf != NULL));
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-
- qspiStartSendI(qspip, cmdp, n, txbuf);
-
- osalSysUnlock();
-}
-
-/**
- * @brief Sends a command then receives data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[out] rxbuf the pointer to the receive buffer
- *
- * @api
- */
-void qspiStartReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((n > 0U) && (rxbuf != NULL));
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-
- qspiStartReceiveI(qspip, cmdp, n, rxbuf);
-
- osalSysUnlock();
-}
-
-#if (QSPI_USE_WAIT == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Sends a command without data phase.
- * @pre In order to use this function the option @p QSPI_USE_WAIT must be
- * enabled.
- * @pre In order to use this function the driver must have been configured
- * without callbacks (@p end_cb = @p NULL).
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- *
- * @api
- */
-void qspiCommand(QSPIDriver *qspip, const qspi_command_t *cmdp) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((cmdp->cfg & QSPI_CFG_DATA_MODE_MASK) == QSPI_CFG_DATA_MODE_NONE);
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
- osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-
- qspiStartCommandI(qspip, cmdp);
- (void) osalThreadSuspendS(&qspip->thread);
-
- osalSysUnlock();
-}
-
-/**
- * @brief Sends a command with data over the QSPI bus.
- * @pre In order to use this function the option @p QSPI_USE_WAIT must be
- * enabled.
- * @pre In order to use this function the driver must have been configured
- * without callbacks (@p end_cb = @p NULL).
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[in] txbuf the pointer to the transmit buffer
- *
- * @api
- */
-void qspiSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((n > 0U) && (txbuf != NULL));
- osalDbgCheck((cmdp->cfg & QSPI_CFG_DATA_MODE_MASK) != QSPI_CFG_DATA_MODE_NONE);
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
- osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-
- qspiStartSendI(qspip, cmdp, n, txbuf);
- (void) osalThreadSuspendS(&qspip->thread);
-
- osalSysUnlock();
-}
-
-/**
- * @brief Sends a command then receives data over the QSPI bus.
- * @pre In order to use this function the option @p QSPI_USE_WAIT must be
- * enabled.
- * @pre In order to use this function the driver must have been configured
- * without callbacks (@p end_cb = @p NULL).
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[out] rxbuf the pointer to the receive buffer
- *
- * @api
- */
-void qspiReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((n > 0U) && (rxbuf != NULL));
- osalDbgCheck((cmdp->cfg & QSPI_CFG_DATA_MODE_MASK) != QSPI_CFG_DATA_MODE_NONE);
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
- osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-
- qspiStartReceiveI(qspip, cmdp, n, rxbuf);
- (void) osalThreadSuspendS(&qspip->thread);
-
- osalSysUnlock();
-}
-#endif /* QSPI_USE_WAIT == TRUE */
-
-#if (QSPI_SUPPORTS_MEMMAP == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Maps in memory space a QSPI flash device.
- * @pre The memory flash device must be initialized appropriately
- * before mapping it in memory space.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[out] addrp pointer to the memory start address of the mapped
- * flash or @p NULL
- *
- * @api
- */
-void qspiMapFlash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp) {
-
- osalDbgCheck((qspip != NULL) && (cmdp != NULL));
- osalDbgCheck((cmdp->cfg & QSPI_CFG_DATA_MODE_MASK) != QSPI_CFG_DATA_MODE_NONE);
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-
- qspiMapFlashI(qspip, cmdp, addrp);
- qspip->state = QSPI_MEMMAP;
-
- osalSysUnlock();
-}
-
-/**
- * @brief Unmaps from memory space a QSPI flash device.
- * @post The memory flash device must be re-initialized for normal
- * commands exchange.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @api
- */
-void qspiUnmapFlash(QSPIDriver *qspip) {
-
- osalDbgCheck(qspip != NULL);
-
- osalSysLock();
-
- osalDbgAssert(qspip->state == QSPI_MEMMAP, "not ready");
-
- qspiUnmapFlashI(qspip);
- qspip->state = QSPI_READY;
-
- osalSysUnlock();
-}
-#endif /* QSPI_SUPPORTS_MEMMAP == TRUE */
-
-#if (QSPI_USE_MUTUAL_EXCLUSION == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Gains exclusive access to the QSPI bus.
- * @details This function tries to gain ownership to the QSPI bus, if the bus
- * is already being used then the invoking thread is queued.
- * @pre In order to use this function the option @p QSPI_USE_MUTUAL_EXCLUSION
- * must be enabled.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @api
- */
-void qspiAcquireBus(QSPIDriver *qspip) {
-
- osalDbgCheck(qspip != NULL);
-
- osalMutexLock(&qspip->mutex);
-}
-
-/**
- * @brief Releases exclusive access to the QSPI bus.
- * @pre In order to use this function the option @p QSPI_USE_MUTUAL_EXCLUSION
- * must be enabled.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @api
- */
-void qspiReleaseBus(QSPIDriver *qspip) {
-
- osalDbgCheck(qspip != NULL);
-
- osalMutexUnlock(&qspip->mutex);
-}
-#endif /* QSPI_USE_MUTUAL_EXCLUSION == TRUE */
-
-#endif /* HAL_USE_QSPI == TRUE */
-
-/** @} */
diff --git a/os/hal/templates/hal_qspi_lld.c b/os/hal/templates/hal_qspi_lld.c deleted file mode 100644 index db9450227..000000000 --- a/os/hal/templates/hal_qspi_lld.c +++ /dev/null @@ -1,208 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_qspi_lld.c
- * @brief PLATFORM QSPI subsystem low level driver source.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#include "hal.h"
-
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/** @brief QSPID1 driver identifier.*/
-#if (PLATFORM_QSPI_USE_QSPI1 == TRUE) || defined(__DOXYGEN__)
-QSPIDriver QSPID1;
-#endif
-
-/*===========================================================================*/
-/* Driver local variables and types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver interrupt handlers. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/**
- * @brief Low level QSPI driver initialization.
- *
- * @notapi
- */
-void qspi_lld_init(void) {
-
-#if PLATFORM_QSPI_USE_QSPI1
- qspiObjectInit(&QSPID1);
-#endif
-}
-
-/**
- * @brief Configures and activates the QSPI peripheral.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_start(QSPIDriver *qspip) {
-
- /* If in stopped state then full initialization.*/
- if (qspip->state == QSPI_STOP) {
-#if PLATFORM_QSPI_USE_QSPI1
- if (&QSPID1 == qspip) {
- }
-#endif
-
- /* Common initializations.*/
- }
-
- /* QSPI setup and enable.*/
-}
-
-/**
- * @brief Deactivates the QSPI peripheral.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_stop(QSPIDriver *qspip) {
-
- /* If in ready state then disables QSPI.*/
- if (qspip->state == QSPI_READY) {
-
- /* QSPI disable.*/
-
- /* Stopping involved clocks.*/
-#if PLATFORM_QSPI_USE_QSPI1
- if (&QSPID1 == qspip) {
- }
-#endif
- }
-}
-
-/**
- * @brief Sends a command without data phase.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- *
- * @notapi
- */
-void qspi_lld_command(QSPIDriver *qspip, const qspi_command_t *cmdp) {
-
- (void)qspip;
- (void)cmdp;
-}
-
-/**
- * @brief Sends a command with data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[in] txbuf the pointer to the transmit buffer
- *
- * @notapi
- */
-void qspi_lld_send(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf) {
-
- (void)qspip;
- (void)cmdp;
- (void)n;
- (void)txbuf;
-}
-
-/**
- * @brief Sends a command then receives data over the QSPI bus.
- * @post At the end of the operation the configured callback is invoked.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[in] n number of bytes to send
- * @param[out] rxbuf the pointer to the receive buffer
- *
- * @notapi
- */
-void qspi_lld_receive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf) {
-
- (void)qspip;
- (void)cmdp;
- (void)n;
- (void)rxbuf;
-}
-
-#if (QSPI_SUPPORTS_MEMMAP == TRUE) || defined(__DOXYGEN__)
-/**
- * @brief Maps in memory space a QSPI flash device.
- * @pre The memory flash device must be initialized appropriately
- * before mapping it in memory space.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- * @param[in] cmdp pointer to the command descriptor
- * @param[out] addrp pointer to the memory start address of the mapped
- * flash or @p NULL
- *
- * @notapi
- */
-void qspi_lld_map_flash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp) {
-
- (void)qspip;
- (void)cmdp;
- (void)addrp;
-}
-
-/**
- * @brief Unmaps from memory space a QSPI flash device.
- * @post The memory flash device must be re-initialized for normal
- * commands exchange.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object
- *
- * @notapi
- */
-void qspi_lld_unmap_flash(QSPIDriver *qspip) {
-
- (void)qspip;
-}
-#endif /* QSPI_SUPPORTS_MEMMAP == TRUE */
-
-#endif /* HAL_USE_QSPI */
-
-/** @} */
diff --git a/os/hal/templates/hal_qspi_lld.h b/os/hal/templates/hal_qspi_lld.h deleted file mode 100644 index ed72321a9..000000000 --- a/os/hal/templates/hal_qspi_lld.h +++ /dev/null @@ -1,158 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file hal_qspi_lld.h
- * @brief PLATFORM QSPI subsystem low level driver header.
- *
- * @addtogroup QSPI
- * @{
- */
-
-#ifndef HAL_QSPI_LLD_H
-#define HAL_QSPI_LLD_H
-
-#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Driver constants. */
-/*===========================================================================*/
-
-/**
- * @name QSPI capabilities
- * @{
- */
-#define QSPI_SUPPORTS_MEMMAP TRUE
-/** @} */
-
-/*===========================================================================*/
-/* Driver pre-compile time settings. */
-/*===========================================================================*/
-
-/**
- * @name Configuration options
- * @{
- */
-/**
- * @brief QSPID1 driver enable switch.
- * @details If set to @p TRUE the support for QSPID1 is included.
- * @note The default is @p FALSE.
- */
-#if !defined(PLATFORM_QSPI_USE_QSPI1) || defined(__DOXYGEN__)
-#define PLATFORM_QSPI_USE_QSPI1 FALSE
-#endif
-/** @} */
-
-/*===========================================================================*/
-/* Derived constants and error checks. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver data structures and types. */
-/*===========================================================================*/
-
-/**
- * @brief Type of a structure representing an QSPI driver.
- */
-typedef struct QSPIDriver QSPIDriver;
-
-/**
- * @brief Type of a QSPI notification callback.
- *
- * @param[in] qspip pointer to the @p QSPIDriver object triggering the
- * callback
- */
-typedef void (*qspicallback_t)(QSPIDriver *qspip);
-
-/**
- * @brief Driver configuration structure.
- */
-typedef struct {
- /**
- * @brief Operation complete callback or @p NULL.
- */
- qspicallback_t end_cb;
- /* End of the mandatory fields.*/
-} QSPIConfig;
-
-/**
- * @brief Structure representing an QSPI driver.
- */
-struct QSPIDriver {
- /**
- * @brief Driver state.
- */
- qspistate_t state;
- /**
- * @brief Current configuration data.
- */
- const QSPIConfig *config;
-#if (QSPI_USE_WAIT == TRUE) || defined(__DOXYGEN__)
- /**
- * @brief Waiting thread.
- */
- thread_reference_t thread;
-#endif /* QSPI_USE_WAIT */
-#if (QSPI_USE_MUTUAL_EXCLUSION == TRUE) || defined(__DOXYGEN__)
- /**
- * @brief Mutex protecting the peripheral.
- */
- mutex_t mutex;
-#endif /* QSPI_USE_MUTUAL_EXCLUSION */
-#if defined(QSPI_DRIVER_EXT_FIELDS)
- QSPI_DRIVER_EXT_FIELDS
-#endif
- /* End of the mandatory fields.*/
-};
-
-/*===========================================================================*/
-/* Driver macros. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* External declarations. */
-/*===========================================================================*/
-
-#if (PLATFORM_QSPI_USE_QSPI1 == TRUE) && !defined(__DOXYGEN__)
-extern QSPIDriver QSPID1;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void qspi_lld_init(void);
- void qspi_lld_start(QSPIDriver *qspip);
- void qspi_lld_stop(QSPIDriver *qspip);
- void qspi_lld_command(QSPIDriver *qspip, const qspi_command_t *cmdp);
- void qspi_lld_send(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, const uint8_t *txbuf);
- void qspi_lld_receive(QSPIDriver *qspip, const qspi_command_t *cmdp,
- size_t n, uint8_t *rxbuf);
-#if QSPI_SUPPORTS_MEMMAP == TRUE
- void qspi_lld_map_flash(QSPIDriver *qspip,
- const qspi_command_t *cmdp,
- uint8_t **addrp);
- void qspi_lld_unmap_flash(QSPIDriver *qspip);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HAL_USE_QSPI */
-
-#endif /* HAL_QSPI_LLD_H */
-
-/** @} */
diff --git a/os/hal/templates/platform.mk b/os/hal/templates/platform.mk index ee1d9e294..3371bf00e 100644 --- a/os/hal/templates/platform.mk +++ b/os/hal/templates/platform.mk @@ -46,9 +46,6 @@ endif ifneq ($(findstring HAL_USE_PWM TRUE,$(HALCONF)),)
PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_pwm_lld.c
endif
-ifneq ($(findstring HAL_USE_QSPI TRUE,$(HALCONF)),)
-PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_qspi_lld.c
-endif
ifneq ($(findstring HAL_USE_RTC TRUE,$(HALCONF)),)
PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_rtc_lld.c
endif
@@ -93,7 +90,6 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/templates/hal_lld.c \ ${CHIBIOS}/os/hal/templates/hal_mac_lld.c \
${CHIBIOS}/os/hal/templates/hal_pal_lld.c \
${CHIBIOS}/os/hal/templates/hal_pwm_lld.c \
- ${CHIBIOS}/os/hal/templates/hal_qspi_lld.c \
${CHIBIOS}/os/hal/templates/hal_rtc_lld.c \
${CHIBIOS}/os/hal/templates/hal_sdc_lld.c \
${CHIBIOS}/os/hal/templates/hal_serial_lld.c \
|