Skip to content

rptun.c: fix rptun.c format follow rpmsg virtio #13172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 26, 2024
Merged

rptun.c: fix rptun.c format follow rpmsg virtio #13172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions drivers/rptun/rptun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
FAR struct rptun_priv_s *priv;
static bool onceinit = false;
FAR char *argv[3];
char arg1[19];
char arg1[32];
char name[32];
int ret;

Expand All @@ -993,11 +993,12 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
priv = kmm_zalloc(sizeof(struct rptun_priv_s));
if (priv == NULL)
{
ret = -ENOMEM;
goto err_mem;
return -ENOMEM;
}

priv->dev = dev;
nxsem_init(&priv->semtx, 0, 0);
nxsem_init(&priv->semrx, 0, 0);

remoteproc_init(&priv->rproc, &g_rptun_ops, priv);

Expand All @@ -1008,10 +1009,8 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
goto err_driver;
}

nxsem_init(&priv->semtx, 0, 0);
nxsem_init(&priv->semrx, 0, 0);
snprintf(arg1, sizeof(arg1), "0x%" PRIxPTR, (uintptr_t)priv);
argv[0] = (FAR void *)RPTUN_GET_CPUNAME(dev);
snprintf(arg1, sizeof(arg1), "%p", priv);
argv[0] = (FAR char *)RPTUN_GET_CPUNAME(dev);
argv[1] = arg1;
argv[2] = NULL;

Expand All @@ -1032,10 +1031,10 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
rpmsg_unregister(name, &priv->rpmsg);

err_driver:
nxsem_destroy(&priv->semtx);
nxsem_destroy(&priv->semrx);
kmm_free(priv);

err_mem:
metal_finish();
return ret;
}

Expand Down