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

MTD Smart: Remove checks for 64KB erase block size. erasesize was changed to 32-bits in struct mtd_geometry_s

Browse Source
This commit is contained in:
Gregory Nutt 2015-11-11 08:25:03 -06:00
parent 2ff1b173f2
commit 9f3edd6373
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/mtd/smart.c
View File

@ -924,14 +924,9 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry)
geometry->geo_writeenabled = false;
#endif
erasesize = dev->geo.erasesize;
if (erasesize == 0)
{
erasesize = 262144;
}
erasesize = dev->geo.erasesize;
geometry->geo_nsectors = dev->geo.neraseblocks * erasesize /
dev->sectorsize;
dev->sectorsize;
geometry->geo_sectorsize = dev->sectorsize;
fvdbg("available: true mediachanged: false writeenabled: %s\n",
@ -971,21 +966,12 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
return OK;
}
erasesize = dev->geo.erasesize;
dev->neraseblocks = dev->geo.neraseblocks;
/* Most FLASH devices have erase size of 64K, but geo.erasesize is only
* 16 bits, so it will be zero
*/
if (erasesize == 0)
{
erasesize = 262144;
}
dev->erasesize = erasesize;
dev->sectorsize = size;
erasesize = dev->geo.erasesize;
dev->neraseblocks = dev->geo.neraseblocks;
dev->erasesize = erasesize;
dev->sectorsize = size;
dev->mtdBlksPerSector = dev->sectorsize / dev->geo.blocksize;
if (erasesize / dev->sectorsize > 256)
{
/* We can't throw a dbg message here becasue it is too early.
@ -2812,14 +2798,7 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
if (dev->erasesize == 0)
{
if (dev->geo.erasesize == 0)
{
dev->erasesize = 262144;
}
else
{
dev->erasesize = dev->geo.erasesize;
}
dev->erasesize = dev->geo.erasesize;
dbg("ERROR: Invalid geometery ... Sectors per erase block must be 256 or less\n");
dbg(" Erase block size = %d\n", dev->erasesize);