Fixed bug #1173.

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

os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c

@@ -270,8 +270,8 @@ static void n25q_reset_memory(SNORDriver *devp) {
 #else
   /* 2x N25Q_CMD_RESET_ENABLE command.*/
   static const wspi_command_t cmd_reset_enable_2 = {
-    .cfg              = WSPI_CFG_CMD(N25Q_CMD_RESET_ENABLE) |
-                        WSPI_CFG_CMD_MODE_TWO_LINES,
+    .cmd              = N25Q_CMD_RESET_ENABLE,
+    .cfg              = WSPI_CFG_CMD_MODE_TWO_LINES,
     .addr             = 0,
     .alt              = 0,
     .dummy            = 0
@@ -279,8 +279,8 @@ static void n25q_reset_memory(SNORDriver *devp) {
 
   /* 2x N25Q_CMD_RESET_MEMORY command.*/
   static const wspi_command_t cmd_reset_memory_2 = {
-    .cfg              = WSPI_CFG_CMD(N25Q_CMD_RESET_MEMORY) |
-                        WSPI_CFG_CMD_MODE_TWO_LINES,
+    .cmd              = N25Q_CMD_RESET_MEMORY,
+    .cfg              = WSPI_CFG_CMD_MODE_TWO_LINES,
     .addr             = 0,
     .alt              = 0,
     .dummy            = 0

os/hal/lib/complex/serial_nor/hal_serial_nor.h

@@ -156,8 +156,10 @@ typedef struct {
 #ifdef __cplusplus
 extern "C" {
 #endif
+#if SNOR_SHARED_BUS == TRUE
   void bus_acquire(BUSDriver *busp, const BUSConfig *config);
   void bus_release(BUSDriver *busp);
+#endif
   void bus_cmd(BUSDriver *busp, uint32_t cmd);
   void bus_cmd_send(BUSDriver *busp, uint32_t cmd, size_t n, const uint8_t *p);
   void bus_cmd_receive(BUSDriver *busp,

readme.txt

@@ -74,6 +74,8 @@
 *****************************************************************************
 
 *** Next ***
+- FIX: Fixed problem with N25Q driver (bug #1173)
+       (backported to 21.6.1)(backported to 20.3.4).
 - FIX: Fixed semaphores broken when CH_CFG_USE_SEMAPHORES_PRIORITY is enabled
        (bug #1172).
 - FIX: Fixed idle thread stack area not cleared when CH_DBG_FILL_THREADS