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

usrsock: adjust rptun API

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-06-06 16:41:20 +08:00 committed by Xiang Xiao
parent ab43c625d1
commit 1345fa13b1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
View File

@ -222,6 +222,7 @@ int main(int argc, char *argv[])
ret = rpmsg_register_callback(&priv, ret = rpmsg_register_callback(&priv,
usrsock_rpmsg_device_created, usrsock_rpmsg_device_created,
usrsock_rpmsg_device_destroy, usrsock_rpmsg_device_destroy,
NULL,
NULL); NULL);
if (ret < 0) if (ret < 0)
{ {
@ -318,6 +319,7 @@ unregister_callback:
rpmsg_unregister_callback(&priv, rpmsg_unregister_callback(&priv,
usrsock_rpmsg_device_created, usrsock_rpmsg_device_created,
usrsock_rpmsg_device_destroy, usrsock_rpmsg_device_destroy,
NULL,
NULL); NULL);
destroy_sem: destroy_sem:
sem_destroy(&priv.sem); sem_destroy(&priv.sem);

15
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
View File

@ -112,6 +112,8 @@ static int usrsock_rpmsg_dns_handler(struct rpmsg_endpoint *ept,
void *data, size_t len, void *data, size_t len,
uint32_t src, void *priv_); uint32_t src, void *priv_);
static bool usrsock_rpmsg_ns_match(struct rpmsg_device *rdev, void *priv_,
const char *name, uint32_t dest);
static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_, static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_,
const char *name, uint32_t dest); const char *name, uint32_t dest);
static void usrsock_rpmsg_ns_unbind(struct rpmsg_endpoint *ept); static void usrsock_rpmsg_ns_unbind(struct rpmsg_endpoint *ept);
@ -822,6 +824,12 @@ static int usrsock_rpmsg_send_dns_event(void *arg,
} }
#endif #endif
static bool usrsock_rpmsg_ns_match(struct rpmsg_device *rdev, void *priv_,
const char *name, uint32_t dest)
{
return !strcmp(name, USRSOCK_RPMSG_EPT_NAME);
}
static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_, static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_,
const char *name, uint32_t dest) const char *name, uint32_t dest)
{ {
@ -829,11 +837,6 @@ static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_,
struct rpmsg_endpoint *ept; struct rpmsg_endpoint *ept;
int ret; int ret;
if (strcmp(name, USRSOCK_RPMSG_EPT_NAME))
{
return;
}
ept = zalloc(sizeof(struct rpmsg_endpoint)); ept = zalloc(sizeof(struct rpmsg_endpoint));
if (!ept) if (!ept)
{ {
@ -1069,6 +1072,7 @@ int main(int argc, char *argv[])
ret = rpmsg_register_callback(priv, ret = rpmsg_register_callback(priv,
NULL, NULL,
NULL, NULL,
usrsock_rpmsg_ns_match,
usrsock_rpmsg_ns_bind); usrsock_rpmsg_ns_bind);
if (ret < 0) if (ret < 0)
{ {
@ -1097,6 +1101,7 @@ int main(int argc, char *argv[])
rpmsg_unregister_callback(priv, rpmsg_unregister_callback(priv,
NULL, NULL,
NULL, NULL,
usrsock_rpmsg_ns_match,
usrsock_rpmsg_ns_bind); usrsock_rpmsg_ns_bind);
free_fd: free_fd:
close(fd); close(fd);