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

drivers/rptun/rptun.c: Refine the start/stop flow to support the repeat boot.

Browse Source
This commit is contained in:
Xiang Xiao 2019-11-11 09:09:40 -06:00 committed by Gregory Nutt
parent 48de68c474
commit fa264ff7e7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/Kconfig
View File

@ -70,6 +70,7 @@ config ARCH_SIM
select ARCH_HAVE_TICKLESS select ARCH_HAVE_TICKLESS
select ARCH_HAVE_POWEROFF select ARCH_HAVE_POWEROFF
select ARCH_HAVE_TESTSET select ARCH_HAVE_TESTSET
select ARCH_NOINTC
select SERIAL_CONSOLE select SERIAL_CONSOLE
---help--- ---help---
Linux/Cywgin user-mode simulation. Linux/Cywgin user-mode simulation.

19
drivers/rptun/rptun.c
View File

@ -76,7 +76,6 @@ struct rptun_priv_s
struct metal_list bind; struct metal_list bind;
struct metal_list node; struct metal_list node;
int pid; int pid;
bool started;
}; };
struct rptun_bind_s struct rptun_bind_s
@ -369,6 +368,12 @@ static int rptun_dev_start(FAR struct remoteproc *rproc)
unsigned int role = RPMSG_REMOTE; unsigned int role = RPMSG_REMOTE;
int ret; int ret;
ret = remoteproc_config(&priv->rproc, NULL);
if (ret)
{
return ret;
}
if (RPTUN_GET_FIRMWARE(priv->dev)) if (RPTUN_GET_FIRMWARE(priv->dev))
{ {
struct rptun_store_s store = struct rptun_store_s store =
@ -492,7 +497,6 @@ static int rptun_dev_start(FAR struct remoteproc *rproc)
RPTUN_REGISTER_CALLBACK(priv->dev, rptun_callback, priv); RPTUN_REGISTER_CALLBACK(priv->dev, rptun_callback, priv);
priv->started = true;
return 0; return 0;
} }
@ -525,9 +529,9 @@ static int rptun_dev_stop(FAR struct remoteproc *rproc)
nxsem_post(&g_rptun_sem); nxsem_post(&g_rptun_sem);
/* Remote proc stop */ /* Remote proc stop and shutdown */
remoteproc_stop(rproc); remoteproc_shutdown(rproc);
/* Remote proc remove */ /* Remote proc remove */
@ -544,7 +548,6 @@ static int rptun_dev_stop(FAR struct remoteproc *rproc)
kmm_free(bind); kmm_free(bind);
} }
priv->started = false;
return 0; return 0;
} }
@ -557,14 +560,14 @@ static int rptun_dev_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
switch (cmd) switch (cmd)
{ {
case RPTUNIOC_START: case RPTUNIOC_START:
if (!priv->started) if (priv->rproc.state == RPROC_OFFLINE)
{ {
ret = rptun_dev_start(&priv->rproc); ret = rptun_dev_start(&priv->rproc);
} }
break; break;
case RPTUNIOC_STOP: case RPTUNIOC_STOP:
if (priv->started) if (priv->rproc.state != RPROC_OFFLINE)
{ {
ret = rptun_dev_stop(&priv->rproc); ret = rptun_dev_stop(&priv->rproc);
} }
@ -829,9 +832,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
priv->dev = dev; priv->dev = dev;
metal_list_init(&priv->bind); metal_list_init(&priv->bind);
remoteproc_init(&priv->rproc, &g_rptun_ops, priv); remoteproc_init(&priv->rproc, &g_rptun_ops, priv);
remoteproc_config(&priv->rproc, NULL);
if (RPTUN_IS_AUTOSTART(dev)) if (RPTUN_IS_AUTOSTART(dev))
{ {