Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rptun/rptun.c
+12 -7
View File
@@ -39,6 +39,10 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <inttypes.h>
#include <stdio.h>
#include <fcntl.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/kthread.h> #include <nuttx/kthread.h>
@@ -47,8 +51,9 @@
#include <nuttx/signal.h> #include <nuttx/signal.h>
#include <metal/utilities.h> #include <metal/utilities.h>
#include <stdio.h> /****************************************************************************
#include <fcntl.h> * Pre-processor Definitions
****************************************************************************/
#ifndef MAX #ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b)) # define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -176,7 +181,7 @@ static int rptun_thread(int argc, FAR char *argv[])
sigset_t set; sigset_t set;
int ret; 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); sigemptyset(&set);
sigaddset(&set, SIGUSR1); sigaddset(&set, SIGUSR1);
@@ -785,7 +790,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
{ {
struct metal_init_params params = METAL_INIT_DEFAULTS; struct metal_init_params params = METAL_INIT_DEFAULTS;
FAR struct rptun_priv_s *priv; FAR struct rptun_priv_s *priv;
char str[16]; char arg1[16];
char name[16]; char name[16];
FAR char *argv[2]; FAR char *argv[2];
int ret; int ret;
@@ -802,10 +807,10 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
return -ENOMEM; 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] = arg1;
argv[0] = str;
argv[1] = NULL; argv[1] = NULL;
ret = kthread_create(name, ret = kthread_create(name,
CONFIG_RPTUN_PRIORITY, CONFIG_RPTUN_PRIORITY,
fs/hostfs/hostfs_rpmsg.c
+1 -1
View File
@@ -554,7 +554,7 @@ FAR void *host_opendir(FAR const char *name)
ret = hostfs_rpmsg_send_recv(HOSTFS_RPMSG_OPENDIR, false, ret = hostfs_rpmsg_send_recv(HOSTFS_RPMSG_OPENDIR, false,
(struct hostfs_rpmsg_header_s *)msg, len, NULL); (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) int host_readdir(FAR void *dirp, FAR struct dirent *entry)