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

drivers/rptun/rptun.c and fs/hostfs/hostfs_rpmsg.c: Fix 64-bit build issue in rpmsg driver.

Browse Source
This commit is contained in:
Xiang Xiao 2019-11-03 07:28:17 -06:00 committed by Gregory Nutt
parent 67b4f9d0e1
commit 383ce02442
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/rptun/rptun.c
View File

@ -39,6 +39,10 @@
#include <nuttx/config.h>
#include <inttypes.h>
#include <stdio.h>
#include <fcntl.h>
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
@ -47,8 +51,9 @@
#include <nuttx/signal.h>
#include <metal/utilities.h>
#include <stdio.h>
#include <fcntl.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
@ -176,7 +181,7 @@ static int rptun_thread(int argc, FAR char *argv[])
sigset_t set;
int ret;
priv = (FAR struct rptun_priv_s *)atoi(argv[1]);
priv = (FAR struct rptun_priv_s *)((uintptr_t)strtoul(argv[1], NULL, 0));
sigemptyset(&set);
sigaddset(&set, SIGUSR1);
@ -785,7 +790,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
{
struct metal_init_params params = METAL_INIT_DEFAULTS;
FAR struct rptun_priv_s *priv;
char str[16];
char arg1[16];
char name[16];
FAR char *argv[2];
int ret;
@ -802,10 +807,10 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
return -ENOMEM;
}
sprintf(name, "rptun%s", RPTUN_GET_CPUNAME(dev));
snprintf(name, 16, "rptun%s", RPTUN_GET_CPUNAME(dev));
snprintf(arg1, 16, "0x%" PRIxPTR, (uintptr_t)priv);
itoa((int)priv, str, 10);
argv[0] = str;
argv[0] = arg1;
argv[1] = NULL;
ret = kthread_create(name,
CONFIG_RPTUN_PRIORITY,

2
fs/hostfs/hostfs_rpmsg.c
View File

@ -554,7 +554,7 @@ FAR void *host_opendir(FAR const char *name)
ret = hostfs_rpmsg_send_recv(HOSTFS_RPMSG_OPENDIR, false,
(struct hostfs_rpmsg_header_s *)msg, len, NULL);
return ret < 0 ? NULL : (FAR void *)ret;
return ret < 0 ? NULL : (FAR void *)((uintptr_t)ret);
}
int host_readdir(FAR void *dirp, FAR struct dirent *entry)