Skip to content

Commit

Permalink
fs: change geometry types from size_t to blkcnt_t and blksize_t
Browse files Browse the repository at this point in the history 
This change reflects that the geometry isn't related to the largest
allocatable unit on the platform.

Calls to read and write block devices are also affected and have
been updated.
  • Loading branch information
@codebje @xiaoxiang781216
codebje authored and xiaoxiang781216 committed Feb 19, 2021
1 parent f344e7b commit 9a1b726
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 93 deletions.
21 changes: 11 additions & 10 deletions arch/arm/src/cxd56xx/cxd56_emmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,13 @@ struct cxd56_emmc_state_s
static int cxd56_emmc_open(FAR struct inode *inode);
static int cxd56_emmc_close(FAR struct inode *inode);
static ssize_t cxd56_emmc_read(FAR struct inode *inode,
unsigned char *buffer, size_t start_sector,
unsigned char *buffer,
blkcnt_t start_sector,
unsigned int nsectors);
#if !defined(CONFIG_MMCSD_READONLY)
static ssize_t cxd56_emmc_write(FAR struct inode *inode,
const unsigned char *buffer,
size_t start_sector,
blkcnt_t start_sector,
unsigned int nsectors);
#endif
static int cxd56_emmc_geometry(FAR struct inode *inode,
Expand Down Expand Up @@ -348,7 +349,7 @@ static int emmc_checkresponse(void)

if (resp & R1STATUS_ALL_ERR)
{
ferr("Response error %08x\n", resp);
ferr("Response error %08" PRIx32 "\n", resp);
return -EIO;
}

Expand Down Expand Up @@ -734,7 +735,7 @@ static int cxd56_emmc_readsectors(FAR struct cxd56_emmc_state_s *priv,
if (idsts &
(EMMC_IDSTS_FBE | EMMC_IDSTS_DU | EMMC_IDSTS_CES | EMMC_IDSTS_AIS))
{
ferr("DMA status failed. %08x\n", idsts);
ferr("DMA status failed. %08" PRIx32 "\n", idsts);
ret = -EIO;
}

Expand All @@ -747,7 +748,7 @@ static int cxd56_emmc_readsectors(FAR struct cxd56_emmc_state_s *priv,

#if !defined(CONFIG_MMCSD_READONLY)
static int cxd56_emmc_writesectors(FAR struct cxd56_emmc_state_s *priv,
const void *buf, size_t start_sector,
const void *buf, blkcnt_t start_sector,
unsigned int nsectors)
{
struct emmc_dma_desc_s *descs;
Expand Down Expand Up @@ -797,7 +798,7 @@ static int cxd56_emmc_writesectors(FAR struct cxd56_emmc_state_s *priv,
if (idsts &
(EMMC_IDSTS_FBE | EMMC_IDSTS_DU | EMMC_IDSTS_CES | EMMC_IDSTS_AIS))
{
ferr("DMA status error. %08x\n", idsts);
ferr("DMA status error. %08" PRIx32 "\n", idsts);
ret = -EIO;
}

Expand Down Expand Up @@ -866,7 +867,7 @@ static int cxd56_emmc_close(FAR struct inode *inode)
}

static ssize_t cxd56_emmc_read(FAR struct inode *inode,
unsigned char *buffer, size_t start_sector,
unsigned char *buffer, blkcnt_t start_sector,
unsigned int nsectors)
{
FAR struct cxd56_emmc_state_s *priv;
Expand All @@ -875,7 +876,7 @@ static ssize_t cxd56_emmc_read(FAR struct inode *inode,
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct cxd56_emmc_state_s *)inode->i_private;

finfo("Read sector %d (%d sectors) to %p\n",
finfo("Read sector %" PRIu32 " (%u sectors) to %p\n",
start_sector, nsectors, buffer);

ret = cxd56_emmc_readsectors(priv, buffer, start_sector, nsectors);
Expand All @@ -891,7 +892,7 @@ static ssize_t cxd56_emmc_read(FAR struct inode *inode,
#if !defined(CONFIG_MMCSD_READONLY)
static ssize_t cxd56_emmc_write(FAR struct inode *inode,
const unsigned char *buffer,
size_t start_sector,
blkcnt_t start_sector,
unsigned int nsectors)
{
FAR struct cxd56_emmc_state_s *priv;
Expand All @@ -900,7 +901,7 @@ static ssize_t cxd56_emmc_write(FAR struct inode *inode,
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct cxd56_emmc_state_s *)inode->i_private;

finfo("Write %p to sector %d (%d sectors)\n", buffer,
finfo("Write %p to sector %" PRIu32 " (%u sectors)\n", buffer,
start_sector, nsectors);

ret = cxd56_emmc_writesectors(priv, buffer, start_sector, nsectors);
Expand Down
18 changes: 9 additions & 9 deletions arch/arm/src/lc823450/lc823450_mmcl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ struct mmcl_dev_s
static int mmcl_open(FAR struct inode *inode);
static int mmcl_close(FAR struct inode *inode);
static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer,
size_t start_sector, unsigned int nsectors);
blkcnt_t start_sector, unsigned int nsectors);
static ssize_t mmcl_write(FAR struct inode *inode,
const unsigned char *buffer, size_t start_sector,
const unsigned char *buffer, blkcnt_t start_sector,
unsigned int nsectors);
static int mmcl_geometry(FAR struct inode *inode,
struct geometry *geometry);
Expand Down Expand Up @@ -122,20 +122,20 @@ static int mmcl_close(FAR struct inode *inode)
****************************************************************************/

static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
ssize_t nread;
struct mmcl_dev_s *dev;

finfo("sector: %d nsectors: %d\n", start_sector, nsectors);
finfo("sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);

DEBUGASSERT(inode && inode->i_private);
dev = (struct mmcl_dev_s *)inode->i_private;

nread = MTD_BREAD(dev->mtd, start_sector, nsectors, buffer);
if (nread != nsectors)
{
finfo("Read %d blocks starting at block %d failed: %d\n",
finfo("Read %u blocks starting at block %" PRIu32 " failed: %d\n",
nsectors, start_sector, nread);
return -EIO;
}
Expand All @@ -151,21 +151,21 @@ static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer,
****************************************************************************/

static ssize_t mmcl_write(FAR struct inode *inode,
const unsigned char *buffer, size_t start_sector,
const unsigned char *buffer, blkcnt_t start_sector,
unsigned int nsectors)
{
ssize_t nwrite;
struct mmcl_dev_s *dev;

finfo("sector: %d nsectors: %d\n", start_sector, nsectors);
finfo("sector: %" PRIu32 " nsectors: %u\n", start_sector, nsectors);

DEBUGASSERT(inode && inode->i_private);
dev = (struct mmcl_dev_s *)inode->i_private;

nwrite = MTD_BWRITE(dev->mtd, start_sector, nsectors, buffer);
if (nwrite != nsectors)
{
finfo("Write %d blocks starting at block %d failed: %d\n",
finfo("Write %u blocks starting at block %" PRIu32 " failed: %d\n",
nsectors, start_sector, nwrite);
return -EIO;
}
Expand Down Expand Up @@ -199,7 +199,7 @@ static int mmcl_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("available: true mediachanged: false writeenabled: %s\n",
geometry->geo_writeenabled ? "true" : "false");

finfo("nsectors: %d sectorsize: %d\n",
finfo("nsectors: %" PRIu32 " sectorsize: %" PRIi16 "\n",
geometry->geo_nsectors, geometry->geo_sectorsize);

return OK;
Expand Down
18 changes: 9 additions & 9 deletions arch/arm/src/s32k1xx/s32k1xx_eeeprom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ static int eeed_close(FAR struct inode *inode);
#endif

static ssize_t eeed_read(FAR struct inode *inode, FAR unsigned char *buffer,
size_t start_sector, unsigned int nsectors);
blkcnt_t start_sector, unsigned int nsectors);
static ssize_t eeed_write(FAR struct inode *inode,
FAR const unsigned char *buffer, size_t start_sector,
FAR const unsigned char *buffer, blkcnt_t start_sector,
unsigned int nsectors);

static int eeed_geometry(FAR struct inode *inode,
Expand Down Expand Up @@ -215,15 +215,15 @@ static int eeed_close(FAR struct inode *inode)
******************************************************************************/

static ssize_t eeed_read(FAR struct inode *inode, unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
FAR struct eeed_struct_s *dev;

DEBUGASSERT(inode && inode->i_private);
dev = (FAR struct eeed_struct_s *)inode->i_private;

finfo("sector: %d nsectors: %d sectorsize: %d\n",
start_sector, dev->eeed_sectsize, nsectors);
finfo("sector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
start_sector, nsectors, dev->eeed_sectsize);

if (start_sector < dev->eeed_nsectors &&
start_sector + nsectors <= dev->eeed_nsectors)
Expand Down Expand Up @@ -251,15 +251,15 @@ static ssize_t eeed_read(FAR struct inode *inode, unsigned char *buffer,
******************************************************************************/

static ssize_t eeed_write(FAR struct inode *inode, const unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
struct eeed_struct_s *dev;

DEBUGASSERT(inode && inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;

finfo("sector: %d nsectors: %d sectorsize: %d\n",
start_sector, dev->eeed_sectsize, nsectors);
finfo("sector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
start_sector, nsectors, dev->eeed_sectsize);

if (start_sector < dev->eeed_nsectors &&
start_sector + nsectors <= dev->eeed_nsectors)
Expand Down Expand Up @@ -312,7 +312,7 @@ static int eeed_geometry(FAR struct inode *inode, struct geometry *geometry)

finfo("available: true mediachanged: false writeenabled: %s\n",
geometry->geo_writeenabled ? "true" : "false");
finfo("nsectors: %d sectorsize: %d\n",
finfo("nsectors: %" PRIu32 " sectorsize: %" PRIu16 "\n",
geometry->geo_nsectors, geometry->geo_sectorsize);

return OK;
Expand Down
8 changes: 4 additions & 4 deletions drivers/loop/losetup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ static int loop_semtake(FAR struct loop_struct_s *dev);
static int loop_open(FAR struct inode *inode);
static int loop_close(FAR struct inode *inode);
static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
size_t start_sector, unsigned int nsectors);
blkcnt_t start_sector, unsigned int nsectors);
static ssize_t loop_write(FAR struct inode *inode,
FAR const unsigned char *buffer,
size_t start_sector, unsigned int nsectors);
blkcnt_t start_sector, unsigned int nsectors);
static int loop_geometry(FAR struct inode *inode,
FAR struct geometry *geometry);

Expand Down Expand Up @@ -194,7 +194,7 @@ static int loop_close(FAR struct inode *inode)
****************************************************************************/

static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
FAR struct loop_struct_s *dev;
ssize_t nbytesread;
Expand Down Expand Up @@ -248,7 +248,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,

static ssize_t loop_write(FAR struct inode *inode,
FAR const unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
FAR struct loop_struct_s *dev;
ssize_t nbyteswritten;
Expand Down
12 changes: 6 additions & 6 deletions drivers/mmcsd/mmcsd_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ static ssize_t mmcsd_flush(FAR void *dev, FAR const uint8_t *buffer,
static int mmcsd_open(FAR struct inode *inode);
static int mmcsd_close(FAR struct inode *inode);
static ssize_t mmcsd_read(FAR struct inode *inode, FAR unsigned char *buffer,
size_t startsector, unsigned int nsectors);
blkcnt_t startsector, unsigned int nsectors);
static ssize_t mmcsd_write(FAR struct inode *inode,
FAR const unsigned char *buffer, size_t startsector,
FAR const unsigned char *buffer, blkcnt_t startsector,
unsigned int nsectors);
static int mmcsd_geometry(FAR struct inode *inode,
FAR struct geometry *geometry);
Expand Down Expand Up @@ -2224,7 +2224,7 @@ static int mmcsd_close(FAR struct inode *inode)
****************************************************************************/

static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
size_t startsector, unsigned int nsectors)
blkcnt_t startsector, unsigned int nsectors)
{
FAR struct mmcsd_state_s *priv;
#if !defined(CONFIG_DRVR_READAHEAD) && defined(CONFIG_MMCSD_MULTIBLOCK_DISABLE)
Expand All @@ -2235,7 +2235,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,

DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
finfo("startsector: %d nsectors: %d sectorsize: %d\n",
finfo("startsector: %" PRIu32 " nsectors: %u sectorsize: %d\n",
startsector, nsectors, priv->blocksize);

if (nsectors > 0)
Expand Down Expand Up @@ -2304,7 +2304,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,

static ssize_t mmcsd_write(FAR struct inode *inode,
FAR const unsigned char *buffer,
size_t startsector, unsigned int nsectors)
blkcnt_t startsector, unsigned int nsectors)
{
FAR struct mmcsd_state_s *priv;
#if defined(CONFIG_MMCSD_MULTIBLOCK_DISABLE)
Expand Down Expand Up @@ -2420,7 +2420,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("available: true mediachanged: %s writeenabled: %s\n",
geometry->geo_mediachanged ? "true" : "false",
geometry->geo_writeenabled ? "true" : "false");
finfo("nsectors: %lu sectorsize: %d\n",
finfo("nsectors: %lu sectorsize: %" PRIi16 "\n",
(unsigned long)geometry->geo_nsectors,
geometry->geo_sectorsize);

Expand Down
16 changes: 8 additions & 8 deletions drivers/mmcsd/mmcsd_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ static int mmcsd_xmitblock(FAR struct mmcsd_slot_s *slot,
static int mmcsd_open(FAR struct inode *inode);
static int mmcsd_close(FAR struct inode *inode);
static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
size_t start_sector, unsigned int nsectors);
blkcnt_t start_sector, unsigned int nsectors);
#if !defined(CONFIG_MMCSD_READONLY)
static ssize_t mmcsd_write(FAR struct inode *inode,
const unsigned char *buffer, size_t start_sector,
const unsigned char *buffer, blkcnt_t start_sector,
unsigned int nsectors);
#endif
static int mmcsd_geometry(FAR struct inode *inode,
Expand Down Expand Up @@ -1156,7 +1156,7 @@ static int mmcsd_close(FAR struct inode *inode)
****************************************************************************/

static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
FAR struct mmcsd_slot_s *slot;
FAR struct spi_dev_s *spi;
Expand All @@ -1166,7 +1166,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
int i;
int ret;

finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
finfo("start_sector=%" PRIu32 " nsectors=%u\n", start_sector, nsectors);

#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
Expand Down Expand Up @@ -1317,7 +1317,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
#if !defined(CONFIG_MMCSD_READONLY)
static ssize_t mmcsd_write(FAR struct inode *inode,
FAR const unsigned char *buffer,
size_t start_sector, unsigned int nsectors)
blkcnt_t start_sector, unsigned int nsectors)
{
FAR struct mmcsd_slot_s *slot;
FAR struct spi_dev_s *spi;
Expand All @@ -1327,7 +1327,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode,
int i;
int ret;

finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
finfo("start_sector=%" PRIu32 " nsectors=%u\n", start_sector, nsectors);

#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
Expand Down Expand Up @@ -1593,8 +1593,8 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
finfo("geo_available: %d\n", geometry->geo_available);
finfo("geo_mediachanged: %d\n", geometry->geo_mediachanged);
finfo("geo_writeenabled: %d\n", geometry->geo_writeenabled);
finfo("geo_nsectors: %d\n", geometry->geo_nsectors);
finfo("geo_sectorsize: %d\n", geometry->geo_sectorsize);
finfo("geo_nsectors: %" PRIu32 "\n", geometry->geo_nsectors);
finfo("geo_sectorsize: %" PRIi16 "\n", geometry->geo_sectorsize);

return OK;
}
Expand Down

0 comments on commit 9a1b726

Please sign in to comment.