diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-11-04 11:19:27 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-11-04 11:19:27 +0000 |
| commit | a250f19c64ecddb2e2dce096436d4e2f7eefe28a (patch) | |
| tree | 463897395b4b1401d5e0cf5a55a618898d41c2e3 | |
| parent | 375272e2379121fad39c31a97e1a24a10e4a487c (diff) | |
| download | ChibiOS-a250f19c64ecddb2e2dce096436d4e2f7eefe28a.tar.gz ChibiOS-a250f19c64ecddb2e2dce096436d4e2f7eefe28a.tar.bz2 ChibiOS-a250f19c64ecddb2e2dce096436d4e2f7eefe28a.zip | |
Fixed small problem in SPI mode.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12407 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c | 4 | ||||
| -rw-r--r-- | testhal/STM32/multi/WSPI-MFS/make/stm32l4r9_discovery.make | 2 |
2 files changed, 3 insertions, 3 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 ca5105f0b..c587712c4 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 @@ -172,7 +172,7 @@ static flash_error_t mx25_poll_status(SNORDriver *devp) { #endif
/* Read status command.*/
#if MX25_BUS_MODE == MX25_BUS_MODE_SPI
- bus_cmd_receive(devp->config->busp, MX25_CMD_SPI_RDSR, 1U, &sts);
+ bus_cmd_receive(devp->config->busp, MX25_CMD_SPI_RDSR, 1U, sts);
#else
bus_cmd_addr_dummy_receive(devp->config->busp, MX25_CMD_OPI_RDSR,
0U, 4U, 2U, sts); /*Note: always 4 dummies.*/
@@ -181,7 +181,7 @@ static flash_error_t mx25_poll_status(SNORDriver *devp) { /* Reading security register and checking for errors.*/
#if MX25_BUS_MODE == MX25_BUS_MODE_SPI
- bus_cmd_receive(devp->config->busp, MX25_CMD_SPI_RDSCUR, 1U, &sts);
+ bus_cmd_receive(devp->config->busp, MX25_CMD_SPI_RDSCUR, 1U, sec);
#else
bus_cmd_addr_dummy_receive(devp->config->busp, MX25_CMD_OPI_RDSCUR,
0U, 4U, 2U, sec); /*Note: always 4 dummies.*/
diff --git a/testhal/STM32/multi/WSPI-MFS/make/stm32l4r9_discovery.make b/testhal/STM32/multi/WSPI-MFS/make/stm32l4r9_discovery.make index 69ad8ff1d..bb649be47 100644 --- a/testhal/STM32/multi/WSPI-MFS/make/stm32l4r9_discovery.make +++ b/testhal/STM32/multi/WSPI-MFS/make/stm32l4r9_discovery.make @@ -113,7 +113,7 @@ include $(CHIBIOS)/tools/mk/autobuild.mk # Other files (optional).
include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/mfs/mfs_test.mk
-include $(CHIBIOS)/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.mk
+include $(CHIBIOS)/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.mk
include $(CHIBIOS)/os/hal/lib/complex/mfs/hal_mfs.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|