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

Cast pointer to uintptr prior to ulong for ioctl

Browse Source 
Signed-off-by: Brennan Ashton <bashton@brennanashton.com>
This commit is contained in:
Brennan Ashton 2020-07-19 16:53:22 +00:00 committed by Alan Carvalho de Assis
parent ff6e2e7b7d
commit 3a58926d01
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/driver/fs_blockpartition.c
View File

@ -224,6 +224,7 @@ static int part_geometry(FAR struct inode *inode, struct geometry *geometry)
static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
{ {
FAR uintptr_t ptr_arg = (uintptr_t)arg;
FAR struct part_struct_s *dev = inode->i_private; FAR struct part_struct_s *dev = inode->i_private;
FAR struct inode *parent = dev->parent; FAR struct inode *parent = dev->parent;
int ret = -ENOTTY; int ret = -ENOTTY;
@ -232,7 +233,8 @@ static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
{ {
if (cmd == MTDIOC_PROTECT || cmd == MTDIOC_UNPROTECT) if (cmd == MTDIOC_PROTECT || cmd == MTDIOC_UNPROTECT)
{ {
FAR struct mtd_protect_s *prot = (FAR struct mtd_protect_s *)arg; FAR struct mtd_protect_s *prot =
(FAR struct mtd_protect_s *)ptr_arg;
prot->startblock += dev->firstsector; prot->startblock += dev->firstsector;
} }
@ -242,7 +244,7 @@ static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
{ {
if (cmd == BIOC_XIPBASE || cmd == MTDIOC_XIPBASE) if (cmd == BIOC_XIPBASE || cmd == MTDIOC_XIPBASE)
{ {
FAR void **base = (FAR void **)arg; FAR void **base = (FAR void **)ptr_arg;
struct geometry geo; struct geometry geo;
ret = parent->u.i_bops->geometry(parent, &geo); ret = parent->u.i_bops->geometry(parent, &geo);
@ -255,7 +257,7 @@ static int part_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
else if (cmd == MTDIOC_GEOMETRY) else if (cmd == MTDIOC_GEOMETRY)
{ {
FAR struct mtd_geometry_s *mgeo = FAR struct mtd_geometry_s *mgeo =
(FAR struct mtd_geometry_s *)arg; (FAR struct mtd_geometry_s *)ptr_arg;
uint32_t blkper = mgeo->erasesize / mgeo->blocksize; uint32_t blkper = mgeo->erasesize / mgeo->blocksize;
mgeo->neraseblocks = dev->nsectors / blkper; mgeo->neraseblocks = dev->nsectors / blkper;

5
fs/partition/fs_partition.c
View File

@ -156,7 +156,8 @@ int parse_block_partition(FAR const char *path,
state.mtd = NULL; state.mtd = NULL;
ret = state.blk->u.i_bops->ioctl(state.blk, MTDIOC_GEOMETRY, (unsigned long)&mgeo); ret = state.blk->u.i_bops->ioctl(
state.blk, MTDIOC_GEOMETRY, (unsigned long)(uintptr_t)&mgeo);
if (ret >= 0) if (ret >= 0)
{ {
state.blocksize = mgeo.blocksize; state.blocksize = mgeo.blocksize;
@ -207,7 +208,7 @@ int parse_mtd_partition(FAR struct mtd_dev_s *mtd,
struct mtd_geometry_s mgeo; struct mtd_geometry_s mgeo;
int ret; int ret;
ret = mtd->ioctl(mtd, MTDIOC_GEOMETRY, (unsigned long)&mgeo); ret = mtd->ioctl(mtd, MTDIOC_GEOMETRY, (unsigned long)(uintptr_t)&mgeo);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;