mirror of
https://github.com/apache/nuttx.git
synced 2026-05-29 04:19:37 +08:00
drivers/mtd/s25fl1.c: Minor change for the s25fl1 QSPI FLASH driver which fixes additional sectorshift vs. pageshift confusion.
This commit is contained in:
@@ -1265,11 +1265,11 @@ static ssize_t s25fl1_bread(FAR struct mtd_dev_s *dev, off_t startblock,
|
|||||||
nbytes >>= S25FL1_SECTOR512_SHIFT;
|
nbytes >>= S25FL1_SECTOR512_SHIFT;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
nbytes = s25fl1_read(dev, startblock << priv->sectorshift,
|
nbytes = s25fl1_read(dev, startblock << priv->pageshift,
|
||||||
nblocks << priv->sectorshift, buffer);
|
nblocks << priv->pageshift, buffer);
|
||||||
if (nbytes > 0)
|
if (nbytes > 0)
|
||||||
{
|
{
|
||||||
nbytes >>= priv->sectorshift;
|
nbytes >>= priv->pageshift;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1300,8 +1300,8 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
ret = s25fl1_write_page(priv, buffer, startblock << priv->sectorshift,
|
ret = s25fl1_write_page(priv, buffer, startblock << priv->pageshift,
|
||||||
nblocks << priv->sectorshift);
|
nblocks << priv->pageshift);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
{
|
{
|
||||||
ferr("ERROR: s25fl1_write_page failed: %d\n", ret);
|
ferr("ERROR: s25fl1_write_page failed: %d\n", ret);
|
||||||
|
|||||||
Reference in New Issue
Block a user