andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15566 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
Giovanni Di Sirio 2022-03-29 07:14:20 +00:00
parent 47360e49ec
commit 42ffe27c35
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
View File

@ -281,30 +281,27 @@ static void mx25_write_cr2(SNORDriver *devp, uint32_t addr, const uint8_t *value
.dummy = 0 .dummy = 0
}; };
const wspi_command_t cmd_write_cr2 = {
#if MX25_SWITCH_WIDTH == TRUE #if MX25_SWITCH_WIDTH == TRUE
.cmd = MX25_CMD_SPI_WRCR2, devp->nocache->cmd.cmd = MX25_CMD_SPI_WRCR2,
.cfg = MX25_CFG_C8_A32_DATA_SPI, devp->nocache->cmd.cfg = MX25_CFG_C8_A32_DATA_SPI,
#else #else
#if MX25_BUS_MODE == MX25_BUS_MODE_SPI #if MX25_BUS_MODE == MX25_BUS_MODE_SPI
.cmd = MX25_CMD_SPI_WRCR2, devp->nocache->cmd.cmd = MX25_CMD_SPI_WRCR2,
.cfg = MX25_CFG_C8_A32_DATA_SPI, devp->nocache->cmd.cfg = MX25_CFG_C8_A32_DATA_SPI,
#elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_STR #elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_STR
.cmd = MX25_CMD_OPI_WRCR2, devp->nocache->cmd.cmd = MX25_CMD_OPI_WRCR2,
.cfg = MX25_CFG_C16_A32_DATA_8STR, devp->nocache->cmd.cfg = MX25_CFG_C16_A32_DATA_8STR,
#elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_DTR #elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_DTR
.cmd = MX25_CMD_OPI_WRCR2, devp->nocache->cmd.cmd = MX25_CMD_OPI_WRCR2,
.cfg = MX25_CFG_C16_A32_DATA_8DTR, devp->nocache->cmd.cfg = MX25_CFG_C16_A32_DATA_8DTR,
#endif #endif
#endif #endif
.addr = addr, devp->nocache->cmd.addr = addr;
.alt = 0, devp->nocache->cmd.alt = 0U;
.dummy = 0 devp->nocache->cmd.dummy = 0U;
};
wspiCommand(devp->config->busp, &cmd_write_enable); wspiCommand(devp->config->busp, &cmd_write_enable);
wspiSend(devp->config->busp, &cmd_write_cr2, 1, value); wspiSend(devp->config->busp, &devp->nocache->cmd, 1, value);
} }
#endif /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */ #endif /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */

6
os/hal/lib/complex/serial_nor/hal_serial_nor.h
View File

@ -134,9 +134,13 @@ struct SNORDriverVMT {
typedef struct snor_nocache_buffer { typedef struct snor_nocache_buffer {
/** /**
* @brief Temporary buffer. * @brief Temporary generic buffer.
*/ */
uint8_t buf[SNOR_BUFFER_SIZE]; uint8_t buf[SNOR_BUFFER_SIZE];
/**
* @brief Temporary command buffer.
*/
wspi_command_t cmd;
} snor_nocache_buffer_t; } snor_nocache_buffer_t;
/** /**