sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/mtd/gd25.c: Add gd25_lock/unlock to case: enable 4-bytes address

Browse Source
This commit is contained in:
ligd 2019-11-12 09:01:10 -06:00 committed by Gregory Nutt
parent 2ba7ce75d7
commit bf98b28737
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/gd25.c
View File

@ -240,6 +240,7 @@ static inline int gd25_readid(FAR struct gd25_dev_s *priv)
uint16_t manufacturer;
uint16_t memory;
uint16_t capacity;
int ret = -ENODEV;
/* Lock and configure the SPI bus */
@ -259,7 +260,6 @@ static inline int gd25_readid(FAR struct gd25_dev_s *priv)
/* Deselect the FLASH and unlock the bus */
SPI_SELECT(priv->spi, SPIDEV_FLASH(priv->spi_devid), false);
gd25_unlock(priv->spi);
finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
manufacturer, memory, capacity);
@ -297,7 +297,7 @@ static inline int gd25_readid(FAR struct gd25_dev_s *priv)
}
else
{
return -ENODEV;
goto out;
}
/* Capacity greater than 16MB, Enable four-byte address */
@ -310,18 +310,24 @@ static inline int gd25_readid(FAR struct gd25_dev_s *priv)
{
ferr("ERROR: capacity %02x: Can't enable 4-byte mode!\n",
capacity);
return -EBUSY;
ret = -EBUSY;
goto out;
}
priv->addr_4byte = true;
}
return OK;
ret = OK;
}
/* We don't understand the manufacturer or the memory type */
out:
/* We don't understand the manufacturer or the memory type.
* Or enable four-byte address failed.
* Or success.
*/
return -ENODEV;
gd25_unlock(priv->spi);
return ret;
}
/**************************************************************************