diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-03 14:32:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-03 14:32:08 -0600 |
| commit | 0d40d1bd1474f04984320a650148d66095a8ff9c (patch) | |
| tree | ac4f2e6df2a6fd5a7050f567704beafc2c4bca8b /nuttx/drivers/mtd/m25px.c | |
| parent | 1092e4b16395d945517b9bcbc2c48828fbe9303c (diff) | |
| download | px4-nuttx-0d40d1bd1474f04984320a650148d66095a8ff9c.tar.gz px4-nuttx-0d40d1bd1474f04984320a650148d66095a8ff9c.tar.bz2 px4-nuttx-0d40d1bd1474f04984320a650148d66095a8ff9c.zip | |
Replace CONFIG_MTD_SMART in MTD drivers with other conditions
Diffstat (limited to 'nuttx/drivers/mtd/m25px.c')
| -rw-r--r-- | nuttx/drivers/mtd/m25px.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/drivers/mtd/m25px.c b/nuttx/drivers/mtd/m25px.c index 17f7a0672..7dc26b3ee 100644 --- a/nuttx/drivers/mtd/m25px.c +++ b/nuttx/drivers/mtd/m25px.c @@ -204,7 +204,7 @@ struct m25p_dev_s uint8_t pageshift; /* 8 */ uint16_t nsectors; /* 128 or 64 */ uint32_t npages; /* 32,768 or 65,536 */ -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE uint8_t subsectorshift; /* 0, 12 or 13 (4K or 8K) */ #endif }; @@ -322,7 +322,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv) { /* Okay.. is it a FLASH capacity that we understand? */ -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE priv->subsectorshift = 0; #endif @@ -344,7 +344,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv) priv->npages = M25P_EN25F80_NPAGES; priv->sectorshift = M25P_EN25F80_SECTOR_SHIFT; priv->nsectors = M25P_EN25F80_NSECTORS; -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE priv->subsectorshift = M25P_EN25F80_SUBSECT_SHIFT; #endif return OK; @@ -486,7 +486,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type { off_t offset; -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE if (priv->subsectorshift > 0) { offset = sector << priv->subsectorshift; @@ -681,7 +681,7 @@ static int m25p_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblock m25p_lock(priv->dev); while (blocksleft > 0) { -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE size_t sectorboundry; size_t blkper; @@ -928,7 +928,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) */ geo->blocksize = (1 << priv->pageshift); -#ifdef CONFIG_MTD_SMART +#ifdef CONFIG_M25P_SUBSECTOR_ERASE if (priv->subsectorshift > 0) { geo->erasesize = (1 << priv->subsectorshift); |