aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/lib/complex
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-11-05 20:13:58 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-11-05 20:13:58 +0000
commit8e0e4b064425c9c54e109191bba8bcf0775ba9ee (patch)
tree3933b00193372643b9a396d431f3e22bb49239fc /os/hal/lib/complex
parentcd153877bab2e0d03feb571f4ad702e199f2cf52 (diff)
downloadChibiOS-8e0e4b064425c9c54e109191bba8bcf0775ba9ee.tar.gz
ChibiOS-8e0e4b064425c9c54e109191bba8bcf0775ba9ee.tar.bz2
ChibiOS-8e0e4b064425c9c54e109191bba8bcf0775ba9ee.zip
Fixed memory mapped mode.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12410 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/lib/complex')
-rw-r--r--os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c b/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
index 44b1018cb..81a15f869 100644
--- a/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
+++ b/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
@@ -71,23 +71,26 @@ const wspi_command_t snor_memmap_read = {
.dummy = 8, /* Note, always 8 for this command. */
.cfg = WSPI_CFG_CMD_MODE_ONE_LINE |
WSPI_CFG_ADDR_MODE_ONE_LINE |
+ WSPI_CFG_ALT_MODE_NONE |
WSPI_CFG_DATA_MODE_ONE_LINE |
WSPI_CFG_CMD_SIZE_8 |
WSPI_CFG_ADDR_SIZE_32
#elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_STR
.cmd = MX25_CMD_OPI_8READ,
.dummy = MX25_READ_DUMMY_CYCLES,
- .cfg = WSPI_CFG_CMD_MODE_TWO_LINES |
- WSPI_CFG_ADDR_MODE_TWO_LINES |
- WSPI_CFG_DATA_MODE_TWO_LINES |
+ .cfg = WSPI_CFG_CMD_MODE_EIGHT_LINES |
+ WSPI_CFG_ADDR_MODE_EIGHT_LINES |
+ WSPI_CFG_ALT_MODE_NONE |
+ WSPI_CFG_DATA_MODE_EIGHT_LINES |
WSPI_CFG_CMD_SIZE_16 |
WSPI_CFG_ADDR_SIZE_32
#elif MX25_BUS_MODE == MX25_BUS_MODE_OPI_DTR
.cmd = MX25_CMD_OPI_8DTRD,
.dummy = MX25_READ_DUMMY_CYCLES,
- .cfg = WSPI_CFG_CMD_MODE_FOUR_LINES |
- WSPI_CFG_ADDR_MODE_FOUR_LINES |
- WSPI_CFG_DATA_MODE_FOUR_LINES |
+ .cfg = WSPI_CFG_CMD_MODE_EIGHT_LINES |
+ WSPI_CFG_ADDR_MODE_EIGHT_LINES |
+ WSPI_CFG_ALT_MODE_NONE |
+ WSPI_CFG_DATA_MODE_EIGHT_LINES |
WSPI_CFG_CMD_SIZE_16 |
WSPI_CFG_ADDR_SIZE_32 |
WSPI_CFG_CMD_DTR |